Skip to content

Commit 9c1aa67

Browse files
authored
Merge branch 'release/9.0.3xx' into darc-release/9.0.3xx-cfca517c-83a6-41dc-9b7b-642c82e45770
2 parents 2ad5d29 + 8fd1abb commit 9c1aa67

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
2727
new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist();
2828
}
2929

30+
[Theory]
3031
[InlineData("net7.0")]
3132
[InlineData("net6.0")]
32-
// Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the WarnOnCultureOverwritten
33-
// is not supported - and the build will fail copy (more details in the last test).
34-
[CoreMSBuildOnlyTheory]
3533
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
3634
{
3735
var testAsset = _testAssetsManager
@@ -46,25 +44,5 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW
4644
// warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set.
4745
.HaveStdOutContaining("warning MSB3002:");
4846
}
49-
50-
[Theory]
51-
[InlineData("net7.0")]
52-
[InlineData("net6.0")]
53-
// Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild.
54-
//
55-
// Without explicit opt-in via WarnOnCultureOverwritten - the test will fail, as
56-
// proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy:
57-
//
58-
// Microsoft.Common.CurrentVersion.targets(4959,5): error MSB3030: Could not copy the file "obj\Debug\net7.0\test-1\MSBuildCultureResourceGeneration.resources.dll" because it was not found.
59-
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework)
60-
{
61-
var testAsset = _testAssetsManager
62-
.CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework)
63-
.WithSource()
64-
.WithTargetFramework(targetFramework);
65-
66-
var buildCommand = new BuildCommand(testAsset);
67-
buildCommand.Execute().Should().Fail();
68-
}
6947
}
7048
}

0 commit comments

Comments
 (0)