Reference latest MSBuild for netcore MSBuild stuff #40603
Merged
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
MSBuild references were changed in dotnet#38506 to use MSBuildMinimumVersion in all non-source-build scenarios, but that's not necessary: the SDK will deliver the latest .NET MSBuild and use it for all CLI-driven builds. Using the old version broke some tests because of a mismatch between newer targets and the old engine that was being used to execute tests. Instead, split the reference based on the TF of the project that is building: for `net472`, use the minimum version if available, but for `$(SdkTargetFramework)` always use the latest.
kasperk81
reviewed
May 1, 2024
| modes will import a version override file after Versions.props. --> | ||
| <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'"> | ||
| <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetFramework)' != 'net472'"> |
There was a problem hiding this comment.
is
'$(DotNetBuildSourceOnly)' == 'true' / != 'true'
part of these conditions redundant? there is no netframework source build
There was a problem hiding this comment.
should be enough to check:
'$(TargetFrameworkIdentifier)' == '.NETFramework'
'$(TargetFrameworkIdentifier)' != '.NETFramework'
baronfel
approved these changes
May 1, 2024
ViktorHofer
approved these changes
May 6, 2024
Forgind
approved these changes
May 10, 2024
|
/backport to release/8.0.4xx |
|
Started backporting to release/8.0.4xx: https://github.com/dotnet/sdk/actions/runs/9085698508 |
|
@marcpopMSFT backporting to release/8.0.4xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Reference latest MSBuild for netcore MSBuild stuff
Using index info to reconstruct a base tree...
M Directory.Packages.props
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Reference latest MSBuild for netcore MSBuild stuff
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@marcpopMSFT an error occurred while backporting to release/8.0.4xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
@Forgind /please backport to release/8.0.4xx |
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.
MSBuild references were changed in #38506 to use
MSBuildMinimumVersion in all non-source-build scenarios, but
that's not necessary: the SDK will deliver the latest .NET MSBuild
and use it for all CLI-driven builds.
Using the old version broke some tests because of a mismatch
between newer targets and the old engine that was being used
to execute tests.
Instead, split the reference based on the TF of the project that is
building: for
net472, use the minimum version if available, butfor
$(SdkTargetFramework)always use the latest.