[release/7.0.x] Source code updates from dotnet/dotnet (#7061)

dotnet-maestro[bot] · web-flow · commit ed5f88d742db · 2026-01-19T19:43:05.000Z
[release/7.0.x] Source code updates from dotnet/dotnet
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -21,8 +21,8 @@ This file should be imported by eng/Versions.props
     <!-- dotnet/corefx dependencies -->
     <SystemComponentModelCompositionPackageVersion>4.5.0</SystemComponentModelCompositionPackageVersion>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26057.111</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26057.111</MicrosoftDotNetXliffTasksPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetXliffTasksPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="4ef9fba1ed958b047163527960c27baf2883f835" BarId="296350" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="99f9e99f92d73ade5453ba8edba5d72247f3cd11" BarId="297507" />
   <!--
     Currently this file is required to publish builds to .NET build asset registry.
     See https://github.com/dotnet/arcade/issues/2396 for details.
@@ -56,13 +56,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26057.111">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26065.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
+      <Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26057.111">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.26065.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
+      <Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
@@ -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.vs2019.amd64
+      image: windows.vs2022.amd64
       os: windows
   steps:
   - ${{ if eq(parameters.is1ESPipeline, '') }}:
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
@@ -293,11 +293,11 @@ stages:
         ${{ else }}:
           ${{ if eq(parameters.is1ESPipeline, true) }}:          
             name: NetCore1ESPool-Publishing-Internal
-            image: windows.vs2019.amd64
+            image: windows.vs2022.amd64
             os: windows
           ${{ else }}:
             name: NetCore1ESPool-Publishing-Internal
-            demands: ImageOverride -equals windows.vs2019.amd64          
+            demands: ImageOverride -equals windows.vs2022.amd64          
       steps:
         - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
           parameters:
diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml
@@ -23,7 +23,7 @@
 #
 #        pool:
 #           name: $(DncEngInternalBuildPool)
-#           demands: ImageOverride -equals windows.vs2019.amd64
+#           demands: ImageOverride -equals windows.vs2022.amd64
 variables:
   - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
     - template: /eng/common/templates-official/variables/pool-providers.yml
diff --git a/global.json b/global.json
@@ -9,7 +9,7 @@
     "pinned": true
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26057.111",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102",
     "Microsoft.Build.NoTargets": "3.7.0"
   }
 }
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/Why/WhyCommand.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/Why/WhyCommand.cs
@@ -23,7 +23,7 @@ internal static void Register(CommandLineApplication app)
             });
         }
 
-        internal static void Register(Command rootCommand, IAnsiConsole console)
+        internal static void Register(Command rootCommand, Lazy<IAnsiConsole> console)
         {
             Register(rootCommand, console, WhyCommandRunner.ExecuteCommand);
         }
@@ -36,11 +36,13 @@ internal static void Register(Command rootCommand, IAnsiConsole console)
         public static void GetWhyCommand(Command rootCommand)
         {
             Register(rootCommand,
-                Spectre.Console.AnsiConsole.Console,
+                new Lazy<IAnsiConsole>(() => Spectre.Console.AnsiConsole.Console),
                 WhyCommandRunner.ExecuteCommand);
         }
 
