Update GivenThatWeWantMSBuildToRespectCustomCulture.cs#47549
Update GivenThatWeWantMSBuildToRespectCustomCulture.cs#47549ViktorHofer merged 1 commit intomainfrom
Conversation
Fixes failing `SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail` test by consolidating back with the core only test theory. This is causing all PRs in sdk main to fail because of a machine rollout that updated VS to 17.13.x
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the failing test by consolidating the behavior into a single test method that verifies a warning instead of a build failure when custom culture issues occur.
- Added a [Theory] attribute to the warning test.
- Removed the failing test and its associated commentary, streamlining the test behavior.
Comments suppressed due to low confidence (1)
test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs:46
- Removing the failing test reduces coverage for scenarios where the build should fail due to custom culture issues. Consider adding alternative tests to ensure that incorrect custom culture settings are properly handled.
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework)
|
Force merge to unblock CI in sdk. The failure is unrelated and the VMR legs don't exercise this code path. |
|
/backport to release/9.0.1xx |
|
Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/13839056126 |
|
@edvilme backporting to "release/9.0.1xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update GivenThatWeWantMSBuildToRespectCustomCulture.cs
Using index info to reconstruct a base tree...
M test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs
Falling back to patching base and 3-way merge...
Auto-merging test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs
CONFLICT (content): Merge conflict in test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Update GivenThatWeWantMSBuildToRespectCustomCulture.cs
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
/backport to release/9.0.2xx |
|
Started backporting to release/9.0.2xx: https://github.com/dotnet/sdk/actions/runs/13839085981 |
|
/backport to release/9.0.3xx |
|
Started backporting to release/9.0.3xx: https://github.com/dotnet/sdk/actions/runs/13839552149 |
|
/backport to release/10.0.1xx-preview2 |
|
Started backporting to release/10.0.1xx-preview2: https://github.com/dotnet/sdk/actions/runs/13839601837 |
|
9.0.100 failed, so I would recommend doing that manually |
edvilme clarified that 9.0.100 doesn't have this issue; it was just a typo |
Update: Just discovered that 9.0.1xx does have the issue, although just one of the tests in this pr exists, I will create a new pr deleting the failing test |
Fixes failing
SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFailtest by consolidating back with the core only test theory.This is causing all PRs in sdk main to fail because of a machine rollout that updated VS to 17.13.x yesterday.