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.

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

Fix double build Fixes #5830 #5838

Merged
merged 3 commits into from
Nov 13, 2020
Merged

Conversation

Forgind
Copy link
Member

@Forgind Forgind commented Oct 28, 2020

No description provided.

@marcpopMSFT
Copy link
Member

@Forgind
Copy link
Member Author

Forgind commented Oct 28, 2020

@marcpopMSFT, it shouldn't. That customer was talking about configuration, whereas this is target framework. I'm a little surprised by their bug, since I would've thought they'd each go into their own folder (unless otherwise specified) and not overwrite each other. In any case, that sounds more like a FUTD check problem, whereas this isn't, I think.

Fixes dotnet#5830. See explanation there.
@@ -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.

@@ -1609,6 +1609,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<ItemGroup>
<_MSBuildProjectReferenceExistent Condition="'%(_MSBuildProjectReferenceExistent.SkipGetTargetFrameworkProperties)' == '' and ('%(Extension)' == '.vcxproj' or '%(Extension)' == '.nativeproj')">
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<UndefineProperties>%(_MSBuildProjectReferenceExistent.UndefineProperties);TargetFramework</UndefineProperties>
Copy link
Member

Choose a reason for hiding this comment

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

Since it took us so long to figure this out please comment this.

@Forgind Forgind merged commit 1954bb4 into dotnet:master Nov 13, 2020
@Forgind Forgind deleted the fix-double-build branch November 13, 2020 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Overbuild and timing breaks when multi-targeting csproj has a P2P to a vcxproj
3 participants