Skip to content

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

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

Open
dotnet-maestro wants to merge 5 commits into
base: main
Choose a base branch
from
+92 −98
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d91a331
Backflow from https://github.com/dotnet/dotnet / db3b742 build 296788
dotnet-maestro[bot] Jan 11, 2026
8239b69
Update dependencies
dotnet-maestro[bot] Jan 11, 2026
7ad85d0
Update dependencies
dotnet-maestro[bot] Jan 13, 2026
0f39ec9
Backflow from https://github.com/dotnet/dotnet / 887f3d5 build 297286
dotnet-maestro[bot] Jan 15, 2026
ba390ff
Update dependencies
dotnet-maestro[bot] Jan 15, 2026
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
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<!-- Don't use Arcade's ExcludeFrom* or TFM filtering build infra -->
<DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
<NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>

<!-- TODO: Remove when the NetCurrent property in the bootstrap Arcade SDK got updated to net11.0. -->
<NetCurrent>net11.0</NetCurrent>
</PropertyGroup>

</Project>
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>18.3.0-preview-26057-107</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.3.0-preview-26057-107</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>11.0.100-alpha.1.26057.107</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-alpha.1.26057.107</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-alpha.1.26057.107</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftBuildPackageVersion>18.4.0-preview-26064-107</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.4.0-preview-26064-107</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26064.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>11.0.100-alpha.1.26064.107</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-alpha.1.26064.107</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="896160ec9eb0fdb1c019f698b39fa0923c9a316c" BarId="296315" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="887f3d5a26e1001ee2777afde10cadcacb8cc735" BarId="297286" />
<ToolsetDependencies>
<Dependency Name="Microsoft.Build" Version="18.3.0-preview-26057-107">
<Dependency Name="Microsoft.Build" Version="18.4.0-preview-26064-107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.3.0-preview-26057-107">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.4.0-preview-26064-107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26057.107">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="11.0.100-alpha.1.26057.107">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="11.0.100-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-alpha.1.26057.107">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-alpha.1.26057.107">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>896160ec9eb0fdb1c019f698b39fa0923c9a316c</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
3 changes: 2 additions & 1 deletion .../Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetCurrent)</TargetFramework>
<TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>

<!-- Default assembly version causes CS7034. Assembly info is not necessary given this
msbuild task assembly is for build only purposes. -->
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<Deterministic>False</Deterministic>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<ItemGroup>
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": "11.0.100-alpha.1.25618.104",
"version": "11.0.100-alpha.1.26060.102",
"allowPrerelease": true,
"rollForward": "latestPatch",
"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": "11.0.100-alpha.1.25618.104"
"dotnet": "11.0.100-alpha.1.26060.102"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26057.107"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.107"
}
}
2 changes: 1 addition & 1 deletion src/externalPackages/externalPackages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Build.Traversal">

<PropertyGroup>
<TargetFramework>$(NetCurrent)</TargetFramework>
<TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/externalPackages/patches/MSBuildLocator/0002-Update-tfm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index 7308e50..5ade71c 100644
<PropertyGroup>
<OutputType>Library</OutputType>
- <TargetFrameworks>net46;net8.0</TargetFrameworks>
+ <TargetFrameworks>net10.0</TargetFrameworks>
+ <TargetFrameworks>net11.0</TargetFrameworks>
<DebugType>full</DebugType>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<AssemblyName>Microsoft.Build.Locator</AssemblyName>
Expand Down
Loading