Skip to content

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

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 26, 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
102 changes: 51 additions & 51 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,112 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="445fb3a55b402cbe3a43576105e6fdc6686c8e4c" BarId="269352" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="9d86ce59f05e31b1bccb0cd5604f803416796fe4" BarId="269499" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25272.109">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25272.109">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25272.109">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.5.25222.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>462eb030906d5cfcbcbbe22126855da1073cda15</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25272.109">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.6.25272.109">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.6.25272.109">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25272.109">
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25272.109">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25272.109">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25272.109">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25272.109">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25272.109">
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25272.109">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25274.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
<Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
46 changes: 23 additions & 23 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,35 @@
dotnet/winforms is handling versions for the analyzers.
-->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25272.109</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25272.109</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25272.109</MicrosoftSourceLinkGitHubVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25274.104</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25274.104</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25274.104</MicrosoftSourceLinkGitHubVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25272.109</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25272.109</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>10.0.0-preview.6.25272.109</SystemDrawingCommonVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25274.104</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25274.104</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>10.0.0-preview.6.25274.104</SystemDrawingCommonVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.6.25272.109</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25272.109</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.6.25272.109</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25272.109</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25272.109</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25272.109</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25272.109</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesVersion>10.0.0-preview.6.25272.109</SystemDirectoryServicesVersion>
<SystemFormatsNrbfVersion>10.0.0-preview.6.25272.109</SystemFormatsNrbfVersion>
<SystemIOPackagingVersion>10.0.0-preview.6.25272.109</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25272.109</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.6.25274.104</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25274.104</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.6.25274.104</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25274.104</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25274.104</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25274.104</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25274.104</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesVersion>10.0.0-preview.6.25274.104</SystemDirectoryServicesVersion>
<SystemFormatsNrbfVersion>10.0.0-preview.6.25274.104</SystemFormatsNrbfVersion>
<SystemIOPackagingVersion>10.0.0-preview.6.25274.104</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25274.104</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25272.109</SystemResourcesExtensionsVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25272.109</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25272.109</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25272.109</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25272.109</SystemWindowsExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25274.104</SystemResourcesExtensionsVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25274.104</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25274.104</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25274.104</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25274.104</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
Expand All @@ -61,7 +61,7 @@
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25272.109</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25274.104</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Sourcelink -->
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-preview.5.25265.106",
"dotnet": "10.0.100-preview.6.25272.112",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCorePlatformsVersion)"
Expand All @@ -14,12 +14,12 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25272.109",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25274.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25274.104",
"Microsoft.Build.NoTargets": "3.7.56"
},
"sdk": {
"version": "10.0.100-preview.5.25265.106"
"version": "10.0.100-preview.6.25272.112"
},
"native-tools": {
"strawberry-perl": "5.38.0.1",
Expand Down