From 92c5b75686cd1e874c51ec2023f5a8a14bf3b290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Thu, 14 Dec 2023 21:33:46 +0100
Subject: [PATCH] Revert "Scaffold a VS extension project based on the new VS
 extensibility model."

This reverts commit 201a6b0064c4ce8e4e12a57fa9d650ab65eed787.

Causes 401s in CI.
---
 Directory.Packages.props               |   4 -
 celerity.sln                           | 190 ++++++++++++-------------
 src/extensions/vs/CelerityExtension.cs |  17 ---
 src/extensions/vs/nuget.config         |  12 --
 src/extensions/vs/vs.cs                |   2 -
 src/extensions/vs/vs.csproj            |  28 ----
 6 files changed, 90 insertions(+), 163 deletions(-)
 delete mode 100644 src/extensions/vs/CelerityExtension.cs
 delete mode 100644 src/extensions/vs/nuget.config
 delete mode 100644 src/extensions/vs/vs.cs
 delete mode 100644 src/extensions/vs/vs.csproj

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 27976345..2379f7b8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -34,10 +34,6 @@
                         Version="4.7.0" />
         <PackageVersion Include="Microsoft.NET.Test.Sdk"
                         Version="17.8.0" />
-        <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Build"
-                        Version="17.9.2080" />
-        <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk"
-                        Version="17.9.2080" />
         <PackageVersion Include="NuGet.Versioning"
                         Version="6.7.0" />
         <PackageVersion Include="OmniSharp.Extensions.LanguageServer"
