diff --git a/azure-pipelines-microbuild-preview.yml b/azure-pipelines-microbuild-preview.yml index 82cf6c014..d1720922c 100644 --- a/azure-pipelines-microbuild-preview.yml +++ b/azure-pipelines-microbuild-preview.yml @@ -32,5 +32,4 @@ extends: validateHelix: false enablePublishBuildArtifacts: false enablePublishBuildAssets: false - enablePublishUsingPipelines: false diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml index 20615d37b..1d99cd174 100644 --- a/azure-pipelines-pr.yml +++ b/azure-pipelines-pr.yml @@ -27,7 +27,6 @@ stages: enableMicrobuild: true enablePublishBuildArtifacts: true enablePublishBuildAssets: true - enablePublishUsingPipelines: true enableTelemetry: true enableSourceBuild: true helixRepo: dotnet/arcade-validation diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2d35df442..14c6bdcb2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,6 +74,7 @@ extends: - template: /eng/common/templates-official/post-build/post-build.yml@self parameters: + publishingInfraVersion: 4 # Symbol validation isn't being very reliable lately. This should be enabled back # once this issue is resolved: https://github.com/dotnet/arcade/issues/2871 enableSymbolValidation: false diff --git a/eng/Publishing.props b/eng/Publishing.props new file mode 100644 index 000000000..f89fad2a9 --- /dev/null +++ b/eng/Publishing.props @@ -0,0 +1,5 @@ + + + 4 + + diff --git a/eng/build.yml b/eng/build.yml index 40796f7f2..82ce17c71 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -3,7 +3,6 @@ parameters: enableHelixValidation: true enablePublishBuildArtifacts: true enablePublishBuildAssets: true - enablePublishUsingPipelines: true stages: - stage: build @@ -16,7 +15,7 @@ stages: enableMicrobuildForMacAndLinux: true enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} enablePublishBuildAssets: ${{ parameters.enablePublishBuildAssets }} - enablePublishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishingVersion: 4 enableTelemetry: true enableSourceBuild: ${{ parameters.enableSourceBuild }} helixRepo: dotnet/arcade-validation @@ -25,10 +24,10 @@ stages: clean: true jobs: - job: Windows_NT + enablePublishing: true variables: - _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER) strategy: @@ -64,7 +63,6 @@ stages: variables: - _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) strategy: @@ -104,7 +102,6 @@ stages: # 10 minute timeout and diagnostic logging needed to diagnose https://github.com/dotnet/dnceng/issues/4798 - _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:SignToolDotNetTimeout=600000 /p:SignToolMSBuildVerbosity=diagnostic