Skip to content

Commit 7a48877

Browse files
Public API annotation fixes. Temporarily fix ambiguity.
1 parent 4bc113e commit 7a48877

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/Components/Web/src/HtmlRendering/HtmlRendererCore.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using System;
54
using System.Diagnostics.CodeAnalysis;
65
using System.Runtime.ExceptionServices;
76
using Microsoft.AspNetCore.Components.RenderTree;

src/Components/Web/src/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Microsoft.AspNetCore.Components.Web.HtmlComponent.ToHtmlString() -> string!
44
Microsoft.AspNetCore.Components.Web.HtmlComponent.WaitForQuiescenceAsync() -> System.Threading.Tasks.Task!
55
Microsoft.AspNetCore.Components.Web.HtmlComponent.WriteHtmlTo(System.IO.TextWriter! output) -> void
66
Microsoft.AspNetCore.Components.Web.HtmlRenderer
7-
Microsoft.AspNetCore.Components.Web.HtmlRenderer.BeginRenderingComponent<TComponent>() -> Microsoft.AspNetCore.Components.Web.HtmlContent!
8-
Microsoft.AspNetCore.Components.Web.HtmlRenderer.BeginRenderingComponent<TComponent>(Microsoft.AspNetCore.Components.ParameterView parameters) -> Microsoft.AspNetCore.Components.Web.HtmlContent!
7+
Microsoft.AspNetCore.Components.Web.HtmlRenderer.BeginRenderingComponent<TComponent>() -> Microsoft.AspNetCore.Components.Web.HtmlComponent!
8+
Microsoft.AspNetCore.Components.Web.HtmlRenderer.BeginRenderingComponent<TComponent>(Microsoft.AspNetCore.Components.ParameterView parameters) -> Microsoft.AspNetCore.Components.Web.HtmlComponent!
99
Microsoft.AspNetCore.Components.Web.HtmlRenderer.Dispatcher.get -> Microsoft.AspNetCore.Components.Dispatcher!
1010
Microsoft.AspNetCore.Components.Web.HtmlRenderer.DisposeAsync() -> System.Threading.Tasks.ValueTask
1111
Microsoft.AspNetCore.Components.Web.HtmlRenderer.HtmlRenderer(System.IServiceProvider! services, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
12-
Microsoft.AspNetCore.Components.Web.HtmlRenderer.RenderComponentAsync<TComponent>() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Web.HtmlContent!>!
13-
Microsoft.AspNetCore.Components.Web.HtmlRenderer.RenderComponentAsync<TComponent>(Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Web.HtmlContent!>!
12+
Microsoft.AspNetCore.Components.Web.HtmlRenderer.RenderComponentAsync<TComponent>() -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Web.HtmlComponent!>!
13+
Microsoft.AspNetCore.Components.Web.HtmlRenderer.RenderComponentAsync<TComponent>(Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Components.Web.HtmlComponent!>!

src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Linq;
66
using Microsoft.AspNetCore.Components;
77
using Microsoft.AspNetCore.Components.Infrastructure;
8-
using Microsoft.AspNetCore.Components.Rendering;
98
using Microsoft.AspNetCore.Components.Routing;
109
using Microsoft.AspNetCore.Components.Web;
1110
using Microsoft.AspNetCore.Mvc;
@@ -207,7 +206,7 @@ internal static void AddViewServices(IServiceCollection services)
207206
//
208207
services.TryAddScoped<IComponentRenderer, ComponentRenderer>();
209208
services.TryAddScoped<StaticComponentRenderer>();
210-
services.TryAddScoped<HtmlRenderer>();
209+
services.TryAddScoped<Microsoft.AspNetCore.Components.Rendering.HtmlRenderer>();
211210
services.TryAddScoped<NavigationManager, HttpNavigationManager>();
212211
services.TryAddScoped<IJSRuntime, UnsupportedJavaScriptRuntime>();
213212
services.TryAddScoped<INavigationInterception, UnsupportedNavigationInterception>();

0 commit comments

Comments
 (0)