Skip to content

Commit 518aafc

Browse files
author
v-wuzhai
authored
[release/9.0.2xx] Update dependencies from dotnet/msbuild (#46619)
2 parents 0cdf9e8 + 0dfd937 commit 518aafc

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<add key="darc-pub-dotnet-emsdk-4c9d1b1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4c9d1b11-1/nuget/v3/index.json" />
4747
<!-- End: Package sources from dotnet-emsdk -->
4848
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
49-
<add key="darc-pub-DotNet-msbuild-Trusted-cbc39be" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-cbc39bea/nuget/v3/index.json" />
49+
<add key="darc-pub-DotNet-msbuild-Trusted-fba050a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fba050ad/nuget/v3/index.json" />
5050
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5151
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
5252
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.13.8">
72+
<Dependency Name="Microsoft.Build" Version="17.13.10">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
74+
<Sha>fba050adfae4a1026808f8f56982fe7eaa64b4de</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.8-preview-25070-17">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.13.10-preview-25107-01">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
78+
<Sha>fba050adfae4a1026808f8f56982fe7eaa64b4de</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.8-preview-25070-17">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.10-preview-25107-01">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>cbc39bea8cd57b4a34a1e463cf6abe394507d6c0</Sha>
83+
<Sha>fba050adfae4a1026808f8f56982fe7eaa64b4de</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.201-beta.25070.3">

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.8</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.8-preview-25070-17</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.13.10</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.13.10-preview-25107-01</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: 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)