diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 2da2d698b9..1f8aa619c7 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -67,8 +67,6 @@ variables: - name: Codeql.Cadence value: 0 - - group: DotNet-Symbol-Server-Pats - resources: repositories: - repository: 1ESPipelineTemplates @@ -105,7 +103,7 @@ extends: enableMicrobuild: true enablePublishTestResults: true testResultsFormat: 'vstest' - enablePublishUsingPipelines: true + publishingVersion: 4 artifacts: publish: logs: true @@ -113,6 +111,7 @@ extends: enableTelemetry: true jobs: - job: Windows + enablePublishing: true timeoutInMinutes: 90 pool: name: $(DncEngInternalBuildPool) @@ -148,9 +147,6 @@ extends: -prepareMachine /p:TeamName=$(_TeamName) /p:DotNetFinalVersionKind=$(_ReleaseVersionKind) - /p:DotNetPublishUsingPipelines=true - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:ProductsToBuild=$(_Products) /p:Test=false @@ -260,3 +256,5 @@ extends: LclPackageId: 'LCL-JUNO-PROD-TESTFX' - template: eng/common/templates-official/post-build/post-build.yml@self + parameters: + publishingInfraVersion: 4 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0f2fe9f91a..8c36dfb8a4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,7 +55,6 @@ stages: enableMicrobuild: true enablePublishTestResults: true testResultsFormat: 'vstest' - enablePublishUsingPipelines: true artifacts: publish: artifacts: true @@ -283,10 +282,10 @@ stages: - template: /eng/common/templates/jobs/jobs.yml parameters: enableMicrobuild: true - enablePublishUsingPipelines: true artifacts: publish: - logs: true + logs: + name: 'Logs_Build_$(Agent.JobName)_$(_BuildConfig)' manifests: true enableTelemetry: true jobs: diff --git a/eng/Publishing.props b/eng/Publishing.props new file mode 100644 index 0000000000..f89fad2a98 --- /dev/null +++ b/eng/Publishing.props @@ -0,0 +1,5 @@ + + + 4 + +