diff --git a/celerity.sln b/celerity.sln
index 7130165a..326395d5 100644
--- a/celerity.sln
+++ b/celerity.sln
@@ -3,43 +3,39 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.002.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F6D1BBA-A673-45FF-BB26-57AED5B9286E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A385D8E0-8390-494C-92D0-F764D3699131}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "benchmarks", "src\benchmarks\benchmarks.csproj", "{D238F6F6-1B43-4082-8CE4-28B7B4A49D00}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "benchmarks", "src\benchmarks\benchmarks.csproj", "{F552FDEF-D460-4A02-9EC1-16108BCD5ECF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "common", "src\common\common.csproj", "{39173791-EC5E-407A-8288-6EACA8340126}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "common", "src\common\common.csproj", "{C7BFD827-8E11-4A27-9E43-8A70C8EF4C02}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "driver", "src\driver\driver.csproj", "{90E091AF-4D90-41D4-B066-68042A1C4735}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "driver", "src\driver\driver.csproj", "{0D5D7C7B-6248-46EF-830B-F98AE1BF6F75}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generators", "src\generators\generators.csproj", "{0EFF1743-A637-4232-A112-33B4CA770006}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generators", "src\generators\generators.csproj", "{22E47770-51D6-4E63-95C6-12ED5CC0184B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tests", "src\tests\tests.csproj", "{8B7C3620-0EDB-4352-B159-2FACCBF1BBD2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tests", "src\tests\tests.csproj", "{D7749F27-3ACF-4864-B6FC-77409B4D037F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "trimming", "src\trimming\trimming.csproj", "{99CA38DE-56CB-40D6-8BB4-7B633CC3F2CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "trimming", "src\trimming\trimming.csproj", "{58887612-3CA6-423E-95F3-1DC7B99A1545}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{35DA481E-29DC-4E8F-81F4-017A91AB4C26}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "language", "language", "{4176AF7C-EBBB-43F1-BDFA-DA892E6AC47E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vs", "src\extensions\vs\vs.csproj", "{B3DEEF03-92F8-4F6B-B42A-B22644EB4AE8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "src\language\core\core.csproj", "{38B0647D-2555-4B77-97CB-14CC1AA8BC76}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "language", "language", "{84DB0A07-F1A6-421E-BFE6-148D7B751B8D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "library", "src\language\library\library.csproj", "{684D64D3-2A81-488F-9257-765EC973D481}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "src\language\core\core.csproj", "{EC63BC7B-9AD7-4D97-85AC-42FC1C37D441}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "service", "src\language\service\service.csproj", "{579A9B10-1C7A-49D9-8C61-5C1662086511}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "library", "src\language\library\library.csproj", "{ED0BC300-A88E-4663-B3D9-826F9287A6BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tooling", "src\language\tooling\tooling.csproj", "{6AFF3908-DEA8-42CB-ACE2-A77973D9584B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "service", "src\language\service\service.csproj", "{93FD0881-6342-4950-8828-E753596B3F47}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtime", "runtime", "{EC5B91B1-5053-4961-A616-57CED91D0589}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tooling", "src\language\tooling\tooling.csproj", "{8714E075-829C-4CC2-89D0-3AF67A6B930D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "compiler", "src\runtime\compiler\compiler.csproj", "{6C599400-9EAE-4A01-91D9-FBBE3862F3FE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtime", "runtime", "{77072F53-4FED-413F-8CC3-65E5A1FA5EA9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "src\runtime\core\core.csproj", "{A1F3DC78-6572-4BEF-BBF2-A7F1FD40E928}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "compiler", "src\runtime\compiler\compiler.csproj", "{DDE5F6C0-1215-4BF1-9269-95568721995C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "interpreter", "src\runtime\interpreter\interpreter.csproj", "{89C5E2B3-831A-40EF-8CCC-C7372B85731E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "src\runtime\core\core.csproj", "{2C278409-9D51-449E-A8D5-FD8F31B6746A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "interpreter", "src\runtime\interpreter\interpreter.csproj", "{9A5CBCD5-5D3C-4CB2-8DF2-33016E196A1A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "kernel", "src\runtime\kernel\kernel.csproj", "{76649417-C733-478D-8F5A-FD368C7097A1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "kernel", "src\runtime\kernel\kernel.csproj", "{045884BD-AE95-453A-9849-5A70052EF532}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,91 +43,85 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D238F6F6-1B43-4082-8CE4-28B7B4A49D00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D238F6F6-1B43-4082-8CE4-28B7B4A49D00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D238F6F6-1B43-4082-8CE4-28B7B4A49D00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D238F6F6-1B43-4082-8CE4-28B7B4A49D00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39173791-EC5E-407A-8288-6EACA8340126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39173791-EC5E-407A-8288-6EACA8340126}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39173791-EC5E-407A-8288-6EACA8340126}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39173791-EC5E-407A-8288-6EACA8340126}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90E091AF-4D90-41D4-B066-68042A1C4735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90E091AF-4D90-41D4-B066-68042A1C4735}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90E091AF-4D90-41D4-B066-68042A1C4735}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90E091AF-4D90-41D4-B066-68042A1C4735}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EFF1743-A637-4232-A112-33B4CA770006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EFF1743-A637-4232-A112-33B4CA770006}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EFF1743-A637-4232-A112-33B4CA770006}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EFF1743-A637-4232-A112-33B4CA770006}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B7C3620-0EDB-4352-B159-2FACCBF1BBD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B7C3620-0EDB-4352-B159-2FACCBF1BBD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B7C3620-0EDB-4352-B159-2FACCBF1BBD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B7C3620-0EDB-4352-B159-2FACCBF1BBD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99CA38DE-56CB-40D6-8BB4-7B633CC3F2CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99CA38DE-56CB-40D6-8BB4-7B633CC3F2CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99CA38DE-56CB-40D6-8BB4-7B633CC3F2CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99CA38DE-56CB-40D6-8BB4-7B633CC3F2CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B3DEEF03-92F8-4F6B-B42A-B22644EB4AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3DEEF03-92F8-4F6B-B42A-B22644EB4AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3DEEF03-92F8-4F6B-B42A-B22644EB4AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3DEEF03-92F8-4F6B-B42A-B22644EB4AE8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC63BC7B-9AD7-4D97-85AC-42FC1C37D441}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC63BC7B-9AD7-4D97-85AC-42FC1C37D441}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC63BC7B-9AD7-4D97-85AC-42FC1C37D441}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC63BC7B-9AD7-4D97-85AC-42FC1C37D441}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED0BC300-A88E-4663-B3D9-826F9287A6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED0BC300-A88E-4663-B3D9-826F9287A6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED0BC300-A88E-4663-B3D9-826F9287A6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED0BC300-A88E-4663-B3D9-826F9287A6BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93FD0881-6342-4950-8828-E753596B3F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93FD0881-6342-4950-8828-E753596B3F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93FD0881-6342-4950-8828-E753596B3F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93FD0881-6342-4950-8828-E753596B3F47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8714E075-829C-4CC2-89D0-3AF67A6B930D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8714E075-829C-4CC2-89D0-3AF67A6B930D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8714E075-829C-4CC2-89D0-3AF67A6B930D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8714E075-829C-4CC2-89D0-3AF67A6B930D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDE5F6C0-1215-4BF1-9269-95568721995C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDE5F6C0-1215-4BF1-9269-95568721995C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDE5F6C0-1215-4BF1-9269-95568721995C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDE5F6C0-1215-4BF1-9269-95568721995C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C278409-9D51-449E-A8D5-FD8F31B6746A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C278409-9D51-449E-A8D5-FD8F31B6746A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C278409-9D51-449E-A8D5-FD8F31B6746A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C278409-9D51-449E-A8D5-FD8F31B6746A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A5CBCD5-5D3C-4CB2-8DF2-33016E196A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A5CBCD5-5D3C-4CB2-8DF2-33016E196A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A5CBCD5-5D3C-4CB2-8DF2-33016E196A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A5CBCD5-5D3C-4CB2-8DF2-33016E196A1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76649417-C733-478D-8F5A-FD368C7097A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76649417-C733-478D-8F5A-FD368C7097A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76649417-C733-478D-8F5A-FD368C7097A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76649417-C733-478D-8F5A-FD368C7097A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F552FDEF-D460-4A02-9EC1-16108BCD5ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F552FDEF-D460-4A02-9EC1-16108BCD5ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F552FDEF-D460-4A02-9EC1-16108BCD5ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F552FDEF-D460-4A02-9EC1-16108BCD5ECF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7BFD827-8E11-4A27-9E43-8A70C8EF4C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7BFD827-8E11-4A27-9E43-8A70C8EF4C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7BFD827-8E11-4A27-9E43-8A70C8EF4C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7BFD827-8E11-4A27-9E43-8A70C8EF4C02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D5D7C7B-6248-46EF-830B-F98AE1BF6F75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D5D7C7B-6248-46EF-830B-F98AE1BF6F75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D5D7C7B-6248-46EF-830B-F98AE1BF6F75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D5D7C7B-6248-46EF-830B-F98AE1BF6F75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22E47770-51D6-4E63-95C6-12ED5CC0184B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22E47770-51D6-4E63-95C6-12ED5CC0184B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22E47770-51D6-4E63-95C6-12ED5CC0184B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22E47770-51D6-4E63-95C6-12ED5CC0184B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7749F27-3ACF-4864-B6FC-77409B4D037F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7749F27-3ACF-4864-B6FC-77409B4D037F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7749F27-3ACF-4864-B6FC-77409B4D037F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7749F27-3ACF-4864-B6FC-77409B4D037F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58887612-3CA6-423E-95F3-1DC7B99A1545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58887612-3CA6-423E-95F3-1DC7B99A1545}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58887612-3CA6-423E-95F3-1DC7B99A1545}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58887612-3CA6-423E-95F3-1DC7B99A1545}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38B0647D-2555-4B77-97CB-14CC1AA8BC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38B0647D-2555-4B77-97CB-14CC1AA8BC76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38B0647D-2555-4B77-97CB-14CC1AA8BC76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38B0647D-2555-4B77-97CB-14CC1AA8BC76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{684D64D3-2A81-488F-9257-765EC973D481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{684D64D3-2A81-488F-9257-765EC973D481}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{684D64D3-2A81-488F-9257-765EC973D481}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{684D64D3-2A81-488F-9257-765EC973D481}.Release|Any CPU.Build.0 = Release|Any CPU
+		{579A9B10-1C7A-49D9-8C61-5C1662086511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{579A9B10-1C7A-49D9-8C61-5C1662086511}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{579A9B10-1C7A-49D9-8C61-5C1662086511}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{579A9B10-1C7A-49D9-8C61-5C1662086511}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AFF3908-DEA8-42CB-ACE2-A77973D9584B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AFF3908-DEA8-42CB-ACE2-A77973D9584B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AFF3908-DEA8-42CB-ACE2-A77973D9584B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AFF3908-DEA8-42CB-ACE2-A77973D9584B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C599400-9EAE-4A01-91D9-FBBE3862F3FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C599400-9EAE-4A01-91D9-FBBE3862F3FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C599400-9EAE-4A01-91D9-FBBE3862F3FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C599400-9EAE-4A01-91D9-FBBE3862F3FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1F3DC78-6572-4BEF-BBF2-A7F1FD40E928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1F3DC78-6572-4BEF-BBF2-A7F1FD40E928}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1F3DC78-6572-4BEF-BBF2-A7F1FD40E928}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1F3DC78-6572-4BEF-BBF2-A7F1FD40E928}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89C5E2B3-831A-40EF-8CCC-C7372B85731E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C5E2B3-831A-40EF-8CCC-C7372B85731E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89C5E2B3-831A-40EF-8CCC-C7372B85731E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89C5E2B3-831A-40EF-8CCC-C7372B85731E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{045884BD-AE95-453A-9849-5A70052EF532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045884BD-AE95-453A-9849-5A70052EF532}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045884BD-AE95-453A-9849-5A70052EF532}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045884BD-AE95-453A-9849-5A70052EF532}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D238F6F6-1B43-4082-8CE4-28B7B4A49D00} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{39173791-EC5E-407A-8288-6EACA8340126} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{90E091AF-4D90-41D4-B066-68042A1C4735} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{0EFF1743-A637-4232-A112-33B4CA770006} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{8B7C3620-0EDB-4352-B159-2FACCBF1BBD2} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{99CA38DE-56CB-40D6-8BB4-7B633CC3F2CF} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{35DA481E-29DC-4E8F-81F4-017A91AB4C26} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{B3DEEF03-92F8-4F6B-B42A-B22644EB4AE8} = {35DA481E-29DC-4E8F-81F4-017A91AB4C26}
-		{84DB0A07-F1A6-421E-BFE6-148D7B751B8D} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{EC63BC7B-9AD7-4D97-85AC-42FC1C37D441} = {84DB0A07-F1A6-421E-BFE6-148D7B751B8D}
-		{ED0BC300-A88E-4663-B3D9-826F9287A6BD} = {84DB0A07-F1A6-421E-BFE6-148D7B751B8D}
-		{93FD0881-6342-4950-8828-E753596B3F47} = {84DB0A07-F1A6-421E-BFE6-148D7B751B8D}
-		{8714E075-829C-4CC2-89D0-3AF67A6B930D} = {84DB0A07-F1A6-421E-BFE6-148D7B751B8D}
-		{77072F53-4FED-413F-8CC3-65E5A1FA5EA9} = {5F6D1BBA-A673-45FF-BB26-57AED5B9286E}
-		{DDE5F6C0-1215-4BF1-9269-95568721995C} = {77072F53-4FED-413F-8CC3-65E5A1FA5EA9}
-		{2C278409-9D51-449E-A8D5-FD8F31B6746A} = {77072F53-4FED-413F-8CC3-65E5A1FA5EA9}
-		{9A5CBCD5-5D3C-4CB2-8DF2-33016E196A1A} = {77072F53-4FED-413F-8CC3-65E5A1FA5EA9}
-		{76649417-C733-478D-8F5A-FD368C7097A1} = {77072F53-4FED-413F-8CC3-65E5A1FA5EA9}
+		{F552FDEF-D460-4A02-9EC1-16108BCD5ECF} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{C7BFD827-8E11-4A27-9E43-8A70C8EF4C02} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{0D5D7C7B-6248-46EF-830B-F98AE1BF6F75} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{22E47770-51D6-4E63-95C6-12ED5CC0184B} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{D7749F27-3ACF-4864-B6FC-77409B4D037F} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{58887612-3CA6-423E-95F3-1DC7B99A1545} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{4176AF7C-EBBB-43F1-BDFA-DA892E6AC47E} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{38B0647D-2555-4B77-97CB-14CC1AA8BC76} = {4176AF7C-EBBB-43F1-BDFA-DA892E6AC47E}
+		{684D64D3-2A81-488F-9257-765EC973D481} = {4176AF7C-EBBB-43F1-BDFA-DA892E6AC47E}
+		{579A9B10-1C7A-49D9-8C61-5C1662086511} = {4176AF7C-EBBB-43F1-BDFA-DA892E6AC47E}
+		{6AFF3908-DEA8-42CB-ACE2-A77973D9584B} = {4176AF7C-EBBB-43F1-BDFA-DA892E6AC47E}
+		{EC5B91B1-5053-4961-A616-57CED91D0589} = {A385D8E0-8390-494C-92D0-F764D3699131}
+		{6C599400-9EAE-4A01-91D9-FBBE3862F3FE} = {EC5B91B1-5053-4961-A616-57CED91D0589}
+		{A1F3DC78-6572-4BEF-BBF2-A7F1FD40E928} = {EC5B91B1-5053-4961-A616-57CED91D0589}
+		{89C5E2B3-831A-40EF-8CCC-C7372B85731E} = {EC5B91B1-5053-4961-A616-57CED91D0589}
+		{045884BD-AE95-453A-9849-5A70052EF532} = {EC5B91B1-5053-4961-A616-57CED91D0589}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D9A8E4C2-E94F-46D5-A255-51162F55DDEA}
+		SolutionGuid = {45E282E3-82EF-496A-A050-30C6B30C3841}
 	EndGlobalSection
 EndGlobal
