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

Fix double build Fixes #5830 #5838

Merged
merged 3 commits into from
Nov 13, 2020
Merged

Fix double build Fixes #5830 #5838

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db36b43
Undefine TargetFramework for vcxproj
Forgind Nov 5, 2020
331e2e2
Move check
Forgind Nov 6, 2020
022c5c2
Update comment
Forgind Nov 11, 2020
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
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
If the NearestTargetFramework property was not set or the project has a single TargetFramework, we need to Undefine
TargetFramework to avoid another project evaluation.
-->
<AnnotatedProjects Condition="'@(AnnotatedProjects)' == '%(Identity)' and ('%(AnnotatedProjects.NearestTargetFramework)' == '' or '%(AnnotatedProjects.HasSingleTargetFramework)' == 'true')">
<AnnotatedProjects Condition="('%(Extension)' == '.vcxproj' or '%(Extension)' == '.nativeproj') or ('@(AnnotatedProjects)' == '%(Identity)' and ('%(AnnotatedProjects.NearestTargetFramework)' == '' or '%(AnnotatedProjects.HasSingleTargetFramework)' == 'true'))">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put metadata on 1612 instead of doing this.

<UndefineProperties>%(AnnotatedProjects.UndefineProperties);TargetFramework</UndefineProperties>
</AnnotatedProjects>

Expand Down