Skip to content

Commit e1e7867

Browse files
author
v-wuzhai
authored
[release/9.0.3xx] Update dependencies from dotnet/msbuild (#45979)
2 parents 4247b2e + 223de94 commit e1e7867

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>763d10a1a251be35337ee736832bfde3f9200672</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24569-04">
72+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25067-08">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
74+
<Sha>c81c498d4efee2ac3360bbfb9f161016a5969994</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24569-04">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25067-08">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
78+
<Sha>c81c498d4efee2ac3360bbfb9f161016a5969994</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24569-04">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25067-08">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
83+
<Sha>c81c498d4efee2ac3360bbfb9f161016a5969994</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25067.2">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@
178178
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
179179
180180
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
181-
<MicrosoftBuildVersion>17.13.0-preview-24569-04</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24569-04</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.14.0-preview-25067-08</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25067-08</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>

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

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

30-
[Theory]
30+
[CoreMSBuildOnlyTheory]
31+
[InlineData("net7.0")]
32+
[InlineData("net6.0")]
33+
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
34+
{
35+
var testAsset = _testAssetsManager
36+
.CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework)
37+
.WithSource()
38+
.WithTargetFramework(targetFramework);
39+
40+
var buildCommand = new BuildCommand(testAsset);
41+
// Custom culture is allowed, but if set explicitly and overwritten - a warning is issued.
42+
buildCommand.Execute().Should().Pass().And
43+
// warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set.
44+
.HaveStdOutContaining("warning MSB3002:");
45+
}
46+
47+
[FullMSBuildOnlyTheory]
3148
[InlineData("net7.0")]
3249
[InlineData("net6.0")]
50+
// Is this Failing? Is full FW MSBuild already on 17.13? Then remove this test and remove `[CoreMSBuildOnlyTheory]` attribute on the test above
51+
//
52+
// Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the test will fail, as
53+
// proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy:
54+
//
55+
// 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.
3356
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework)
3457
{
3558
var testAsset = _testAssetsManager

0 commit comments

Comments
 (0)