Introduced IsWindowsTfm MultiTargetIdentifier shorthand

Author: Arlodotexe

MultiTarget/MultiTargetIdentifiers.props

@@ -43,6 +43,7 @@
 
     <IsUwp Condition="'$(IsUwp)' == '' AND $(UwpTargetFramework.Contains('$(TargetFramework);')) AND '$(UwpTargetFramework)' != '' AND '$(MultiTargetsUwp)' == 'true'">true</IsUwp>
     <IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND $(WinAppSdkTargetFramework.Contains('$(TargetFramework);')) AND '$(WinAppSdkTargetFramework)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>
+    <IsWindowsTfm Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == '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>
@@ -60,6 +61,6 @@
     <WinUIMajorVersion Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true' AND $(WinUIMajorVersion) == ''">2</WinUIMajorVersion>
     <WinUIMajorVersion Condition="'$(HasWinUI)' == 'true' AND '$(IsWinAppSdk)' == 'true' AND $(WinUIMajorVersion) == ''">3</WinUIMajorVersion>
 
-    <UseUwp Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">true</UseUwp>
+    <UseUwp Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true' AND '$(IsWindowsTfm)' == 'true'">true</UseUwp>
   </PropertyGroup>
 </Project>

MultiTarget/NoWarn.props

@@ -1,6 +1,6 @@
 <Project>  
   <!-- Disable warnings for 'This call site is reachable on all platforms.' caused by underlying platform. -->
-  <PropertyGroup Condition="'$(IsUwp)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+  <PropertyGroup Condition="'$(IsUwp)' == 'true' AND '$(IsWindowsTfm)' == 'true'">
     <NoWarn>$(NoWarn);CA1416;NETSDK1219;</NoWarn>
   </PropertyGroup>
 

MultiTarget/PackageReferences/Uwp.props

@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
     <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.UI.Xaml" Version="2.8.7-prerelease.241119001" />
-    <PackageReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Windows.CsWinRT" Version="2.1.6" PrivateAssets="all" />
+    <PackageReference Condition="'$(IsWindowsTfm)' == 'true'" Include="Microsoft.Windows.CsWinRT" Version="2.1.6" PrivateAssets="all" />
 
     <!-- Temp workaround until next Windows SDK servicing update -->
-    <PackageReference Condition="'$(HasWinUI)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Windows.SDK.CPP" Version="10.0.26100.2454" PrivateAssets="all" />
+    <PackageReference Condition="'$(HasWinUI)' == 'true' AND '$(IsWindowsTfm)' == 'true'" Include="Microsoft.Windows.SDK.CPP" Version="10.0.26100.2454" PrivateAssets="all" />
   </ItemGroup>
 </Project>

MultiTarget/WinUI.Extra.props

@@ -17,8 +17,8 @@
     -->
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
-    <TargetPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition="'$(IsWindowsTfm)' == 'true'">10.0.26100.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition="'$(IsWindowsTfm)' != 'true'">10.0.19041.0</TargetPlatformVersion>
   </PropertyGroup>
 
   <!-- Workaround, improved error message when consuming from Uno projects with mismatched TFMs -->
@@ -32,8 +32,8 @@
   <PropertyGroup Condition="'$(IsUwp)' == 'true'">
     <Platforms>x86;x64;arm64</Platforms>
 
-    <WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.26100.54</WindowsSdkPackageVersion>
-    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
+    <WindowsSdkPackageVersion Condition="'$(IsWindowsTfm)' == 'true'">10.0.26100.54</WindowsSdkPackageVersion>
+    <RuntimeIdentifiers Condition="'$(IsWindowsTfm)' == 'true'">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 $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+  <PropertyGroup Condition="'$(IsUwp)' == 'true' AND '$(IsWindowsTfm)' == 'true'">
     <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 $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
+  <Sdk Condition="'$(IsUwp)' == 'true' AND '$(IsWindowsTfm)' != 'true'" Name="MSBuild.Sdk.Extras" Version="3.0.23" />
 
   <!-- Import this component's source project -->
   <ItemGroup>