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

[Blazor][Desktop] Mark packages as shipping #31035

Merged
merged 4 commits into from
Mar 19, 2021
Merged

[Blazor][Desktop] Mark packages as shipping #31035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4a7e3f
Make packages shipping
javiercn Mar 18, 2021
6db3c39
Update RepoTasks to msbuild 16.9
wtgodbe Mar 18, 2021
647454d
Update global.json
wtgodbe Mar 18, 2021
fa23d01
Update Nuget
wtgodbe Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/tools/RepoTasks/RepoTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NuGet.Packaging" Version="5.6.0" />
<PackageReference Include="NuGet.Packaging" Version="5.8.0" />
Copy link
Member

Choose a reason for hiding this comment

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

@javiercn while you're addressing Doug's feedback please also upgrade this to 5.9.0

Copy link
Member

Choose a reason for hiding this comment

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

@javiercn and I chatted offline. He's going to do a follow-up for the API baseline files. This can go there too.

Copy link
Member

Choose a reason for hiding this comment

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

In that case I'll update it in #31064

<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
Copy link
Member

Choose a reason for hiding this comment

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

Given errors in CI build and much lower required version in global.json, these might need further changes to get working. If that's possible, please update https://github.com/dotnet/aspnetcore/blob/main/global.json#L22

Copy link
Member

Choose a reason for hiding this comment

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

Won't that update the required VS version for contributors? Do we want to bump that all the way up to 16.9? I think 16.6 would be recent enough to know about the new TFMs

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it'll update what contributors need. Since 16.9 is the current public non-preview build of VS, I'm not positive that's a show-stopper.

But, if we decide not to jump to 16.9, I'd prefer we moved to 16.8 instead of 16.6 because it includes an msbuild supporting the new functions for the new TFMs.

Copy link
Member

Choose a reason for hiding this comment

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

I'll go for 16.8

</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"Git": "2.22.0",
"jdk": "11.0.3",
"vs": {
"version": "16.5",
"version": "16.8",
"components": [
"Microsoft.VisualStudio.Component.VC.ATL",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
Expand Down
4 changes: 1 addition & 3 deletions ...ts/WebView/Platforms/WebView2/src/Microsoft.AspNetCore.Components.WebView.WebView2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
https://github.com/MicrosoftEdge/WebView2Feedback/issues/710 -->
<TargetFrameworks>$(DefaultNetCoreTargetFramework)-windows</TargetFrameworks>
<Description>WebView2 wrappers for BlazorWebView components on Windows.</Description>
<IsShippingPackage>false</IsShippingPackage>
<!-- TODO: REMOVE -->
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
<IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Copy link
Member

Choose a reason for hiding this comment

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

Copy from eng/PublicAPI.empty.txt instead of letting the analyzer create these files. We want the #nullable enable bit from the get-go.

10 changes: 10 additions & 0 deletions src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.AcceleratorKeyPressed -> System.EventHandler<Microsoft.Web.WebView2.Core.CoreWebView2AcceleratorKeyPressedEventArgs>
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
4 changes: 1 addition & 3 deletions ...ew/Platforms/WindowsForms/src/Microsoft.AspNetCore.Components.WebView.WindowsForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)-windows</TargetFramework>
<Description>Build Windows Forms applications with Blazor and WebView2.</Description>
<IsShippingPackage>false</IsShippingPackage>
<UseWindowsForms>true</UseWindowsForms>
<!-- TODO: REMOVE -->
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
<IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

16 changes: 16 additions & 0 deletions src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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.RootComponent>
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<string, object>
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.RootComponent(string selector, System.Type componentType, System.Collections.Generic.IDictionary<string, object> 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<TComponent>(this System.Collections.ObjectModel.ObservableCollection<Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent> components, string selector, System.Collections.Generic.IDictionary<string, object> parameters = null) -> void
static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Remove(this System.Collections.ObjectModel.ObservableCollection<Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent> components, string selector) -> void
4 changes: 1 addition & 3 deletions src/Components/WebView/Platforms/Wpf/src/Microsoft.AspNetCore.Components.WebView.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)-windows</TargetFramework>
<Description>Build WPF applications with Blazor and WebView2.</Description>
<IsShippingPackage>false</IsShippingPackage>
<UseWPF>true</UseWPF>
<!-- TODO: REMOVE -->
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
<IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

20 changes: 20 additions & 0 deletions src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,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.RootComponent>
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<string, object>
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
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