Skip to content

Commit 0aed71d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13826)
[main] Source code updates from dotnet/dotnet
1 parent 0a14832 commit 0aed71d

File tree

5 files changed

+80
-80
lines changed

5 files changed

+80
-80
lines changed

‎eng/Version.Details.props‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props
77
<Project>
88
<PropertyGroup>
99
<!-- dotnet/dotnet dependencies -->
10-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetArcadeSdkPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25419.104</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25419.104</MicrosoftNETCorePlatformsPackageVersion>
21-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.1.25419.104</MicrosoftWin32SystemEventsPackageVersion>
22-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25419.104</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25419.104</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25419.104</SystemCodeDomPackageVersion>
25-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25419.104</SystemConfigurationConfigurationManagerPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25419.104</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>10.0.0-rc.1.25419.104</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25419.104</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25419.104</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25419.104</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25419.104</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>10.0.0-rc.1.25419.104</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25419.104</SystemWindowsExtensionsPackageVersion>
10+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetArcadeSdkPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCorePlatformsPackageVersion>
21+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.1.25420.121</MicrosoftWin32SystemEventsPackageVersion>
22+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25420.121</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24+
<SystemCodeDomPackageVersion>10.0.0-rc.1.25420.121</SystemCodeDomPackageVersion>
25+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25420.121</SystemConfigurationConfigurationManagerPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25420.121</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>10.0.0-rc.1.25420.121</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25420.121</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25420.121</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25420.121</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25420.121</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>10.0.0-rc.1.25420.121</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25420.121</SystemWindowsExtensionsPackageVersion>
3434
</PropertyGroup>
3535
<!--Property group for alternate package version names-->
3636
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="04752cb2abae96e13adee371bf45a334fc7a32d2" BarId="280037" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="c4dc56079d959dbdb7fc27ea8ad7f95194885923" BarId="280214" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25419.104">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25420.121">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
13+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25419.104">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25420.121">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
17+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25419.104">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25420.121">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
21+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.1.25419.104">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.1.25420.121">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
25+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25419.104">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25420.121">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
29+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25419.104">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25420.121">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
33+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25419.104">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25420.121">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
37+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25419.104">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25420.121">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
41+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25419.104">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25420.121">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
45+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25419.104">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25420.121">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
49+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25419.104">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25420.121">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
53+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25419.104">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25420.121">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
57+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25419.104">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25420.121">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
61+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.1.25419.104">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.1.25420.121">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
65+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25419.104">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25420.121">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
69+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25419.104">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25420.121">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
73+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25419.104">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25420.121">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
77+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.1.25419.104">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.1.25420.121">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
81+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25419.104">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.121">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
88+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25419.104">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25420.121">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
92+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25419.104">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25420.121">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
96+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25419.104">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.121">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
100+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25419.104">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25420.121">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
104+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25419.104">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25420.121">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>04752cb2abae96e13adee371bf45a334fc7a32d2</Sha>
108+
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/common/core-templates/steps/source-index-stage1-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
553553

554554
if (!(Test-Path $vsWhereExe)) {
555555
Create-Directory $vsWhereDir
556-
Write-Host 'Downloading vswhere $vswhereVersion'
556+
Write-Host "Downloading vswhere $vswhereVersion"
557557
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
558558
Retry({
559559
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25419.104",
25-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25419.104",
26-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25419.104",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121",
25+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25420.121",
26+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121",
2727
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
28-
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25419.104"
28+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25420.121"
2929
},
3030
"native-tools": {
3131
"cmake": "latest"

0 commit comments

Comments
 (0)