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.

Sign up for GitHub

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

Jump to bottom

[main] Update dependencies from dotnet/arcade #9315

Merged
merged 10 commits into from
Oct 25, 2023
Merged

[main] Update dependencies from dotnet/arcade #9315

merged 10 commits into from
Oct 25, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 9, 2023 •
edited
Loading

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: fc4faec0-9ee6-43b9-bc7a-08da8607f4c7
  • Build: 20231016.4
  • Date Produced: October 16, 2023 7:28:01 PM UTC
  • Commit: 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4
  • Branch: refs/heads/release/8.0

dotnet-maestro bot and others added 2 commits October 9, 2023 12:23
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
9d18242 
…008.1

Microsoft.DotNet.Arcade.Sdk , 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
@JaynieBai
Merge branch 'main' of https://github.com/dotnet/msbuild into darc-ma…
367cbed 
…in-53bdf802-e931-4a51-aeb8-9ec8f3d91b1d
@JaynieBai
Copy link
Member

xunit/xunit#2780

@JaynieBai JaynieBai requested review from rainersigwald and JanKrivanek and removed request for rainersigwald October 10, 2023 09:14
JanKrivanek
JanKrivanek approved these changes Oct 10, 2023
View reviewed changes
Copy link
Member

@JanKrivanek JanKrivanek left a comment

Choose a reason for hiding this comment

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

Overall looks good

rainersigwald
rainersigwald requested changes Oct 10, 2023
View reviewed changes
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
8bd24a9 
…010.4

Microsoft.DotNet.Arcade.Sdk , 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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
a008b99 
…016.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 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
rainersigwald
rainersigwald requested changes Oct 19, 2023
View reviewed changes
Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

Only one concern but it's a pretty big one.

Can we:

  1. Separate the xUnit refactorings into their own PR and merge that.
  2. Take the Arcade update but back down the SDK version

?

JaynieBai and others added 4 commits October 20, 2023 11:09
@JaynieBai
Merge branch 'main' of https://github.com/dotnet/msbuild into darc-ma…
4421491 
…in-53bdf802-e931-4a51-aeb8-9ec8f3d91b1d
@JaynieBai
Revert "Fix error xUnit2020 and xUnit1031"
97a72b4
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
d683e84 
…016.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 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
@JaynieBai
Revert the dotnet version
6f87b14
@rainersigwald rainersigwald enabled auto-merge (squash) October 25, 2023 10:07
rainersigwald
rainersigwald approved these changes Oct 25, 2023
View reviewed changes
Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

Thanks @JaynieBai!

@rainersigwald rainersigwald merged commit 3a2f9ba into main Oct 25, 2023
@rainersigwald rainersigwald deleted the darc-main-53bdf802-e931-4a51-aeb8-9ec8f3d91b1d branch October 25, 2023 10:08
rainersigwald added a commit that referenced this pull request Oct 25, 2023
@rainersigwald
Revert "Update dependencies from dotnet/arcade (#9315)"
76c0507 
This reverts commit 3a2f9ba.
rainersigwald added a commit that referenced this pull request Oct 25, 2023
@rainersigwald
Revert "Update dependencies from dotnet/arcade (#9315)" (#9360)
ed404c0 
This reverts commit 3a2f9ba, which broke some official build steps because Arcade now depends on an RTM runtime.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JanKrivanek JanKrivanek JanKrivanek approved these changes

@JaynieBai JaynieBai JaynieBai left review comments

@rainersigwald rainersigwald rainersigwald approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JaynieBai @rainersigwald @JanKrivanek