Skip to content

Commit 66ac076

Browse files
wtgodbewtgodbe
authored
Merge branch 'main' into wtgodbe/nugetmsbuild
2 parents 225b7d5 + 30e468e commit 66ac076

File tree

38 files changed

+113
-257
lines changed

38 files changed

+113
-257
lines changed

‎.github/ISSUE_TEMPLATE/30_razor_tooling.md

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,20 @@ For other types of questions, consider using [StackOverflow](https://stackoverfl
1515
1616
-->
1717

18-
<!-- NOTE: This issue template is meant specifically to be used for issues with the new experimental Razor tooling experience provided in Visual Studio's Preview Feature pane -->
18+
### Visual Studio Code
1919

20-
### Describe the bug
21-
A clear and concise description of what the bug is.
20+
Select the `Razor: Report a Razor Issue` command in [VSCode Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette) and follow the instructions to gather information necessary for us to investigate. Paste below:
2221

23-
### To Reproduce
24-
<!--
25-
We ❤ code! Point us to a minimalistic repro project hosted in a GitHub repo.
26-
For a repro project, create a new ASP.NET Core project using the template of your your choice, apply the minimum required code to result in the issue you're observing.
27-
28-
We will close this issue if:
29-
- the repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
30-
- if we will not be able to repro the behavior you're reporting
31-
-->
32-
33-
### Logs & Exceptions
22+
---
23+
Paste Content Here
24+
---
3425

35-
Please collect the data below before reporting your issue to aid us in diagnosing the root cause.
26+
### Visual Studio Windows
3627

37-
#### Activity log (only needed if VS crashes)
38-
[Here](https://docs.microsoft.com/en-us/visualstudio/extensibility/how-to-use-the-activity-log?view=vs-2019#to-examine-the-activity-log) are the instructions on how to generate/acquire one. Note that GitHub does not generally allow .xml files to be uploaded with issues.
28+
You may file an issue here but please create a Visual Studio bug first and link here as it will capture all necessary logs for us to investigate further.
3929

40-
#### Language Server logs
41-
1. Run Visual Studio with the [/Log](https://docs.microsoft.com/en-us/visualstudio/ide/reference/log-devenv-exe?view=vs-2019) command line switch
42-
2. Reproduce the issue
43-
3. Provide the logs located at `%Temp%\VisualStudio\LSP`
30+
How to report a problem in Visual Studio: https://docs.microsoft.com/en-us/visualstudio/ide/how-to-report-a-problem-with-visual-studio
4431

45-
### Further technical details
46-
- VS version (Help => About Microsoft Visual Studio, i.e. 16.8.0 Preview 1 30313.27...). If in Codespaces there will be two versions (server and client), please provide both.
47-
- Scenario (Local, LiveShare, Codespaces)
32+
### Visual Studio Mac
4833

49-
### Pre-requisite checklist
50-
- [ ] Steps to reproduce the issue
51-
- [ ] Razor Language Server client logs included.
52-
- [ ] HTML Language Server client logs included
34+
Please try and provide as much information as possible so we can try and resolve the issue.

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</ItemGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
23-
<PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
24-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
25-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
23+
<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" />
24+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
25+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.3.21160.5"
3+
"version": "6.0.100-preview.3.21168.19"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-preview.3.21160.5",
6+
"dotnet": "6.0.100-preview.3.21168.19",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.25",
@@ -19,7 +19,7 @@
1919
"Git": "2.22.0",
2020
"jdk": "11.0.3",
2121
"vs": {
22-
"version": "16.5",
22+
"version": "16.8",
2323
"components": [
2424
"Microsoft.VisualStudio.Component.VC.ATL",
2525
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -198,34 +198,12 @@ void TryAddMapping(AzureADSchemeOptions o)
198198

199199
private static void AddAdditionalMvcApplicationParts(IServiceCollection services)
200200
{
201-
var additionalParts = GetAdditionalParts();
202201
var mvcBuilder = services
203202
.AddMvc()
204203
.ConfigureApplicationPartManager(apm =>
205204
{
206-
foreach (var part in additionalParts)
207-
{
208-
if (!apm.ApplicationParts.Any(ap => HasSameName(ap.Name, part.Name)))
209-
{
210-
apm.ApplicationParts.Add(part);
211-
}
212-
}
213-
214205
apm.FeatureProviders.Add(new AzureADAccountControllerFeatureProvider());
215206
});
216-
217-
bool HasSameName(string left, string right) => string.Equals(left, right, StringComparison.Ordinal);
218-
}
219-
220-
private static IEnumerable<ApplicationPart> GetAdditionalParts()
221-
{
222-
var thisAssembly = typeof(AzureADAuthenticationBuilderExtensions).Assembly;
223-
var relatedAssemblies = RelatedAssemblyAttribute.GetRelatedAssemblies(thisAssembly, throwOnError: true);
224-
225-
foreach (var reference in relatedAssemblies)
226-
{
227-
yield return new CompiledRazorAssemblyPart(reference);
228-
}
229207
}
230208
}
231209
}

‎src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
77
<PackageTags>aspnetcore;authentication;AzureAD</PackageTags>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
109
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
1110
</PropertyGroup>
1211

‎src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
77
<PackageTags>aspnetcore;authentication;AzureADB2C</PackageTags>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
<ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
109
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
1110
</PropertyGroup>
1211

‎src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,8 @@ public WebAuthenticationTests(WebApplicationFactory<Startup> fixture)
3131
public static TheoryData<string> NotAddedEndpoints =>
3232
new TheoryData<string>()
3333
{
34-
"/AzureAD/Account/AccessDenied",
35-
"/AzureAD/Account/Error",
36-
"/AzureAD/Account/SignedOut",
3734
"/AzureAD/Account/SignIn",
3835
"/AzureAD/Account/SignOut",
39-
"/AzureADB2C/Account/AccessDenied",
40-
"/AzureADB2C/Account/Error",
41-
"/AzureADB2C/Account/SignedOut",
4236
"/AzureADB2C/Account/SignIn",
4337
"/AzureADB2C/Account/ResetPassword",
4438
"/AzureADB2C/Account/EditProfile",

‎src/Components/Web.JS/dist/Release/blazor.webview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Components/Web.JS/src/Platform/WebView/WebViewIpcReceiver.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ export function startIpcReceiver() {
3131

3232
'BeginInvokeJS': DotNet.jsCallDispatcher.beginInvokeJSFromDotNet,
3333

34-
'EndInvokeDotNet': DotNet.jsCallDispatcher.endInvokeDotNetFromJS,
34+
'EndInvokeDotNet': (asyncCallId: string, success: boolean, invocationResultOrError: string) => {
35+
const resultOrExceptionMessage: any = DotNet.parseJsonWithRevivers(invocationResultOrError);
36+
DotNet.jsCallDispatcher.endInvokeDotNetFromJS(asyncCallId, success, resultOrExceptionMessage);
37+
},
3538

3639
'Navigate': navigationManagerFunctions.navigateTo,
3740
};

‎src/Components/WebView/Platforms/WebView2/src/Microsoft.AspNetCore.Components.WebView.WebView2.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
https://github.com/MicrosoftEdge/WebView2Feedback/issues/710 -->
77
<TargetFrameworks>$(DefaultNetCoreTargetFramework)-windows</TargetFrameworks>
88
<Description>WebView2 wrappers for BlazorWebView components on Windows.</Description>
9-
<IsShippingPackage>false</IsShippingPackage>
10-
<!-- TODO: REMOVE -->
11-
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
9+
<IsShippingPackage>true</IsShippingPackage>
1210
</PropertyGroup>
1311

1412
<ItemGroup>

‎src/Components/WebView/Platforms/WebView2/src/PublicAPI.Shipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


‎src/Components/WebView/Platforms/WebView2/src/PublicAPI.Unshipped.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper
2+
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.AcceleratorKeyPressed -> System.EventHandler<Microsoft.Web.WebView2.Core.CoreWebView2AcceleratorKeyPressedEventArgs>
3+
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.CoreWebView2.get -> Microsoft.Web.WebView2.Core.CoreWebView2
4+
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.EnsureCoreWebView2Async(Microsoft.Web.WebView2.Core.CoreWebView2Environment environment = null) -> System.Threading.Tasks.Task
5+
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.get -> System.Uri
6+
Microsoft.AspNetCore.Components.WebView.WebView2.IWebView2Wrapper.Source.set -> void
7+
Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager
8+
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
9+
override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.NavigateCore(System.Uri absoluteUri) -> void
10+
override Microsoft.AspNetCore.Components.WebView.WebView2.WebView2WebViewManager.SendMessage(string message) -> void

‎src/Components/WebView/Platforms/WindowsForms/src/Microsoft.AspNetCore.Components.WebView.WindowsForms.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)-windows</TargetFramework>
55
<Description>Build Windows Forms applications with Blazor and WebView2.</Description>
6-
<IsShippingPackage>false</IsShippingPackage>
76
<UseWindowsForms>true</UseWindowsForms>
8-
<!-- TODO: REMOVE -->
9-
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
7+
<IsShippingPackage>true</IsShippingPackage>
108
</PropertyGroup>
119

1210
<ItemGroup>

‎src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Shipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


‎src/Components/WebView/Platforms/WindowsForms/src/PublicAPI.Unshipped.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView
2+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.BlazorWebView() -> void
3+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.get -> string
4+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.HostPage.set -> void
5+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.RootComponents.get -> System.Collections.ObjectModel.ObservableCollection<Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent>
6+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.Services.get -> System.IServiceProvider
7+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.Services.set -> void
8+
Microsoft.AspNetCore.Components.WebView.WindowsForms.BlazorWebView.WebView.get -> Microsoft.Web.WebView2.WinForms.WebView2
9+
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent
10+
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.ComponentType.get -> System.Type
11+
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Parameters.get -> System.Collections.Generic.IDictionary<string, object>
12+
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.RootComponent(string selector, System.Type componentType, System.Collections.Generic.IDictionary<string, object> parameters) -> void
13+
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent.Selector.get -> string
14+
Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions
15+
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
16+
static Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponentCollectionExtensions.Remove(this System.Collections.ObjectModel.ObservableCollection<Microsoft.AspNetCore.Components.WebView.WindowsForms.RootComponent> components, string selector) -> void

‎src/Components/WebView/Platforms/WindowsForms/testassets/WinFormsTestApp/wwwroot/webviewhost.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<title>WinFormsTestApp</title>
88
<base href="/" />
99
<link href="css/app.css" rel="stylesheet" />
10+
11+
<!-- Used by ExternalContentPackage -->
12+
<link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
13+
14+
<!-- App bundle that contains a reference to the scoped css bundle created by TestContentPackage -->
15+
<link href="WinFormsTestApp.styles.css" rel="stylesheet" />
1016
</head>
1117

1218
<body>

‎src/Components/WebView/Platforms/Wpf/src/Microsoft.AspNetCore.Components.WebView.Wpf.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)-windows</TargetFramework>
55
<Description>Build WPF applications with Blazor and WebView2.</Description>
6-
<IsShippingPackage>false</IsShippingPackage>
76
<UseWPF>true</UseWPF>
8-
<!-- TODO: REMOVE -->
9-
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
7+
<IsShippingPackage>true</IsShippingPackage>
108
</PropertyGroup>
119

1210
<ItemGroup>

‎src/Components/WebView/Platforms/Wpf/src/PublicAPI.Shipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


‎src/Components/WebView/Platforms/Wpf/src/PublicAPI.Unshipped.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView
2+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.BlazorWebView() -> void
3+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Dispose() -> void
4+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.get -> string
5+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPage.set -> void
6+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponents.get -> System.Collections.ObjectModel.ObservableCollection<Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent>
7+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Services.get -> System.IServiceProvider
8+
Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.Services.set -> void
9+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent
10+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.ComponentType.get -> System.Type
11+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.ComponentType.set -> void
12+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Parameters.get -> System.Collections.Generic.IDictionary<string, object>
13+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Parameters.set -> void
14+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.RootComponent() -> void
15+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.get -> string
16+
Microsoft.AspNetCore.Components.WebView.Wpf.RootComponent.Selector.set -> void
17+
override Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.OnApplyTemplate() -> void
18+
static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.HostPageProperty -> System.Windows.DependencyProperty
19+
static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.RootComponentsProperty -> System.Windows.DependencyProperty
20+
static readonly Microsoft.AspNetCore.Components.WebView.Wpf.BlazorWebView.ServicesProperty -> System.Windows.DependencyProperty

‎src/Components/WebView/Platforms/Wpf/testassets/WpfTestApp/wwwroot/webviewhost.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<title>WinFormsTestApp</title>
88
<base href="/" />
99
<link href="css/app.css" rel="stylesheet" />
10+
11+
<!-- Used by ExternalContentPackage -->
12+
<link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
13+
14+
<!-- App bundle that contains a reference to the scoped css bundle created by TestContentPackage -->
15+
<link href="WpfTestApp.styles.css" rel="stylesheet" />
1016
</head>
1117

1218
<body>

‎src/Components/WebView/WebView/src/IpcReceiver.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,7 @@ private void BeginInvokeDotNet(PageContext pageContext, string callId, string as
8282

8383
private void EndInvokeJS(PageContext pageContext, long asyncHandle, bool succeeded, string argumentsOrError)
8484
{
85-
if (succeeded)
86-
{
87-
DotNetDispatcher.EndInvokeJS(pageContext.JSRuntime, argumentsOrError);
88-
}
89-
else
90-
{
91-
throw new InvalidOperationException(argumentsOrError);
92-
}
85+
DotNetDispatcher.EndInvokeJS(pageContext.JSRuntime, argumentsOrError);
9386
}
9487

9588
private Task DispatchBrowserEventAsync(PageContext pageContext, string eventDescriptor, string eventArgs)

0 commit comments

Comments
 (0)