From 549e41eac716fe85baa8607495541fcf3538fa53 Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)"
 <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:02:30 -0700
Subject: [PATCH 1/3] Update WinUI.Extra.props

Remove webview2loader.dll from package (hopefully) - test workaround to report back to platform.
---
 MultiTarget/WinUI.Extra.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
index d8ccc4a4..b8f89758 100644
--- a/MultiTarget/WinUI.Extra.props
+++ b/MultiTarget/WinUI.Extra.props
@@ -36,6 +36,9 @@
 
     <WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">10.0.22621.41</WindowsSdkPackageVersion>
     <WindowsSdkPackageVersion Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">10.0.22621.38</WindowsSdkPackageVersion>
+
+    <!--- Workaround for ADO 53865998 - See https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/215 - Don't include extraneous WebView2 dll -->
+    <WebView2NeverCopyLoaderDllToOutputDirectory Condition="'$(WebView2NeverCopyLoaderDllToOutputDirectory)' == '' And '$(WebView2EnableCsWinRTProjection)' == 'true'">true</WebView2NeverCopyLoaderDllToOutputDirectory>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsUno)' == 'true'">

From 0a9bda2625ea5956a6b6c1e66b6fa216129d72bd Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 25 Sep 2024 12:09:37 -0500
Subject: [PATCH 2/3] Update WebView2, removed broken
 WebView2NeverCopyLoaderDllToOutputDirectory conditions

---
 MultiTarget/PackageReferences/WinAppSdk.props | 1 +
 MultiTarget/WinUI.Extra.props                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
index 9ab83e02..a29cc1e7 100644
--- a/MultiTarget/PackageReferences/WinAppSdk.props
+++ b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -2,6 +2,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
index b8f89758..d195c646 100644
--- a/MultiTarget/WinUI.Extra.props
+++ b/MultiTarget/WinUI.Extra.props
@@ -38,7 +38,7 @@
     <WindowsSdkPackageVersion Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">10.0.22621.38</WindowsSdkPackageVersion>
 
     <!--- Workaround for ADO 53865998 - See https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/215 - Don't include extraneous WebView2 dll -->
-    <WebView2NeverCopyLoaderDllToOutputDirectory Condition="'$(WebView2NeverCopyLoaderDllToOutputDirectory)' == '' And '$(WebView2EnableCsWinRTProjection)' == 'true'">true</WebView2NeverCopyLoaderDllToOutputDirectory>
+    <WebView2NeverCopyLoaderDllToOutputDirectory>true</WebView2NeverCopyLoaderDllToOutputDirectory>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsUno)' == 'true'">

From b1bc50185b0a4f41b97767d5b7338c80f25e8a40 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 26 Sep 2024 11:12:05 -0500
Subject: [PATCH 3/3] Update WebView2 package reference to include
 PrivateAssets="all"

---
 MultiTarget/PackageReferences/WinAppSdk.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
index a29cc1e7..2418e0a7 100644
--- a/MultiTarget/PackageReferences/WinAppSdk.props
+++ b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />