Skip to content

[main] Source code updates from dotnet/dotnet #13525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 49 additions & 49 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="9d86ce59f05e31b1bccb0cd5604f803416796fe4" BarId="269499" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25274.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25274.104">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25274.104">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25274.104">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25274.104">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25274.104">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25274.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25274.104">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25274.104">
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25274.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25274.104">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25274.104">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25274.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25274.104">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25274.104">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25276.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
42 changes: 21 additions & 21 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25274.104</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25274.104</SystemTextEncodingsWebVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25276.103</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25276.103</SystemTextEncodingsWebVersion>
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25274.104</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.6.25274.104</SystemIOHashingPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25276.103</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.6.25276.103</SystemIOHashingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25274.104</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreILDAsmPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25274.104</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.6.25274.104</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25274.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25274.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25274.104</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25274.104</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25274.104</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25274.104</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25276.103</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.6.25276.103</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25276.103</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25276.103</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25276.103</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25276.103</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25274.104</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25274.104</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25274.104</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25274.104</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25274.104</MicrosoftNETSdkILVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25276.103</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25276.103</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25276.103</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25276.103</MicrosoftNETSdkILVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand All @@ -46,9 +46,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25274.104</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25274.104</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25274.104</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25276.103</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"version": "10.0.100-preview.6.25272.112"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25274.104",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25274.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25274.104",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25276.103",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25276.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25276.103",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25274.104"
"Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25276.103"
},
"native-tools": {
"cmake": "latest"
Expand Down