Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/10.0] Source code updates from dotnet/dotnet #1374

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 4 commits into from
Sep 15, 2025
Merged

[release/10.0] Source code updates from dotnet/dotnet #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d68999a
Backflow from https://github.com/dotnet/dotnet / 26861c1 build 282973
dotnet-maestro[bot] Sep 13, 2025
7064853
Merge release/10.0 into darc-release/10.0-360ed1f1-bc7b-4166-820f-b89…
dotnet-maestro[bot] Sep 13, 2025
40e3d84
Update dependencies from https://github.com/dotnet/dotnet build 282973
dotnet-maestro[bot] Sep 13, 2025
25abd3c
Update dependencies from https://github.com/dotnet/dotnet build 283077
dotnet-maestro[bot] Sep 14, 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
12 changes: 6 additions & 6 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildPackageVersion>17.15.0-preview-25460-104</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25460-104</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25460.104</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.2.25460.104</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.2.25460.104</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftBuildPackageVersion>17.15.0-preview-25462-117</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25462-117</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25462.117</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25462.117</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.2.25462.117</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.2.25462.117</MicrosoftNETCoreILDAsmPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
26 changes: 13 additions & 13 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="eac14590f69f6876d418cef9e8fdd3f44f6ef0b2" BarId="282708" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="ee760c42a6df115208fe2262d358be6d4003e55f" BarId="283077" />
<ToolsetDependencies>
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25460-104">
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25462-117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25460-104">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25462-117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25460.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25462.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25460.104">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25462.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.2.25460.104">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.2.25462.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.2.25460.104">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.2.25462.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}

$dotnetVersions = @('5','6','7','8','9')
$dotnetVersions = @('5','6','7','8','9','10')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7' '8' '9')
DotNetVersions=('5' '6' '7' '8' '9' '10')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100-rc.1.25420.111",
"version": "10.0.100-rc.1.25451.107",
"allowPrerelease": true,
"rollForward": "latestFeature",
"paths": [
Expand All @@ -10,11 +10,11 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100-rc.1.25420.111"
"dotnet": "10.0.100-rc.1.25451.107"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.117"
}
}
40 changes: 40 additions & 0 deletions src/externalPackages/patches/MSBuildLocator/0003-Remove-MicroBuild-signing.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From 172ddcea384b69303bbfb9a0a3df39741f84adba Mon Sep 17 00:00:00 2001
From: Ella Hathaway <[email protected]>
Date: Thu, 14 Aug 2025 23:16:58 +0000
Subject: [PATCH] Remove MicroBuild signing
Backport: https://github.com/dotnet/arcade/issues/16057

---
.../Microsoft.Build.Locator.csproj | 18 ------------------
1 file changed, 18 deletions(-)

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index 2df3750..3990321 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -29,22 +29,4 @@
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
</ItemGroup>

- <ItemGroup>
- <PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
- <Content Include="build\Microsoft.Build.Locator.props">
- <CopyToOutputDirectory>Never</CopyToOutputDirectory>
- <PackagePath>build\</PackagePath>
- </Content>
- <Content Include="build\Microsoft.Build.Locator.targets">
- <CopyToOutputDirectory>Never</CopyToOutputDirectory>
- <PackagePath>build\</PackagePath>
- </Content>
- </ItemGroup>
-
- <ItemGroup>
- <FilesToSign Include="$(OutDir)\Microsoft.Build.Locator.dll">
- <Authenticode>Microsoft400</Authenticode>
- </FilesToSign>
- </ItemGroup>
-
</Project>
--
2.43.0