From a6dd27ec9b85f9809c02028aff36f8ac1f91db21 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 30 Oct 2024 17:25:04 -0700
Subject: [PATCH 1/5] Remove temporary 'WebView2' package workaround

---
 .../ComputeSharp.SwapChain.D2D1.Uwp.csproj                 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj b/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj
index 245fc66d3..9448d99f2 100644
--- a/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj
+++ b/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj
@@ -38,13 +38,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
-
-    <!--
-      This sample does not need WebView2, but WinAppSDK is pulling it in as a transitive NuGet
-      dependency. We can manually exclude all of its assets to avoid them being in the output.
-      This also prevents the old projections from being referenced and triggering the generator.
-    -->
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" IncludeAssets="none" />
   </ItemGroup>
 
   <ItemGroup>

From 652ddf0223791c769d98a14b3813778c15dd41ab Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 30 Oct 2024 17:25:15 -0700
Subject: [PATCH 2/5] Remove unused 'win-x86.pubxml' file

---
 .../Properties/PublishProfiles/win-x86.pubxml         | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 samples/ComputeSharp.SwapChain.D2D1.Uwp/Properties/PublishProfiles/win-x86.pubxml

diff --git a/samples/ComputeSharp.SwapChain.D2D1.Uwp/Properties/PublishProfiles/win-x86.pubxml b/samples/ComputeSharp.SwapChain.D2D1.Uwp/Properties/PublishProfiles/win-x86.pubxml
deleted file mode 100644
index 2a99a7623..000000000
--- a/samples/ComputeSharp.SwapChain.D2D1.Uwp/Properties/PublishProfiles/win-x86.pubxml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Platform>x86</Platform>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-    <PublishAot>true</PublishAot>
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

From 9e9e5ec9f72945e64a371d2434bc8bcda575e8e5 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 30 Oct 2024 17:25:40 -0700
Subject: [PATCH 3/5] Don't set 'UseUwpTools' in .csproj

---
 .../ComputeSharp.SwapChain.D2D1.Uwp.csproj                       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj b/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj
index 9448d99f2..33c04dcaf 100644
--- a/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj
+++ b/samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj
@@ -5,7 +5,6 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <WindowsSdkPackageVersion>10.0.22621.54</WindowsSdkPackageVersion>
     <UseUwp>true</UseUwp>
-    <UseUwpTools>true</UseUwpTools>
     <Platforms>x64;arm64</Platforms>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <DefaultLanguage>en-US</DefaultLanguage>

From 40e8d782ad02e80f08080fdff10439324adf0f7a Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 30 Oct 2024 17:28:52 -0700
Subject: [PATCH 4/5] Remove unnecessary CsWinRT package references

---
 .../ComputeSharp.D2D1.Uwp.csproj                    |  9 ---------
 .../ComputeSharp.D2D1.WinUI.csproj                  | 13 -------------
 src/ComputeSharp.Uwp/ComputeSharp.Uwp.csproj        | 12 ------------
 src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj    |  9 ---------
 4 files changed, 43 deletions(-)

diff --git a/src/ComputeSharp.D2D1.Uwp/ComputeSharp.D2D1.Uwp.csproj b/src/ComputeSharp.D2D1.Uwp/ComputeSharp.D2D1.Uwp.csproj
index b7c768835..d3167e850 100644
--- a/src/ComputeSharp.D2D1.Uwp/ComputeSharp.D2D1.Uwp.csproj
+++ b/src/ComputeSharp.D2D1.Uwp/ComputeSharp.D2D1.Uwp.csproj
@@ -10,9 +10,6 @@
 
   <PropertyGroup>
 
-    <!-- Also disabled in 'ComputeSharp.D2D1.WinUI', see notes there -->
-    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
-
     <!-- Same warnings as in 'ComputeSharp.D2D1.WinUI', see notes there -->
     <NoWarn>$(NoWarn);CS0419</NoWarn>
     <NoWarn>$(NoWarn);IDE0065</NoWarn>
@@ -23,12 +20,6 @@
 
   <ItemGroup>
     <PackageReference Include="Win2D.uwp" Version="1.28.0-preview1" />
-
-    <!--
-      We need the CsWinRT reference for the generator to kick in and generate all necessary supporting code
-      to make the exposed types AOT compatible. Since we only need the generator, we can mark this as private.
-    -->
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ComputeSharp.D2D1.WinUI/ComputeSharp.D2D1.WinUI.csproj b/src/ComputeSharp.D2D1.WinUI/ComputeSharp.D2D1.WinUI.csproj
index e09404453..fcf775f2e 100644
--- a/src/ComputeSharp.D2D1.WinUI/ComputeSharp.D2D1.WinUI.csproj
+++ b/src/ComputeSharp.D2D1.WinUI/ComputeSharp.D2D1.WinUI.csproj
@@ -12,13 +12,6 @@
 
   <PropertyGroup>
 
-    <!--
-      Disable IIDOptimizer, as it's causing a build error when the debug mode is set to embedded.
-      This is only needed when generating projections anyway, and not in normal C# class libraries.
-      See: https://github.com/microsoft/CsWinRT/issues/1478.
-    -->
-    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
-
     <!--
       Ignore some warnings about ambiguous cref attribute references. These are because the assembly defines
       blittable bindings for several ABI types from Win2D, in the same namespace as the ABI types from the
@@ -32,12 +25,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.0" />
-
-    <!--
-      We need the CsWinRT reference for the generator to kick in and generate all necessary supporting code
-      to make the exposed types AOT compatible. Since we only need the generator, we can mark this as private.
-    -->
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ComputeSharp.Uwp/ComputeSharp.Uwp.csproj b/src/ComputeSharp.Uwp/ComputeSharp.Uwp.csproj
index 4079fd7b4..cd6473495 100644
--- a/src/ComputeSharp.Uwp/ComputeSharp.Uwp.csproj
+++ b/src/ComputeSharp.Uwp/ComputeSharp.Uwp.csproj
@@ -8,18 +8,6 @@
     <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup>
-
-    <!-- Disable IIDOptimizer, as it's not needed (see comments in ComputeSharp.D2D1.WinUI)-->
-    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
-  </PropertyGroup>
-
-  <ItemGroup>
-
-    <!-- Reference CsWinRT locally for the source generators (see comments in ComputeSharp.D2D1.WinUI) -->
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ComputeSharp\ComputeSharp.csproj" />
   </ItemGroup>
diff --git a/src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj b/src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj
index c07cd7e29..a5faa0d23 100644
--- a/src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj
+++ b/src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj
@@ -13,17 +13,8 @@
     <WebView2EnableCsWinRTProjectionExcludeCoreRef>true</WebView2EnableCsWinRTProjectionExcludeCoreRef>
   </PropertyGroup>
 
-  <PropertyGroup>
-
-    <!-- Disable IIDOptimizer, as it's not needed (see comments in ComputeSharp.D2D1.WinUI)-->
-    <CsWinRTIIDOptimizerOptOut>true</CsWinRTIIDOptimizerOptOut>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
-
-    <!-- Reference CsWinRT locally for the source generators (see comments in ComputeSharp.D2D1.WinUI) -->
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

From cdcbc5889a723361241e68bfdddea2d924fcf9e4 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Wed, 30 Oct 2024 17:31:31 -0700
Subject: [PATCH 5/5] Bump .NET SDK to 8.0.403

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 789bff3bd..1880a952c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.403",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }