Skip to content

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

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.

Sign up for GitHub

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 29, 2025
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7aba8
Update dependencies from https://github.com/dotnet/dotnet build 269724
dotnet-maestro[bot] May 28, 2025
ea1f399
Update dependencies from https://github.com/dotnet/dotnet build 269884
dotnet-maestro[bot] May 29, 2025
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
View file
Open in desktop
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="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d" BarId="269724" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25276.103">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25276.103">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25276.103">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25276.103">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25276.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25276.103">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25276.103">
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.6.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25276.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25276.103">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25276.103">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25276.103">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25276.103">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25276.103">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25277.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f5705c8f4c5079bba77bae8698ba1583bde0388c</Sha>
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
42 changes: 21 additions & 21 deletions eng/Versions.props
View file
Open in desktop
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.25276.103</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25276.103</SystemTextEncodingsWebVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25277.102</SystemReflectionMetadataLoadContextVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25277.102</SystemTextEncodingsWebVersion>
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25276.103</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.6.25276.103</SystemIOHashingPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-preview.6.25277.102</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-preview.6.25277.102</SystemIOHashingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25276.103</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.6.25277.102</MicrosoftNETCoreILDAsmPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<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>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25277.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-preview.6.25277.102</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25277.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.6.25277.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.6.25277.102</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-preview.6.25277.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25277.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.6.25277.102</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
<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>
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25277.102</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25277.102</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25277.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.6.25277.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETSdkILVersion>10.0.0-preview.6.25277.102</MicrosoftNETSdkILVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand All @@ -46,9 +46,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25276.103</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25276.103</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25277.102</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25277.102</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25277.102</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
2 changes: 1 addition & 1 deletion eng/common/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ function Build {
/p:Sign=$sign \
/p:Publish=$publish \
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
"${properties[@]}"
${properties[@]+"${properties[@]}"}

ExitWithExitCode 0
}
Expand Down
1 change: 0 additions & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,6 @@ function GetNuGetPackageCachePath() {
$env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
} else {
$env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
$env:RESTORENOHTTPCACHE = $true
}
}

Expand Down
2 changes: 0 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,12 @@ function InitializeBuildTool {
_InitializeBuildToolCommand="msbuild"
}

# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
function GetNuGetPackageCachePath {
if [[ -z ${NUGET_PACKAGES:-} ]]; then
if [[ "$use_global_nuget_cache" == true ]]; then
export NUGET_PACKAGES="$HOME/.nuget/packages/"
else
export NUGET_PACKAGES="$repo_root/.packages/"
export RESTORENOHTTPCACHE=true
fi
fi

Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
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.25276.103",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25276.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25276.103",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25277.102",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25277.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25277.102",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25276.103"
"Microsoft.NET.Sdk.IL": "10.0.0-preview.6.25277.102"
},
"native-tools": {
"cmake": "latest"
Expand Down
Loading