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

Merged
merged 26 commits into from
Mar 1, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 22, 2024

This pull request updates the following dependencies

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

  • Subscription: 89b8d7af-c2e7-42f8-3b29-08d8b8050dda
  • Build: 20240229.2
  • Date Produced: February 29, 2024 6:24:27 PM UTC
  • Commit: 85ae8b264f3312aac5ca08dcab039556e99fcb00
  • Branch: refs/heads/main

…119.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24069.2
@dotnet-maestro dotnet-maestro bot requested review from wtgodbe and a team as code owners January 22, 2024 13:07
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jan 22, 2024
@sebastienros
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@eerhardt
Copy link
Member

@mkArtakMSFT @javiercn @SteveSandersonMS - it looks like the e2e Blazor tests are failing. Can someone take a look?

OpenQA.Selenium.BrowserAssertFailedException : Xunit.Sdk.NotEqualException: Assert.NotEqual() Failure
Expected: Not "Current count: 0"
Actual:   "Current count: 0"
   at Xunit.Assert.NotEqual[T](T expected, T actual, IEqualityComparer`1 comparer) in /_/src/xunit.assert/Asserts/EqualityAsserts.cs:line 302
   at Microsoft.AspNetCore.E2ETesting.WaitAssert.<>c__DisplayClass18_0`1.<WaitAssertCore>b__0(IWebDriver _) in /home/vsts/work/1/s/src/Shared/E2ETesting/WaitAssert.cs:line 101
Screen shot captured at '/home/vsts/work/1/s/src/Components/test/E2ETest/bin/screenshots/763e05b0cc034d0da156a1e0147b3828.png'
Encountered browser errors
[2024-01-23T19:18:27Z] [Info] http://127.0.0.1:46683/_framework/dotnet.native.9.0.0-alpha.1.24066.33.skl7xdoebu.js 7:20879 "System.Exception: We should have thrown here!"
[2024-01-23T19:18:27Z] [Info] http://127.0.0.1:46683/_framework/dotnet.native.9.0.0-alpha.1.24066.33.skl7xdoebu.js 7:20879 "   at ThreadingApp.Pages.Counter.TestThreads()"
[2024-01-23T19:18:27Z] [Severe] http://127.0.0.1:46683/_framework/blazor.webassembly.js 0:45287 "crit: Microsoft.AspNetCore.Components.WebAssembly.Rendering.WebAssemblyRenderer[100]\n      Unhandled exception rendering component: We should have thrown here!\nSystem.Exception: We should have thrown here!\n   at ThreadingApp.Pages.Counter.TestThreads()\n   at Microsoft.AspNetCore.Components.ComponentBase.CallStateHasChangedOnAsyncCompletion(Task task)\n   at Microsoft.AspNetCore.Components.RenderTree.Renderer.GetErrorHandledTask(Task , ComponentState )"Page content:
<head>
    <meta charset="utf-8">
    <!-- Forcing the device width here so that our automated tests work consistently on mobile browsers. -->
    <meta name="viewport" content="width=1024">
    <title>Blazor standalone</title>
    <base href="/">
</head>
<body>
    <app><!--!--><!--!--><!--!--><!--!--><div class="sidebar"><!--!--><div class="top-row pl-4 navbar navbar-dark"><!--!--><a class="navbar-brand" href="">Blazor app</a>
    <button class="navbar-toggler"><!--!--><span class="navbar-toggler-icon"></span></button></div><!--!-->

<div><ul class="nav flex-column"><li class="nav-item px-3"><!--!--><a href="" class="nav-link"><!--!--><span class="bi bi-house-door-fill" aria-hidden="true"></span> Home
            </a></li><!--!-->
        <li class="nav-item px-3"><!--!--><a href="counter" class="nav-link active" aria-current="page"><!--!--><span class="bi bi-plus-square-fill" aria-hidden="true"></span> Counter
            </a></li><!--!-->
        <li class="nav-item px-3"><!--!--><a href="fetchdata" class="nav-link"><!--!--><span class="bi bi-list-nested" aria-hidden="true"></span> Fetch data
            </a></li></ul></div></div><!--!-->

<div class="main"><!--!--><div class="top-row px-4"><a href="http://blazor.net" target="_blank" class="ml-md-auto">About</a></div>

    <div class="content px-4"><!--!--><!--!--><h1 tabindex="-1">Counter</h1>

<p>Current count: 0</p><!--!-->

<button class="btn btn-primary">Click me</button><!--!-->
<button class="btn btn-primary" id="TestThreads">Test threads</button></div></div><!--!-->
        <!--!--></app>

    <div id="blazor-error-ui" style="display: block;">
        An unhandled exception has occurred. See browser dev tools for details.
        <a href="" class="reload">Reload</a>
        <a class="dismiss">\ud83d\uddd9</a>
    </div>

    <script src="_framework/blazor.webassembly.js" autostart="false"></script>
    <script>
        (function(){
            Blazor.start().then(function () {
                window['__aspnetcore__testing__blazor_wasm__started__'] = true;
            });
        })();
    </script>


</body>

---- Assert.NotEqual() Failure
Expected: Not "Current count: 0"
Actual:   "Current count: 0"

@javiercn
Copy link
Member

@eerhardt I think that might be a flaky test

…126.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24076.5
@eerhardt
Copy link
Member

@mthalman @MichaelSimons - we are getting a source build break with the new version of arcade:

.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24076.5/tools/SourceBuild/AfterSourceBuild.proj(80,5): error : (NETCORE_ENGINEERING_TELEMETRY=AfterSourceBuild) 8 new pre-builts discovered! Detailed usage report can be found at /__w/1/s/artifacts/sb/prebuilt-report/baseline-comparison.xml.
See https://aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them.
Package IDs are:
MicroBuild.Core.0.2.0
MicroBuild.Core.Sentinel.1.0.0
Microsoft.DotNet.Build.Tasks.Feed.9.0.0-beta.24076.5
Microsoft.DotNet.Build.Tasks.VisualStudio.9.0.0-beta.24076.5
Microsoft.Signed.Wix.1.0.0-v3.14.0.5722
Microsoft.SymbolUploader.Build.Task.2.0.0-preview.1.23470.14
sn.1.0.0
vswhere.2.6.7

I'm not sure how we can resolve this. Is this an issue with arcade?

@mthalman
Copy link
Member

@mthalman @MichaelSimons - we are getting a source build break with the new version of arcade:

.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24076.5/tools/SourceBuild/AfterSourceBuild.proj(80,5): error : (NETCORE_ENGINEERING_TELEMETRY=AfterSourceBuild) 8 new pre-builts discovered! Detailed usage report can be found at /__w/1/s/artifacts/sb/prebuilt-report/baseline-comparison.xml.
See https://aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them.
Package IDs are:
MicroBuild.Core.0.2.0
MicroBuild.Core.Sentinel.1.0.0
Microsoft.DotNet.Build.Tasks.Feed.9.0.0-beta.24076.5
Microsoft.DotNet.Build.Tasks.VisualStudio.9.0.0-beta.24076.5
Microsoft.Signed.Wix.1.0.0-v3.14.0.5722
Microsoft.SymbolUploader.Build.Task.2.0.0-preview.1.23470.14
sn.1.0.0
vswhere.2.6.7

I'm not sure how we can resolve this. Is this an issue with arcade?

@mmitche - I think this may be due to your change from dotnet/arcade#14411 since that is touching where these packages are referenced by Arcade.

cc @dotnet/source-build-internal

@mmitche
Copy link
Member

mmitche commented Jan 30, 2024

Yes that's probably me. This is surprising though....maybe this has to do with aspnet's custom logic to build its build tasks.
dotnet/source-build#3807

…202.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24102.4
@dotnet-policy-service dotnet-policy-service bot added the pending-ci-rerun When assigned to a PR indicates that the CI checks should be rerun label Feb 12, 2024
@wtgodbe wtgodbe removed the pending-ci-rerun When assigned to a PR indicates that the CI checks should be rerun label Feb 13, 2024
@javiercn
Copy link
Member

/azp run aspnetcore-ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@javiercn
Copy link
Member

/azp run aspnetcore-components-e2e

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@javiercn
Copy link
Member

@wtgodbe can you take a look?

@javiercn
Copy link
Member

@MichaelSimons seems that there is still a source build related issue here

@mthalman
Copy link
Member

The failure was earlier identified in #53528 (comment).

@mmitche - What's the resolution here?

@MichaelSimons
Copy link
Member

This looks to be coming from the BuildRepoTasks. In this case _ImportOrUseTooling is set to true after dotnet/arcade#14411 was merged. Prior to this the package weren't imported because DotNetBuildFromSource was true.

@mmitche - do you think DotNetBuildSourceOnly should be flown into this BuildRepoTasks invocation? Else does the _ImportOrUseTooling property need to be "exposed for this use case? IDK

@SteveSandersonMS
Copy link
Member

…214.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24114.1
@mmitche
Copy link
Member

mmitche commented Feb 28, 2024

Hmm..that didn't do it..._ImportOrUseTooling ended up false, but same/similar error. Will need more investigation tomorrow.

@mmitche
Copy link
Member

mmitche commented Feb 28, 2024

I think my other aspnetcore change depends on this. Prioritizing this.

@mmitche
Copy link
Member

mmitche commented Feb 28, 2024

Update: At this point I don't see a totally obvious link between the control update and this failure. What I am seeing is the following:

  • The runtime pack and crossgen packs are not restored in the failing SB version.
  • LatestPackageReference actually contains 2 items for crossgen and the runtime

image

vs.

image

@mmitche
Copy link
Member

mmitche commented Feb 29, 2024

Update: Removing DotNetBuildRepo and DotNetBuildSourceOnly from the root invocation does not fail. In addition, it should be noted that this works in the VMR right now, so another clue.

@mmitche
Copy link
Member

mmitche commented Feb 29, 2024

I think I've spotted it. f9d0d6b from @tmds enabled portable builds of unknown arches. This happens under DotNetBuildSourceOnly, but at the time when he checked in, we didn't have DotNetBuildSourceOnly in this repo yet. So it wasn't getting passed in. Now that it is, f9d0d6b#diff-9e65f6e7d94b1416538b21399c17de70960df5df64f272b56ce23868f12a7469R134 pulls in the same crossgen and runtime packs twice.

@mmitche
Copy link
Member

mmitche commented Feb 29, 2024

Okay I think that does it. @wtgodbe to review the tweak to LatestPackageReference

@mmitche
Copy link
Member

mmitche commented Feb 29, 2024

Agh, that latest issue is msbuild picking up the command line error. Should be fixed in latest arcade.

dotnet-maestro bot and others added 3 commits February 29, 2024 22:59
…229.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24129.2
…229.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24062.5 -> To Version 9.0.0-beta.24129.2
@tmds
Copy link
Member

tmds commented Mar 1, 2024

I think I've spotted it. f9d0d6b from @tmds enabled portable builds of unknown arches. This happens under DotNetBuildSourceOnly, but at the time when he checked in, we didn't have DotNetBuildSourceOnly in this repo yet.

Thanks for fixing the issue!

When making this change I had done some validation, but all these builds involved rids that didn't cause duplicates here.

These were vmr builds, so I assume something must have been setting DotNetBuildSourceOnly to true in these build for aspnetcore or the change I made wouldn't have had an effect.

the tweak to LatestPackageReference

I think you could also prevent the duplicate by adding an Exclude like:

<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.$(TargetRuntimeIdentifier)" Exclude="@(LatestPackageReference)" Condition=" '$(DotNetBuildSourceOnly)' == 'true' " />

@mmitche
Copy link
Member

mmitche commented Mar 1, 2024

I think you could also prevent the duplicate by adding an Exclude like:

Ooh I like that better than the dedupe. Will switch over. And yeah, aspnetcore hadn't had an arcade update yet that was setting the new flags.

Copy link
Member

@wtgodbe wtgodbe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but can you undo the submodule change?

@dotnet-maestro dotnet-maestro bot merged commit 6cfd675 into main Mar 1, 2024
28 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-b53c7ee8-482a-44eb-8859-45b8b9099279 branch March 1, 2024 18:59
@dotnet-policy-service dotnet-policy-service bot added this to the 9.0-preview3 milestone Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants