From e8b990a8c919509df1609c90880064c5abac7d1e Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Mon, 7 Jul 2025 11:56:31 +0200
Subject: [PATCH] Add Spectre.Console

---
 .gitmodules                                   |  3 ++
 .../0001-Remove-PolySharp.patch               | 27 ++++++++++++++
 .../projects/spectre-console.proj             | 37 +++++++++++++++++++
 src/externalPackages/src/spectre-console      |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 src/externalPackages/patches/spectre-console/0001-Remove-PolySharp.patch
 create mode 100644 src/externalPackages/projects/spectre-console.proj
 create mode 160000 src/externalPackages/src/spectre-console

diff --git a/.gitmodules b/.gitmodules
index 8b8f665d17..ad43f9059d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,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
diff --git a/src/externalPackages/patches/spectre-console/0001-Remove-PolySharp.patch b/src/externalPackages/patches/spectre-console/0001-Remove-PolySharp.patch
new file mode 100644
index 0000000000..658f73a8f5
--- /dev/null
+++ b/src/externalPackages/patches/spectre-console/0001-Remove-PolySharp.patch
@@ -0,0 +1,27 @@
+From 152b8a363213133fc3ec87e3abd6595ac98f0b57 Mon Sep 17 00:00:00 2001
+From: Jan Jones <janjones@microsoft.com>
+Date: Mon, 7 Jul 2025 11:04:42 +0000
+Subject: [PATCH] Remove PolySharp
+
+---
+ 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.34.1
+
diff --git a/src/externalPackages/projects/spectre-console.proj b/src/externalPackages/projects/spectre-console.proj
new file mode 100644
index 0000000000..e79368f3b3
--- /dev/null
+++ b/src/externalPackages/projects/spectre-console.proj
@@ -0,0 +1,37 @@
+<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) /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>
diff --git a/src/externalPackages/src/spectre-console b/src/externalPackages/src/spectre-console
new file mode 160000
index 0000000000..f32f80dc57
--- /dev/null
+++ b/src/externalPackages/src/spectre-console
@@ -0,0 +1 @@
+Subproject commit f32f80dc57d8b0c8446a72ea0d382f3048f8bac1