Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SetPlatform: Use Platform Instead Of PlatformTarget #6889

Merged
merged 2 commits into from
Sep 27, 2021
Merged

SetPlatform: Use Platform Instead Of PlatformTarget #6889

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
701f0fc
Pass and undefine Platform property
benvillalobos Sep 24, 2021
8f353e2
Remove usage of PlatformTarget altogether
benvillalobos Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,11 +1615,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
======================================================================================
-->

<!-- Managed projects need to have PlatformTarget set for SetPlatform negotiation. Default to $(Platform), which is AnyCPU by default. -->
<PropertyGroup>
<PlatformTarget Condition="'$(EnableDynamicPlatformResolution)' == 'true' and '$(PlatformTarget)' == ''
and '$(MSBuildProjectExtension)' != '.vcxproj' and '$(MSBuildProjectExtension)' != '.nativeproj'">$(Platform)</PlatformTarget>

<UseDefaultPlatformLookupTables Condition="'$(UseDefaultPlatformLookupTables)' == ''">true</UseDefaultPlatformLookupTables>
</PropertyGroup>

Expand All @@ -1642,12 +1638,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
Condition="'%(_MSBuildProjectReferenceExistent.SkipGetPlatformProperties)' != 'true'"/>
</ItemGroup>

<!-- Managed Platform "source of truth" is $(PlatformTarget). For cpp it's $(Platform) -->
<PropertyGroup>
<CurrentPlatform>$(PlatformTarget)</CurrentPlatform>
<CurrentPlatform Condition="'$(MSBuildProjectExtension)' == '.vcxproj' or '$(MSBuildProjectExtension)' == '.nativeproj'">$(Platform)</CurrentPlatform>
</PropertyGroup>

<!-- Assign default PlatformLookupTables when doing Managed <-> Unmanaged hops -->
<ItemGroup>
<!-- If we're looking at a c++ project from a managed project, map managed platforms to native platforms. -->
Expand All @@ -1663,7 +1653,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
</ItemGroup>

<GetCompatiblePlatform AnnotatedProjects="@(_ProjectReferencePlatformPossibilities)"
CurrentProjectPlatform="$(CurrentPlatform)"
CurrentProjectPlatform="$(Platform)"
PlatformLookupTable="$(PlatformLookupTable)"
Condition="'@(_ProjectReferencePlatformPossibilities)' != ''">
<Output ItemName="_ProjectsWithPlatformAssignment" TaskParameter="AssignedProjectsWithPlatform" />
Expand All @@ -1675,13 +1665,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<ItemGroup Condition="'@(_ProjectsWithPlatformAssignment)' != ''">
<ProjectsWithNearestPlatform Include="@(_ProjectsWithPlatformAssignment)"/>
<ProjectsWithNearestPlatform Condition="'@(ProjectsWithNearestPlatform)' == '%(Identity)' and '%(ProjectsWithNearestPlatform.NearestPlatform)' != ''">
<SetPlatform>PlatformTarget=%(ProjectsWithNearestPlatform.NearestPlatform)</SetPlatform>
<SetPlatform Condition="'%(ProjectsWithNearestPlatform.IsVcxOrNativeProj)' == 'true'">Platform=%(ProjectsWithNearestPlatform.NearestPlatform)</SetPlatform>
<SetPlatform>Platform=%(ProjectsWithNearestPlatform.NearestPlatform)</SetPlatform>
</ProjectsWithNearestPlatform>

<!-- When GetCompatiblePlatform fails to assign NearestPlatform, undefine Platform and let that project build "on its own" -->
<ProjectsWithNearestPlatform Condition="'@(ProjectsWithNearestPlatform)' == '%(Identity)' and '%(ProjectsWithNearestPlatform.NearestPlatform)' == ''">
<UndefineProperties Condition="'%(ProjectsWithNearestPlatform.IsVcxOrNativeProj)' == 'true'">%(ProjectsWithNearestPlatform.UndefineProperties);Platform</UndefineProperties>
<UndefineProperties Condition="'%(ProjectsWithNearestPlatform.IsVcxOrNativeProj)' != 'true'">%(ProjectsWithNearestPlatform.UndefineProperties);PlatformTarget</UndefineProperties>
<UndefineProperties>%(ProjectsWithNearestPlatform.UndefineProperties);Platform</UndefineProperties>
</ProjectsWithNearestPlatform>

<_MSBuildProjectReferenceExistent Remove="@(_MSBuildProjectReferenceExistent)" Condition="'%(_MSBuildProjectReferenceExistent.SkipGetPlatformProperties)' != 'true'"/>
Expand Down