diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor index ea1ba916c9..acf853ed95 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.razor @@ -38,7 +38,7 @@ else @code { WeatherForecast[] forecasts; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { forecasts = await Http.GetJsonAsync("weatherforecast"); } diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor index a7dc14ae5c..3f84a28301 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.razor @@ -37,7 +37,7 @@ else @code { WeatherForecast[] forecasts; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { forecasts = await Http.GetJsonAsync("sample-data/weather.json"); } diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor index 4623109354..e8dded3721 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor @@ -31,7 +31,7 @@ string largeOrgChartJson; int numPeopleDeserialized; - protected override void OnInit() + protected override void OnInitialized() { smallOrgChartJson = JsonSerializer.Serialize(smallOrgChart); largeOrgChartJson = JsonSerializer.Serialize(largeOrgChart); diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs index 8df845d88b..61f8f87e49 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs @@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Components [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } private set { throw null; } } protected override void BuildRenderTree(Microsoft.AspNetCore.Components.RenderTree.RenderTreeBuilder builder) { } - protected override void OnInit() { } + protected override void OnInitialized() { } void System.IDisposable.Dispose() { } } @@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.Components.Forms public partial class DataAnnotationsValidator : Microsoft.AspNetCore.Components.ComponentBase { public DataAnnotationsValidator() { } - protected override void OnInit() { } + protected override void OnInitialized() { } } public partial class EditForm : Microsoft.AspNetCore.Components.ComponentBase diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs index 10d157f9a7..5e536698b7 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -88,8 +88,8 @@ namespace Microsoft.AspNetCore.Components System.Threading.Tasks.Task Microsoft.AspNetCore.Components.IHandleEvent.HandleEventAsync(Microsoft.AspNetCore.Components.EventCallbackWorkItem callback, object arg) { throw null; } protected virtual void OnAfterRender() { } protected virtual System.Threading.Tasks.Task OnAfterRenderAsync() { throw null; } - protected virtual void OnInit() { } - protected virtual System.Threading.Tasks.Task OnInitAsync() { throw null; } + protected virtual void OnInitialized() { } + protected virtual System.Threading.Tasks.Task OnInitializedAsync() { throw null; } protected virtual void OnParametersSet() { } protected virtual System.Threading.Tasks.Task OnParametersSetAsync() { throw null; } public virtual System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters) { throw null; } diff --git a/src/Components/Components/src/Auth/CascadingAuthenticationState.razor b/src/Components/Components/src/Auth/CascadingAuthenticationState.razor index 2910fc5fba..41da6c5f60 100644 --- a/src/Components/Components/src/Auth/CascadingAuthenticationState.razor +++ b/src/Components/Components/src/Auth/CascadingAuthenticationState.razor @@ -12,7 +12,7 @@ /// [Parameter] public RenderFragment ChildContent { get; private set; } - protected override void OnInit() + protected override void OnInitialized() { AuthenticationStateProvider.AuthenticationStateChanged += OnAuthenticationStateChanged; diff --git a/src/Components/Components/src/ComponentBase.cs b/src/Components/Components/src/ComponentBase.cs index 43bd52f90f..5aac552426 100644 --- a/src/Components/Components/src/ComponentBase.cs +++ b/src/Components/Components/src/ComponentBase.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Components /// Method invoked when the component is ready to start, having received its /// initial parameters from its parent in the render tree. /// - protected virtual void OnInit() + protected virtual void OnInitialized() { } @@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Components /// want the component to refresh when that operation is completed. /// /// A representing any asynchronous operation. - protected virtual Task OnInitAsync() + protected virtual Task OnInitializedAsync() => Task.CompletedTask; /// @@ -192,8 +192,8 @@ namespace Microsoft.AspNetCore.Components private async Task RunInitAndSetParametersAsync() { - OnInit(); - var task = OnInitAsync(); + OnInitialized(); + var task = OnInitializedAsync(); if (task.Status != TaskStatus.RanToCompletion && task.Status != TaskStatus.Canceled) { diff --git a/src/Components/Components/src/Forms/DataAnnotationsValidator.cs b/src/Components/Components/src/Forms/DataAnnotationsValidator.cs index 1cf02723bb..4e76eac07c 100644 --- a/src/Components/Components/src/Forms/DataAnnotationsValidator.cs +++ b/src/Components/Components/src/Forms/DataAnnotationsValidator.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Components.Forms [CascadingParameter] EditContext CurrentEditContext { get; set; } /// - protected override void OnInit() + protected override void OnInitialized() { if (CurrentEditContext == null) { diff --git a/src/Components/Components/test/ComponentBaseTest.cs b/src/Components/Components/test/ComponentBaseTest.cs index ba9c17f46b..6f9a32b07e 100644 --- a/src/Components/Components/test/ComponentBaseTest.cs +++ b/src/Components/Components/test/ComponentBaseTest.cs @@ -402,21 +402,21 @@ namespace Microsoft.AspNetCore.Components.Test builder.CloseElement(); } - protected override void OnInit() + protected override void OnInitialized() { if (RunsBaseOnInit) { - base.OnInit(); + base.OnInitialized(); } OnInitLogic?.Invoke(this); } - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { if (RunsBaseOnInitAsync) { - await base.OnInitAsync(); + await base.OnInitializedAsync(); } if (OnInitAsyncLogic != null) diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs index bfa9c49b22..a8331e5133 100644 --- a/src/Components/Components/test/RendererTest.cs +++ b/src/Components/Components/test/RendererTest.cs @@ -3888,17 +3888,16 @@ namespace Microsoft.AspNetCore.Components.Test [Parameter] public ConcurrentQueue<(int testId, EventType @event)> Log { get; set; } - protected override void OnInit() + protected override void OnInitialized() { if (TryGetEntry(EventType.OnInit, out var entry)) { var result = entry.EventAction(); LogResult(result.Result); } - base.OnInit(); } - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { if (TryGetEntry(EventType.OnInitAsyncSync, out var entrySync)) { diff --git a/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs b/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs index fbf5a8f9bf..e65159b0c7 100644 --- a/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs +++ b/src/Components/Components/test/Rendering/HtmlRendererTestBase.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Components.Rendering public void RenderComponentAsync_CanRenderEmptyElement() { // Arrange - + var expectedHtml = new[] { "<", "p", ">", "" }; var serviceProvider = new ServiceCollection().AddSingleton(new RenderFragment(rtb => { @@ -508,7 +508,7 @@ namespace Microsoft.AspNetCore.Components.Rendering [Parameter] public bool Nested { get; set; } [Parameter] public int Value { get; set; } - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { Value = Value * 2; await Task.Yield(); @@ -538,7 +538,7 @@ namespace Microsoft.AspNetCore.Components.Rendering [Parameter] public int Value { get; set; } - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { Value = Value * 2; await Task.Delay(Value * 100); diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor index 34be56726f..73a2b6260d 100644 --- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor +++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor @@ -23,7 +23,7 @@ @code { - protected override void OnInit() + protected override void OnInitialized() { // Start at AuthHome, not at any other component in the same app that happens to // register itself for the route "" diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor index c843e11a91..980343734e 100644 --- a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor +++ b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor @@ -3,7 +3,7 @@ { protected bool isAfterDelay; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { // If there are lots of instances of this component, the following delay // will result in a lot of them triggering a re-render simultaneously diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor index f531b1d877..8cc8859ad9 100644 --- a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor @@ -39,7 +39,7 @@ EditContext editContext; string submissionStatus; - protected override void OnInit() + protected override void OnInitialized() { editContext = new EditContext(person).AddDataAnnotationsValidation(); diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor index d3b27ad3bc..582913ae27 100644 --- a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor @@ -53,7 +53,7 @@ KeyCasesTreeNode.Node parsedRootNode; RenderContext renderContext = new RenderContext(); - protected override void OnInit() + protected override void OnInitialized() { Update(); } diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor index 551038293c..340e1046cd 100644 --- a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor +++ b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor @@ -46,7 +46,7 @@ [Parameter] Node Data { get; set; } [CascadingParameter] KeyCasesComponent.RenderContext RenderContext { get; set; } - protected override void OnInit() + protected override void OnInitialized() { firstCreatedOnUpdateCount = RenderContext.UpdateCount; } diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor index a62cd6d6b0..4474f487df 100644 --- a/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/RouterTest/UriHelperComponent.razor @@ -8,9 +8,8 @@ @code{ string UrlLocation; - protected override void OnInit() + protected override void OnInitialized() { - base.OnInit(); UrlLocation = UriHelper.GetAbsoluteUri(); UriHelper.OnLocationChanged += (_, __) => { diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor index 2ff15a18ba..327c590242 100644 --- a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor +++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor @@ -9,7 +9,7 @@ int tick; private bool _isDisposed; - protected override void OnInit() + protected override void OnInitialized() { Task.Run(() => InvokeAsync(async () => { diff --git a/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs b/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs index 3b69925b91..c4e311566c 100644 --- a/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs +++ b/src/Mvc/Mvc.Components.Prerendering/test/HtmlHelperComponentPrerenderingExtensionsTests.cs @@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures [Parameter] public bool Force { get; set; } - protected override void OnInit() + protected override void OnInitialized() { UriHelper.NavigateTo(RedirectUri, Force); } diff --git a/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs index f2cfc99b7e..639fa4e66c 100644 --- a/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs +++ b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs @@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test { RedirectUri = "http://localhost/redirect" })); - + Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " + "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" + "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", @@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test [Parameter] public bool Force { get; set; } - protected override void OnInit() + protected override void OnInitialized() { UriHelper.NavigateTo(RedirectUri, Force); } diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor index 0e9259d691..7f70eedec7 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor +++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/NavigationComponent.razor @@ -2,7 +2,7 @@ @functions{ - protected override void OnInit() + protected override void OnInitialized() { Helper.NavigateTo("/navigation-redirect"); } diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor index 2bfe1d7c4d..3c99abbf81 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor +++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Throws.razor @@ -2,9 +2,9 @@ @* This is expected to throw and result in a 500 *@ @code { - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { - await base.OnInitAsync(); + await base.OnInitializedAsync(); throw new InvalidTimeZoneException("test"); } } \ No newline at end of file diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor index 896e045212..c7c9d6eb1c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/FetchData.razor @@ -38,7 +38,7 @@ else @code { WeatherForecast[] forecasts; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { forecasts = await ForecastService.GetForecastAsync(DateTime.Now); } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor index c8891a3360..614ab800e3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Shared/LoginDisplay.IndividualB2CAuth.razor @@ -22,7 +22,7 @@ @code { bool canEditProfile; - protected override void OnInit() + protected override void OnInitialized() { var options = AzureADB2COptions.Get(AzureADB2CDefaults.AuthenticationScheme); canEditProfile = !string.IsNullOrEmpty(options.EditProfilePolicyId);