Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/9.0.2xx] Update dependencies from dotnet/msbuild #45880

Merged
merged 7 commits into from
Jan 19, 2025
+33 −9
Merged

[release/9.0.2xx] Update dependencies from dotnet/msbuild #45880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12d3704
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jan 10, 2025
8392810
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jan 13, 2025
4a604e9
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Jan 14, 2025
e5148c2
MSBuild supports custom cultures
JanKrivanek Dec 2, 2024
dbb29f3
Separate FullFW and Core test cases
JanKrivanek Dec 3, 2024
dff6e10
Fix multiple attributes
JanKrivanek Dec 3, 2024
5a8b06d
Merge branch 'release/9.0.2xx' into darc-release/9.0.2xx-fdf46c8e-e15…
Forgind Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
25 changes: 24 additions & 1 deletion test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs
View file
Open in desktop
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
Loading