diff --git a/Microsoft.CmdPal.sln b/Microsoft.CmdPal.sln
new file mode 100644
index 0000000000..c66382c637
--- /dev/null
+++ b/Microsoft.CmdPal.sln
@@ -0,0 +1,104 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.34929.205
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsCommandPalette", "src\modules\cmdpal\src\WindowsCommandPalette\WindowsCommandPalette.csproj", "{F71CF22B-A5C7-4328-A5B3-F4191AE57314}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calculator", "src\modules\cmdpal\src\Plugins\Calculator\Calculator.csproj", "{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AllApps", "src\modules\cmdpal\src\Plugins\AllApps\AllApps.csproj", "{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{B7FF739F-7716-4FC3-B622-705486187B87}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\modules\cmdpal\src\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{FAA24D36-5515-467C-91E7-101A189AAF48}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Windows.CommandPalette.Extensions", "src\modules\cmdpal\extensionsdk\Microsoft.Windows.CommandPalette.Extensions\Microsoft.Windows.CommandPalette.Extensions.vcxproj", "{305DD37E-C85D-4B08-AAFE-7381FA890463}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Windows.CommandPalette.Extensions.Helpers", "src\modules\cmdpal\extensionsdk\Microsoft.Windows.CommandPalette.Extensions.Helpers\Microsoft.Windows.CommandPalette.Extensions.Helpers.csproj", "{79060D06-7174-4D66-8D0B-4FF021154049}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmdPal.Common", "src\modules\cmdpal\src\common\CmdPal.Common.csproj", "{05CDE6EE-23AE-42AF-A9F5-E398C382675F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Debug|x64.ActiveCfg = Debug|x64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Debug|x64.Build.0 = Debug|x64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Debug|x64.Deploy.0 = Debug|x64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Release|ARM64.Build.0 = Release|ARM64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Release|ARM64.Deploy.0 = Release|ARM64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Release|x64.ActiveCfg = Release|x64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Release|x64.Build.0 = Release|x64
+		{F71CF22B-A5C7-4328-A5B3-F4191AE57314}.Release|x64.Deploy.0 = Release|x64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Debug|ARM64.Build.0 = Debug|ARM64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Debug|x64.ActiveCfg = Debug|x64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Debug|x64.Build.0 = Debug|x64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Release|ARM64.Build.0 = Release|ARM64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Release|x64.ActiveCfg = Release|x64
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739}.Release|x64.Build.0 = Release|x64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Debug|x64.ActiveCfg = Debug|x64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Debug|x64.Build.0 = Debug|x64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Release|ARM64.Build.0 = Release|ARM64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Release|x64.ActiveCfg = Release|x64
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D}.Release|x64.Build.0 = Release|x64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|x64.ActiveCfg = Debug|x64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|x64.Build.0 = Debug|x64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|ARM64.Build.0 = Release|ARM64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.ActiveCfg = Release|x64
+		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.Build.0 = Release|x64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.Build.0 = Debug|ARM64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.ActiveCfg = Debug|x64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.Build.0 = Debug|x64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|ARM64.ActiveCfg = Release|ARM64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|ARM64.Build.0 = Release|ARM64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|x64.ActiveCfg = Release|x64
+		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|x64.Build.0 = Release|x64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Debug|ARM64.Build.0 = Debug|arm64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Debug|x64.ActiveCfg = Debug|x64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Debug|x64.Build.0 = Debug|x64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Release|ARM64.ActiveCfg = Release|arm64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Release|ARM64.Build.0 = Release|arm64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Release|x64.ActiveCfg = Release|x64
+		{79060D06-7174-4D66-8D0B-4FF021154049}.Release|x64.Build.0 = Release|x64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Debug|ARM64.Build.0 = Debug|arm64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Debug|x64.ActiveCfg = Debug|x64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Debug|x64.Build.0 = Debug|x64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Release|ARM64.ActiveCfg = Release|arm64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Release|ARM64.Build.0 = Release|arm64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Release|x64.ActiveCfg = Release|x64
+		{05CDE6EE-23AE-42AF-A9F5-E398C382675F}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C668A4BF-8BC1-48D1-B00D-FF99D05E6739} = {B7FF739F-7716-4FC3-B622-705486187B87}
+		{F5E5B8B9-7F51-43B8-ACED-1BD380BED98D} = {B7FF739F-7716-4FC3-B622-705486187B87}
+		{305DD37E-C85D-4B08-AAFE-7381FA890463} = {FAA24D36-5515-467C-91E7-101A189AAF48}
+		{79060D06-7174-4D66-8D0B-4FF021154049} = {FAA24D36-5515-467C-91E7-101A189AAF48}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BC94BFC2-A741-4978-B6A4-9E01B7660E6B}
+	EndGlobalSection
+EndGlobal
diff --git a/src/modules/cmdpal/ToolingVersions.props b/src/modules/cmdpal/ToolingVersions.props
index 2e60e6ca8b..4b461fae79 100644
--- a/src/modules/cmdpal/ToolingVersions.props
+++ b/src/modules/cmdpal/ToolingVersions.props
@@ -3,7 +3,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
   <!-- Please keep the .NET version and SDK version is sync with HyperVExtension/ToolingVersion.props.-->
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <Platforms>x64;arm64;</Platforms>
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.Windows.CommandPalette.Extensions.Helpers/Microsoft.Windows.CommandPalette.Extensions.Helpers.csproj b/src/modules/cmdpal/extensionsdk/Microsoft.Windows.CommandPalette.Extensions.Helpers/Microsoft.Windows.CommandPalette.Extensions.Helpers.csproj
index 5ef82e55ef..9827e2e144 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.Windows.CommandPalette.Extensions.Helpers/Microsoft.Windows.CommandPalette.Extensions.Helpers.csproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.Windows.CommandPalette.Extensions.Helpers/Microsoft.Windows.CommandPalette.Extensions.Helpers.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\ToolingVersions.props" />
+  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
   <PropertyGroup>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -7,6 +7,7 @@
     <DebugType>pdbonly</DebugType>
     <!-- Remove once new CsWinRT version is available and Uri.cs is removed -->
     <NoWarn>0436</NoWarn>
