From d295ce42bb366b0cd0b63c272d4ef04cf3a0b3c9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 30 Jul 2024 14:13:45 -0700
Subject: [PATCH 1/4] Remove redundant items in .targets

---
 nuget/Microsoft.Windows.CsWinRT.targets | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nuget/Microsoft.Windows.CsWinRT.targets b/nuget/Microsoft.Windows.CsWinRT.targets
index 10bdf8216..12aa9c1fa 100644
--- a/nuget/Microsoft.Windows.CsWinRT.targets
+++ b/nuget/Microsoft.Windows.CsWinRT.targets
@@ -328,7 +328,11 @@ $(CsWinRTInternalProjection)
     <CsWinRTEnableICustomPropertyProviderSupport Condition="'$(CsWinRTEnableICustomPropertyProviderSupport)' == ''">true</CsWinRTEnableICustomPropertyProviderSupport>
     <CsWinRTEnableIReferenceSupport Condition="'$(CsWinRTEnableIReferenceSupport)' == ''">true</CsWinRTEnableIReferenceSupport>
     <CsWinRTEnableIDynamicInterfaceCastableSupport Condition="'$(CsWinRTEnableIDynamicInterfaceCastableSupport)' == ''">true</CsWinRTEnableIDynamicInterfaceCastableSupport>
-    <CsWinRTUseWindowsUIXamlProjections Condition="'$(CsWinRTUseWindowsUIXamlProjections)' == ''">false</CsWinRTUseWindowsUIXamlProjections>
+
+    <!--
+      Note: the 'CsWinRTUseWindowsUIXamlProjections' property and associated 'CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS' feature
+      switch are set by the .NET SDK, so that the right projection mode is enabled even when CsWinRT is not directly referenced.
+    -->
   </PropertyGroup>
 
   <!-- Default values for all other CsWinRT properties (without feature switches) -->
@@ -371,11 +375,6 @@ $(CsWinRTInternalProjection)
     <RuntimeHostConfigurationOption Include="CSWINRT_ENABLE_IDYNAMICINTERFACECASTABLE"
                                     Value="$(CsWinRTEnableIDynamicInterfaceCastableSupport)"
                                     Trim="true" />
-
-    <!-- CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS switch -->
-    <RuntimeHostConfigurationOption Include="CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS"
-                                    Value="$(CsWinRTUseWindowsUIXamlProjections)"
-                                    Trim="true" />
   </ItemGroup>
 
 </Project>

From 5621a76ed10f675beef1240e5760b6dac777ea31 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 30 Jul 2024 14:18:01 -0700
Subject: [PATCH 2/4] Remove leftover feature switch

---
 nuget/Microsoft.Windows.CsWinRT.targets | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nuget/Microsoft.Windows.CsWinRT.targets b/nuget/Microsoft.Windows.CsWinRT.targets
index 12aa9c1fa..fd5965c0b 100644
--- a/nuget/Microsoft.Windows.CsWinRT.targets
+++ b/nuget/Microsoft.Windows.CsWinRT.targets
@@ -309,13 +309,6 @@ $(CsWinRTInternalProjection)
     </ItemGroup>
   </Target>
 
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="CsWinRT.UiXamlMode" Condition="'$(CsWinRTUiXamlMode)' != ''">
-      <Value>$(CsWinRTUiXamlMode)</Value>
-      <Trim>true</Trim>
-    </RuntimeHostConfigurationOption>
-  </ItemGroup>
-
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets')"/>
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Authoring.targets" Condition="'$(CsWinRTComponent)' == 'true'"/>
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.IIDOptimizer.targets" Condition="'$(CsWinRTIIDOptimizerOptOut)' != 'true'"/>

From ea32c3d6dc24a494b7c03c01eb1c3737521a0422 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 30 Jul 2024 15:07:18 -0700
Subject: [PATCH 3/4] Remove 'CompilerVisibleProperty'

---
 nuget/Microsoft.Windows.CsWinRT.Authoring.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nuget/Microsoft.Windows.CsWinRT.Authoring.targets b/nuget/Microsoft.Windows.CsWinRT.Authoring.targets
index f9f5ca8bc..33287c367 100644
--- a/nuget/Microsoft.Windows.CsWinRT.Authoring.targets
+++ b/nuget/Microsoft.Windows.CsWinRT.Authoring.targets
@@ -33,7 +33,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <CompilerVisibleProperty Include="CsWinRTWindowsMetadata" />
     <CompilerVisibleProperty Include="CsWinRTGenerateProjection" />
     <CompilerVisibleProperty Include="CsWinRTAuthoringInputs" />
-    <CompilerVisibleProperty Include="CsWinRTUseWindowsUIXamlProjections" />
   </ItemGroup>
 
   <!-- Note this runs before the msbuild editor config file is generated because that is what is used to pass properties to the source generator. -->

From 21f0f536cffbecad3b0036247da4fbbfd6d1dde9 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 30 Jul 2024 15:09:06 -0700
Subject: [PATCH 4/4] Fix 'AuthoringWuxTest.csproj'

---
 src/Tests/AuthoringWuxTest/AuthoringWuxTest.csproj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Tests/AuthoringWuxTest/AuthoringWuxTest.csproj b/src/Tests/AuthoringWuxTest/AuthoringWuxTest.csproj
index 03711233f..ac4488781 100644
--- a/src/Tests/AuthoringWuxTest/AuthoringWuxTest.csproj
+++ b/src/Tests/AuthoringWuxTest/AuthoringWuxTest.csproj
@@ -11,6 +11,14 @@
     <!-- <CsWinRTEnableLogging>true</CsWinRTEnableLogging> -->
     <!--<CsWinRTKeepGeneratedSources>true</CsWinRTKeepGeneratedSources>--> 
   </PropertyGroup>
+
+  <!-- Temporary workaround, remove when https://github.com/dotnet/sdk/pull/41936 is available in the .NET SDK -->
+  <ItemGroup>
+    <CompilerVisibleProperty Include="CsWinRTUseWindowsUIXamlProjections" />
+    <RuntimeHostConfigurationOption Include="CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS"
+                                    Value="$(CsWinRTUseWindowsUIXamlProjections)"
+                                    Trim="true" />
+  </ItemGroup>
   
   <ItemGroup>    
     <ProjectReference Include="..\..\Projections\Windows\Windows.csproj" />