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

[release/5.0-preview3] Update dependencies from dotnet/arcade #2826

Merged
merged 2 commits into from
Apr 1, 2020
Merged

[release/5.0-preview3] Update dependencies from dotnet/arcade #2826

merged 2 commits into from
Apr 1, 2020

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Mar 31, 2020 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: 3e19b39a-03cd-4c7b-ed9f-08d7d0ee12d3
  • Build: 20200330.5
  • Date Produced: 3/30/2020 5:56 PM
  • Commit: 09bb9d929120b402348c9a0e9c8c951e824059aa
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.DotNet.ApiCompat -> 5.0.0-beta.20180.5
    • Microsoft.DotNet.Arcade.Sdk -> 5.0.0-beta.20180.5
    • Microsoft.DotNet.CodeAnalysis -> 5.0.0-beta.20180.5
    • Microsoft.DotNet.GenAPI -> 5.0.0-beta.20180.5
    • Microsoft.DotNet.Helix.Sdk -> 5.0.0-beta.20180.5

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20200…
24e371c 
…330.5

- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20180.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20180.5
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20180.5
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20180.5
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20180.5
@ghost ghost requested review from vatsan-madhavan and rladuca March 31, 2020 17:29
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Mar 31, 2020
@ghost ghost requested a review from SamBent March 31, 2020 17:29
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Mar 31, 2020 •
edited
Loading

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 Mar 31, 2020

@vatsan-madhavan Can you take a look at these failures? We need this for preview3 (because of the channel changes), though I can work around the issues if this looks like a lot of work to fix.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Mar 31, 2020 •
edited
Loading

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.

@vatsan-madhavan
Copy link
Member

looking

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Mar 31, 2020 •
edited
Loading

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.

@vatsan-madhavan
Copy link
Member

I'm going to move back Microsoft.DotNet.ApiCompat to the older version. I'm finding that every ApiCopmat baseline file is having to be updated more-or-less completely, which is not something I want to do for P3 just so this PR could be waved forward.

The changes are relatively small (require adding access modifiers to signatures), but they are pervasive/tedious and manual-intensive.

For e.g., after fixing WindowsBase-ref-Net48, PresentationCore-ref-Net48 pops up these errors:

MembersMustExist : Member 'internal System.Windows.Media.Composition.DUCE.ResourceHandle System.Windows.Media.Brush.AddRefOnChannelCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Media.Composition.DUCE.Channel System.Windows.Media.Brush.GetChannelCore(System.Int32)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Int32 System.Windows.Media.Brush.GetChannelCountCore()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Media.Composition.DUCE.ResourceHandle System.Windows.Media.Brush.GetHandleCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal void System.Windows.Media.Brush.ReleaseOnChannelCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Object System.Windows.Media.Converters.BaseIListConverter.ConvertFromCore(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.String)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Object System.Windows.Media.Converters.BaseIListConverter.ConvertToCore(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object, System.Type)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Media.Composition.DUCE.ResourceHandle System.Windows.Media.Effects.Effect.AddRefOnChannelCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Media.Composition.DUCE.Channel System.Windows.Media.Effects.Effect.GetChannelCore(System.Int32)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Int32 System.Windows.Media.Effects.Effect.GetChannelCountCore()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Media.Composition.DUCE.ResourceHandle System.Windows.Media.Effects.Effect.GetHandleCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Rect System.Windows.Media.Effects.Effect.GetRenderBounds(System.Windows.Rect)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal void System.Windows.Media.Effects.Effect.ReleaseOnChannelCore(System.Windows.Media.Composition.DUCE.Channel)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal void System.Windows.Media.Imaging.BitmapDecoder.SealObject()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal void System.Windows.Media.Imaging.BitmapEncoder.SealObject()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Windows.Media.TextFormatting.TextParagraphCache System.Windows.Media.TextFormatting.TextFormatter.CreateParagraphCache(System.Windows.Media.TextFormatting.TextSource, System.Int32, System.Double, System.Windows.Media.TextFormatting.TextParagraphProperties, System.Windows.Media.TextFormatting.TextLineBreak, System.Windows.Media.TextFormatting.TextRunCache)' does not exist in the implementation but it does exist in the contract.

/cc @rladuca

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Mar 31, 2020 •
edited
Loading

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
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@vatsan-madhavan
Copy link
Member

Reverted using e8bdd7e
https://github.com/dotnet/wpf/blob/e8bdd7e0fae84aeacf913d40d32422db480c9a31/eng/Version.Details.xml#L98-L102
/cc @rladuca @mmitche

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Mar 31, 2020 •
edited
Loading

Auto-Merge Status

This pull request has been merged because the following merge policies have succeeded.

  • ✔️ 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 Succeeded - No reviews have requested changes.

@vatsan-madhavan vatsan-madhavan force-pushed the darc-release/5.0-preview3-8ab665e9-3408-4cd9-8283-bd07910f23d9 branch from c1e1e5c to 3f3ea62 Compare April 1, 2020 02:22
@dotnet-maestro dotnet-maestro bot merged commit 2a7a3bc into release/5.0-preview3 Apr 1, 2020
@dotnet-maestro dotnet-maestro bot deleted the darc-release/5.0-preview3-8ab665e9-3408-4cd9-8283-bd07910f23d9 branch April 1, 2020 02:43
@vatsan-madhavan vatsan-madhavan mentioned this pull request Apr 9, 2020
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Apr 12, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vatsan-madhavan vatsan-madhavan Awaiting requested review from vatsan-madhavan

@rladuca rladuca Awaiting requested review from rladuca

@SamBent SamBent Awaiting requested review from SamBent

Assignees
No one assigned
Labels
PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mmitche @vatsan-madhavan