Skip to content

Commit 045ce32

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250602.2 (#10905)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk 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 eb36809 commit 045ce32

File tree

6 files changed

+23
-48
lines changed

6 files changed

+23
-48
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,8 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<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" />
9-
<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" />
10-
<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" />
11-
<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" />
12-
<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" />
13-
<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" />
14-
<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" />
15-
<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" />
16-
<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" />
178
<!-- End: Package sources from dotnet-runtime -->
189
<!-- Begin: Package sources from dotnet-winforms -->
19-
<add key="darc-int-dotnet-winforms-711ee9f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-winforms-711ee9f-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-8/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-winforms-711ee9f-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-7/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-winforms-711ee9f-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-6/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-winforms-711ee9f-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-5/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-winforms-711ee9f-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-4/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-winforms-711ee9f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-3/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-winforms-711ee9f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-2/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-winforms-711ee9f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-711ee9fe-1/nuget/v3/index.json" />
2810
<!-- End: Package sources from dotnet-winforms -->
2911
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3012
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -40,26 +22,8 @@
4022
<disabledPackageSources>
4123
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4224
<!-- Begin: Package sources from dotnet-runtime -->
43-
<add key="darc-int-dotnet-runtime-e36e4d1-1" value="true" />
44-
<add key="darc-int-dotnet-runtime-e36e4d1-2" value="true" />
45-
<add key="darc-int-dotnet-runtime-e36e4d1-3" value="true" />
46-
<add key="darc-int-dotnet-runtime-e36e4d1-4" value="true" />
47-
<add key="darc-int-dotnet-runtime-e36e4d1-5" value="true" />
48-
<add key="darc-int-dotnet-runtime-e36e4d1-6" value="true" />
49-
<add key="darc-int-dotnet-runtime-e36e4d1-7" value="true" />
50-
<add key="darc-int-dotnet-runtime-e36e4d1-8" value="true" />
51-
<add key="darc-int-dotnet-runtime-e36e4d1" value="true" />
5225
<!-- End: Package sources from dotnet-runtime -->
5326
<!-- Begin: Package sources from dotnet-winforms -->
54-
<add key="darc-int-dotnet-winforms-711ee9f-1" value="true" />
55-
<add key="darc-int-dotnet-winforms-711ee9f-2" value="true" />
56-
<add key="darc-int-dotnet-winforms-711ee9f-3" value="true" />
57-
<add key="darc-int-dotnet-winforms-711ee9f-4" value="true" />
58-
<add key="darc-int-dotnet-winforms-711ee9f-5" value="true" />
59-
<add key="darc-int-dotnet-winforms-711ee9f-6" value="true" />
60-
<add key="darc-int-dotnet-winforms-711ee9f-7" value="true" />
61-
<add key="darc-int-dotnet-winforms-711ee9f-8" value="true" />
62-
<add key="darc-int-dotnet-winforms-711ee9f" value="true" />
6327
<!-- End: Package sources from dotnet-winforms -->
6428
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6529
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25271.1">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
170+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25271.1">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25302.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
174+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25271.1">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
178+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25271.1">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25302.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
186+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

‎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
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2"
1717
},
1818
"sdk": {
1919
"version": "9.0.106"

0 commit comments

Comments
 (0)