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

[release/8.x] Update dependencies from dotnet/arcade #1967

Merged

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 18, 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.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk)

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

  • Subscription: 60a1a160-6ffa-4450-1398-08dbcfd3ac55
  • Build: 20231016.4
  • Date Produced: October 16, 2023 7:28:01 PM UTC
  • Commit: 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4
  • Branch: refs/heads/release/8.0

…016.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23516.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk
ghost
ghost previously requested changes Oct 18, 2023
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

This PR changes the .NET SDK version. Review required from before merging.

@ViktorHofer
Copy link
Member

Why is this repository using the UseDotNet AzDO task? Arcade already restores the SDK automatically. cc @mmitche

@jjonescz
Copy link
Contributor

jjonescz commented Oct 20, 2023

Removed UseDotNet AzDO task, seems it's not needed (and started a signed build to verify it's not needed there either; but it looks like it doesn't work without it).

Now only tests are failing with dotnet/razor#9342:

System.TypeLoadException : Could not load type 'Enumerator' from assembly 'Microsoft.CodeAnalysis, Version=4.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'.

Which means we need to wait until VS 17.8P4 is available on CI machines where this problem should be fixed I think.

Plus will probably need to do something similar to this: fc7a9bf.

@ViktorHofer
Copy link
Member

Which means we need to wait until VS 17.8P4 is available on CI machines where this problem should be fixed I think.

I think we require VS 17.8 P3 which is currently prepared by the Core Engineering team and should be available later today. @marcpopMSFT / @jaredpar is that right?

@jjonescz
Copy link
Contributor

I think we require VS 17.8 P3 which is currently prepared by the Core Engineering team and should be available later today.

If it works with 17.8P3 then great, but I think regular preview queue will have 17.8P3 and scouting preview queue will have 17.8P4, so we can choose.

@jjonescz jjonescz force-pushed the darc-release/8.x-c23d961a-f29c-4127-b0af-99a020876755 branch from 218903e to afd9102 Compare October 20, 2023 11:38
@ViktorHofer
Copy link
Member

ViktorHofer commented Oct 20, 2023

Plus will probably need to do something similar to this: fc7a9bf.

When I last worked on this, I was told that we only want to update the SHAs when there's a reason to do so. The dotnet-format tool must be invoked with the dotnet/format repo's SDK because that's the toolchain that builds the tool. I added this commit a while ago to enforce that requirement: 31d13fa

Unfortunately I just noticed that my changes were undone with the following commits that came in at a later point:

I don't understand why this was done, maybe @JoeRobich can tell?

EDIT: reverted Joe's changes and made it possible to use the parent repo sdk, i.e. for project-system.

@JoeRobich
Copy link
Member

I don't understand why this was done, maybe @JoeRobich can tell?

EDIT: reverted Joe's changes and made it possible to use the parent repo sdk, i.e. for project-system.

I made the change when updating MSBuildLocator to v1.6.1. It was having difficulties locating a workable SDK for the integration tests. I see we are on 1.6.10 now, so it may be better behaved.

jjonescz and others added 2 commits October 23, 2023 12:18
…017.14

Microsoft.CodeAnalysis
 From Version 4.8.0-3.23474.1 -> To Version 4.8.0-3.23517.14
@jjonescz
Copy link
Contributor

This looks good now but we still need to fix signed builds.

@ViktorHofer
Copy link
Member

Should we merge this in meanwhile and fix the remaining issues separately?

@jjonescz
Copy link
Contributor

Merging this would break signed builds for release/8.x so it wouldn't flow into the SDK.

@jjonescz jjonescz force-pushed the darc-release/8.x-c23d961a-f29c-4127-b0af-99a020876755 branch from 33e354f to 4266b80 Compare October 23, 2023 10:21
…016.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23516.4

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk
@jjonescz
Copy link
Contributor

@jjonescz jjonescz merged commit fd1f33b into release/8.x Oct 24, 2023
19 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-release/8.x-c23d961a-f29c-4127-b0af-99a020876755 branch October 24, 2023 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants