Add Spectre.Console 0.52.0 (#1447)

* Add Spectre.Console 0.52.0 (#1287)

Context: #1287

* Update spectre-console submodule to 0.52.0

* Add patch file to delete problematic binaries:

#1287 (comment)

Co-authored-by: Jan Jones <[email protected]>

* Remove binary patch again

* Pin darc version

* Add DelaySign and PublicSign to build arguments

---------

Co-authored-by: Jan Jones <[email protected]>
Co-authored-by: Premek Vysoky <[email protected]>
Co-authored-by: Alexander Köplinger <[email protected]>

Author: 4 people

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "vs-solutionpersistence"]
 	path = src/externalPackages/src/vs-solutionpersistence
 	url = https://github.com/microsoft/vs-solutionpersistence.git
+[submodule "spectre-console"]
+	path = src/externalPackages/src/spectre-console
+	url = https://github.com/spectreconsole/spectre.console

eng/Versions.props

@@ -15,6 +15,7 @@
     <HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
     <MSBuildLocatorReleaseVersion>1.10.2</MSBuildLocatorReleaseVersion>
     <SolutionPersistenceVersion>1.0.52</SolutionPersistenceVersion>
+    <SpectreConsoleReleaseVersion>0.52.0</SpectreConsoleReleaseVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- NuGet dependencies -->

eng/common/vmr-sync.sh

@@ -164,7 +164,7 @@ set -e
 highlight 'Installing .NET, preparing the tooling..'
 source "./eng/common/tools.sh"
 InitializeDotNetCli true
-GetDarc
+GetDarc "1.1.0-beta.25514.2"
 dotnetDir=$( cd ./.dotnet/; pwd -P )
 dotnet=$dotnetDir/dotnet
 

src/externalPackages/patches/spectre-console/0001-Remove-PolySharp.patch

@@ -0,0 +1,28 @@
+From dc5adfd1633f110e26c02693ca0b84b2e4c26a30 Mon Sep 17 00:00:00 2001
+From: Jonathan Peppers <[email protected]>
+Date: Wed, 29 Oct 2025 21:19:22 +0000
+Subject: [PATCH] Remove PolySharp
+
+PolySharp is not available in source-build environments.
+---
+ src/Spectre.Console/Spectre.Console.csproj | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/Spectre.Console/Spectre.Console.csproj b/src/Spectre.Console/Spectre.Console.csproj
+index bb56ec6..ddfa90e 100644
+--- a/src/Spectre.Console/Spectre.Console.csproj
++++ b/src/Spectre.Console/Spectre.Console.csproj
+@@ -22,10 +22,6 @@
+     <PackageReference Include="Wcwidth.Sources">
+       <PrivateAssets>all</PrivateAssets>
+     </PackageReference>
+-    <PackageReference Include="PolySharp">
+-      <PrivateAssets>all</PrivateAssets>
+-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+-    </PackageReference>
+   </ItemGroup>
+ 
+   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+-- 
+2.47.3
+

src/externalPackages/projects/spectre-console.proj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <PackagesOutput>$(ProjectDirectory)src/Spectre.Console/bin/$(Configuration)/</PackagesOutput>
+    <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
+    <CustomRepoBuild>true</CustomRepoBuild>
+  </PropertyGroup>
+
+  <Target Name="CustomRepoBuild">
+    <PropertyGroup>
+      <BuildCommandArgs>$(ProjectDirectory)src/Spectre.Console/Spectre.Console.csproj</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(SpectreConsoleReleaseVersion)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:UseBuildTimeTools=false</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:IsAotCompatible=false</BuildCommandArgs>
+    </PropertyGroup>
+
+    <Exec Command="$(DotNetTool) restore /bl:$(ArtifactsLogRepoDir)restore.binlog $(BuildCommandArgs)"
+          EnvironmentVariables="@(EnvironmentVariables)"
+          WorkingDirectory="$(ProjectDirectory)"
+          IgnoreStandardErrorWarningFormat="true" />
+
+    <Exec Command="$(DotNetTool) build /bl:$(ArtifactsLogRepoDir)build.binlog $(BuildCommandArgs)"
+          EnvironmentVariables="@(EnvironmentVariables)"
+          WorkingDirectory="$(ProjectDirectory)"
+          IgnoreStandardErrorWarningFormat="true" />
+
+    <Exec Command="$(DotNetTool) pack /bl:$(ArtifactsLogRepoDir)pack.binlog $(BuildCommandArgs)"
+          EnvironmentVariables="@(EnvironmentVariables)"
+          WorkingDirectory="$(ProjectDirectory)"
+          IgnoreStandardErrorWarningFormat="true" />
+  </Target>
+
+</Project>

src/externalPackages/src/spectre-console

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <PackageVersion>3.0.0</PackageVersion>
+    <AssemblyName>Wcwidth.Sources</AssemblyName>
+  </PropertyGroup>
+
+</Project>

src/textOnlyPackages/src/wcwidth.sources/3.0.0/Wcwidth.Sources.3.0.0.csproj

@@ -0,0 +1,48 @@
+using System;
+
+namespace Wcwidth
+{
+    internal static class IntegerExtensions
+    {
+        public static bool Exist(this uint[,] table, uint value)
+        {
+            return Find(table, value) != 0;
+        }
+
+        public static int Find(this uint[,] table, uint value)
+        {
+            if (table is null)
+            {
+                throw new ArgumentNullException(nameof(table));
+            }
+
+            var min = 0;
+            var max = table.GetUpperBound(0);
+            int mid;
+
+            if (value < table[0, 0] || value > table[max, 1])
+            {
+                return 0;
+            }
+
+            while (max >= min)
+            {
+                mid = (min + max) / 2;
+                if (value > table[mid, 1])
+                {
+                    min = mid + 1;
+                }
+                else if (value < table[mid, 0])
+                {
+                    max = mid - 1;
+                }
+                else
+                {
+                    return 1;
+                }
+            }
+
+            return 0;
+        }
+    }
+}