diff --git a/src/extensions/vs/CelerityExtension.cs b/src/extensions/vs/CelerityExtension.cs
deleted file mode 100644
index d36e70ee..00000000
--- a/src/extensions/vs/CelerityExtension.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Vezel.Celerity.VisualStudio;
-
-[SuppressMessage("", "CA1812")]
-[VisualStudioContribution]
-internal sealed class CelerityExtension : Extension
-{
-    public override ExtensionConfiguration ExtensionConfiguration { get; } =
-        new()
-        {
-            Metadata = new(
-                "celerity",
-                Version.Parse(ThisAssembly.AssemblyFileVersion),
-                "Vezel",
-                "Celerity",
-                "Celerity programming language support for Visual Studio."),
-        };
-}
diff --git a/src/extensions/vs/nuget.config b/src/extensions/vs/nuget.config
deleted file mode 100644
index d791407a..00000000
--- a/src/extensions/vs/nuget.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- TODO: Remove this file when the packages are available on NuGet. -->
-<configuration>
-    <packageSources>
-        <add key="vs-extensibility" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption/nuget/v3/index.json" />
-    </packageSources>
-
-    <packageSourceMapping>
-        <packageSource key="vs-extensibility">
-            <package pattern="*" />
-        </packageSource>
-    </packageSourceMapping>
-</configuration>
diff --git a/src/extensions/vs/vs.cs b/src/extensions/vs/vs.cs
deleted file mode 100644
index ae5cefba..00000000
--- a/src/extensions/vs/vs.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-[assembly: DisableRuntimeMarshalling]
-[module: SkipLocalsInit]
diff --git a/src/extensions/vs/vs.csproj b/src/extensions/vs/vs.csproj
deleted file mode 100644
index cc5615d9..00000000
--- a/src/extensions/vs/vs.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <AssemblyName>Vezel.Celerity.VisualStudio</AssemblyName>
-        <CopyDebugSymbolFilesFromPackages Condition="'$(DebugSymbols)' == 'true'">true</CopyDebugSymbolFilesFromPackages>
-        <RootNamespace>Vezel.Celerity.VisualStudio</RootNamespace>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Using Include="Microsoft.VisualStudio.Extensibility" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="../../language/library/library.csproj" />
-        <ProjectReference Include="../../language/service/service.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <!-- TODO: Remove this hack when the packages are available on NuGet. -->
-        <GlobalPackageReference Remove="Microsoft.VisualStudio.Threading.Analyzers" />
-        <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" />
-        <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" />
-    </ItemGroup>
-
-    <Import Project="../../language/core/core.targets" />
-    <Import Project="../../language/library/library.targets" />
-    <Import Project="../../language/service/service.targets" />
-    <Import Project="../../language/tooling/tooling.targets" />
-</Project>