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

Added test for .user file in outer build #37192

Merged
merged 2 commits into from
Feb 22, 2024

Conversation

maridematte
Copy link
Contributor

Adding a test for this change in MSBuild (dotnet/msbuild#9444).

The .user file 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.

.Should()
.Pass();

string outputPathValue = File.ReadAllText(Path.Combine(testAsset.TestRoot, testProject.Name, "OutputPathValue.txt"));
Copy link
Member

Choose a reason for hiding this comment

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

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 . . .

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

Please rebase on release/8.0.2xx, so we don't have to wait a year :)

@maridematte maridematte changed the base branch from main to release/8.0.2xx November 29, 2023 13:01
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)
@maridematte maridematte marked this pull request as ready for review January 5, 2024 18:27
@baronfel
Copy link
Member

Could you retarget to the release/8.0.3xx branch?

@baronfel baronfel changed the base branch from release/8.0.2xx to release/8.0.3xx February 21, 2024 03:18
@baronfel
Copy link
Member

nevermind, that retarged cleanly. we can let CI run one more time and auto-merge since this was approved a while back.

@baronfel baronfel enabled auto-merge (squash) February 21, 2024 03:18
@baronfel
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@baronfel baronfel merged commit 8eea5e6 into dotnet:release/8.0.3xx Feb 22, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants