diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml index 495a5abf..7915d05c 100644 --- a/azure-pipelines-pr.yml +++ b/azure-pipelines-pr.yml @@ -12,8 +12,6 @@ pr: variables: - name: _TeamName value: Roslyn - - name: _PublishUsingPipelines - value: true - name: _DotNetArtifactsCategory value: .NETCore @@ -27,7 +25,6 @@ stages: enablePublishBuildArtifacts: true enablePublishTestResults: true enablePublishBuildAssets: true - enablePublishUsingPipelines: $(_PublishUsingPipelines) enableTelemetry: true helixRepo: dotnet/symreader jobs: @@ -51,7 +48,6 @@ stages: /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) /p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) # else @@ -135,7 +131,7 @@ stages: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: - publishingInfraVersion: 3 + 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/azure-pipelines.yml b/azure-pipelines.yml index 9d399682..dba7721e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,12 +58,13 @@ extends: enablePublishBuildArtifacts: true enablePublishTestResults: true enablePublishBuildAssets: true - enablePublishUsingPipelines: true + publishingVersion: 4 enableTelemetry: true enableSourceBuild: true helixRepo: dotnet/metadata-tools jobs: - job: Windows + enablePublishing: true pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: vmImage: 'windows-latest' @@ -78,7 +79,6 @@ extends: - name: _OfficialBuildArgs value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(TeamName) - /p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER) # else - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: @@ -147,5 +147,5 @@ extends: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates-official/post-build/post-build.yml@self parameters: - publishingInfraVersion: 3 + publishingInfraVersion: 4 enableSymbolValidation: false \ No newline at end of file diff --git a/eng/Publishing.props b/eng/Publishing.props index 10bc8c86..b457aafd 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,6 +1,6 @@ - 3 + 4