-        internal static void Register(Command rootCommand, IAnsiConsole console, Func<WhyCommandArgs, Task<int>> action)
+        // console must be lazy, because Spectre.Console's AnsiConsole will send VT sequences to the output
+        // as soon as it's created, which causes problems with the dotnet CLI's C++ output, like dotnet --info
+        internal static void Register(Command rootCommand, Lazy<IAnsiConsole> console, Func<WhyCommandArgs, Task<int>> action)
         {
             var whyCommand = new DocumentedCommand("why", Strings.WhyCommand_Description, "https://aka.ms/dotnet/nuget/why");
 
@@ -109,15 +111,15 @@ bool HasPathArgument(ArgumentResult ar)
                         parseResult.GetValue(path)!,
                         parseResult.GetValue(package)!,
                         parseResult.GetValue(frameworks)!,
-                        console,
+                        console.Value,
                         cancellationToken);
 
                     int exitCode = await action(whyCommandArgs);
                     return exitCode;
                 }
                 catch (ArgumentException ex)
                 {
-                    console.Markup($"[red]{ex.Message}[/]");
+                    console.Value.Markup($"[red]{ex.Message}[/]");
                     return ExitCodes.InvalidArguments;
                 }
             });
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Program.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Program.cs
@@ -106,10 +106,12 @@ public static int MainInternal(string[] args, CommandOutputLogger log, IEnvironm
                     var nugetCommand = new Command("nuget");
                     rootCommand.Subcommands.Add(nugetCommand);
 
+                    var lazyConsole = new Lazy<Spectre.Console.IAnsiConsole>(() => Spectre.Console.AnsiConsole.Console);
+
                     ConfigCommand.Register(nugetCommand, getHidePrefixLogger);
                     ConfigCommand.Register(rootCommand, getHidePrefixLogger);
-                    Commands.Why.WhyCommand.Register(nugetCommand, Spectre.Console.AnsiConsole.Console);
-                    Commands.Why.WhyCommand.Register(rootCommand, Spectre.Console.AnsiConsole.Console);
+                    Commands.Why.WhyCommand.Register(nugetCommand, lazyConsole);
+                    Commands.Why.WhyCommand.Register(rootCommand, lazyConsole);
                 }
 
                 CancellationTokenSource tokenSource = new CancellationTokenSource();
diff --git a/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/Commands/Why/WhyCommandLineParsingTests.cs b/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/Commands/Why/WhyCommandLineParsingTests.cs
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using NuGet.CommandLine.XPlat.Commands;
 using NuGet.CommandLine.XPlat.Commands.Why;
+using Spectre.Console;
 using Spectre.Console.Testing;
 using Xunit;
 
@@ -19,9 +20,10 @@ public void WhyCommand_HasHelpUrl()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
             // Act
-            WhyCommand.Register(rootCommand, new TestConsole());
+            WhyCommand.Register(rootCommand, console);
 
             // Assert
             rootCommand.Subcommands[0].Should().BeAssignableTo<DocumentedCommand>();
