Remove all checks regarding $(MSBuildAssemblyVersion) being set or not #7165
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dfederm
commented
Dec 21, 2021
src/Tasks/Microsoft.Common.props
Outdated
| @@ -63,72 +63,19 @@ Copyright (C) Microsoft Corporation. All rights reserved. | |||
| <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(ImportProjectExtensionProps)' == 'true' and exists('$(MSBuildProjectExtensionsPath)')" /> | |||
|
|
|||
| <!-- | |||
| Import wildcard "ImportBefore" props files if we're actually in a 12.0+ project (rather than a project being | |||
| treated as 4.0) | |||
| Wildcard imports come from $(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props\ folder. | |||
There was a problem hiding this comment.
Removed the reference to the "Microsoft.Common.props.d folder" since as far as I can tell, it never actually existed? Even in the PR which added this comment, it didn't seem to apply then either.
There was a problem hiding this comment.
The reason for the weird naming is given the comments itself.
Unfortunately, there is already a file named "Microsoft.Common.props" in this directory so we have to have a slightly different directory name to hold extensions.
But the actual path is $(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Imports\$(MSBuildThisFile)\ for Microsoft.Common.props.
dfederm
commented
Dec 21, 2021
Nirmal4G
reviewed
Dec 22, 2021
Co-authored-by: Nirmal Guru <Nirmal4G@gmail.com>
Sure, I'll take care of xmlns in a separate PR :) |
Co-authored-by: Forgind <Forgind@users.noreply.github.com>
Forgind
added
the
merge-when-branch-open
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5190
Context
$(MSBuildAssemblyVersion)is a built-in property which returns the MSBuild Assembly version as you may expect. In various props/targets it's used to detect whether MSBuild v4 is running, and at this point that's never the case that MSBuild v4 (or any MSBuild for that matter) would be using these props/targets.My understanding is that the props/targets which ship with the .NET Framework and do ship with MSBuild v4 are distributed separately and not part of this repo.
Changes Made
Removed all conditions where the existence of
$(MSBuildAssemblyVersion)was used.