Merge pull request #1 from nwestfall/feature/net5

Updated to .NET 5
nwestfall · Mar 14, 2021 · 84f9862 · 84f9862
2 parents 241c4b6 + b07d3f9
commit 84f9862
Show file tree

Hide file tree

Showing 48 changed files with 1,761 additions and 455 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [main, master]
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Install dependencies
+      run: dotnet restore src/BlazorTenant/BlazorTenant.csproj
+    - name: Build
+      run: dotnet build --configuration Release --no-restore src/BlazorTenant/BlazorTenant.csproj
+    - name: Test
+      uses: zyborg/dotnet-tests-report@v1
+      with:
+        project_path: test/BlazorTenant.Tests
+        report_name: blazor_tenant_tests
+        report_title: Blazor Tenant Tests
+        github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -1,4 +1,4 @@
-name: .NET Core
+name: Release
 
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.x
     - name: Get the version
       id: get_version
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/\v/}

diff --git a/example/BlazorTenant.Example/App.razor b/example/BlazorTenant.Example/App.razor
@@ -1,5 +1,5 @@
-<CascadingAuthenticationState>
-    <MultiTenantRouter AppAssembly="@typeof(Program).Assembly">
+<CascadingAuthenticationState>
+    <MultiTenantRouter AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         </Found>
@@ -14,5 +14,4 @@
             </LayoutView>
         </NoTenant>
     </MultiTenantRouter>
-</CascadingAuthenticationState>
-
+</CascadingAuthenticationState>
diff --git a/example/BlazorTenant.Example/BlazorTenant.Example.csproj b/example/BlazorTenant.Example/BlazorTenant.Example.csproj
@@ -1,17 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.4" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/BlazorTenant.Example/Pages/Authentication.razor b/example/BlazorTenant.Example/Pages/Authentication.razor
diff --git a/example/BlazorTenant.Example/Pages/Counter.razor b/example/BlazorTenant.Example/Pages/Counter.razor
@@ -1,4 +1,4 @@
-@page "/counter"
+@page "/counter"
 
 <h1>Counter</h1>
 

diff --git a/example/BlazorTenant.Example/Pages/FetchData.razor b/example/BlazorTenant.Example/Pages/FetchData.razor
@@ -1,4 +1,4 @@
-@page "/fetchdata"
+@page "/fetchdata"
 @inject HttpClient Http
 
 <h1>Weather forecast</h1>

diff --git a/example/BlazorTenant.Example/Pages/Index.razor b/example/BlazorTenant.Example/Pages/Index.razor
@@ -1,7 +1,7 @@
 @page "/"
 @inject Tenant tenant
 
-<h1>Hello, @tenant.Identifier!</h1>
+<h1>Hello, world!</h1>
 
 Welcome to your new app.
 
@@ -10,4 +10,4 @@ Welcome to your new app.
 @foreach(var prop in tenant.Parameters)
 {
     <p><b>@prop.Key:</b> @prop.Value</p>
-}
+}
diff --git a/example/BlazorTenant.Example/Program.cs b/example/BlazorTenant.Example/Program.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -23,7 +22,7 @@ public static async Task Main(string[] args)
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
 
-            builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
             var store = new InMemoryTenantStore();
             var tenantSection = builder.Configuration.GetSection("Tenants");
@@ -57,7 +56,7 @@ public static async Task Main(string[] args)
                 options.ProviderOptions.DefaultScopes.Clear();
                 options.ProviderOptions.DefaultScopes.Add("openid profile offline_access api");
             });
-            
+
             var build = builder.Build();
             _sp = build.Services;
             build.Services.AddServiceProviderToMultiTenantRoutes();

