Skip to content

Commit

Permalink
[release/9.0.2xx] Update dependencies from dotnet/msbuild (#45880)
Browse files Browse the repository at this point in the history
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jan Krivanek <[email protected]>
Co-authored-by: Forgind <[email protected]>
  • Loading branch information
4 people authored Jan 19, 2025
1 parent 0bedec8 commit aa15f79
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 9 deletions.
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<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" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-bfea91c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfea91c5/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,18 @@
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24569-04">
<Dependency Name="Microsoft.Build" Version="17.13.6">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
<Sha>bfea91c5fba33abb318bd022d96d4b2b1735eed8</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24569-04">
<Dependency Name="Microsoft.Build.Localization" Version="17.13.6-preview-25064-08">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
<Sha>bfea91c5fba33abb318bd022d96d4b2b1735eed8</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24569-04">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.6-preview-25064-08">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
<Sha>bfea91c5fba33abb318bd022d96d4b2b1735eed8</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.25056.5">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
<MicrosoftBuildVersion>17.13.0-preview-24569-04</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24569-04</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.13.6</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.6-preview-25064-08</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>17.12</MinimumVSVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,32 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string
new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist();
}

[Theory]
[InlineData("net7.0")]
[InlineData("net6.0")]
[CoreMSBuildOnlyTheory]
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework)
{
var testAsset = _testAssetsManager
.CopyTestAsset("MSBuildCultureResourceGeneration", identifier: targetFramework)
.WithSource()
.WithTargetFramework(targetFramework);

var buildCommand = new BuildCommand(testAsset);
// Custom culture is allowed, but if set explicitly and overwritten - a warning is issued.
buildCommand.Execute().Should().Pass().And
// warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set.
.HaveStdOutContaining("warning MSB3002:");
}

[InlineData("net7.0")]
[InlineData("net6.0")]
[FullMSBuildOnlyTheory]
// Is this Failing? Is full FW MSBuild already on 17.13? Then remove this test and remove `[CoreMSBuildOnlyTheory]` attribute on the test above
//
// Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the test will fail, as
// proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy:
//
// 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.
public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail(string targetFramework)
{
var testAsset = _testAssetsManager
Expand Down

0 comments on commit aa15f79

Please sign in to comment.