Removal of IsWindowsTfm bool in favor of value checks on MultiTargetPlatformIdentifier

Author: Arlodotexe

MultiTarget/MultiTargetIdentifiers.props

@@ -46,9 +46,6 @@
 
     <MultiTargetPlatformIdentifier Condition="'$(MultiTargetPlatformIdentifier)' == ''">$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</MultiTargetPlatformIdentifier>
 
-    <!-- TODO: Investigate. Should be named IsWindows, but ran into unexpected issues in VS. Property name may be taken and internally used by an SDK. -->
-    <IsWindowsTfm Condition="$(MultiTargetPlatformIdentifier) == 'windows'">true</IsWindowsTfm>
-
     <IsDroid Condition="'$(IsDroid)' == '' AND $(AndroidLibTargetFramework.Contains('$(TargetFramework);')) AND '$(AndroidLibTargetFramework)' != '' AND '$(MultiTargetsDroid)' == 'true'">true</IsDroid>
     <IsMacOS Condition="'$(IsMacOS)' == '' AND $(MacOSLibTargetFramework.Contains('$(TargetFramework);')) AND '$(MacOSLibTargetFramework)' != '' AND '$(MultiTargetsMacOS)' == 'true'">true</IsMacOS>
     <IsiOS Condition="'$(IsiOS)' == '' AND $(iOSLibTargetFramework.Contains('$(TargetFramework);')) AND '$(iOSLibTargetFramework)' != '' AND '$(MultiTargetsiOS)' == 'true'">true</IsiOS>

MultiTarget/WinUI.Extra.props

@@ -17,13 +17,13 @@
     -->
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
-    <TargetPlatformVersion Condition="'$(IsWindowsTfm)' == 'true'">10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformVersion Condition="'$(IsWindowsTfm)' != 'true'">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">10.0.26100.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition="'$(MultiTargetPlatformIdentifier)' != 'windows'">10.0.19041.0</TargetPlatformVersion>
   </PropertyGroup>
 
   <!-- Workaround, improved error message when consuming from Uno projects with mismatched TFMs -->
   <!-- See https://github.com/CommunityToolkit/Windows/issues/388 -->
-  <ItemGroup>
+  <windows>
     <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" />
@@ -32,8 +32,8 @@
   <PropertyGroup Condition="'$(IsUwp)' == 'true'">
     <Platforms>x86;x64;arm64</Platforms>
 
-    <WindowsSdkPackageVersion Condition="'$(IsWindowsTfm)' == 'true'">10.0.26100.54</WindowsSdkPackageVersion>
-    <RuntimeIdentifiers Condition="'$(IsWindowsTfm)' == 'true'">win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
+    <WindowsSdkPackageVersion Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">10.0.26100.54</WindowsSdkPackageVersion>
+    <RuntimeIdentifiers Condition="'$(MultiTargetPlatformIdentifier)' == 'windows'">win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsWinAppSdk)' == 'true'">
@@ -58,7 +58,7 @@
   </PropertyGroup>
 
   <!-- Disable warnings for 'This call site is reachable on all platforms.' caused by underlying platform. -->
-  <PropertyGroup Condition="'$(IsUwp)' == 'true' AND '$(IsWindowsTfm)' == 'true'">
+  <PropertyGroup Condition="'$(IsUwp)' == 'true' AND '$(MultiTargetPlatformIdentifier)' == 'windows'">
     <NoWarn>$(NoWarn);CA1416;</NoWarn>
   </PropertyGroup>
 

ToolkitComponent.SampleProject.props

@@ -6,7 +6,7 @@
   <!-- Set up the MultiTarget system -->
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
-  <Sdk Condition="'$(IsUwp)' == 'true' AND '$(IsWindowsTfm)' != 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
+  <Sdk Condition="'$(IsUwp)' == 'true' AND '$(MultiTargetPlatformIdentifier)' != 'windows'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
 
   <!-- Import this component's source project -->
   <ItemGroup>