Skip to content

Commit d1a94a9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250602.2 (#1253)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.25271.1 -> To Version 9.0.0-beta.25302.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b567cdb commit d1a94a9

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -207,38 +207,38 @@
207207
<Uri>https://github.com/dotnet/llvm-project</Uri>
208208
<Sha>daa0939940ad46ff17734d8eb0b795d711d3ca69</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25271.1">
210+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
212+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25271.1">
214+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
216+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
217217
</Dependency>
218-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25271.1">
218+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25302.2">
219219
<Uri>https://github.com/dotnet/arcade</Uri>
220-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
220+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25271.1">
222+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25302.2">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
224+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25271.1">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25302.2">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
228+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
229229
</Dependency>
230-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25271.1">
230+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25302.2">
231231
<Uri>https://github.com/dotnet/arcade</Uri>
232-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
232+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
233233
</Dependency>
234-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25271.1">
234+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25302.2">
235235
<Uri>https://github.com/dotnet/arcade</Uri>
236-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
236+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
237237
</Dependency>
238238
<!-- Intermediate is necessary for source build. -->
239-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25271.1">
239+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25302.2">
240240
<Uri>https://github.com/dotnet/arcade</Uri>
241-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
241+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
242242
<SourceBuild RepoName="arcade" ManagedOnly="true" />
243243
</Dependency>
244244
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
5252
</PropertyGroup>
5353
<PropertyGroup>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25271.1</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25271.1</MicrosoftDotNetBuildTasksTemplatingVersion>
56-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
57-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksTemplatingVersion>
56+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
57+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
5858
</PropertyGroup>
5959
<PropertyGroup>
6060
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ parameters:
4444
displayName: Publish installers and checksums
4545
type: boolean
4646
default: true
47+
48+
- name: requireDefaultChannels
49+
displayName: Fail the build if there are no default channel(s) registrations for the current build
50+
type: boolean
51+
default: false
4752

4853
- name: SDLValidationParameters
4954
type: object
@@ -312,5 +317,6 @@ stages:
312317
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
313318
-AzdoToken '$(System.AccessToken)'
314319
-WaitPublishingFinish true
320+
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
315321
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
316322
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ param(
55
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
77
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
8-
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
8+
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
9+
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
910
)
1011

1112
try {
@@ -33,6 +34,10 @@ try {
3334
if ("false" -eq $WaitPublishingFinish) {
3435
$optionalParams.Add("--no-wait") | Out-Null
3536
}
37+
38+
if ("true" -eq $RequireDefaultChannels) {
39+
$optionalParams.Add("--default-channels-required") | Out-Null
40+
}
3641

3742
& $darc add-build-to-channel `
3843
--id $buildId `

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "9.0.106"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1",
7-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
7+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)