Skip to content

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

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
MiYanni merged 6 commits into from
Jan 20, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7dd7b7a
Backflow from https://github.com/dotnet/dotnet / 371e34a build 297654
dotnet-maestro[bot] Jan 16, 2026
faf1d02
Update dependencies
dotnet-maestro[bot] Jan 16, 2026
bc1b1b8
Update dependencies
dotnet-maestro[bot] Jan 17, 2026
8461b88
Update dependencies
dotnet-maestro[bot] Jan 18, 2026
633e1ef
Merge branch 'main' into darc-main-c3ebae14-da9b-47ef-8c1a-b1865ab644f1
DonnaChen888 Jan 20, 2026
2537604
Update hardcoded TFM form net10.0 to net11.0
DonnaChen888 Jan 20, 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.26066.111</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>3.0.0-preview.1.26066.111</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="411dbc3cd87aad5a3edbc879081055c9e00b1db0" BarId="297715" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26062.101">
<Dependency Name="System.CommandLine" Version="3.0.0-preview.1.26066.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>411dbc3cd87aad5a3edbc879081055c9e00b1db0</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.26066.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7b9ad20ba1d45df5a99fdd9dedbf3bfe6a6fc24f</Sha>
<Sha>411dbc3cd87aad5a3edbc879081055c9e00b1db0</Sha>
</Dependency>
<!-- Dependencies required for source build. We'll still update manually -->
<Dependency Name="System.Formats.Asn1" Version="10.0.1">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<PropertyGroup>
<VersionPrefix>11.0.100</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>

Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2019.amd64
Copy link
Member

@MiYanni MiYanni Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would arcade have image downgrades...? 🤔

os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2019.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2022.amd64
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2022.amd64
# demands: ImageOverride -equals windows.vs2019.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
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.26064.118",
"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.26064.118"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.101"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26066.111"
}
}
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
2 changes: 1 addition & 1 deletion ...ne.Authoring.Tasks.IntegrationTests/Resources/BasicTemplatePackage/TemplatePackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>TemplatePackage</PackageId>
<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ....Authoring.Tasks.IntegrationTests/Resources/InvalidTemplatePackage/TemplatePackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>TemplatePackage</PackageId>
<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ...asks.IntegrationTests/Resources/InvalidTemplatePackage_MissingName/TemplatePackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>TemplatePackage</PackageId>
<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ...egrationTests/Resources/InvalidTemplatePackage_MissingOptionalData/TemplatePackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>TemplatePackage</PackageId>
<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ...ine.Authoring.Tasks.IntegrationTests/Resources/TemplatePackageEnDe/TemplatePackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>TemplatePackage</PackageId>
<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ...Tasks.IntegrationTests/Resources/TemplatePackagePartiallyLocalized/TemplatePackage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<PackageType>Template</PackageType>
<PackageId>TemplatePackage</PackageId>
<Authors>Microsoft</Authors>
Expand Down
2 changes: 1 addition & 1 deletion ...s.IntegrationTests/Snapshots/templatepack.Basic.verified/templatepack/templatepack.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
2 changes: 1 addition & 1 deletion ...tes.IntegrationTests/Snapshots/templatepack.CLI.verified/templatepack/templatepack.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
2 changes: 1 addition & 1 deletion ...tionTests/Snapshots/templatepack.NoMSBuildTasks.verified/templatepack/templatepack.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
2 changes: 1 addition & 1 deletion ...ationTests/Snapshots/templatepack.WithName.verified/templatepack/MyTemplatePackage.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