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.

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

[main] Update dependencies from dotnet/msbuild #44977

Merged
merged 22 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5b56997
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 20, 2024
20cdb41
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 21, 2024
656e3cd
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 22, 2024
00cdbad
Created a follow up ticket, skipping affected tests to unblock mergin…
SimaTian Nov 26, 2024
efab774
forgot to skip one test
SimaTian Nov 26, 2024
67fba37
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 26, 2024
6710f8d
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 27, 2024
5ee6c9e
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 28, 2024
56f235f
Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
surayya-MS Nov 28, 2024
9019e39
Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
surayya-MS Nov 29, 2024
413d3b4
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 29, 2024
508b28b
Revert "forgot to skip one test"
surayya-MS Nov 29, 2024
1d8f45f
Revert "Created a follow up ticket, skipping affected tests to unbloc…
surayya-MS Nov 29, 2024
aaab6c4
Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
surayya-MS Nov 29, 2024
6c9eaeb
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Nov 30, 2024
23edf3c
Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
surayya-MS Dec 2, 2024
a03549a
MSBuild supports custom cultures
JanKrivanek Dec 2, 2024
8c6c968
Separate FullFW and Core test cases
JanKrivanek Dec 3, 2024
b1d5b22
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 3, 2024
7dcf229
Fix multiple attributes
JanKrivanek Dec 3, 2024
da69b18
Merge branch 'darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa' of http…
JanKrivanek Dec 3, 2024
08b0eec
Update dependencies from https://github.com/dotnet/msbuild build 2024…
dotnet-maestro[bot] Dec 4, 2024
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@
<Sha>6755ffefdb9899c08738941d7498d880bc25e52d</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24568-05">
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24603-07">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
<Sha>e5669f0208fdb25e72e7f00e93758f656c1462c1</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24568-05">
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24603-07">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
<Sha>e5669f0208fdb25e72e7f00e93758f656c1462c1</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24568-05">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24603-07">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
<Sha>e5669f0208fdb25e72e7f00e93758f656c1462c1</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.24578.1">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@
then use that in Directory.Packages.props.

At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
<MicrosoftBuildVersion>17.13.0-preview-24568-05</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24568-05</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildVersion>17.13.0-preview-24603-07</MicrosoftBuildVersion>
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24603-07</MicrosoftBuildLocalizationVersion>
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
</PropertyGroup>
<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
Loading