From 0d21852e3a35017978470979d90055b0584ecdd9 Mon Sep 17 00:00:00 2001
From: Carl in 't Veld <carl@intveld.nl>
Date: Mon, 14 Oct 2019 22:16:06 +0200
Subject: [PATCH] Upgrade to .NET Core 3.0 GA

---
 demos/BlazorBasics/App.razor                 | 13 +++++++++----
 demos/BlazorBasics/BlazorBasics.csproj       |  7 ++++---
 demos/BlazorBasics/Pages/FetchData.razor     |  2 +-
 demos/BlazorBasics/Shared/SurveyPrompt.razor |  2 +-
 demos/BlazorBasics/_Imports.razor            |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/demos/BlazorBasics/App.razor b/demos/BlazorBasics/App.razor
index eb5c93b..1c360b7 100644
--- a/demos/BlazorBasics/App.razor
+++ b/demos/BlazorBasics/App.razor
@@ -1,5 +1,10 @@
-<Router AppAssembly="typeof(Program).Assembly">
-    <NotFoundContent>
-        <p>Sorry, there's nothing at this address.</p>
-    </NotFoundContent>
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
 </Router>
diff --git a/demos/BlazorBasics/BlazorBasics.csproj b/demos/BlazorBasics/BlazorBasics.csproj
index 3879bcc..9b5340f 100644
--- a/demos/BlazorBasics/BlazorBasics.csproj
+++ b/demos/BlazorBasics/BlazorBasics.csproj
@@ -7,9 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(AspNetCoreVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="$(AspNetCoreVersion)" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19465.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19465.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19465.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19465.2" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/demos/BlazorBasics/Pages/FetchData.razor b/demos/BlazorBasics/Pages/FetchData.razor
index 3f5b9a9..01192d6 100644
--- a/demos/BlazorBasics/Pages/FetchData.razor
+++ b/demos/BlazorBasics/Pages/FetchData.razor
@@ -37,7 +37,7 @@ else
 @functions {
     WeatherForecast[] forecasts;
 
-    protected override async Task OnInitAsync()
+    protected override async Task OnInitializedAsync()
     {
         forecasts = await Http.GetJsonAsync<WeatherForecast[]>("sample-data/weather.json");
     }
diff --git a/demos/BlazorBasics/Shared/SurveyPrompt.razor b/demos/BlazorBasics/Shared/SurveyPrompt.razor
index a126a15..f399ba4 100644
--- a/demos/BlazorBasics/Shared/SurveyPrompt.razor
+++ b/demos/BlazorBasics/Shared/SurveyPrompt.razor
@@ -11,5 +11,5 @@
 
 @code {
     // Demonstrates how a parent component can supply parameters
-    [Parameter] string Title { get; set; }
+    [Parameter] public string Title { get; set; }
 }
diff --git a/demos/BlazorBasics/_Imports.razor b/demos/BlazorBasics/_Imports.razor
index 4f235e3..f16972f 100644
--- a/demos/BlazorBasics/_Imports.razor
+++ b/demos/BlazorBasics/_Imports.razor
@@ -1,6 +1,6 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Layouts
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
 @using BlazorBasics