Fixed declaration order for MultiTargetPlatformIdentifier definition …

…and props files which use it
CommunityToolkit · Dec 11, 2024 · 00974a2 · 00974a2
1 parent 35b9e39
commit 00974a2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/ProjectHeads/Head.Uwp.props b/ProjectHeads/Head.Uwp.props
@@ -1,4 +1,15 @@
 <Project>
+    <PropertyGroup>
+        <!--
+            Normally this is defined by the MultiTargetIdentifiers.props file,
+            but the heads do not use this part of the MultiTarget system since deployable heads don't really multi-target.
+            Non-sdk style UWP heads usually define TargetPlatformIdentifier manually.
+        -->
+        <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+        <MultiTargetPlatformIdentifier>$(TargetPlatformIdentifier)</MultiTargetPlatformIdentifier>
+    </PropertyGroup>
+
+    <!-- These are parts of the MultiTarget system which need to be extracted into a common dependency between both ./tooling/MultiTarget and ./tooling/ProjectHeads. -->
     <Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\PackageReferences\Uwp.props" />
     <Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\WinUI.Extra.props" />
 
@@ -12,8 +23,6 @@
         <OutputType>AppContainerExe</OutputType>
         <AppDesignerFolder>Properties</AppDesignerFolder>
         <DefaultLanguage>en-US</DefaultLanguage>
-        <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-        <MultiTargetPlatformIdentifier>$(TargetPlatformIdentifier)</MultiTargetPlatformIdentifier>
         <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
         <FileAlignment>512</FileAlignment>
         <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>