Skip to content

Commit c50142c

Browse files
authored
[release/10.0.1xx-preview1] Update dependencies from dotnet/msbuild (#46371)
2 parents 9035d02 + 0446aac commit c50142c

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
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>3ac196ac425223d11490e759c2641256ce746f21</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25073-02">
76+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25103-04">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>291a8108761ed347562228f2f8f25477996a5a93</Sha>
78+
<Sha>66061962dffd4250199894b385d0ad441a9b32d6</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25073-02">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25103-04">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>291a8108761ed347562228f2f8f25477996a5a93</Sha>
82+
<Sha>66061962dffd4250199894b385d0ad441a9b32d6</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25073-02">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25103-04">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>291a8108761ed347562228f2f8f25477996a5a93</Sha>
87+
<Sha>66061962dffd4250199894b385d0ad441a9b32d6</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25079.4">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@
193193
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
194194
195195
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
196-
<MicrosoftBuildVersion>17.14.0-preview-25073-02</MicrosoftBuildVersion>
197-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25073-02</MicrosoftBuildLocalizationVersion>
196+
<MicrosoftBuildVersion>17.14.0-preview-25103-04</MicrosoftBuildVersion>
197+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25103-04</MicrosoftBuildLocalizationVersion>
198198
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
199199
<MinimumVSVersion>17.12</MinimumVSVersion>
200200
</PropertyGroup>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
2929

3030
[InlineData("net7.0")]
3131
[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).
3234
[CoreMSBuildOnlyTheory]
3335
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
3436
{
@@ -39,17 +41,18 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW
3941

4042
var buildCommand = new BuildCommand(testAsset);
4143
// Custom culture is allowed, but if set explicitly and overwritten - a warning is issued.
42-
buildCommand.Execute().Should().Pass().And
44+
// However the warning is explicit opt-in.
45+
buildCommand.Execute("/p:WarnOnCultureOverwritten=true").Should().Pass().And
4346
// warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set.
4447
.HaveStdOutContaining("warning MSB3002:");
4548
}
4649

50+
[Theory]
4751
[InlineData("net7.0")]
4852
[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
53+
// Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild.
5154
//
52-
// Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the test will fail, as
55+
// Without explicit opt-in via WarnOnCultureOverwritten - the test will fail, as
5356
// proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy:
5457
//
5558
// 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.

0 commit comments

Comments
 (0)