+	  <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -26,7 +27,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
 
@@ -34,4 +34,4 @@
     <ProjectReference Include="..\Microsoft.Windows.CommandPalette.Extensions\Microsoft.Windows.CommandPalette.Extensions.vcxproj" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/modules/cmdpal/src/Plugins/AllApps/AllApps.csproj b/src/modules/cmdpal/src/Plugins/AllApps/AllApps.csproj
index a971f41657..6a1583bf1f 100644
--- a/src/modules/cmdpal/src/Plugins/AllApps/AllApps.csproj
+++ b/src/modules/cmdpal/src/Plugins/AllApps/AllApps.csproj
@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\ToolingVersions.props" />
+  <Import Project="..\..\..\..\..\Common.Dotnet.CsWinRT.props" />
   <PropertyGroup>
     <RootNamespace>AllApps</RootNamespace>
     <UseWinUI>true</UseWinUI>
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" />
-      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-      <PackageReference Include="Microsoft.Windows.CsWinRT" />
-      <PackageReference Include="System.IO.Abstractions" />
-      <PackageReference Include="Microsoft.Windows.CsWin32">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      </PackageReference>
+    <PackageReference Include="System.IO.Abstractions" />
+    <PackageReference Include="Microsoft.Windows.CsWin32">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/modules/cmdpal/src/Plugins/Calculator/Calculator.csproj b/src/modules/cmdpal/src/Plugins/Calculator/Calculator.csproj
index da8048d9bd..012d0402d7 100644
--- a/src/modules/cmdpal/src/Plugins/Calculator/Calculator.csproj
+++ b/src/modules/cmdpal/src/Plugins/Calculator/Calculator.csproj
@@ -1,15 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\ToolingVersions.props" />
+  <Import Project="..\..\..\..\..\Common.Dotnet.CsWinRT.props" />
   <PropertyGroup>
     <RootNamespace>Calculator</RootNamespace>
     <UseWinUI>true</UseWinUI>
   </PropertyGroup>
 
-  <ItemGroup>
-      <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\extensionsdk\Microsoft.Windows.CommandPalette.Extensions.Helpers\Microsoft.Windows.CommandPalette.Extensions.Helpers.csproj" />
   </ItemGroup>
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj b/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
index ff86a9d277..2eb0b66202 100644
--- a/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
+++ b/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\ToolingVersions.props" />
+  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>WindowsCommandPalette</RootNamespace>
@@ -40,12 +41,9 @@
 
     <!-- <PackageReference Include="CommunityToolkit.WinUI" /> -->
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
     <Manifest Include="RunPackage.appxmanifest" />
 
-    <PackageReference Include="Microsoft.Windows.CsWin32">
+	<PackageReference Include="Microsoft.Windows.CsWin32">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/modules/cmdpal/src/common/CmdPal.Common.csproj b/src/modules/cmdpal/src/common/CmdPal.Common.csproj
index 1c42dfed6a..b3cacd265d 100644
--- a/src/modules/cmdpal/src/common/CmdPal.Common.csproj
+++ b/src/modules/cmdpal/src/common/CmdPal.Common.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\ToolingVersions.props" />
+  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
   <PropertyGroup>
     <RootNamespace>CmdPal.Common</RootNamespace>
     <Nullable>enable</Nullable>
@@ -14,7 +14,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>