Added test for .user file in outer build #37192
Merged
Conversation
This file contains hidden or 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
ghost
added
JanKrivanek
approved these changes
Nov 28, 2023
| .Should() | ||
| .Pass(); | ||
|
|
||
| string outputPathValue = File.ReadAllText(Path.Combine(testAsset.TestRoot, testProject.Name, "OutputPathValue.txt")); |
There was a problem hiding this comment.
This file could have been created by inner builds, though, right? Though I guess since this is after Build, the outer build would have overwritten it with an empty one . . .
There was a problem hiding this comment.
Yes, the file will be created by the inner builds too, but the outer one will be the last and will override whatever is there.
src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs
Outdated
Show resolved
Hide resolved
maridematte
added a commit
to dotnet/msbuild
that referenced
this pull request
Dec 15, 2023
Fixes #9131 Context As described on the issue, muti-targeted builds did not import the .user file on the outer build. This change makes the outer build import the .user file. Changes Made Added import reference to .user file in Microsoft.Common.CrossTargeting.targets . Testing Test is in SDK repo (dotnet/sdk#37192)
maridematte
added a commit
to maridematte/msbuild
that referenced
this pull request
Dec 18, 2023
Fixes dotnet#9131 Context As described on the issue, muti-targeted builds did not import the .user file on the outer build. This change makes the outer build import the .user file. Changes Made Added import reference to .user file in Microsoft.Common.CrossTargeting.targets . Testing Test is in SDK repo (dotnet/sdk#37192)
maridematte
added a commit
to dotnet/msbuild
that referenced
this pull request
Dec 18, 2023
Fixes #9131 Context As described on the issue, muti-targeted builds did not import the .user file on the outer build. This change makes the outer build import the .user file. Changes Made Added import reference to .user file in Microsoft.Common.CrossTargeting.targets . Testing Test is in SDK repo (dotnet/sdk#37192)
|
Could you retarget to the release/8.0.3xx branch? |
|
nevermind, that retarged cleanly. we can let CI run one more time and auto-merge since this was approved a while back. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Adding a test for this change in MSBuild (dotnet/msbuild#9444).
The
.userfile is currently not available in the outer build. The PR adds the import to the outer build, and the test is best suited for the SDK repo as this affects mostly SDK style projects.