Skip to content

Commit a53be97

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250409.3 (#8081)
[feature/10.0] Update dependencies from dotnet/arcade
1 parent edc7eb1 commit a53be97

File tree

6 files changed

+42
-25
lines changed

6 files changed

+42
-25
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25208.5">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25209.3">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
27+
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25208.5">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25209.3">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
31+
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25208.5">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25209.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
35+
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25208.5">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25209.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
39+
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25208.5">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25209.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
43+
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25208.5</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25208.5</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25208.5</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25209.3</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25209.3</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25209.3</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25208.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25208.1</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>

‎eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ parameters:
2929

3030
is1ESPipeline: ''
3131

32+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
33+
isAssetlessBuild: false
34+
3235
jobs:
3336
- job: Asset_Registry_Publish
3437

@@ -72,14 +75,15 @@ jobs:
7275
- checkout: self
7376
fetchDepth: 3
7477
clean: true
75-
76-
- task: DownloadPipelineArtifact@2
77-
displayName: Download Asset Manifests
78-
inputs:
79-
artifactName: AssetManifests
80-
targetPath: '$(Build.StagingDirectory)/AssetManifests'
81-
condition: ${{ parameters.condition }}
82-
continueOnError: ${{ parameters.continueOnError }}
78+
79+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
80+
- task: DownloadPipelineArtifact@2
81+
displayName: Download Asset Manifests
82+
inputs:
83+
artifactName: AssetManifests
84+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
85+
condition: ${{ parameters.condition }}
86+
continueOnError: ${{ parameters.continueOnError }}
8387

8488
- task: NuGetAuthenticate@1
8589

@@ -92,6 +96,7 @@ jobs:
9296
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9397
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
9498
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
99+
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
95100
/p:MaestroApiEndpoint=https://maestro.dot.net
96101
/p:OfficialBuildId=$(Build.BuildNumber)
97102
condition: ${{ parameters.condition }}
@@ -124,7 +129,7 @@ jobs:
124129
publishLocation: Container
125130
artifactName: ReleaseConfigs
126131

127-
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
132+
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
128133
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
129134
parameters:
130135
BARBuildId: ${{ parameters.BARBuildId }}
@@ -145,6 +150,7 @@ jobs:
145150
-WaitPublishingFinish true
146151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
147152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
153+
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
148154
149155
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
150156
- template: /eng/common/core-templates/steps/publish-logs.yml

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ parameters:
6060
artifactNames: ''
6161
downloadArtifacts: true
6262

63+
- name: isAssetlessBuild
64+
type: boolean
65+
displayName: Is Assetless Build
66+
default: false
67+
6368
# These parameters let the user customize the call to sdk-task.ps1 for publishing
6469
# symbols & general artifacts as well as for signing validation
6570
- name: symbolPublishingAdditionalParameters
@@ -320,3 +325,4 @@ stages:
320325
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
321326
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
322327
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
328+
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ param(
66
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
77
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
88
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
9-
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
9+
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
10+
[Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
1011
)
1112

1213
try {
@@ -39,6 +40,10 @@ try {
3940
$optionalParams.Add("--default-channels-required") | Out-Null
4041
}
4142

43+
if ("true" -eq $SkipAssetsPublishing) {
44+
$optionalParams.Add("--skip-assets-publishing") | Out-Null
45+
}
46+
4247
& $darc add-build-to-channel `
4348
--id $buildId `
4449
--publishing-infra-version $PublishingInfraVersion `

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"msbuild-sdks": {
3636
"Microsoft.Build.NoTargets": "3.7.0",
37-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25208.5",
38-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25208.5"
37+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3",
38+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25209.3"
3939
}
4040
}

0 commit comments

Comments
 (0)