From 21f51c4e50de3861486440c1bd751cbd604ec1eb Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 19 Mar 2021 12:45:07 -0700 Subject: [PATCH 1/3] Fix nullable annotations --- .../WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt | 2 +- .../WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt | 5 +++-- .../WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt | 2 +- .../Platforms/WindowsForms/src/PublicAPI.Unshipped.txt | 5 +++-- .../WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt | 2 +- .../WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt | 5 +++-- src/Components/WebView/WebView/src/PublicAPI.Unshipped.txt | 5 +++-- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt b/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt index 5f282702bb03..ab058de62d44 100644 --- a/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt +++ b/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt @@ -1 +1 @@ - \ No newline at end of file +#nullable enable diff --git a/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt b/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt index a8211ecc5a5e..5b677c86d722 100644 --- a/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt @@ -1,4 +1,5 @@ -Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper +#nullable enable +Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.AcceleratorKeyPressed -> System.EventHandler Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.CoreWebView2.get -> Microsoft.Web.WebView2.Core.CoreWebView2 Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.EnsureCoreWebView2Async(Microsoft.Web.WebView2.Core.CoreWebView2Environment environment = null) -> System.Threading.Tasks.Task @@ -7,4 +8,4 @@ Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.set -> Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.WebView2WebViewManager(Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper webview, System.IServiceProvider services, Microsoft.AspNetCore.Components.Dispatcher dispatcher, Microsoft.Extensions.FileProviders.IFileProvider fileProvider, string hostPageRelativePath) -> void override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.NavigateCore(System.Uri absoluteUri) -> void -override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.SendMessage(string message) -> void \ No newline at end of file +override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.SendMessage(string message) -> void diff --git a/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt b/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt index 5f282702bb03..ab058de62d44 100644 --- a/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt +++ b/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt @@ -1 +1 @@ - \ No newline at end of file +#nullable enable diff --git a/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt b/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt index 0b62b2184adb..9d9532d73506 100644 --- a/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt @@ -1,4 +1,5 @@ -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView +#nullable enable +Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.BlazorWebView() -> void Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.get -> string Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.set -> void @@ -13,4 +14,4 @@ Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.RootComponent Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Selector.get -> string Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Add(this System.Collections.ObjectModel.ObservableCollection components, string selector, System.Collections.Generic.IDictionary parameters = null) -> void -static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Remove(this System.Collections.ObjectModel.ObservableCollection components, string selector) -> void \ No newline at end of file +static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Remove(this System.Collections.ObjectModel.ObservableCollection components, string selector) -> void diff --git a/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt b/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt index 5f282702bb03..ab058de62d44 100644 --- a/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt +++ b/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt @@ -1 +1 @@ - \ No newline at end of file +#nullable enable diff --git a/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt b/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt index 00176ac5e1fe..bbc38196e2ed 100644 --- a/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt @@ -1,4 +1,5 @@ -Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView +#nullable enable +Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.BlazorWebView() -> void Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Dispose() -> void Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.get -> string @@ -17,4 +18,4 @@ Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.set -> void override Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.OnApplyTemplate() -> void static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPageProperty -> System.Windows.DependencyProperty static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponentsProperty -> System.Windows.DependencyProperty -static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.ServicesProperty -> System.Windows.DependencyProperty \ No newline at end of file +static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.ServicesProperty -> System.Windows.DependencyProperty diff --git a/src/Components/WebView/WebView/src/PublicAPI.Unshipped.txt b/src/Components/WebView/WebView/src/PublicAPI.Unshipped.txt index 599a60601862..4d456858d373 100644 --- a/src/Components/WebView/WebView/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/WebView/src/PublicAPI.Unshipped.txt @@ -1,4 +1,5 @@ -Microsoft.AspNetCore.Components.WebView.WebViewManager +#nullable enable +Microsoft.AspNetCore.Components.WebView.WebViewManager Microsoft.AspNetCore.Components.WebView.WebViewManager.AddRootComponentAsync(System.Type! componentType, string! selector, Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task! Microsoft.AspNetCore.Components.WebView.WebViewManager.Dispatcher.get -> Microsoft.AspNetCore.Components.Dispatcher! Microsoft.AspNetCore.Components.WebView.WebViewManager.Dispose() -> void @@ -11,4 +12,4 @@ Microsoft.Extensions.DependencyInjection.ComponentsWebViewServiceCollectionExten abstract Microsoft.AspNetCore.Components.WebView.WebViewManager.NavigateCore(System.Uri! absoluteUri) -> void abstract Microsoft.AspNetCore.Components.WebView.WebViewManager.SendMessage(string! message) -> void static Microsoft.Extensions.DependencyInjection.ComponentsWebViewServiceCollectionExtensions.AddBlazorWebView(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -virtual Microsoft.AspNetCore.Components.WebView.WebViewManager.Dispose(bool disposing) -> void \ No newline at end of file +virtual Microsoft.AspNetCore.Components.WebView.WebViewManager.Dispose(bool disposing) -> void From f26996f84359d3c96c473b133ebb92d703a42dab Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 19 Mar 2021 13:49:43 -0700 Subject: [PATCH 2/3] Fix APIs --- .../WebView2/src/PublicAPI.Unshipped.txt | 14 +++++----- .../WindowsForms/src/PublicAPI.Unshipped.txt | 24 ++++++++-------- .../Platforms/Wpf/src/PublicAPI.Unshipped.txt | 28 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt b/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt index 5b677c86d722..318076a2d943 100644 --- a/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt @@ -1,11 +1,11 @@ #nullable enable Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.AcceleratorKeyPressed -> System.EventHandler -Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.CoreWebView2.get -> Microsoft.Web.WebView2.Core.CoreWebView2 -Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.EnsureCoreWebView2Async(Microsoft.Web.WebView2.Core.CoreWebView2Environment environment = null) -> System.Threading.Tasks.Task -Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.get -> System.Uri -Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.set -> void +~Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.CoreWebView2.get -> Microsoft.Web.WebView2.Core.CoreWebView2 +~Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.EnsureCoreWebView2Async(Microsoft.Web.WebView2.Core.CoreWebView2Environment environment = null) -> System.Threading.Tasks.Task +~Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.get -> System.Uri +~Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.set -> void Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager -Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.WebView2WebViewManager(Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper webview, System.IServiceProvider services, Microsoft.AspNetCore.Components.Dispatcher dispatcher, Microsoft.Extensions.FileProviders.IFileProvider fileProvider, string hostPageRelativePath) -> void -override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.NavigateCore(System.Uri absoluteUri) -> void -override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.SendMessage(string message) -> void +~Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.WebView2WebViewManager(Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper webview, System.IServiceProvider services, Microsoft.AspNetCore.Components.Dispatcher dispatcher, Microsoft.Extensions.FileProviders.IFileProvider fileProvider, string hostPageRelativePath) -> void +~override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.NavigateCore(System.Uri absoluteUri) -> void +~override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.SendMessage(string message) -> void diff --git a/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt b/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt index 9d9532d73506..42ff8b15f587 100644 --- a/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt @@ -1,17 +1,17 @@ #nullable enable Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.BlazorWebView() -> void -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.get -> string -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.set -> void -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.RootComponents.get -> System.Collections.ObjectModel.ObservableCollection -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.Services.get -> System.IServiceProvider -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.Services.set -> void -Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.WebView.get -> Microsoft.Web.WebView2.WinForms.WebView2 +~Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.get -> string +~Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.set -> void +~Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.RootComponents.get -> System.Collections.ObjectModel.ObservableCollection +~Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.Services.get -> System.IServiceProvider +~Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.Services.set -> void +~Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.WebView.get -> Microsoft.Web.WebView2.WinForms.WebView2 Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent -Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.ComponentType.get -> System.Type -Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Parameters.get -> System.Collections.Generic.IDictionary -Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.RootComponent(string selector, System.Type componentType, System.Collections.Generic.IDictionary parameters) -> void -Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Selector.get -> string +~Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.ComponentType.get -> System.Type +~Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Parameters.get -> System.Collections.Generic.IDictionary +~Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.RootComponent(string selector, System.Type componentType, System.Collections.Generic.IDictionary parameters) -> void +~Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Selector.get -> string Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions -static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Add(this System.Collections.ObjectModel.ObservableCollection components, string selector, System.Collections.Generic.IDictionary parameters = null) -> void -static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Remove(this System.Collections.ObjectModel.ObservableCollection components, string selector) -> void +~static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Add(this System.Collections.ObjectModel.ObservableCollection components, string selector, System.Collections.Generic.IDictionary parameters = null) -> void +~static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Remove(this System.Collections.ObjectModel.ObservableCollection components, string selector) -> void diff --git a/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt b/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt index bbc38196e2ed..6817de171f4b 100644 --- a/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt +++ b/src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt @@ -2,20 +2,20 @@ Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.BlazorWebView() -> void Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Dispose() -> void -Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.get -> string -Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.set -> void -Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponents.get -> System.Collections.ObjectModel.ObservableCollection -Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Services.get -> System.IServiceProvider -Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Services.set -> void +~Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.get -> string +~Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.set -> void +~Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponents.get -> System.Collections.ObjectModel.ObservableCollection +~Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Services.get -> System.IServiceProvider +~Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Services.set -> void Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent -Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.ComponentType.get -> System.Type -Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.ComponentType.set -> void -Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Parameters.get -> System.Collections.Generic.IDictionary -Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Parameters.set -> void +~Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.ComponentType.get -> System.Type +~Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.ComponentType.set -> void +~Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Parameters.get -> System.Collections.Generic.IDictionary +~Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Parameters.set -> void Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.RootComponent() -> void -Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.get -> string -Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.set -> void +~Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.get -> string +~Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.set -> void override Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.OnApplyTemplate() -> void -static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPageProperty -> System.Windows.DependencyProperty -static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponentsProperty -> System.Windows.DependencyProperty -static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.ServicesProperty -> System.Windows.DependencyProperty +~static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPageProperty -> System.Windows.DependencyProperty +~static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponentsProperty -> System.Windows.DependencyProperty +~static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.ServicesProperty -> System.Windows.DependencyProperty From 9f311edffbd634fddd1ff193117b42b7da8663f9 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 19 Mar 2021 14:40:37 -0700 Subject: [PATCH 3/3] Add missing API baseline file --- src/Components/WebView/WebView/src/PublicAPI.Shipped.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/WebView/WebView/src/PublicAPI.Shipped.txt b/src/Components/WebView/WebView/src/PublicAPI.Shipped.txt index ab058de62d44..7dc5c58110bf 100644 --- a/src/Components/WebView/WebView/src/PublicAPI.Shipped.txt +++ b/src/Components/WebView/WebView/src/PublicAPI.Shipped.txt @@ -1 +1 @@ -#nullable enable +#nullable enable