Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion azure-pipelines-microbuild-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ extends:
validateHelix: false
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishUsingPipelines: false

1 change: 0 additions & 1 deletion azure-pipelines-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ stages:
enableMicrobuild: true
enablePublishBuildArtifacts: true
enablePublishBuildAssets: true
enablePublishUsingPipelines: true
enableTelemetry: true
enableSourceBuild: true
helixRepo: dotnet/arcade-validation
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<PublishingVersion>4</PublishingVersion>
</PropertyGroup>
</Project>
7 changes: 2 additions & 5 deletions eng/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ parameters:
enableHelixValidation: true
enablePublishBuildArtifacts: true
enablePublishBuildAssets: true
enablePublishUsingPipelines: true

stages:
- stage: build
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -64,7 +63,6 @@ stages:
variables:
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType)
/p:TeamName=$(_TeamName)
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)

strategy:
Expand Down Expand Up @@ -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
Expand Down