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

Merged
merged 16 commits into from
Oct 11, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 5, 2023

This pull request updates the following dependencies

Coherency Updates

The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format

  • Coherency Updates:
    • Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23426.1 to 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk)

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

  • Subscription: 3d9043af-0e17-4eb5-f3e3-08d8e97c775d
  • Build: 20231010.4
  • Date Produced: October 10, 2023 5:22:53 PM UTC
  • Commit: 0e89c8d7ddbb54510d9d0a757fda5126021b79f0
  • Branch: refs/heads/main

…004.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23504.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Oct 5, 2023
@Forgind
Copy link
Member

Forgind commented Oct 5, 2023

@mmitche, are you the right person to ping to look at dependency flow issues from dotnet/arcade? This one seems to be complaining about a package downgrade error:
error NU1605: (NETCORE_ENGINEERING_TELEMETRY=Restore) Warning As Error: Detected package downgrade: xunit.analyzers from 1.3.0 to 1.1.0. Reference the package directly from the project to select a different version.

…006.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@ViktorHofer
Copy link
Member

Will be fixed with dotnet/arcade#14088

…006.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 7, 2023

The remaining failures are now due to the xunit.analyzers update.

dotnet-maestro bot and others added 4 commits October 7, 2023 12:18
…006.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
…006.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23506.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
…008.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23508.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@dotnet-maestro dotnet-maestro bot requested review from a team, tmat, arunchndr and AntonLapounov as code owners October 9, 2023 15:11
@ViktorHofer
Copy link
Member

I fixed a couple of failures. The remaining ones require three changes:

@v-wuzhai
Copy link
Member

v-wuzhai commented Oct 10, 2023

@ViktorHofer @marcpopMSFT It still looks like failure. Can you take a look?

ViktorHofer and others added 3 commits October 10, 2023 10:19
…010.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23502.1 (parent: Microsoft.DotNet.Arcade.Sdk
@@ -36,7 +36,7 @@ public async ValueTask TryHandleFileAction_WritesUpdateCssMessage()
}

[Fact]
public async ValueTask TryHandleFileAction_CausesBrowserRefreshForNonCssFile()
public async Task TryHandleFileAction_CausesBrowserRefreshForNonCssFile()
Copy link
Member

@ViktorHofer ViktorHofer Oct 10, 2023

Choose a reason for hiding this comment

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

These two tests never ran before because they returned ValueTaks which xunit doesn't support. They are failing because L16 and L42 pass a sealed type to Moq, which isn't supported (and the passed in ctor arguments don't seem to match either). Any opinions on what to do with those two tests? Delete them, comment them out or try to fix them?

They were added with 6eb4528

Copy link
Member

Choose a reason for hiding this comment

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

If they never ran before I would say delete them and log an issue pointing to the commit of the deletion.

Copy link
Member

Choose a reason for hiding this comment

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

@marcpopMSFT
Copy link
Member

There's a templating f# test that's looking for an unreleased runtime. Did we get flow from templating that had that change or an update to an f# package? That'll resolve later today but concerning as it could happen every month. @baronfel

There's a watch test failing because of a missing Xunit.Combinatorial assembly. We're on 1.3.2 but is the watch assembly still on 1.3.0? @tmat

@marcpopMSFT
Copy link
Member

Pinging @KevinRansom and @vzarytovskii for the F# failure

@KevinRansom
Copy link
Member

@marcpopMSFT , this is the mvc F# project looking for razor, it has nothing to do with us, just the F# mvc template might need tweaking.

@marcpopMSFT
Copy link
Member

@marcpopMSFT , this is the mvc F# project looking for razor, it has nothing to do with us, just the F# mvc template might need tweaking.

@wtgodbe @danmoseley Do we need a change in the mvc templates here? Should we disable the test for now and reenable later or merge this with the aspnet codeflow (I've been hesitant to do that as it increases the size of the change and number of things that'll need to be fixed)

@danmoseley
Copy link
Member

pasting failure

D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103: Unable to find a stable package Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation with version (>= 7.0.12)
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 2100 version(s) in dotnet6 [ Nearest version: 6.0.0-rtm.21520.4 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 1621 version(s) in dotnet7 [ Nearest version: 7.0.0-rtm.22513.3 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 1566 version(s) in dotnet8 [ Nearest version: 8.0.0-alpha.1.22416.11 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 138 version(s) in dotnet9 [ Nearest version: 9.0.0-alpha.1.23417.4 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 135 version(s) in dotnet-public [ Nearest version: 8.0.0-preview.1.23112.2 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 1 version(s) in dotnet-tools [ Nearest version: 5.0.0-rc.2.20513.11 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 1 version(s) in dotnet7-transport [ Nearest version: 7.0.0-rc.1.22427.2 ]
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in D:\a\_work\1\s\artifacts\bin\redist\Release\dotnet\sdk\9.0.100-ci\FSharp\library-packs
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in richnav
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in vs-impl
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet-eng
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet-libraries-transport
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet-libraries
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet-tools-transport
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet6-transport
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet8-transport
D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj : error NU1103:   - Found 0 version(s) in dotnet9-transport
  Failed to restore D:\a\_work\1\s\artifacts\tmp\Release\dotnet-new.IntegrationTests\WebProjectsTests\20231010140144974\mvc_fs-70\mvc_fs-70.fsproj (in 1.13 sec).

@mkArtakMSFT

@danmoseley
Copy link
Member

the version it wants is present on nuget.org. should it be being mirrored (in dotnet7 feed?)

@wtgodbe
Copy link
Member

wtgodbe commented Oct 10, 2023

It should be mirrored to dotnet-public, let me look into why that didn't happen

@wtgodbe
Copy link
Member

wtgodbe commented Oct 10, 2023

Oh, just need to re-run - the original run was before the packages got pushed to nuget & mirrored to dotnet-public. I just confirmed it's there.

@danmoseley
Copy link
Member

ok rerunning

@v-wuzhai
Copy link
Member

The watch test failure information shows as follows:

System.IO.FileNotFoundException: Could not load file or assembly 'Xunit.Combinatorial, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b2b52da82b58eb73'. The system cannot find the file specified.
File name: 'Xunit.Combinatorial, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b2b52da82b58eb73'

@tmat Could you take a look at the failures here?

…010.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23510.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 11, 2023

There's a watch test failing because of a missing Xunit.Combinatorial assembly. We're on 1.3.2 but is the watch assembly still on 1.3.0?

The assembly's version from the Xunit.Combinatorial/1.3.2 package is 1.3.0.0. Assembly and package versions aren't always aligned.

image

Good idea though but it must be something else. I just checked the payload folder and the assembly isn't in there. I'm trying a change out that removes the PrivateAssets metadata from the PackageReference that brings that dependency in. Still, no idea why this is only happening here and not in other places.

@ViktorHofer ViktorHofer enabled auto-merge (squash) October 11, 2023 17:03
@ViktorHofer
Copy link
Member

Here's a crazy theory. There was one test file in dotnet-watch.Tests.csproj that had two tests with wrong return values ValueTask instead of Task which isn't supported by unit. We removed those incorrectly authored tests in this PR might have triggered the other tests in this assembly to actually run (and load xunit.Combinatorial).

@ViktorHofer ViktorHofer merged commit a3bf79f into main Oct 11, 2023
16 of 17 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-6fd67f58-d02c-4a3e-8fb3-681d9c4f7ddd branch October 11, 2023 17:16
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.

8 participants