Upgraded to 5.0-rc2

Artak Mkrtchyan · Artak Mkrtchyan · commit e374318177a7 · 2020-10-29T23:27:08.000-07:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
-        <AspNetCoreVersion>5.0.0-preview.7.20326.3</AspNetCoreVersion>
-        <BlazorVersion>5.0.0-preview.7.20326.3</BlazorVersion>
-        <EntityFrameworkVersion>5.0.0-preview.7.20326.1</EntityFrameworkVersion>
-        <SystemNetHttpJsonVersion>5.0.0-preview.7.20326.1</SystemNetHttpJsonVersion>
+        <AspNetCoreVersion>5.0.0-rc.2.*</AspNetCoreVersion>
+        <BlazorVersion>5.0.0-rc.2.*</BlazorVersion>
+        <EntityFrameworkVersion>5.0.0-rc.2.*</EntityFrameworkVersion>
+        <SystemNetHttpJsonVersion>5.0.0-rc.2.*</SystemNetHttpJsonVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/BlazingPizza.Client/App.razor b/src/BlazingPizza.Client/App.razor
@@ -1,7 +1,7 @@
 ﻿<CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Program).Assembly" Context="routeData">
-        <Found>
-            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
+    <Router AppAssembly="typeof(Program).Assembly">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
                     <RedirectToLogin />
                 </NotAuthorized>
diff --git a/src/BlazingPizza.Client/BlazingPizza.Client.csproj b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -1,13 +1,12 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <UseBlazorWebAssembly>true</UseBlazorWebAssembly>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"  Version="$(BlazorVersion)" PrivateAssets="all"  />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(SystemNetHttpJsonVersion)" />
     <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
diff --git a/src/BlazingPizza.Client/Program.cs b/src/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("app");
+            builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
diff --git a/src/BlazingPizza.Client/wwwroot/index.html b/src/BlazingPizza.Client/wwwroot/index.html
@@ -12,9 +12,7 @@
     <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
-        <div class="loading-bar"></div>
-    </app>
+    <div id="app" class="loading-bar"></div>
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
diff --git a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -8,5 +8,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
-
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class Program`
`12`	`12`	`public static async Task Main(string[] args)`
`13`	`13`	`{`
`14`	`14`	`var builder = WebAssemblyHostBuilder.CreateDefault(args);`
`15`		`- builder.RootComponents.Add<App>("app");`
	`15`	`+ builder.RootComponents.Add<App>("#app");`
`16`	`16`
`17`	`17`	`builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });`
`18`	`18`	`builder.Services.AddHttpClient<OrdersClient>(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))`