diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index c2e3aea6249..4510a0702c0 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -22,6 +22,10 @@ parameters: displayName: Require Default Channels type: boolean default: true +- name: enableSigningValidation + displayName: Enable Signing Validation + type: boolean + default: true variables: # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script. @@ -45,9 +49,8 @@ variables: - ${{ if eq(parameters.EnableOptProf, false) }}: - name: SkipApplyOptimizationData value: true - - ${{ if and(not(startsWith(variables['Build.SourceBranch'], 'refs/heads/exp/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/perf/'))) }}: - - name: requireDefaultChannels - value: ${{ parameters.requireDefaultChannelsEnabled }} + - name: requireDefaultChannels + value: ${{ parameters.requireDefaultChannelsEnabled }} - name: EnableReleaseOneLocBuild value: true # Enable loc for vs17.14 - name: Codeql.Enabled @@ -127,4 +130,12 @@ extends: parameters: isExperimental: false enableComponentGovernance: true - enableSigningValidation: true + + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: true + enableSourceLinkValidation: false + enableNugetValidation: false + requireDefaultChannels: ${{ parameters.requireDefaultChannelsEnabled }} + enableSigningValidation: ${{ parameters.enableSigningValidation }} diff --git a/azure-pipelines/.vsts-dotnet-build-jobs.yml b/azure-pipelines/.vsts-dotnet-build-jobs.yml index 92dfb7b7d5e..d267de0ca42 100644 --- a/azure-pipelines/.vsts-dotnet-build-jobs.yml +++ b/azure-pipelines/.vsts-dotnet-build-jobs.yml @@ -6,9 +6,6 @@ parameters: - name: enableComponentGovernance type: boolean default: false -- name: enableSigningValidation - type: boolean - default: false jobs: - job: Windows_NT @@ -53,7 +50,7 @@ jobs: restoreSolution: 'eng\common\internal\Tools.csproj' nugetConfigPath: 'eng\common\internal\NuGet.config' restoreDirectory: '$(Build.SourcesDirectory)\.packages' - + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: @@ -234,12 +231,3 @@ jobs: name: $(DncEngInternalBuildPool) image: $(WindowsImage) os: windows - -- template: /eng/common/templates-official/post-build/post-build.yml@self - parameters: - publishingInfraVersion: 3 - enableSymbolValidation: true - enableSourceLinkValidation: false - enableNugetValidation: false - requireDefaultChannels: ${{ variables.requireDefaultChannels }} - enableSigningValidation: ${{ variables.enableSigningValidation }} \ No newline at end of file diff --git a/azure-pipelines/.vsts-dotnet-exp-perf.yml b/azure-pipelines/.vsts-dotnet-exp-perf.yml index b0ebac31c46..743fb7b855e 100644 --- a/azure-pipelines/.vsts-dotnet-exp-perf.yml +++ b/azure-pipelines/.vsts-dotnet-exp-perf.yml @@ -18,6 +18,10 @@ parameters: displayName: Require Default Channels type: boolean default: true +- name: enableSigningValidation + displayName: Enable Signing Validation + type: boolean + default: false variables: # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script. @@ -85,4 +89,12 @@ extends: parameters: isExperimental: true enableComponentGovernance: false - enableSigningValidation: false + + - template: /eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 3 + enableSymbolValidation: true + enableSourceLinkValidation: false + enableNugetValidation: false + requireDefaultChannels: ${{ parameters.requireDefaultChannelsEnabled }} + enableSigningValidation: ${{ parameters.enableSigningValidation }} \ No newline at end of file