Skip to content

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

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

Closed
dotnet-maestro wants to merge 4 commits into from
Closed

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

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
7f09cf8
Backflow from https://github.com/dotnet/dotnet / 887f3d5 build 297286
dotnet-maestro[bot] Jan 15, 2026
831c5a8
Update dependencies
dotnet-maestro[bot] Jan 15, 2026
8fcbc77
Merge branch 'main' into darc-main-d899b621-0894-4950-bf03-b67c1c553427
SimonZhao888 Jan 15, 2026
601456c
Merge branch 'main' into darc-main-d899b621-0894-4950-bf03-b67c1c553427
SimonZhao888 Jan 16, 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
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26062.101</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26062.101</SystemCommandLinePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26064.107</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26064.107</SystemCommandLinePackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.1</MicrosoftExtensionsLoggingPackageVersion>
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f" BarId="296906" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="887f3d5a26e1001ee2777afde10cadcacb8cc735" BarId="297286" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26062.101">
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26062.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="10.0.1">
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": "latestFeature",
"paths": [
Expand All @@ -10,9 +10,9 @@
"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.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.107"
}
}
2 changes: 1 addition & 1 deletion ...ft.TemplateEngine.Authoring.Templates/content/TemplatePackage/New.Template.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Keep package type as 'Template' to show the package as a template package on nuget.org and make your template available in dotnet new search.-->
<PackageType>Template</PackageType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>
<ContentTargetFolders>content</ContentTargetFolders>
Expand Down
Loading