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 #44011

Merged
merged 6 commits into from
Oct 17, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 9, 2024

This pull request updates the following dependencies

From https://github.com/dotnet/msbuild

  • Subscription: 51256791-e30b-4b96-f2b9-08daf1d75f3f
  • Build: 20241017.5
  • Date Produced: October 17, 2024 8:11:55 AM UTC
  • Commit: b8f46eb171f3b1c7e3bddb8afaff9fbb0ba59e9d
  • Branch: refs/heads/main

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Oct 9, 2024
@nagilson
Copy link
Member

nagilson commented Oct 9, 2024

Microsoft.NET.Sdk.BlazorWebAssembly.Tests.WasmJsModulesIntegrationTests.Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest

A blazor test is failing. Rerunning.

@nagilson nagilson enabled auto-merge October 9, 2024 18:24
@nagilson
Copy link
Member

nagilson commented Oct 9, 2024

/azp run

Copy link

Azure Pipelines successfully started running 4 pipeline(s).

@nagilson
Copy link
Member

nagilson commented Oct 9, 2024

Same as #44018

@nagilson
Copy link
Member

@dotnet/aspnet-blazor-eng Expected collection to be empty because the generated manifest should match the expected baseline. This blazor wasm test appears to be broken. I dont think this is a problem with MSBuild. May you PTAL?

@javiercn
Copy link
Member

Taking a look

@javiercn
Copy link
Member

javiercn commented Oct 14, 2024

@wtgodbe for some reason it seems that the VMR is trying to run node.js code.

Has anything changed here recently?

image

This is the command being passed on

repo-projects\Directory.Build.targets(459,5): error MSB3073: The command "D:\a\_work\1\vmr\src\aspnetcore\eng\build.cmd -restore -all -pack -publish -NativeToolsOnMachine -ci -configuration Release -bl /p:DotNetBuildRepo=true /p:DotNetBuildOrchestrator=true /p:RestoreConfigFile=D:\a\_work\1\vmr\artifacts\obj\aspnetcore\NuGet.config /p:SourceBuiltAssetsDir=D:\a\_work\1\vmr\artifacts\assets\Release\ /p:SourceBuiltAssetManifestsDir=D:\a\_work\1\vmr\artifacts\obj\AssetManifests\aspnetcore\ -arch x64 /p:TargetRuntimeIdentifier=win-x64 /p:SourceBuiltShippingPackagesDir=D:\a\_work\1\vmr\artifacts\packages\Release\Shipping\aspnetcore\ /p:SourceBuiltNonShippingPackagesDir=D:\a\_work\1\vmr\artifacts\packages\Release\NonShipping\aspnetcore > D:\a\_work\1\vmr\artifacts\log\Release\aspnetcore\aspnetcore.log 2>&1" exited with code 1.

@wtgodbe
Copy link
Member

wtgodbe commented Oct 14, 2024

We haven't changed anything recently (3 months) as far as I can tell - we should be globally disabling the node build during SourceBuild (that is, when DotNetBuildSourceOnly is true): https://github.com/dotnet/aspnetcore/blob/049814ca468cad1ea1e29412e0aa3eea182a63c1/eng/Common.props#L12-L13

I don't see that prop being passed on the command line, maybe it's set during source-build but not the VMR build? CC @MichaelSimons @mthalman do you know?

@mthalman
Copy link
Member

I don't see any aspnetcore errors right now in the build results. I do see an msbuild error:

/vmr/src/msbuild/src/Build/Evaluation/Profiler/EvaluationLocationPrettyPrinterBase.cs(78,24): error CS0121: (NETCORE_ENGINEERING_TELEMETRY=Build) The call is ambiguous between the following methods or properties: 'string.Join(string?, params ReadOnlySpan<object?>)' and 'string.Join(string?, params ReadOnlySpan<string?>)'

…1009.9

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24504-04 -> To Version 17.13.0-preview-24509-09
…1009.17

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24509-09 -> To Version 17.13.0-preview-24509-17
…1014.4

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24509-17 -> To Version 17.13.0-preview-24514-04
@javiercn javiercn force-pushed the darc-main-9edec88b-402a-4c9e-aed0-30bafa23b466 branch from 9862172 to ee59aaf Compare October 16, 2024 11:07
…1014.17

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24514-04 -> To Version 17.13.0-preview-24514-17
@kasperk81
Copy link
Contributor

