merged from -standard. includes ng15.2.0 update, nuget package update…

…s, lint cleanups
emonney · Mar 23, 2023 · 3758b96 · 3758b96
1 parent b3ae495
commit 3758b96
Show file tree

Hide file tree

Showing 67 changed files with 5,626 additions and 4,965 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,8 @@ obj/
 Obj/
 log/
 Log/
+keys/
+Keys/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -263,5 +265,4 @@ __pycache__/
 *.pyc
 # Others
 *.licenseheader
-Thumbs.db
-tempkey.jwk
+Thumbs.db
diff --git a/DAL/Core/AccountManager.cs b/DAL/Core/AccountManager.cs
@@ -262,6 +262,7 @@ public async Task<ApplicationRole> GetRoleLoadRelatedAsync(string roleName)
             var role = await _context.Roles
                 .Include(r => r.Claims)
                 .Include(r => r.Users)
+                .AsSingleQuery()
                 .Where(r => r.Name == roleName)
                 .SingleOrDefaultAsync();
 
@@ -274,6 +275,7 @@ public async Task<List<ApplicationRole>> GetRolesLoadRelatedAsync(int page, int
             IQueryable<ApplicationRole> rolesQuery = _context.Roles
                 .Include(r => r.Claims)
                 .Include(r => r.Users)
+                .AsSingleQuery()
                 .OrderBy(r => r.Name);
 
             if (page != -1)

diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>6.0.0</Version>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>7.0.1</Version>
     <Description>Data Access Layer for the Quick Application template</Description>
-    <Copyright>Copyright © 2022 www.ebenmonney.com</Copyright>
+    <Copyright>Copyright © 2023 www.ebenmonney.com</Copyright>
     <PackageProjectUrl>https://www.ebenmonney.com/quickapp</PackageProjectUrl>
     <Company>EBENMONNEY</Company>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
   </ItemGroup>
 
 </Project>
diff --git a/DAL/Repositories/CustomerRepository.cs b/DAL/Repositories/CustomerRepository.cs
@@ -33,6 +33,7 @@ public IEnumerable<Customer> GetAllCustomersData()
             return _appContext.Customers
                 .Include(c => c.Orders).ThenInclude(o => o.OrderDetails).ThenInclude(d => d.Product)
                 .Include(c => c.Orders).ThenInclude(o => o.Cashier)
+                .AsSingleQuery()
                 .OrderBy(c => c.Name)
                 .ToList();
         }

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Ebenezer Monney
+Copyright (c) 2023 Ebenezer Monney
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/QuickApp.sln b/QuickApp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.2.32602.215
+VisualStudioVersion = 17.4.33110.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickApp", "QuickApp\QuickApp.csproj", "{8FD3A1CC-28FA-4298-A847-21F907B566F2}"
 EndProject

diff --git a/QuickApp/Authorization/ProfileService.cs b/QuickApp/Authorization/ProfileService.cs
@@ -10,10 +10,9 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using IdentityModel;
-using IdentityServer4.Extensions;
-using IdentityServer4.Models;
-using IdentityServer4.Services;
+using Duende.IdentityServer.Services;
+using Duende.IdentityServer.Models;
+using Duende.IdentityServer.Extensions;
 using Microsoft.AspNetCore.Identity;
 using DAL.Core;
 using DAL.Models;

diff --git a/QuickApp/ClientApp/.browserslistrc b/QuickApp/ClientApp/.browserslistrc
diff --git a/QuickApp/ClientApp/.editorconfig b/QuickApp/ClientApp/.editorconfig
@@ -14,6 +14,3 @@ quote_type = single
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
-
-[*.{razor,cshtml}]
-charset = utf-8-bom
diff --git a/QuickApp/ClientApp/README.md b/QuickApp/ClientApp/README.md
@@ -1,6 +1,6 @@
 # QuickApp
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.2.7.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.2.2.
 
 ## Development server
 

diff --git a/QuickApp/ClientApp/angular.json b/QuickApp/ClientApp/angular.json
@@ -21,7 +21,9 @@
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js"
+            ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
@@ -144,10 +146,11 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
             "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
             "inlineStyleLanguage": "scss",
             "assets": [
               "src/assets"
@@ -214,9 +217,5 @@
         }
       }
     }
-  },
-  "defaultProject": "quickapp",
-  "cli": {
-    "analytics": false
   }
 }
diff --git a/QuickApp/ClientApp/karma.conf.js b/QuickApp/ClientApp/karma.conf.js