Switch to yml and

change project to new SDK to pack nupkg
2023-01-27 11:44:01 -07:00 · 2023-01-27 11:44:01 -07:00 · 9415850042
commit 9415850042
parent 681ffefb58
8 changed files with 212 additions and 281 deletions
--- a/.groovy
+++ b/.groovy
@ -1,89 +0,0 @@
-#!/usr/bin/env groovy
-/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */
-import groovy.transform.Field
-
-@Field String _DDrive = 'D:/'
-@Field String _SolutionName = '...'
-@Field String _GitCommitSeven = '...'
-@Field String _GitName = 'PDF-Text-Stripper'
-@Field String _AgentStaging = 'mestsa07ec-ecmeseaf'
-@Field String _DDriveNet = "${_DDrive}Framework4.8"
-@Field String _AgentProduction = 'messa08ec-ecmeseaf'
-@Field String _AgentDevelopment = 'mestsa003-mesedasvc'
-@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe'
-
-pipeline {
-    agent {
-        label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else'
-    }
-    parameters {
-        string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server')
-    }
-    stages {
-        stage('Git') {
-            steps {
-                bat(returnStatus: true, script: 'git init')
-                bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git')
-                bat(returnStatus: true, script: 'git pull origin master')
-            }
-        }
-        stage('Setup') {
-            steps {
-                script {
-                    _SolutionName = "${env.JOB_NAME}"
-                    _GitCommitSeven = '1234567'
-                    // _GitCommitSeven = env.GIT_COMMIT.substring(0, 7)
-                    def files = findFiles(glob: '*.sln')
-                    if (files.length != 1) {
-                        error("Build failed because couldn't find a *.sln file")
-                    }
-                    echo """
-                        ${files[0].name}
-                        ${files[0].path}
-                        ${files[0].directory}
-                        ${files[0].length}
-                        ${files[0].lastModified}
-                        """
-                    _SolutionName = files[0].name.split('[.]sln')[0]
-                }
-            }
-        }
-        stage('Info') {
-            steps {
-                echo "_SolutionName ${_SolutionName}" // ...
-                echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11
-                echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master
-                echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41
-                echo "GIT_SERVER ${params.GIT_SERVER}" // ...
-                echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git
-                echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11
-                echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/
-                echo "JOB_NAME ${env.JOB_NAME}" // ...
-                echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\...
-            }
-        }
-        stage('Framework Build') {
-            steps {
-                echo "Build number is ${currentBuild.number}"
-                bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' +
-                    '/ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; ' +
-                    '/DetailedSummary ' +
-                    '/m ' +
-                    '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' +
-                    '/restore:True ' +
-                    '/target:Build ' +
-                    _SolutionName + '.sln')
-            }
-        }
-        // stage('Force Fail') {
-        //     steps {
-        //         error("Build failed because of this and that..")
-        //     }
-        // }
-    }
-    post {
-        always {
-            // cleanWs()
-        }
-    }
-}
--- a/89
+++ b/89
@ -1,89 +0,0 @@
-#!/usr/bin/env groovy
-/* groovylint-disable CompileStatic, ConsecutiveStringConcatenation, DuplicateNumberLiteral, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, VariableTypeRequired */
-import groovy.transform.Field
-
-@Field String _DDrive = 'D:/'
-@Field String _SolutionName = '...'
-@Field String _GitCommitSeven = '...'
-@Field String _GitName = 'PDF-Text-Stripper'
-@Field String _AgentStaging = 'mestsa07ec-ecmeseaf'
-@Field String _DDriveNet = "${_DDrive}Framework4.8"
-@Field String _AgentProduction = 'messa08ec-ecmeseaf'
-@Field String _AgentDevelopment = 'mestsa003-mesedasvc'
-@Field String _ProgramFilesMSBuild = 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe'
-
-pipeline {
-    agent {
-        label env.JENKINS_ENVIRONMENT == 'Development' ? _AgentDevelopment : env.JENKINS_ENVIRONMENT == 'Staging' ? _AgentStaging : env.JENKINS_ENVIRONMENT == 'Production' ? _AgentProduction : 'Else'
-    }
-    parameters {
-        string(name: 'GIT_SERVER', defaultValue: env.JENKINS_ENVIRONMENT == 'Development' ? 'mestsa003.infineon.com' : 'mestsa07ec.ec.local', description: 'git server')
-    }
-    stages {
-        // stage('Git') {
-        //     steps {
-        //         bat(returnStatus: true, script: 'git init')
-        //         bat(returnStatus: true, script: 'git remote add origin \\\\' + params.GIT_SERVER + '\\Git\\' + _GitName + '.git')
-        //         bat(returnStatus: true, script: 'git pull origin master')
-        //     }
-        // }
-        stage('Setup') {
-            steps {
-                script {
-                    _SolutionName = "${env.JOB_NAME}"
-                    _GitCommitSeven = '1234567'
-                    // _GitCommitSeven = env.GIT_COMMIT.substring(0, 7)
-                    def files = findFiles(glob: '*.sln')
-                    if (files.length != 1) {
-                        error("Build failed because couldn't find a *.sln file")
-                    }
-                    echo """
-                        ${files[0].name}
-                        ${files[0].path}
-                        ${files[0].directory}
-                        ${files[0].length}
-                        ${files[0].lastModified}
-                        """
-                    _SolutionName = files[0].name.split('[.]sln')[0]
-                }
-            }
-        }
-        stage('Info') {
-            steps {
-                echo "_SolutionName ${_SolutionName}" // ...
-                echo "BUILD_NUMBER ${env.BUILD_NUMBER}" // 11
-                echo "GIT_BRANCH ${env.GIT_BRANCH}" // origin/master
-                echo "GIT_COMMIT ${env.GIT_COMMIT}" // 73b814069f2cf0173a62a8228815a9bc9ba93c41
-                echo "GIT_SERVER ${params.GIT_SERVER}" // ...
-                echo "GIT_URL ${env.GIT_URL}" // D:\ProgramData\Git\....git
-                echo "JENKINS_ENVIRONMENT ${env.JENKINS_ENVIRONMENT}" // 11
-                echo "JENKINS_URL ${env.JENKINS_URL}" // http://localhost:8080/
-                echo "JOB_NAME ${env.JOB_NAME}" // ...
-                echo "WORKSPACE ${env.WORKSPACE}" // D:\.jenkins\_\...
-            }
-        }
-        stage('Framework Build') {
-            steps {
-                echo "Build number is ${currentBuild.number}"
-                bat(returnStatus: true, script: '"' + _ProgramFilesMSBuild + '" ' +
-                    '/ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; ' +
-                    '/DetailedSummary ' +
-                    '/m ' +
-                    '/property:Configuration=Debug;TargetFrameworkVersion=v4.8 ' +
-                    '/restore:True ' +
-                    '/target:Build ' +
-                    _SolutionName + '.sln')
-            }
-        }
-        // stage('Force Fail') {
-        //     steps {
-        //         error("Build failed because of this and that..")
-        //     }
-        // }
-    }
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
--- a/PDF-Text-Stripper-Development.yml
+++ b/PDF-Text-Stripper-Development.yml
@ -0,0 +1,91 @@
+trigger:
+  branches:
+    include:
+      - development
+
+pool:
+  name: Mesa-Windows-Service
+  demands: PDF-Text-Stripper-Development
+
+steps:
+  - script: |
+      set coreVersion=net6.0
+      echo %coreVersion%
+      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
+      echo $(CoreVersion)
+    displayName: CoreVersion
+
+  - script: |
+      set configuration=Debug
+      echo %configuration%
+      echo ##vso[task.setvariable variable=Configuration;]%configuration%
+      echo ($Configuration)
+    displayName: Configuration
+
+  - script: |
+      set nugetSource=https://messa017.infineon.com/v3/index.json
+      echo %nugetSource%
+      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
+      echo $(NugetSource)
+    displayName: NugetSource
+
+  - script: |
+      set gitCommit=$(Build.SourceVersion)
+      set gitCommitSeven=%gitCommit:~0,7%
+      echo %gitCommitSeven%
+      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
+      echo $(GitCommitSeven)
+    displayName: GitCommitSeven
+
+  - script: |
+      echo $(Build.BuildId)
+      echo $(Build.Reason)
+      echo $(Build.Repository.Id)
+      echo $(Build.Repository.Name)
+      echo $(Build.SourceVersion)
+      echo $(CoreVersion)
+      echo $(Configuration)
+      echo $(NugetSource)
+      echo $(GitCommitSeven)
+      REM echo $(pipelinePassword)
+    displayName: "Echo Check"
+
+  - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
+    displayName: "Nuget Clear"
+    enabled: false
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
+    displayName: 'MSBuild Restore'
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+    displayName: MSBuild
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
+    displayName: 'Commit Id'
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: D:\Framework4.8'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
+      OverWrite: true
+    enabled: false
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
+      OverWrite: true
+    enabled: false
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+    workingDirectory: Tests
+    displayName: "Core Clean - Tests"
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
+    displayName: 'Force Fail'
+    enabled: false
--- a/PDF-Text-Stripper.yml
+++ b/PDF-Text-Stripper.yml
@ -0,0 +1,89 @@
+trigger:
+  branches:
+    include:
+      - master
+
+pool:
+  name: Mesa-Windows-Service
+  demands: PDF-Text-Stripper
+
+steps:
+  - script: |
+      set coreVersion=net6.0
+      echo %coreVersion%
+      echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
+      echo $(CoreVersion)
+    displayName: CoreVersion
+
+  - script: |
+      set configuration=Release
+      echo %configuration%
+      echo ##vso[task.setvariable variable=Configuration;]%configuration%
+      echo ($Configuration)
+    displayName: Configuration
+
+  - script: |
+      set nugetSource=https://messa08ec.ec.local/v3/index.json
+      echo %nugetSource%
+      echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
+      echo $(NugetSource)
+    displayName: NugetSource
+
+  - script: |
+      set gitCommit=$(Build.SourceVersion)
+      set gitCommitSeven=%gitCommit:~0,7%
+      echo %gitCommitSeven%
+      echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
+      echo $(GitCommitSeven)
+    displayName: GitCommitSeven
+
+  - script: |
+      echo $(Build.BuildId)
+      echo $(Build.Reason)
+      echo $(Build.Repository.Id)
+      echo $(Build.Repository.Name)
+      echo $(Build.SourceVersion)
+      echo $(CoreVersion)
+      echo $(Configuration)
+      echo $(NugetSource)
+      echo $(GitCommitSeven)
+      REM echo $(pipelinePassword)
+    displayName: "Echo Check"
+
+  - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
+    displayName: "Nuget Clear"
+    enabled: false
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8 /p:RestoreSources=$(NugetSource)'
+    displayName: 'MSBuild Restore'
+
+  - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /detailedsummary /consoleloggerparameters:PerformanceSummary;ErrorsOnly; /property:Configuration=$(Configuration);TargetFrameworkVersion=v4.8'
+    displayName: MSBuild
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)-$(Build.Repository.Name)>bin\$(Configuration)\$(Build.Repository.Name).txt'
+    displayName: 'Commit Id'
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: D:\Framework4.8'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: 'D:\Framework4.8\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
+      OverWrite: true
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: \\messv02ecc1.ec.local\EC_EAFRepository'
+    inputs:
+      SourceFolder: 'bin\$(Configuration)'
+      Contents: '*$(Build.Repository.Name)*'
+      TargetFolder: '\\messv02ecc1.ec.local\EC_EAFRepository\Staging\DeploymentStorage\Adaptation_$(Build.Repository.Name)'
+      OverWrite: true
+
+  - script: |
+      "C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)
+    workingDirectory: Tests
+    displayName: "Core Clean - Tests"
+
+  - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
+    displayName: 'Force Fail'
+    enabled: false
--- a/PDF-Text-Stripper/App.config
+++ b/PDF-Text-Stripper/App.config
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
--- a/PDF-Text-Stripper/PDF-Text-Stripper.csproj
+++ b/PDF-Text-Stripper/PDF-Text-Stripper.csproj
@ -1,62 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProjectGuid>{EBD5F9D2-02E8-44E7-A91F-C7D28E7D5C7E}</ProjectGuid>
-		<LangVersion>10.0</LangVersion>
-		<OutputType>Exe</OutputType>
-		<RootNamespace>PDF_Text_Stripper</RootNamespace>
-		<AssemblyName>PDF-Text-Stripper</AssemblyName>
-		<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-		<FileAlignment>512</FileAlignment>
-		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<Deterministic>true</Deterministic>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<PlatformTarget>AnyCPU</PlatformTarget>
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<Optimize>false</Optimize>
-		<OutputPath>bin\Debug\</OutputPath>
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<PlatformTarget>AnyCPU</PlatformTarget>
-		<DebugType>pdbonly</DebugType>
-		<Optimize>true</Optimize>
-		<OutputPath>bin\Release\</OutputPath>
-		<DefineConstants>TRACE</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-	<ItemGroup>
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-		<Reference Include="System.Xml.Linq" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="Microsoft.CSharp" />
-		<Reference Include="System.Data" />
-		<Reference Include="System.Net.Http" />
-		<Reference Include="System.Xml" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="Program.cs" />
-		<Compile Include="Properties\AssemblyInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="IKVM.AWT.WinForms">
-			<Version>7.2.4630.5</Version>
-		</PackageReference>
-		<PackageReference Include="Pdfbox">
-			<Version>1.1.1</Version>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="App.config" />
-	</ItemGroup>
-	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Authors>Mike Phares</Authors>
+    <Company>Infineon Technologies Americas Corp.</Company>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <LangVersion>10.0</LangVersion>
+    <OutputType>Exe</OutputType>
+    <PackageId>Infineon.Mesa.PDF.Text.Stripper</PackageId>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <TargetFrameworks>net48</TargetFrameworks>
+    <Version>4.8.0.1</Version>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5" />
+    <PackageReference Include="Pdfbox" Version="1.1.1" />
+  </ItemGroup>
 </Project>
--- a/PDF-Text-Stripper/Properties/AssemblyInfo.cs
+++ b/PDF-Text-Stripper/Properties/AssemblyInfo.cs
@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PDFTextStripper")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Infineon Technologies")]
-[assembly: AssemblyProduct("PDFTextStripper")]
-[assembly: AssemblyCopyright("Copyright © Infineon Technologies 2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ebd5f9d2-02e8-44e7-a91f-c7d28e7d5c7e")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.8.0.1")]
-[assembly: AssemblyFileVersion("4.8.0.1")]
--- a/global.json
+++ b/global.json
@ -0,0 +1,6 @@
+{
+    "sdk": {
+      "version": "6.0.100"
+    }
+  }
+