diff --git a/azure-pipelines-nonprod.yml b/azure-pipelines-nonprod.yml index 42981a4430..7260e50aa1 100644 --- a/azure-pipelines-nonprod.yml +++ b/azure-pipelines-nonprod.yml @@ -7,8 +7,6 @@ variables: value: AspNetCore - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true -- name: _PublishUsingPipelines - value: true - name: _BuildConfig value: Release # Rely on task Arcade injects, not auto-injected build step. @@ -67,12 +65,13 @@ extends: enableMicrobuild: true enablePublishBuildArtifacts: true enablePublishTestResults: true + publishingVersion: 4 enablePublishBuildAssets: true - enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }} enableTelemetry: true mergeTestResults: true jobs: - job: Windows + enablePublishing: true pool: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 @@ -82,7 +81,6 @@ extends: - name: _OfficialBuildArgs value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignType value: real @@ -108,7 +106,7 @@ extends: PublishLocation: Container - template: /eng/common/templates-official/post-build/post-build.yml@self parameters: - publishingInfraVersion: 3 + publishingInfraVersion: 4 enableSymbolValidation: false enableSourceLinkValidation: false enableSigningValidation: false diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml index 9c3ab173b4..76e5faf9d4 100644 --- a/azure-pipelines-pr.yml +++ b/azure-pipelines-pr.yml @@ -8,8 +8,6 @@ variables: value: AspNetCore - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true - - name: _PublishUsingPipelines - value: true - name: _BuildConfig value: Release - template: /eng/common/templates/variables/pool-providers.yml @@ -36,7 +34,6 @@ stages: enablePublishBuildArtifacts: true enablePublishTestResults: true enablePublishBuildAssets: true - enablePublishUsingPipelines: true enableTelemetry: true mergeTestResults: true jobs: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1800ac7b7f..591f3b7aa4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,8 +7,6 @@ variables: value: AspNetCore - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true -- name: _PublishUsingPipelines - value: true - name: _BuildConfig value: Release # Rely on task Arcade injects, not auto-injected build step. @@ -61,12 +59,13 @@ extends: enableMicrobuild: true enablePublishBuildArtifacts: true enablePublishTestResults: true + publishingVersion: 4 enablePublishBuildAssets: true - enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }} enableTelemetry: true mergeTestResults: true jobs: - job: Windows + enablePublishing: true pool: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 @@ -76,7 +75,6 @@ extends: - name: _OfficialBuildArgs value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - name: _SignType value: real @@ -102,7 +100,7 @@ extends: PublishLocation: Container - template: /eng/common/templates-official/post-build/post-build.yml@self parameters: - publishingInfraVersion: 3 + publishingInfraVersion: 4 enableSymbolValidation: false enableSourceLinkValidation: false enableSigningValidation: false diff --git a/eng/Publishing.props b/eng/Publishing.props index 86f157d5c2..941dcdf443 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,7 +1,7 @@ - 3 + 4 @@ -48,4 +48,4 @@ - \ No newline at end of file +