8000 [main] Update dependencies from dotnet/msbuild (#44977) · dotnet/sdk@f2ae697 · GitHub
[go: up one dir, main page]
Skip to content

Commit f2ae697

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/msbuild (#44977)
[main] Update dependencies from dotnet/msbuild - Created a follow up ticket, skipping affected tests to unblock merging for now. - forgot to skip one test - Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa - Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa - Revert "forgot to skip one test" This reverts commit efab774. - Revert "Created a follow up ticket, skipping affected tests to unblock merging for now." This reverts commit 00cdbad. - Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa - Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa - MSBuild supports custom cultures - Separate FullFW and Core test cases - Fix multiple attributes - Merge branch 'darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa' of https://github.com/dotnet/sdk into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
1 parent 363ff49 commit f2ae697

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
@@ -73,18 +73,18 @@
7373
<Sha>6755ffefdb9899c08738941d7498d880bc25e52d</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24568-05">
76+
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24604-04">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
78+
<Sha>5491064fe8d18c8f73d8b6048d277c3ec8b81d31</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24568-05">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24604-04">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
82+
<Sha>5491064fe8d18c8f73d8b6048d277c3ec8b81d31</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24568-05">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24604-04">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
87+
<Sha>5491064fe8d18c8f73d8b6048d277c3ec8b81d31</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.24578.1">

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@
199199
then use that in Directory.Packages.props.
200200
201201
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
202-
<MicrosoftBuildVersion>17.13.0-preview-24568-05</MicrosoftBuildVersion>
203-
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24568-05</MicrosoftBuildLocalizationVersion>
202+
<MicrosoftBuildVersion>17.13.0-preview-24604-04</MicrosoftBuildVersion>
203+
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24604-04</MicrosoftBuildLocalizationVersion>
204204
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
205205
</PropertyGroup>
206206
<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]
3130
[InlineData("net7.0")]
3231
[InlineData("net6.0")]
32+
[CoreMSBuildOnlyTheory]
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+
[InlineData("net7.0")]
48+
[InlineData("net6.0")]
49+
[FullMSBuildOnlyTheory]
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)
0