@@ -33,8 +35,10 @@ public void WithTwoArguments_PathAndPackageAreSet()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 whyCommandArgs.Path.Should().Be(@"path\to\my.proj");
@@ -54,8 +58,9 @@ public void WithOneArguments_PackageIsSet()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 whyCommandArgs.Path.Should().NotBeNull();
@@ -75,8 +80,9 @@ public void WithZeroArguments_HasParseError()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 throw new Exception("Should not get here");
@@ -92,8 +98,9 @@ public void WithThreeArguments_HasParseError()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 throw new Exception("Should not get here");
@@ -112,8 +119,9 @@ public void FrameworkOption_CanBeAtAnyPosition(string args)
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 whyCommandArgs.Path.Should().Be("my.proj");
@@ -135,8 +143,9 @@ public void FrameworkOption_CanBeLongOrShortForm(string arg)
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 whyCommandArgs.Path.Should().Be("my.proj");
@@ -156,8 +165,9 @@ public void FrameworkOption_AcceptsMultipleValues()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 whyCommandArgs.Path.Should().Be("my.proj");
@@ -177,8 +187,9 @@ public void HelpOption_ShowsHelp()
         {
             // Arrange
             Command rootCommand = new("nuget");
+            var console = new Lazy<IAnsiConsole>(() => new TestConsole());
 
-            WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>
+            WhyCommand.Register(rootCommand, console, whyCommandArgs =>
             {
                 // Assert
                 whyCommandArgs.Path.Should().Be("my.proj");

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#`
`24`	`24`	`# pool:`
`25`	`25`	`# name: $(DncEngInternalBuildPool)`
`26`		`-# demands: ImageOverride -equals windows.vs2019.amd64`
	`26`	`+# demands: ImageOverride -equals windows.vs2022.amd64`
`27`	`27`	`variables:`
`28`	`28`	`- ${{ if eq(variables['System.TeamProject'], 'internal') }}:`
`29`	`29`	`- template: /eng/common/templates-official/variables/pool-providers.yml`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"pinned": true`
`10`	`10`	`},`
`11`	`11`	`"msbuild-sdks": {`
`12`		`- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26057.111",`
	`12`	`+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102",`
`13`	`13`	`"Microsoft.Build.NoTargets": "3.7.0"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ internal static void Register(CommandLineApplication app)`
`23`	`23`	`});`
`24`	`24`	`}`
`25`	`25`
`26`		`- internal static void Register(Command rootCommand, IAnsiConsole console)`
	`26`	`+ internal static void Register(Command rootCommand, Lazy<IAnsiConsole> console)`
`27`	`27`	`{`
`28`	`28`	`Register(rootCommand, console, WhyCommandRunner.ExecuteCommand);`
`29`	`29`	`}`
`@@ -36,11 +36,13 @@ internal static void Register(Command rootCommand, IAnsiConsole console)`
`36`	`36`	`public static void GetWhyCommand(Command rootCommand)`
`37`	`37`	`{`
`38`	`38`	`Register(rootCommand,`
`39`		`- Spectre.Console.AnsiConsole.Console,`
	`39`	`+ new Lazy<IAnsiConsole>(() => Spectre.Console.AnsiConsole.Console),`
`40`	`40`	`WhyCommandRunner.ExecuteCommand);`
`41`	`41`	`}`
`42`	`42`
`43`		`- internal static void Register(Command rootCommand, IAnsiConsole console, Func<WhyCommandArgs, Task<int>> action)`
	`43`	`+ // console must be lazy, because Spectre.Console's AnsiConsole will send VT sequences to the output`
	`44`	`+ // as soon as it's created, which causes problems with the dotnet CLI's C++ output, like dotnet --info`
	`45`	`+ internal static void Register(Command rootCommand, Lazy<IAnsiConsole> console, Func<WhyCommandArgs, Task<int>> action)`
`44`	`46`	`{`
`45`	`47`	`var whyCommand = new DocumentedCommand("why", Strings.WhyCommand_Description, "https://aka.ms/dotnet/nuget/why");`
`46`	`48`
`@@ -109,15 +111,15 @@ bool HasPathArgument(ArgumentResult ar)`
`109`	`111`	`parseResult.GetValue(path)!,`
`110`	`112`	`parseResult.GetValue(package)!,`
`111`	`113`	`parseResult.GetValue(frameworks)!,`
`112`		`- console,`
	`114`	`+ console.Value,`
`113`	`115`	`cancellationToken);`
`114`	`116`
`115`	`117`	`int exitCode = await action(whyCommandArgs);`
`116`	`118`	`return exitCode;`
`117`	`119`	`}`
`118`	`120`	`catch (ArgumentException ex)`
`119`	`121`	`{`
`120`		`- console.Markup($"[red]{ex.Message}[/]");`
	`122`	`+ console.Value.Markup($"[red]{ex.Message}[/]");`
`121`	`123`	`return ExitCodes.InvalidArguments;`
`122`	`124`	`}`
`123`	`125`	`});`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using FluentAssertions;`
`8`	`8`	`using NuGet.CommandLine.XPlat.Commands;`
`9`	`9`	`using NuGet.CommandLine.XPlat.Commands.Why;`
	`10`	`+using Spectre.Console;`
`10`	`11`	`using Spectre.Console.Testing;`
`11`	`12`	`using Xunit;`
`12`	`13`
`@@ -19,9 +20,10 @@ public void WhyCommand_HasHelpUrl()`
`19`	`20`	`{`
`20`	`21`	`// Arrange`
`21`	`22`	`Command rootCommand = new("nuget");`
	`23`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`22`	`24`
`23`	`25`	`// Act`
`24`		`- WhyCommand.Register(rootCommand, new TestConsole());`
	`26`	`+ WhyCommand.Register(rootCommand, console);`
`25`	`27`
`26`	`28`	`// Assert`
`27`	`29`	`rootCommand.Subcommands[0].Should().BeAssignableTo<DocumentedCommand>();`
`@@ -33,8 +35,10 @@ public void WithTwoArguments_PathAndPackageAreSet()`
`33`	`35`	`{`
`34`	`36`	`// Arrange`
`35`	`37`	`Command rootCommand = new("nuget");`
	`38`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`36`	`39`
`37`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`40`	`+`
	`41`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`38`	`42`	`{`
`39`	`43`	`// Assert`
`40`	`44`	`whyCommandArgs.Path.Should().Be(@"path\to\my.proj");`
`@@ -54,8 +58,9 @@ public void WithOneArguments_PackageIsSet()`
`54`	`58`	`{`
`55`	`59`	`// Arrange`
`56`	`60`	`Command rootCommand = new("nuget");`
	`61`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`57`	`62`
`58`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`63`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`59`	`64`	`{`
`60`	`65`	`// Assert`
`61`	`66`	`whyCommandArgs.Path.Should().NotBeNull();`
`@@ -75,8 +80,9 @@ public void WithZeroArguments_HasParseError()`
`75`	`80`	`{`
`76`	`81`	`// Arrange`
`77`	`82`	`Command rootCommand = new("nuget");`
	`83`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`78`	`84`
`79`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`85`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`80`	`86`	`{`
`81`	`87`	`// Assert`
`82`	`88`	`throw new Exception("Should not get here");`
`@@ -92,8 +98,9 @@ public void WithThreeArguments_HasParseError()`
`92`	`98`	`{`
`93`	`99`	`// Arrange`
`94`	`100`	`Command rootCommand = new("nuget");`
	`101`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`95`	`102`
`96`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`103`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`97`	`104`	`{`
`98`	`105`	`// Assert`
`99`	`106`	`throw new Exception("Should not get here");`
`@@ -112,8 +119,9 @@ public void FrameworkOption_CanBeAtAnyPosition(string args)`
`112`	`119`	`{`
`113`	`120`	`// Arrange`
`114`	`121`	`Command rootCommand = new("nuget");`
	`122`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`115`	`123`
`116`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`124`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`117`	`125`	`{`
`118`	`126`	`// Assert`
`119`	`127`	`whyCommandArgs.Path.Should().Be("my.proj");`
`@@ -135,8 +143,9 @@ public void FrameworkOption_CanBeLongOrShortForm(string arg)`
`135`	`143`	`{`
`136`	`144`	`// Arrange`
`137`	`145`	`Command rootCommand = new("nuget");`
	`146`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`138`	`147`
`139`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`148`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`140`	`149`	`{`
`141`	`150`	`// Assert`
`142`	`151`	`whyCommandArgs.Path.Should().Be("my.proj");`
`@@ -156,8 +165,9 @@ public void FrameworkOption_AcceptsMultipleValues()`
`156`	`165`	`{`
`157`	`166`	`// Arrange`
`158`	`167`	`Command rootCommand = new("nuget");`
	`168`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`159`	`169`
`160`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`170`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`161`	`171`	`{`
`162`	`172`	`// Assert`
`163`	`173`	`whyCommandArgs.Path.Should().Be("my.proj");`
`@@ -177,8 +187,9 @@ public void HelpOption_ShowsHelp()`
`177`	`187`	`{`
`178`	`188`	`// Arrange`
`179`	`189`	`Command rootCommand = new("nuget");`
	`190`	`+ var console = new Lazy<IAnsiConsole>(() => new TestConsole());`
`180`	`191`
`181`		`- WhyCommand.Register(rootCommand, new TestConsole(), whyCommandArgs =>`
	`192`	`+ WhyCommand.Register(rootCommand, console, whyCommandArgs =>`
`182`	`193`	`{`
`183`	`194`	`// Assert`
`184`	`195`	`whyCommandArgs.Path.Should().Be("my.proj");`