diff --git a/example/BlazorTenant.Example/Properties/launchSettings.json b/example/BlazorTenant.Example/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:59832",
-      "sslPort": 44336
+      "applicationUrl": "http://localhost:45311",
+      "sslPort": 44360
     }
   },
   "profiles": {
@@ -18,6 +18,7 @@
     },
     "BlazorTenant.Example": {
       "commandName": "Project",
+      "dotnetRunMessages": "true",
       "launchBrowser": true,
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "https://localhost:5001;http://localhost:5000",

diff --git a/example/BlazorTenant.Example/Shared/MainLayout.razor b/example/BlazorTenant.Example/Shared/MainLayout.razor
@@ -1,19 +1,18 @@
-@inherits LayoutComponentBase
-@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+@inherits LayoutComponentBase
 @inject Tenant tenant
-@inject NavigationManager Navigation
-@inject SignOutSessionStateManager SignOutManager
 
-<div class="sidebar">
-    <NavMenu />
-</div>
-
-<div class="main">
-    <div class="top-row px-4">
-        <a href="http://blazor.net" target="_blank" class="ml-md-auto">@(tenant?.Identifier ?? "N/A")</a>
+<div class="page">
+    <div class="sidebar">
+        <NavMenu />
     </div>
 
-    <div class="content px-4">
-        @Body
+    <div class="main">
+        <div class="top-row px-4">
+            <a href="http://blazor.net" target="_blank" class="ml-md-auto">@(tenant?.Identifier ?? "N/A")</a>
+        </div>
+
+        <div class="content px-4">
+            @Body
+        </div>
     </div>
-</div>
+</div>
diff --git a/example/BlazorTenant.Example/Shared/MainLayout.razor.css b/example/BlazorTenant.Example/Shared/MainLayout.razor.css
@@ -0,0 +1,70 @@
+.page {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+}
+
+.main {
+    flex: 1;
+}
+
+.sidebar {
+    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+}
+
+.top-row {
+    background-color: #f7f7f7;
+    border-bottom: 1px solid #d6d5d5;
+    justify-content: flex-end;
+    height: 3.5rem;
+    display: flex;
+    align-items: center;
+}
+
+    .top-row ::deep a, .top-row .btn-link {
+        white-space: nowrap;
+        margin-left: 1.5rem;
+    }
+
+    .top-row a:first-child {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
+@media (max-width: 640.98px) {
+    .top-row:not(.auth) {
+        display: none;
+    }
+
+    .top-row.auth {
+        justify-content: space-between;
+    }
+
+    .top-row a, .top-row .btn-link {
+        margin-left: 0;
+    }
+}
+
+@media (min-width: 641px) {
+    .page {
+        flex-direction: row;
+    }
+
+    .sidebar {
+        width: 250px;
+        height: 100vh;
+        position: sticky;
+        top: 0;
+    }
+
+    .top-row {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+    }
+
+    .main > div {
+        padding-left: 2rem !important;
+        padding-right: 1.5rem !important;
+    }
+}
diff --git a/example/BlazorTenant.Example/Shared/NavMenu.razor.css b/example/BlazorTenant.Example/Shared/NavMenu.razor.css
@@ -0,0 +1,62 @@
+.navbar-toggler {
+    background-color: rgba(255, 255, 255, 0.1);
+}
+
+.top-row {
+    height: 3.5rem;
+    background-color: rgba(0,0,0,0.4);
+}
+
+.navbar-brand {
+    font-size: 1.1rem;
+}
+
+.oi {
+    width: 2rem;
+    font-size: 1.1rem;
+    vertical-align: text-top;
+    top: -2px;
+}
+
+.nav-item {
+    font-size: 0.9rem;
+    padding-bottom: 0.5rem;
+}
+
+    .nav-item:first-of-type {
+        padding-top: 1rem;
+    }
+
+    .nav-item:last-of-type {
+        padding-bottom: 1rem;
+    }
+
+    .nav-item ::deep a {
+        color: #d7d7d7;
+        border-radius: 4px;
+        height: 3rem;
+        display: flex;
+        align-items: center;
+        line-height: 3rem;
+    }
+
+.nav-item ::deep a.active {
+    background-color: rgba(255,255,255,0.25);
+    color: white;
+}
+
+.nav-item ::deep a:hover {
+    background-color: rgba(255,255,255,0.1);
+    color: white;
+}
+
+@media (min-width: 641px) {
+    .navbar-toggler {
+        display: none;
+    }
+
+    .collapse {
+        /* Never collapse the sidebar for wide screens */
+        display: block;
+    }
+}
diff --git a/example/BlazorTenant.Example/Shared/RedirectToLogin.razor b/example/BlazorTenant.Example/Shared/RedirectToLogin.razor
diff --git a/example/BlazorTenant.Example/Shared/SurveyPrompt.razor b/example/BlazorTenant.Example/Shared/SurveyPrompt.razor
@@ -1,10 +1,10 @@
-<div class="alert alert-secondary mt-4" role="alert">
+<div class="alert alert-secondary mt-4" role="alert">
     <span class="oi oi-pencil mr-2" aria-hidden="true"></span>
     <strong>@Title</strong>
 
     <span class="text-nowrap">
         Please take our
-        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2127014">brief survey</a>
+        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2137916">brief survey</a>
     </span>
     and tell us what you think.
 </div>

diff --git a/example/BlazorTenant.Example/_Imports.razor b/example/BlazorTenant.Example/_Imports.razor
@@ -3,6 +3,7 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.JSInterop