diff --git a/Install-Scripts.sln b/Install-Scripts.sln index 7165ecf19..876891b00 100644 --- a/Install-Scripts.sln +++ b/Install-Scripts.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32526.322 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignScripts", "src\Signing\SignScripts.csproj", "{8335F5A8-00BD-4457-924B-CAF878E5D929}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Install-Scripts.Test", "tests\Install-Scripts.Test\Install-Scripts.Test.csproj", "{EC847B17-29BB-486C-8BC8-91EA9565B286}" EndProject Global @@ -13,10 +11,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8335F5A8-00BD-4457-924B-CAF878E5D929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8335F5A8-00BD-4457-924B-CAF878E5D929}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8335F5A8-00BD-4457-924B-CAF878E5D929}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8335F5A8-00BD-4457-924B-CAF878E5D929}.Release|Any CPU.Build.0 = Release|Any CPU {EC847B17-29BB-486C-8BC8-91EA9565B286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC847B17-29BB-486C-8BC8-91EA9565B286}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC847B17-29BB-486C-8BC8-91EA9565B286}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 84a2ca171..5b67f67b4 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -13,6 +13,11 @@ stages: jobs: - template: /eng/common/templates/jobs/jobs.yml parameters: + artifacts: + publish: + artifacts: true + manifests: true + enableMicrobuild: true workspace: clean: all jobs: @@ -26,21 +31,28 @@ stages: - checkout: self clean: true steps: - - script: Build.cmd -test - displayName: Run Tests + - script: Build.cmd + -test + -sign + -configuration $(_BuildConfig) + -bl + $(_InternalBuildArgs) + displayName: Test and Sign - task: PublishTestResults@2 displayName: Publish Test Results inputs: testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/Debug/*.xml' + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' testRunTitle: $(Agent.JobName) mergeTestResults: true condition: always() - - task: PublishBuildArtifacts@1 - displayName: Publish Logs + - task: CopyFiles@2 + displayName: Gather logs for publish to artifacts inputs: - PathtoPublish: artifacts/log - ArtifactName: Logs_$(Agent.JobName) + SourceFolder: 'artifacts/log' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log' + continueOnError: true condition: always() - job: Linux @@ -52,13 +64,13 @@ stages: - checkout: self displayName: Checkout Self clean: true - - script: ./build.sh --test + - script: ./build.sh --test --configuration $(_BuildConfig) -bl displayName: Run Tests - task: PublishTestResults@2 displayName: Publish Test Results inputs: testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/Debug/*.xml' + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' testRunTitle: $(Agent.JobName) mergeTestResults: true condition: always() @@ -77,13 +89,13 @@ stages: - checkout: self displayName: Checkout Self clean: true - - script: ./build.sh --test + - script: ./build.sh --test --configuration $(_BuildConfig) -bl displayName: Run Tests - task: PublishTestResults@2 displayName: Publish Test Results inputs: testResultsFormat: xUnit - testResultsFiles: 'artifacts/TestResults/Debug/*.xml' + testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' testRunTitle: $(Agent.JobName) mergeTestResults: true condition: always() diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 2a6c4d995..ab1a687ef 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -59,10 +59,9 @@ extends: artifacts: publish: artifacts: true - logs: true manifests: true + isAssetlessBuild: true enableMicrobuild: true - enablePublishUsingPipelines: true workspace: clean: all jobs: @@ -77,8 +76,13 @@ extends: - checkout: self clean: true steps: - - script: Build.cmd -test - displayName: Run Tests + - script: Build.cmd + -sign + -test + -configuration $(_BuildConfig) + -bl + $(_InternalBuildArgs) + displayName: Test and Sign - task: PublishTestResults@2 displayName: Publish Test Results inputs: @@ -87,30 +91,22 @@ extends: testRunTitle: $(Agent.JobName) mergeTestResults: true condition: always() - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: artifacts/log - ArtifactName: Logs_$(Agent.JobName) - condition: always() - - script: eng\common\cibuild.cmd - -configuration Release - -projects src/Signing/SignScripts.csproj - -prepareMachine - $(_InternalBuildArgs) - /p:Test=false - /p:DotNetSignType=$(_SignType) - /p:TeamName=$(_TeamName) - displayName: Sign scripts - env: - SIGNTOOL_DISABLE_TELEMETRY: 'true' - task: PowerShell@2 displayName: Validate Signature inputs: filePath: eng/common/sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:InputFiles='$(Build.Repository.LocalPath)/artifacts/bin/SignScripts/**/*.ps1' - /p:PackageBasePath='$(Build.Repository.LocalPath)/artifacts/bin/SignScripts/' + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.Repository.LocalPath)/artifacts/bin/SignScripts/$(_BuildConfig)/' + /p:RestoreConfigFile='$(Build.Repository.LocalPath)/NuGet.config' + - task: CopyFiles@2 + displayName: Gather logs for publish to artifacts + inputs: + SourceFolder: 'artifacts/log' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log' + continueOnError: true + condition: always() + - job: Linux timeoutInMinutes: 30 pool: @@ -121,7 +117,7 @@ extends: - checkout: self displayName: Checkout Self clean: true - - script: ./build.sh --test + - script: ./build.sh --test -configuration $(_BuildConfig) -bl displayName: Run Tests - task: PublishTestResults@2 displayName: Publish Test Results @@ -148,7 +144,7 @@ extends: - checkout: self displayName: Checkout Self clean: true - - script: ./build.sh --test + - script: ./build.sh --test -configuration $(_BuildConfig) -bl displayName: Run Tests - task: PublishTestResults@2 displayName: Publish Test Results @@ -169,8 +165,8 @@ extends: parameters: enableSigningValidation: false enableNugetValidation: false - enableSymbolValidation: true - enableSourceLinkValidation: true + enableSymbolValidation: false + enableSourceLinkValidation: false publishingInfraVersion: 3 publishDependsOn: - Validate @@ -189,4 +185,3 @@ extends: -TsaCodebaseName "Install-Scripts" -TsaPublish $True -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)\eng\policheck_exclusions.xml")' - diff --git a/eng/Signing.props b/eng/Signing.props index 3260747b5..e40b797d1 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,5 +1,35 @@ + + <_SignOutputDir>$(ArtifactsDir)bin\SignScripts\$(Configuration)\ + + - + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/common-variables.yml b/eng/common-variables.yml index 1ab832309..1f6cffc0d 100644 --- a/eng/common-variables.yml +++ b/eng/common-variables.yml @@ -8,12 +8,16 @@ variables: value: True - name: _RunAsInternal value: False - - name: _InternalBuildArgs - value: '' - name: _UseBuildManifest value: False - name: _SignType value: test + - name: _BuildConfig + value: Release + - name: _InternalBuildArgs + value: /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: _RunAsPublic diff --git a/src/Signing/SignScripts.csproj b/src/Signing/SignScripts.csproj deleted file mode 100644 index 6b23720ca..000000000 --- a/src/Signing/SignScripts.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - net6.0 - false - false - false - false - true - UNUSED - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - Always - - - Always - - - Microsoft400 - - - Linux500046PGPDetached - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file