From b7b0c45ce69d0ce7f066181532524d9a662334f4 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Thu, 4 Feb 2021 10:31:20 -0800 Subject: [PATCH 1/2] Add support for source generators in Razor compiler --- .../src/Properties/AssemblyInfo.cs | 1 + .../src/RazorProjectItem.cs | 4 +- .../src/RazorSourceDocument.cs | 11 +++-- .../src/Properties/AssemblyInfo.cs | 1 + .../Properties/launchSettings.json | 40 +++++++++++++++++++ .../IIS.Tests/Properties/launchSettings.json | 40 +++++++++++++++++++ .../Properties/launchSettings.json | 38 ++++++++++++++++-- 7 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json create mode 100644 src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs index feb088c7424d..16c52d793703 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs @@ -10,6 +10,7 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.TagHelperTool, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.NET.Sdk.Razor.SourceGenerators, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor.Workspaces, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Remote.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs index 6c245de89398..5984af481073 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectItem.cs @@ -130,9 +130,11 @@ public string FilePathWithoutExtension } } + internal RazorSourceDocument RazorSourceDocument { get; set; } + private string DebuggerToString() { return CombinedPath; } } -} \ No newline at end of file +} diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs index 31acb7dfd69c..81e162fa5d6c 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorSourceDocument.cs @@ -162,7 +162,7 @@ public static RazorSourceDocument ReadFrom(Stream stream, Encoding encoding, Raz { throw new ArgumentNullException(nameof(properties)); } - + return new StreamSourceDocument(stream, encoding, properties); } @@ -179,7 +179,7 @@ public static RazorSourceDocument ReadFrom(RazorProjectItem projectItem) } // ProjectItem.PhysicalPath is usually an absolute (rooted) path. - var filePath = projectItem.PhysicalPath; + var filePath = projectItem.PhysicalPath; if (string.IsNullOrEmpty(filePath)) { // Fall back to the relative path only if necessary. @@ -193,6 +193,11 @@ public static RazorSourceDocument ReadFrom(RazorProjectItem projectItem) filePath = projectItem.FilePath; } + if (projectItem.RazorSourceDocument is not null) + { + return projectItem.RazorSourceDocument; + } + using (var stream = projectItem.Read()) { // Autodetect the encoding. @@ -217,7 +222,7 @@ public static RazorSourceDocument Create(string content, string fileName) return Create(content, fileName, Encoding.UTF8); } - + /// /// Creates a from the specified . diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs index e43c1b880205..0f4a63f26f6c 100644 --- a/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs +++ b/src/Razor/Microsoft.CodeAnalysis.Razor/src/Properties/AssemblyInfo.cs @@ -24,3 +24,4 @@ [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.VisualStudio.Mac.LanguageServices.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] +[assembly: InternalsVisibleTo("Microsoft.NET.Sdk.Razor.SourceGenerators, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json new file mode 100644 index 000000000000..fe76b29b53d8 --- /dev/null +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json @@ -0,0 +1,40 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json b/src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json new file mode 100644 index 000000000000..fe76b29b53d8 --- /dev/null +++ b/src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json @@ -0,0 +1,40 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json b/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json index 2cfb910b9931..fe76b29b53d8 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json +++ b/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json @@ -1,8 +1,40 @@ { + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, "profiles": { - "ServerComparison.TestSites": { - "commandName": "Project", - "launchBrowser": true + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } } } } From e3a686ba3c00a0d827484429f32f0592b7519034 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Fri, 5 Feb 2021 13:53:45 -0800 Subject: [PATCH 2/2] Fix PublicAPI text files --- .../Components/src/PublicAPI.Unshipped.txt | 1 + src/Components/Ignitor/src/Ignitor.csproj | 2 + .../Ignitor/src/PublicAPI.Shipped.txt | 193 ------------------ .../Ignitor/src/PublicAPI.Unshipped.txt | 1 - .../Properties/launchSettings.json | 40 ---- .../IIS.Tests/Properties/launchSettings.json | 40 ---- .../Properties/launchSettings.json | 38 +--- 7 files changed, 6 insertions(+), 309 deletions(-) delete mode 100644 src/Components/Ignitor/src/PublicAPI.Shipped.txt delete mode 100644 src/Components/Ignitor/src/PublicAPI.Unshipped.txt delete mode 100644 src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json delete mode 100644 src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json diff --git a/src/Components/Components/src/PublicAPI.Unshipped.txt b/src/Components/Components/src/PublicAPI.Unshipped.txt index 3acbf2de6886..2c38bf72124e 100644 --- a/src/Components/Components/src/PublicAPI.Unshipped.txt +++ b/src/Components/Components/src/PublicAPI.Unshipped.txt @@ -9,3 +9,4 @@ Microsoft.AspNetCore.Components.DynamicComponent.Type.get -> System.Type! Microsoft.AspNetCore.Components.DynamicComponent.Type.set -> void static Microsoft.AspNetCore.Components.ParameterView.FromDictionary(System.Collections.Generic.IDictionary! parameters) -> Microsoft.AspNetCore.Components.ParameterView virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo? fieldInfo, System.EventArgs! eventArgs) -> System.Threading.Tasks.Task! +*REMOVED*readonly Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit.RemovedAttributeName -> string diff --git a/src/Components/Ignitor/src/Ignitor.csproj b/src/Components/Ignitor/src/Ignitor.csproj index 7b505ab30167..d8d2c39257af 100644 --- a/src/Components/Ignitor/src/Ignitor.csproj +++ b/src/Components/Ignitor/src/Ignitor.csproj @@ -7,6 +7,8 @@ $(NoWarn);CS1591 $(DefineConstants);IGNITOR true + + false diff --git a/src/Components/Ignitor/src/PublicAPI.Shipped.txt b/src/Components/Ignitor/src/PublicAPI.Shipped.txt deleted file mode 100644 index a755bf1e0395..000000000000 --- a/src/Components/Ignitor/src/PublicAPI.Shipped.txt +++ /dev/null @@ -1,193 +0,0 @@ -#nullable enable -Ignitor.ArrayBuilderSegment -Ignitor.ArrayBuilderSegment.Array.get -> T[]! -Ignitor.ArrayBuilderSegment.Count.get -> int -Ignitor.ArrayBuilderSegment.Offset.get -> int -Ignitor.ArrayBuilderSegment.this[int index].get -> T -Ignitor.ArrayRange -Ignitor.ArrayRange.Clone() -> Ignitor.ArrayRange -Ignitor.BlazorClient -Ignitor.BlazorClient.BlazorClient() -> void -Ignitor.BlazorClient.Cancel() -> void -Ignitor.BlazorClient.CaptureOperations.get -> bool -Ignitor.BlazorClient.CaptureOperations.set -> void -Ignitor.BlazorClient.CircuitId.get -> string? -Ignitor.BlazorClient.ClickAsync(string! elementId, bool expectRenderBatch = true) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.ConfirmBatch(int batchId, string? error = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.ConfirmRenderBatch.get -> bool -Ignitor.BlazorClient.ConfirmRenderBatch.set -> void -Ignitor.BlazorClient.ConnectAsync(System.Uri! uri, bool connectAutomatically = true, System.Action? configure = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.DefaultConnectionTimeout.get -> System.TimeSpan? -Ignitor.BlazorClient.DefaultConnectionTimeout.set -> void -Ignitor.BlazorClient.DefaultOperationTimeout.get -> System.TimeSpan? -Ignitor.BlazorClient.DefaultOperationTimeout.set -> void -Ignitor.BlazorClient.DisposeAsync() -> System.Threading.Tasks.ValueTask -Ignitor.BlazorClient.DotNetInteropCompletion -> System.Action? -Ignitor.BlazorClient.ExpectCircuitError(System.Func! action, System.TimeSpan? timeout = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.ExpectCircuitErrorAndDisconnect(System.Func! action, System.TimeSpan? timeout = null) -> System.Threading.Tasks.Task<(string? error, System.Exception? exception)>! -Ignitor.BlazorClient.ExpectDisconnect(System.Func! action, System.TimeSpan? timeout = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.ExpectDotNetInterop(System.Func! action, System.TimeSpan? timeout = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.ExpectJSInterop(System.Func! action, System.TimeSpan? timeout = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.ExpectRenderBatch(System.Func! action, System.TimeSpan? timeout = null) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.FindElementById(string! id) -> Ignitor.ElementNode! -Ignitor.BlazorClient.FormatError.get -> System.Func? -Ignitor.BlazorClient.FormatError.set -> void -Ignitor.BlazorClient.GetPrerenderDescriptors(System.Uri! uri) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.Hive.get -> Ignitor.ElementHive! -Ignitor.BlazorClient.HubConnection.get -> Microsoft.AspNetCore.SignalR.Client.HubConnection! -Ignitor.BlazorClient.ImplicitWait.get -> bool -Ignitor.BlazorClient.InvokeDotNetMethod(object! callId, string! assemblyName, string! methodIdentifier, object! dotNetObjectId, string! argsJson) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.JSInterop -> System.Action? -Ignitor.BlazorClient.LoggerProvider.get -> Microsoft.Extensions.Logging.ILoggerProvider! -Ignitor.BlazorClient.LoggerProvider.set -> void -Ignitor.BlazorClient.OnCircuitError -> System.Action? -Ignitor.BlazorClient.Operations.get -> Ignitor.Operations! -Ignitor.BlazorClient.PrepareForNextBatch(System.TimeSpan? timeout) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.PrepareForNextCircuitError(System.TimeSpan? timeout) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.PrepareForNextDisconnect(System.TimeSpan? timeout) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.PrepareForNextDotNetInterop(System.TimeSpan? timeout) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.PrepareForNextJSInterop(System.TimeSpan? timeout) -> System.Threading.Tasks.Task! -Ignitor.BlazorClient.RenderBatchReceived -> System.Action? -Ignitor.BlazorClient.SelectAsync(string! elementId, string! value) -> System.Threading.Tasks.Task! -Ignitor.CapturedAttachComponentCall -Ignitor.CapturedAttachComponentCall.ComponentId.get -> int -Ignitor.CapturedJSInteropCall -Ignitor.CapturedJSInteropCall.AsyncHandle.get -> int -Ignitor.CapturedJSInteropCall.ResultType.get -> int -Ignitor.CapturedJSInteropCall.TargetInstanceId.get -> long -Ignitor.CapturedRenderBatch -Ignitor.CapturedRenderBatch.Id.get -> int -Ignitor.ComponentNode -Ignitor.ComponentNode.ComponentId.get -> int -Ignitor.ComponentNode.ComponentNode(int componentId) -> void -Ignitor.ComponentState -Ignitor.ComponentState.Component.get -> Ignitor.IComponent? -Ignitor.ComponentState.ComponentId.get -> int -Ignitor.ComponentState.ComponentState(int componentId) -> void -Ignitor.ContainerNode -Ignitor.ContainerNode.Children.get -> System.Collections.Generic.IReadOnlyList! -Ignitor.ContainerNode.ContainerNode() -> void -Ignitor.ContainerNode.CreateAndInsertComponent(int componentId, int childIndex) -> Ignitor.ComponentNode! -Ignitor.ContainerNode.CreateAndInsertContainer(int childIndex) -> Ignitor.ContainerNode! -Ignitor.ContainerNode.InsertLogicalChild(Ignitor.Node! child, int childIndex) -> void -Ignitor.ContainerNode.RemoveLogicalChild(int childIndex) -> void -Ignitor.ElementHive -Ignitor.ElementHive.Components.get -> System.Collections.Generic.Dictionary! -Ignitor.ElementHive.ElementHive() -> void -Ignitor.ElementHive.SerializedValue.get -> string! -Ignitor.ElementHive.TryFindElementById(string! id, out Ignitor.ElementNode? element) -> bool -Ignitor.ElementHive.Update(Ignitor.RenderBatch batch) -> void -Ignitor.ElementNode -Ignitor.ElementNode.Attributes.get -> System.Collections.Generic.IReadOnlyDictionary! -Ignitor.ElementNode.ClickAsync(Microsoft.AspNetCore.SignalR.Client.HubConnection! connection) -> System.Threading.Tasks.Task! -Ignitor.ElementNode.ElementEventDescriptor -Ignitor.ElementNode.ElementEventDescriptor.ElementEventDescriptor(string! eventName, ulong eventId) -> void -Ignitor.ElementNode.ElementEventDescriptor.EventId.get -> ulong -Ignitor.ElementNode.ElementEventDescriptor.EventName.get -> string! -Ignitor.ElementNode.ElementNode(string! tagName) -> void -Ignitor.ElementNode.Events.get -> System.Collections.Generic.IReadOnlyDictionary! -Ignitor.ElementNode.Properties.get -> System.Collections.Generic.IReadOnlyDictionary! -Ignitor.ElementNode.RemoveAttribute(string! key) -> void -Ignitor.ElementNode.SetAttribute(string! key, object! value) -> void -Ignitor.ElementNode.SetEvent(string! eventName, Ignitor.ElementNode.ElementEventDescriptor! descriptor) -> void -Ignitor.ElementNode.SetProperty(string! key, object! value) -> void -Ignitor.ElementNode.TagName.get -> string! -Ignitor.ElementReference -Ignitor.Error -Ignitor.Error.Error() -> void -Ignitor.Error.Stack.get -> string? -Ignitor.Error.Stack.set -> void -Ignitor.IComponent -Ignitor.IgnitorMessagePackHubProtocol -Ignitor.IgnitorMessagePackHubProtocol.IgnitorMessagePackHubProtocol() -> void -Ignitor.MarkupNode -Ignitor.Node -Ignitor.Node.Node() -> void -Ignitor.Node.SerializedValue.get -> string! -Ignitor.Operations -Ignitor.Operations.AttachComponent.get -> System.Collections.Concurrent.ConcurrentQueue! -Ignitor.Operations.Batches.get -> System.Collections.Concurrent.ConcurrentQueue! -Ignitor.Operations.DotNetCompletions.get -> System.Collections.Concurrent.ConcurrentQueue! -Ignitor.Operations.Errors.get -> System.Collections.Concurrent.ConcurrentQueue! -Ignitor.Operations.JSInteropCalls.get -> System.Collections.Concurrent.ConcurrentQueue! -Ignitor.Operations.Operations() -> void -Ignitor.RenderBatch -Ignitor.RenderBatch.DisposedComponentIDs.get -> Ignitor.ArrayRange -Ignitor.RenderBatch.DisposedEventHandlerIDs.get -> Ignitor.ArrayRange -Ignitor.RenderBatch.ReferenceFrames.get -> Ignitor.ArrayRange -Ignitor.RenderBatch.UpdatedComponents.get -> Ignitor.ArrayRange -Ignitor.RenderBatchReader -Ignitor.RenderTreeDiff -Ignitor.RenderTreeEdit -Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.PermutationListEnd = 10 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.PermutationListEntry = 9 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.PrependFrame = 1 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.RemoveAttribute = 4 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.RemoveFrame = 2 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.SetAttribute = 3 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.StepIn = 6 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.StepOut = 7 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.UpdateMarkup = 8 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeEditType.UpdateText = 5 -> Ignitor.RenderTreeEditType -Ignitor.RenderTreeFrame -Ignitor.RenderTreeFrame.AttributeEventHandlerId.get -> ulong -Ignitor.RenderTreeFrame.ComponentId.get -> int -Ignitor.RenderTreeFrame.ComponentReferenceCaptureParentFrameIndex.get -> int -Ignitor.RenderTreeFrame.ComponentSubtreeLength.get -> int -Ignitor.RenderTreeFrame.ElementSubtreeLength.get -> int -Ignitor.RenderTreeFrame.FrameType.get -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrame.RegionSubtreeLength.get -> int -Ignitor.RenderTreeFrame.Sequence.get -> int -Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.Attribute = 3 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.Component = 4 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.ComponentReferenceCapture = 7 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.Element = 1 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.ElementReferenceCapture = 6 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.Markup = 8 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.None = 0 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.Region = 5 -> Ignitor.RenderTreeFrameType -Ignitor.RenderTreeFrameType.Text = 2 -> Ignitor.RenderTreeFrameType -Ignitor.TextNode -readonly Ignitor.ArrayRange.Count -> int -readonly Ignitor.RenderTreeDiff.ComponentId -> int -readonly Ignitor.RenderTreeDiff.Edits -> Ignitor.ArrayBuilderSegment -readonly Ignitor.RenderTreeEdit.MoveToSiblingIndex -> int -readonly Ignitor.RenderTreeEdit.ReferenceFrameIndex -> int -readonly Ignitor.RenderTreeEdit.SiblingIndex -> int -readonly Ignitor.RenderTreeEdit.Type -> Ignitor.RenderTreeEditType -static Ignitor.RenderBatchReader.Read(System.ReadOnlySpan data) -> Ignitor.RenderBatch -virtual Ignitor.Node.Parent.get -> Ignitor.ContainerNode? -virtual Ignitor.Node.Parent.set -> void -~Ignitor.ArrayRange.ArrayRange(T[] array, int count) -> void -~Ignitor.CapturedAttachComponentCall.CapturedAttachComponentCall(int componentId, string selector) -> void -~Ignitor.CapturedAttachComponentCall.Selector.get -> string -~Ignitor.CapturedJSInteropCall.ArgsJson.get -> string -~Ignitor.CapturedJSInteropCall.CapturedJSInteropCall(int asyncHandle, string identifier, string argsJson, int resultType, long targetInstanceId) -> void -~Ignitor.CapturedJSInteropCall.Identifier.get -> string -~Ignitor.CapturedRenderBatch.CapturedRenderBatch(int id, byte[] data) -> void -~Ignitor.CapturedRenderBatch.Data.get -> byte[] -~Ignitor.ElementReference.ElementReference(string id) -> void -~Ignitor.ElementReference.Id.get -> string -~Ignitor.MarkupNode.MarkupContent.get -> string -~Ignitor.MarkupNode.MarkupNode(string markupContent) -> void -~Ignitor.RenderTreeFrame.AttributeEventUpdatesAttributeName.get -> string -~Ignitor.RenderTreeFrame.AttributeName.get -> string -~Ignitor.RenderTreeFrame.AttributeValue.get -> object -~Ignitor.RenderTreeFrame.Component.get -> Ignitor.IComponent -~Ignitor.RenderTreeFrame.ComponentKey.get -> object -~Ignitor.RenderTreeFrame.ComponentReferenceCaptureAction.get -> System.Action -~Ignitor.RenderTreeFrame.ComponentType.get -> System.Type -~Ignitor.RenderTreeFrame.ElementKey.get -> object -~Ignitor.RenderTreeFrame.ElementName.get -> string -~Ignitor.RenderTreeFrame.ElementReferenceCaptureAction.get -> System.Action -~Ignitor.RenderTreeFrame.ElementReferenceCaptureId.get -> string -~Ignitor.RenderTreeFrame.MarkupContent.get -> string -~Ignitor.RenderTreeFrame.TextContent.get -> string -~Ignitor.TextNode.TextContent.get -> string -~Ignitor.TextNode.TextContent.set -> void -~Ignitor.TextNode.TextNode(string text) -> void -~override Ignitor.RenderTreeFrame.ToString() -> string -~readonly Ignitor.ArrayRange.Array -> T[] -~readonly Ignitor.RenderTreeEdit.RemovedAttributeName -> string diff --git a/src/Components/Ignitor/src/PublicAPI.Unshipped.txt b/src/Components/Ignitor/src/PublicAPI.Unshipped.txt deleted file mode 100644 index 7dc5c58110bf..000000000000 --- a/src/Components/Ignitor/src/PublicAPI.Unshipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json deleted file mode 100644 index fe76b29b53d8..000000000000 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/Properties/launchSettings.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json b/src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json deleted file mode 100644 index fe76b29b53d8..000000000000 --- a/src/Servers/IIS/IIS/test/IIS.Tests/Properties/launchSettings.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, - "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - } - } -} diff --git a/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json b/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json index fe76b29b53d8..2cfb910b9931 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json +++ b/src/Servers/testassets/ServerComparison.TestSites/Properties/launchSettings.json @@ -1,40 +1,8 @@ { - "iisSettings": { - "windowsAuthentication": true, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:5762/", - "sslPort": 0 - } - }, "profiles": { - "ANCM IIS Express": { - "commandName": "Executable", - "executablePath": "$(IISExpressPath)", - "commandLineArgs": "$(IISExpressArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } - }, - "ANCM IIS": { - "commandName": "Executable", - "executablePath": "$(IISPath)", - "commandLineArgs": "$(IISArguments)", - "environmentVariables": { - "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", - "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", - "LAUNCHER_ARGS": "$(TargetPath)", - "ASPNETCORE_ENVIRONMENT": "Development", - "LAUNCHER_PATH": "$(DotNetPath)", - "ASPNETCORE_MODULE_DEBUG": "console" - } + "ServerComparison.TestSites": { + "commandName": "Project", + "launchBrowser": true } } }