Skip to content

[release/3.0] Update dependencies from dotnet/arcade #1955

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

Merged
21 commits merged into from
Nov 22, 2019

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Sep 25, 2019

This pull request updates the following dependencies

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

  • Build: 20191119.2
  • Date Produced: 11/19/2019 6:14 PM
  • Commit: e34d933e18ba1cd393bbafcb6018e0f858d3e89e
  • Branch: refs/heads/release/3.x
  • Updates:
    • Microsoft.DotNet.ApiCompat -> 1.0.0-beta.19569.2
    • Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19569.2
    • Microsoft.DotNet.CodeAnalysis -> 1.0.0-beta.19569.2
    • Microsoft.DotNet.GenAPI -> 1.0.0-beta.19569.2
    • Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19569.2

…924.3

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19474.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19474.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19474.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19474.3
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Sep 25, 2019
@ghost ghost requested a review from SamBent September 25, 2019 16:37
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Sep 25, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies No un-ignored checks.
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-wd" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
Copy link
Member

@rladuca rladuca Sep 25, 2019

Choose a reason for hiding this comment

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

We need this feed, this contains WPF/WinForms transport packages.

Copy link
Member

Choose a reason for hiding this comment

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

These are also now automatically pushed to an azdo feed, and so should be able to be removed.

Copy link
Member

Choose a reason for hiding this comment

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

To be clear, the goal is to get down to:

  • nuget.org
  • Azdo feeds

I'm speculatively poking at some of this as I update these feeds now to get a head start.

Copy link
Member

Choose a reason for hiding this comment

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

Ah ok, sorry I was misunderstanding before and I saw the build error looking for WinForms.

I'm making similar changes in our test repo, so I'll wait on this for a final version before moving it there.

Copy link
Member

Choose a reason for hiding this comment

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

What is the mapping between these feeds and the AzDo transport feeds? For eg, which AzDo feed gets packages from the dotnet-windowsdesktop feed?

I like the idea of human understandable NuGet.config...

Copy link
Member

Choose a reason for hiding this comment

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

  • All dotnet 3 transport packages go to dotnet3-transport
  • All dotnet 3 non-transport (shipping) packages go to dotnet3
  • All dotnet 3.1 transport packages go to dotnet3.1-transport
  • All dotnet 3.1 non-transport (shipping) packages go to dotnet3.1
  • All dotnet 5 transport packages go to dotnet5-transport
  • All dotnet 5 non-transport (shipping) packages go to dotnet5
  • Arcade's tools go to dotnet-tools

There's no segregation between the various repos. That was largely a result of the scalability issues with the blob feed push.

@mmitche
Copy link
Member

mmitche commented Sep 26, 2019

@rladuca I added a subscription to the wpf test repo and updated the dependency

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Sep 26, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies Unsuccessful checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@mmitche
Copy link
Member

mmitche commented Sep 26, 2019

@vatsan-madhavan I think I got most necessary updates done here, but can you take a look at the remaining failures?

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Sep 26, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies Unsuccessful checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@mmitche mmitche added the * NO MERGE * metadata: The PR is not ready for merge yet (see discussion for detailed reasons) label Oct 3, 2019
@mmitche
Copy link
Member

mmitche commented Oct 3, 2019

Don't merge this while we are shutting down 3.0.1

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Oct 3, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies Unsuccessful checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@mmitche mmitche removed the * NO MERGE * metadata: The PR is not ready for merge yet (see discussion for detailed reasons) label Oct 10, 2019
Copy link
Member

@mmitche mmitche left a comment

Choose a reason for hiding this comment

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

block until 3.0.1 finishes

@mmitche
Copy link
Member

mmitche commented Oct 30, 2019

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Oct 30, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Standard Merge Policies Unsuccessful checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • Standard Merge Policies There are reviews that have requested changes.

@mmitche
Copy link
Member

mmitche commented Nov 22, 2019

@rladuca Your changes now verifying here

@rladuca
Copy link
Member

rladuca commented Nov 22, 2019

This will fail again in packaging. I need to merge some more fixups.

@dotnet-maestro
Copy link
Contributor Author

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Waiting on checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • Standard Merge Policies There are reviews that have requested changes.

@mmitche
Copy link
Member

mmitche commented Nov 22, 2019

This will fail again in packaging. I need to merge some more fixups.

Just push directly onto this branch as needed

            .NET Core 3.1 SDK hasn't consumed the fix for NuGet/Home#8467 yet.
            Suppress these warnings temporarily
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 22, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • Waiting on checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • Standard Merge Policies There are reviews that have requested changes.

@rladuca
Copy link
Member

rladuca commented Nov 22, 2019

Locally "build -ci -pack" succeeds, should be good to go.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 22, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • ✔️ Standard Merge Policies Succeeded - Successful checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • Standard Merge Policies There are reviews that have requested changes.

@mmitche
Copy link
Member

mmitche commented Nov 22, 2019

Yay!

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 22, 2019

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • ✔️ Standard Merge Policies Succeeded - Successful checks: dotnet-wpf CI, dotnet-wpf CI (Build Windows_NT Build_Release_x64), dotnet-wpf CI (Build Windows_NT Build_Debug_x64), dotnet-wpf CI (Build Windows_NT Build_Release_x86), dotnet-wpf CI (Build Windows_NT Build_Debug_x86)
  • Standard Merge Policies There are reviews that have requested changes.

@vatsan-madhavan vatsan-madhavan added the auto_merge bot-command label Nov 22, 2019
@ghost
Copy link

ghost commented Nov 22, 2019

Hello @vatsan-madhavan!

Because this pull request has the auto_merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit c3da7c1 into release/3.0 Nov 22, 2019
@ghost ghost deleted the darc-release/3.0-a3262d79-668a-447f-baf4-f135ad5bfe7c branch November 22, 2019 23:26
@ghost ghost locked as resolved and limited conversation to collaborators Apr 14, 2022
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto_merge bot-command PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants