Skip to content

Commit 00974a2

Browse files
committed
Fixed declaration order for MultiTargetPlatformIdentifier definition and props files which use it
1 parent 35b9e39 commit 00974a2

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

ProjectHeads/Head.Uwp.props

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
<Project>
2+
<PropertyGroup>
3+
<!--
4+
Normally this is defined by the MultiTargetIdentifiers.props file,
5+
but the heads do not use this part of the MultiTarget system since deployable heads don't really multi-target.
6+
Non-sdk style UWP heads usually define TargetPlatformIdentifier manually.
7+
-->
8+
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
9+
<MultiTargetPlatformIdentifier>$(TargetPlatformIdentifier)</MultiTargetPlatformIdentifier>
10+
</PropertyGroup>
11+
12+
<!-- These are parts of the MultiTarget system which need to be extracted into a common dependency between both ./tooling/MultiTarget and ./tooling/ProjectHeads. -->
213
<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\PackageReferences\Uwp.props" />
314
<Import Project="$(MSBuildThisFileDirectory)\..\MultiTarget\WinUI.Extra.props" />
415

@@ -12,8 +23,6 @@
1223
<OutputType>AppContainerExe</OutputType>
1324
<AppDesignerFolder>Properties</AppDesignerFolder>
1425
<DefaultLanguage>en-US</DefaultLanguage>
15-
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
16-
<MultiTargetPlatformIdentifier>$(TargetPlatformIdentifier)</MultiTargetPlatformIdentifier>
1726
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1827
<FileAlignment>512</FileAlignment>
1928
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

0 commit comments

Comments
 (0)