Skip to content

Commit 345e534

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/9.0] Update dependencies from dotnet/arcade (#13545)
Update dependencies from https://github.com/dotnet/arcade build 20250602.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions 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 02c3f5e commit 345e534

File tree

6 files changed

+30
-37
lines changed

6 files changed

+30
-37
lines changed

‎NuGet.config

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-e36e4d1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-e36e4d1-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-8/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-e36e4d1-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-7/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-e36e4d1-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-6/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-e36e4d1-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-5/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-runtime-e36e4d1-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-4/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-e36e4d1-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-3/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-runtime-e36e4d1-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-2/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-runtime-e36e4d1-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e36e4d1a-1/nuget/v3/index.json" />
167
<!-- End: Package sources from dotnet-runtime -->
178
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
189
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -33,15 +24,6 @@
3324
<clear />
3425
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3526
<!-- Begin: Package sources from dotnet-runtime -->
36-
<add key="darc-int-dotnet-runtime-e36e4d1-1" value="true" />
37-
<add key="darc-int-dotnet-runtime-e36e4d1-2" value="true" />
38-
<add key="darc-int-dotnet-runtime-e36e4d1-3" value="true" />
39-
<add key="darc-int-dotnet-runtime-e36e4d1-4" value="true" />
40-
<add key="darc-int-dotnet-runtime-e36e4d1-5" value="true" />
41-
<add key="darc-int-dotnet-runtime-e36e4d1-6" value="true" />
42-
<add key="darc-int-dotnet-runtime-e36e4d1-7" value="true" />
43-
<add key="darc-int-dotnet-runtime-e36e4d1-8" value="true" />
44-
<add key="darc-int-dotnet-runtime-e36e4d1" value="true" />
4527
<!-- End: Package sources from dotnet-runtime -->
4628
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4729
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
191191
</ProductDependencies>
192192
<ToolsetDependencies>
193193
<!-- Arcade -->
194-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25271.1">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
196+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25271.1">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25302.2">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
200+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.25271.1">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.25302.2">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
204+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25271.1">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
208+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25271.1">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" 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.XUnitExtensions" Version="9.0.0-beta.25271.1">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" 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>
218218
</ToolsetDependencies>
219219
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
</PropertyGroup>
5858
<!-- Arcade -->
5959
<PropertyGroup>
60-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetGenFacadesPackageVersion>
61-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25271.1</MicrosoftDotNetRemoteExecutorVersion>
62-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
60+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetGenFacadesPackageVersion>
61+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25302.2</MicrosoftDotNetRemoteExecutorVersion>
62+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
6363
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6464
</PropertyGroup>
6565
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "9.0.106"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1",
18-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25271.1",
19-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
18+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25302.2",
19+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "9.0.5"
2222
},

0 commit comments

Comments
 (0)