Merge pull request #292 from mkArtak/release/5.0

Update BlazingPizza app to 5.0

Merge pull request #292 from mkArtak/release/5.0
Update BlazingPizza app to 5.0
d053349a · Artak · GitHub · fddeba9b · 0f2f2563 · d053349a
Unverified Commit d053349a authored Nov 20, 2020 by Artak Committed by GitHub Nov 20, 2020
20 changed files
--- a/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Client/BlazingPizza.Client.csproj
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
    <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
  </ItemGroup>

--- a/save-points/08-templated-components/BlazingPizza.Client/Program.cs
+++ b/save-points/08-templated-components/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ namespace BlazingPizza.Client
        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))

--- a/save-points/08-templated-components/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/08-templated-components/BlazingPizza.Client/wwwroot/index.html
@@ -11,9 +11,9 @@
    <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
        <div class="loading-bar"></div>
-    </app>
+    </div>

    <div id="blazor-error-ui">
        An unhandled error has occurred.

--- a/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/08-templated-components/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
 <Project Sdk="Microsoft.NET.Sdk.Razor">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
@@ -10,4 +9,8 @@
    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
  </ItemGroup>

+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
--- a/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Server/BlazingPizza.Server.csproj
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>

--- a/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
+++ b/save-points/08-templated-components/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ namespace BlazingPizza.Server

        public void ConfigureServices(IServiceCollection services)
        {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();

            services.AddDbContext<PizzaStoreContext>(options => 
                options.UseSqlite("Data Source=pizza.db"));

--- a/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/08-templated-components/BlazingPizza.Shared/BlazingPizza.Shared.csproj
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
    <RootNamespace>BlazingPizza</RootNamespace>
  </PropertyGroup>


--- a/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/BlazingPizza.Client.csproj
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
    <PackageReference Include="Microsoft.Extensions.Http" Version="$(AspNetCoreVersion)" />
    <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
  </ItemGroup>

--- a/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ namespace BlazingPizza.Client
        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))

--- a/save-points/09-progressive-web-app/BlazingPizza.Client/wwwroot/index.html
+++ b/save-points/09-progressive-web-app/BlazingPizza.Client/wwwroot/index.html
@@ -12,9 +12,9 @@
    <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
        <div class="loading-bar"></div>
-    </app>
+    </div>

    <div id="blazor-error-ui">
        An unhandled error has occurred.

--- a/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
 <Project Sdk="Microsoft.NET.Sdk.Razor">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
@@ -10,4 +9,9 @@
    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
  </ItemGroup>

+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
+
--- a/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/BlazingPizza.Server.csproj
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>

--- a/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
+++ b/save-points/09-progressive-web-app/BlazingPizza.Server/Startup.cs
@@ -19,8 +19,8 @@ namespace BlazingPizza.Server

        public void ConfigureServices(IServiceCollection services)
        {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+            services.AddControllersWithViews();
+            services.AddRazorPages();

            services.AddDbContext<PizzaStoreContext>(options =>
                options.UseSqlite("Data Source=pizza.db"));

--- a/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
+++ b/save-points/09-progressive-web-app/BlazingPizza.Shared/BlazingPizza.Shared.csproj
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
    <RootNamespace>BlazingPizza</RootNamespace>
  </PropertyGroup>


--- a/src/BlazingPizza.Client/App.razor
+++ b/src/BlazingPizza.Client/App.razor
 <CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Program).Assembly" Context="routeData">
-        <Found>
+    <Router AppAssembly="typeof(Program).Assembly">
+        <Found Context="routeData">
            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
                <NotAuthorized>
                    <RedirectToLogin />

--- a/src/BlazingPizza.Client/BlazingPizza.Client.csproj
+++ b/src/BlazingPizza.Client/BlazingPizza.Client.csproj
-<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)" />

--- a/src/BlazingPizza.Client/Program.cs
+++ b/src/BlazingPizza.Client/Program.cs
@@ -12,7 +12,7 @@ namespace BlazingPizza.Client
        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))

--- a/src/BlazingPizza.Client/wwwroot/index.html
+++ b/src/BlazingPizza.Client/wwwroot/index.html
@@ -12,9 +12,9 @@
    <title>Blazing Pizza</title>
 </head>
 <body>
-    <app>
+    <div id="app">
        <div class="loading-bar"></div>
-    </app>
+    </div>

    <div id="blazor-error-ui">
        An unhandled error has occurred.

--- a/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
+++ b/src/BlazingPizza.ComponentsLibrary/BlazingPizza.ComponentsLibrary.csproj
@@ -9,4 +9,8 @@
    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
  </ItemGroup>

+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>
--- a/src/BlazingPizza.Server/Startup.cs
+++ b/src/BlazingPizza.Server/Startup.cs
@@ -18,9 +18,9 @@ namespace BlazingPizza.Server
        public IConfiguration Configuration { get; }

        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddMvc()
-                .AddNewtonsoftJson();
+        {
+            services.AddControllersWithViews();
+            services.AddRazorPages();

            services.AddDbContext<PizzaStoreContext>(options =>
                options.UseSqlite("Data Source=pizza.db"));
@@ -61,8 +61,8 @@ namespace BlazingPizza.Server

            app.UseEndpoints(endpoints =>
            {
-                endpoints.MapControllers();
                endpoints.MapRazorPages();
+                endpoints.MapControllers();
                endpoints.MapFallbackToFile("index.html");
            });
        }