fail: Failed to synchronize repo sdk
      Failed to apply the patch 0001-remove-buildxl-feed.patch to src/msbuild.

@MichaelSimons
Copy link
Member

fail: Failed to synchronize repo sdk
      Failed to apply the patch 0001-remove-buildxl-feed.patch to src/msbuild.

The backport of https://github.com/dotnet/sdk/blob/main/src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch is flowing in so the patch needs to be removed.

@MichaelSimons MichaelSimons requested a review from a team as a code owner October 16, 2024 15:40
@MichaelSimons MichaelSimons requested a review from a team as a code owner October 16, 2024 15:40
@MichaelSimons
Copy link
Member

fail: Failed to synchronize repo sdk
      Failed to apply the patch 0001-remove-buildxl-feed.patch to src/msbuild.

The backport of https://github.com/dotnet/sdk/blob/main/src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch is flowing in so the patch needs to be removed.

Removed

@ViktorHofer
Copy link
Member

The call is ambiguous between the following methods or properties: 'string.Join(string?, params ReadOnlySpan<object?>)' and 'string.Join(string?, params ReadOnlySpan<string?>)'

cc @jeffhandley @bartonjs

@bartonjs
Copy link
Member

That's weird, since string.Join hasn't changed since May:

e5d59bd65f6c (Jan Kotas                 2024-01-28 18:56:44 -0800  5694)         public static string Join(string? separator, System.Collections.Generic.IEnumerable<string?> values) { throw null; }
e5d59bd65f6c (Jan Kotas                 2024-01-28 18:56:44 -0800  5695)         public static string Join(string? separator, params object?[] values) { throw null; }
5f067ce8b500 (David Cantú               2024-05-20 00:38:35 -0500  5696)         public static string Join(string? separator, params System.ReadOnlySpan<object?> values) { throw null; }
e5d59bd65f6c (Jan Kotas                 2024-01-28 18:56:44 -0800  5697)         public static string Join(string? separator, params string?[] value) { throw null; }
5f067ce8b500 (David Cantú               2024-05-20 00:38:35 -0500  5698)         public static string Join(string? separator, params System.ReadOnlySpan<string?> value) { throw null; }
e5d59bd65f6c (Jan Kotas                 2024-01-28 18:56:44 -0800  5699)         public static string Join(string? separator, string?[] value, int startIndex, int count) { throw null; }
e5d59bd65f6c (Jan Kotas                 2024-01-28 18:56:44 -0800  5700)         public static string Join<T>(char separator, System.Collections.Generic.IEnumerable<T> values) { throw null; }
e5d59bd65f6c (Jan Kotas                 2024-01-28 18:56:44 -0800  5701)         public static string Join<T>(string? separator, System.Collections.Generic.IEnumerable<T> values) { throw null; }

The line in question is https://github.com/dotnet/msbuild/blob/23587699646ec96072cf58a124bfa377b74435d1/src/Build/Evaluation/Profiler/EvaluationLocationPrettyPrinterBase.cs#L77-L79

@333fred @jaredpar is this a recent compiler regression? It seems pretty obviously string.Join(string, params ReadOnlySpan<string>) to me...

@bartonjs
Copy link
Member

The best/fastest fix, though, is for that MSBuild file to get rid of the square brackets. Then it'll pick params ReadOnlySpan<string> (per sharplab). And if it dual compiles to an older TFM, it'll still pick params string[]... the brackets add nothing, but break the build.

Or revert dotnet/msbuild@eae7bbd, which is the commit that introduced it. (Unless it's using a different branch)

@kasperk81
Copy link
Contributor

dotnet/msbuild#10829

@kasperk81
Copy link
Contributor

and it was due to the language change dotnet/roslyn@433ae40#diff-4f6e5f49b6d6d62ce86251ce6786148019f252a110d98c8cc1e8f76572c4b8b0R76

…1017.5

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24514-17 -> To Version 17.13.0-preview-24517-05
@nagilson nagilson merged commit 23fef2d into main Oct 17, 2024
39 of 40 checks passed
@nagilson nagilson deleted the darc-main-9edec88b-402a-4c9e-aed0-30bafa23b466 branch October 17, 2024 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-CodeFlow Area-VMR untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants