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/arcade #46021

Merged
merged 20 commits into from
Jan 24, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 16, 2025

This pull request updates the following dependencies

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

  • Subscription: 3d9043af-0e17-4eb5-f3e3-08d8e97c775d
  • Build: 20250123.5
  • Date Produced: January 23, 2025 10:06:59 PM UTC
  • Commit: ba09eddf11e81ff604c3118eddb86517cfcd4969
  • Branch: refs/heads/main

@ViktorHofer
Copy link
Member

ViktorHofer commented Jan 18, 2025

Some of the failures when updating to a newer .NET SDK:

[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.RuntimeIdentifierInference.targets(326,5): message NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》  RazorClassLibrary -> /private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/razorclasslibrary/bin/Release/net10.0/RazorClassLibrary.dll
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error : InvalidOperationException: Sequence contains more than one element [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at System.Linq.ThrowHelper.ThrowMoreThanOneElementException() [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at System.Linq.Enumerable.TryGetSingle[TSource](IEnumerable`1 source, Boolean& found) [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at System.Linq.Enumerable.SingleOrDefault[TSource](IEnumerable`1 source) [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAssetsDevelopmentManifest.ComputeManifestAssets(IEnumerable`1 assets)+MoveNext() in /_/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs:line 107 [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at System.Linq.Enumerable.<ToArray>g__EnumerableToArray|321_0[TSource](IEnumerable`1 source) [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at System.Linq.Enumerable.ToArray[TSource](IEnumerable`1 source) [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAssetsDevelopmentManifest.ComputeDevelopmentManifest(IEnumerable`1 assets, IEnumerable`1 discoveryPatterns) in /_/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs:line 68 [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :    at Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAssetsDevelopmentManifest.Execute() in /_/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs:line 51 [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         》/tmp/helix/working/A5B2094E/p/d/sdk/10.0.100-ci/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets(637,5): error :  [/private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj]
[xUnit.net 00:00:23.16]         Command 'dotnet msbuild /t:Publish /private/tmp/helix/working/A5B2094E/t/dotnetSdkTests.ozKY5Yye/AoT_Publish_I---9BC42A2F/blazorwasm/blazorwasm.csproj /restore /p:Configuration=Release' exited with exit code 1.

from https://helixr1107v0xdeko0k025g8.blob.core.windows.net/dotnet-sdk-refs-pull-46021-merge-1c127358c69046b58c/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.dll.1/3/console.e71ac7cd.log?helixlogtype=result

cc @javiercn

> C:\h\w\AAA80907\p\d\dotnet.exe new --debug:ephemeral-hive wpf --no-restore
[xUnit.net 00:05:27.70]     EndToEnd.Tests.ProjectBuildTests.ItCanCreateAndBuildTemplatesWithDefaultFramework_Windows(templateName: "winformscontrollib", language: "C#") [FAIL]
[xUnit.net 00:05:27.70]       Assert.Equal() Failure: Strings differ
[xUnit.net 00:05:27.70]                     ↓ (pos 3)
[xUnit.net 00:05:27.70]       Expected: "net9.0-windows"
[xUnit.net 00:05:27.70]       Actual:   "net10.0-windows"
[xUnit.net 00:05:27.70]                     ↑ (pos 3)

@dotnet/templating-engine-maintainers

I'm surprised that many of these failures only show upgrading the toolset SDK. I.e. I would have expected the wpf TFM failure to show up when the TFM got changed in the wpf repository and the changed flowed into sdk. Same for the custom usings one. Are we sure that we are testing consistently with the live sdk?

@marcpopMSFT

@javiercn
Copy link
Member

I think #46164 needs to go in, before this PR gets unblocked.

@ViktorHofer ViktorHofer requested review from a team as code owners January 23, 2025 07:33
dotnet-maestro bot and others added 9 commits January 23, 2025 11:46
…115.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25065.4
…116.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25066.1
…117.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25067.3
…120.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25070.2
…121.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25071.3
…122.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25072.2
@javiercn javiercn force-pushed the darc-main-533dd42c-2566-45a1-8ce5-710765af532c branch from 5f135d3 to bd0621b Compare January 23, 2025 10:46
@ViktorHofer
Copy link
Member

@javiercn why are force-pushing into this PR? That isn't necessary. The PR also already was up-to-date with HEAD and the new SDK.

@javiercn
Copy link
Member

@ViktorHofer I did not push to it, I did an update with rebase from the GH UI

@ViktorHofer
Copy link
Member

ViktorHofer commented Jan 23, 2025

OK, got it. The rebase from the UI is the same as a force push as it rewrites history. It would be better to not use the rebase strategy but the merge option (same button but different option) in dependency flow PRs in the future.

@ViktorHofer
Copy link
Member

Btw from what I saw in the previous run, the issue still persists but we should soon know more.

@javiercn
Copy link
Member

@ViktorHofer I'll keep an eye on it.

@ViktorHofer
Copy link
Member

ViktorHofer commented Jan 23, 2025

  Failed Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.WasmAoTPublishIntegrationTest.AoT_Publish_HostedAppWithScopedCss_VisualStudio [1 m 15 s]
  Error Message:
   System.Collections.Generic.KeyNotFoundException : The given key '_framework/blazor.server.js' was not present in the dictionary.
  Stack Trace:
     at System.Collections.Generic.Dictionary`2.get_Item(TKey key)
   at Microsoft.NET.Sdk.BlazorWebAssembly.Tests.ServiceWorkerAssert.VerifyServiceWorkerFiles(TestAsset testAsset, String outputDirectory, String serviceWorkerPath, String serviceWorkerContent, String assetsManifestPath, String staticWebAssetsBasePath) in /_/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ServiceWorkerAssert.cs:line 50
   at Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.WasmAoTPublishIntegrationTest.AoT_Publish_HostedAppWithScopedCss_VisualStudio() in /_/test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/WasmAoTPublishIntegrationTest.cs:line 181
   at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
   at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)

from https://helixr1107v0xdeko0k025g8.blob.core.windows.net/dotnet-sdk-refs-pull-46021-merge-c18709c3442b4f8caf/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.dll.1/3/console.55e9a839.log?helixlogtype=result

@javiercn
Copy link
Member

@ViktorHofer that one is different from what I've seen. I'm taking a look.

@javiercn
Copy link
Member

@ViktorHofer I think I've found the issue and I'm running the tests locally to verify. It's a change in test expectations because of a packaging change that we did for 10.0.

I'm tweaking things a bit to limit the scope of the change and I'm updating the test expectations where needed. We had plans to tweak this logic in the future, but I guess no better time than the present :)

@javiercn javiercn requested review from a team and vijayrkn as code owners January 23, 2025 16:11
@javiercn
Copy link
Member

Pushed a few fixes. I don't think everything is fixed just yet, but want to see how much is left

dotnet-maestro bot and others added 3 commits January 24, 2025 05:02
…123.5

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.25072.2 -> To Version 10.0.0-beta.25073.5
@javiercn
Copy link
Member

@ViktorHofer as far as I can tell all the Blazor issues have been resolved, is that the case? (I only see other non-related failures on the PR)

@ViktorHofer ViktorHofer merged commit e2b601d into main Jan 24, 2025
39 of 42 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-533dd42c-2566-45a1-8ce5-710765af532c branch January 24, 2025 12:18
@ViktorHofer
Copy link
Member

Thanks for your help @javiercn. You might want to file a follow-up issue to track adding tests for those scenarios at insertion time instead of add SDK update time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants