Add 'EnableXamlCompilerMismatchedTfmUnoWorkaround'

CommunityToolkit · Dec 26, 2024 · eb797b5 · eb797b5
1 parent 93931e0
commit eb797b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/MultiTarget/Extra.props b/MultiTarget/Extra.props
@@ -14,7 +14,7 @@
 
   <!-- Workaround, improved error message when consuming from Uno projects with mismatched TFMs -->
   <!-- See https://github.com/CommunityToolkit/Windows/issues/388 -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(EnableXamlCompilerMismatchedTfmUnoWorkaround)' == 'true'">
     <None PackagePath="lib/net9.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
     <None PackagePath="lib/net8.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
     <None PackagePath="lib/net7.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />

diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props
@@ -49,6 +49,11 @@
 
     <IsUno Condition="'$(IsWasm)' == 'true' OR '$(IsWpf)' == 'true' OR '$(IsGtk)' == 'true' OR '$(IsDroid)' == 'true' OR '$(IsMacOS)' == 'true' OR '$(IsiOS)' == 'true'">true</IsUno>
 
+    <!--
+      Provide an opt-out switch for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/185.
+      This causes problems for UWP packages just targeting 17763 or other lower TFMs, as it conflicts with this.
+    -->
+    <EnableXamlCompilerMismatchedTfmUnoWorkaround Condition="'$(EnableXamlCompilerMismatchedTfmUnoWorkaround)' == ''">true</EnableXamlCompilerMismatchedTfmUnoWorkaround>
 
     <!--
       This property is only for changing the version used by Uno.