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 xamarin/xamarin-android #2103

Merged
merged 4 commits into from
Aug 17, 2021
Merged

[main] Update dependencies from xamarin/xamarin-android #2103

merged 4 commits into from
Aug 17, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Aug 14, 2021 •
edited

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.NETCore.App.Ref: from 6.0.0-rc.1.21406.5 to 6.0.0-rc.1.21414.4 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.Dotnet.Sdk.Internal: from 6.0.100-rc.1.21408.2 to 6.0.100-rc.1.21415.2 (parent: Microsoft.Android.Sdk.Windows)
    • Microsoft.Extensions.Primitives: from 6.0.0-rc.1.21406.5 to 6.0.0-rc.1.21414.4 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21408.1 to 6.0.0-rc.1.21413.12 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Authorization: from 6.0.0-rc.1.21408.1 to 6.0.0-rc.1.21413.12 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Components.WebView: from 6.0.0-rc.1.21408.1 to 6.0.0-rc.1.21413.12 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Components.Web: from 6.0.0-rc.1.21408.1 to 6.0.0-rc.1.21413.12 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.JSInterop: from 6.0.0-rc.1.21408.1 to 6.0.0-rc.1.21413.12 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.1.21407.4 to 6.0.0-rc.1.21414.3 (parent: Microsoft.Dotnet.Sdk.Internal)

From https://github.com/xamarin/xamarin-android

  • Subscription: 63fe8ad0-daf0-49c9-9959-08d920866296
  • Build: main-f7d32102cc3ada67aa12cc0beed2cf97226f41b3-1
  • Date Produced: 8/17/2021 11:29 AM
  • Commit: f7d32102cc3ada67aa12cc0beed2cf97226f41b3
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
76af683 
…uild main-944605ef265361b360b67f65548cb5a4aedda69f-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-ci.main.129 -> To Version 30.0.100-ci.main.130

Dependency coherency updates

Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,System.CodeDom
 From Version 6.0.0-rc.1.21405.12 -> To Version 6.0.0-rc.1.21406.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
ba7ebef 
…uild main-1bd24acc8fdf34e79d53726c279a769aea3d91ff-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-ci.main.129 -> To Version 30.0.100-ci.main.133

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.0-rc.1.21406.5 -> To Version 6.0.0-rc.1.21411.2 (parent: Microsoft.Dotnet.Sdk.Internal
@jonathanpeppers jonathanpeppers mentioned this pull request Aug 16, 2021
Merged
12 tasks
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
f41aa48 
…uild main-f7d32102cc3ada67aa12cc0beed2cf97226f41b3-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-ci.main.129 -> To Version 30.0.100-rc.1.137

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64
 From Version 6.0.0-rc.1.21406.5 -> To Version 6.0.0-rc.1.21414.4 (parent: Microsoft.Dotnet.Sdk.Internal
@jonathanpeppers
Copy link
Member

@Eilon is there a WebViewManager API that changed?

src\BlazorWebView\src\WebView2\WebView2WebViewManager.cs(39,15): error CS7036: There is no argument given that corresponds to the required formal parameter 'hostPageRelativePath' of 'WebViewManager.WebViewManager(IServiceProvider, Dispatcher, Uri, IFileProvider, JSComponentConfigurationStore, string)' [D:\agent\1\s\src\BlazorWebView\src\WebView2\Microsoft.AspNetCore.Components.WebView.WebView2.csproj]

@Eilon
Copy link
Member

Eilon commented Aug 17, 2021

Looking

@Eilon
Copy link
Member

Eilon commented Aug 17, 2021

Ah yes I am expecting this error! The compiler error is just weird. Will work on the fix.

@Eilon
Provide default JSComponentConfigurationStore to fix Blazor change
fc39d37 
The proper implementation of Blazor dynamic root components will be done in #1825
@dotnet-maestro dotnet-maestro bot requested a review from Eilon as a code owner August 17, 2021 18:53
@Eilon
Copy link
Member

Eilon commented Aug 17, 2021 •
edited

Pushed a change that will fix the compiler error (we added a new required parameter in a Blazor base class, so we have to match that in derived classes here). This is just a default implementation, but in #1825 we will add proper support for this feature.

jonathanpeppers
jonathanpeppers approved these changes Aug 17, 2021
View reviewed changes
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

This looks pretty green now. I restarted one Android 30 phase for Essentials.

@Eilon
Copy link
Member

Eilon commented Aug 17, 2021

This PR is from a few days ago so it might not have the Essentials fix. I heard that got fixed more recently in main? (I don't know the details, just what I heard.)

@mattleibow mattleibow merged commit 7a6459b into main Aug 17, 2021
@mattleibow mattleibow deleted the darc-main-77e3b8db-b55f-4cb3-9174-39a57d93e154 branch August 17, 2021 19:47
@mattleibow mattleibow mentioned this pull request Aug 17, 2021
Closed
18 tasks
@Eilon Eilon added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Sep 30, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Dec 25, 2023
@samhouts samhouts added the fixed-in-6.0.100-rc.1.7 Look for this fix in 6.0.100-rc.1.7! label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jonathanpeppers jonathanpeppers jonathanpeppers approved these changes

@mattleibow mattleibow mattleibow approved these changes

@Eilon Eilon Awaiting requested review from Eilon

Assignees
No one assigned
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions fixed-in-6.0.100-rc.1.7 Look for this fix in 6.0.100-rc.1.7!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jonathanpeppers @Eilon @mattleibow @samhouts