Merge pull request #42 from damienbod/dev-updates

Updated all packages, update code styles
damienbod · Oct 22, 2022 · f2a3acd · f2a3acd
2 parents adbd717 + fc5c2ee
commit f2a3acd
Show file tree

Hide file tree

Showing 69 changed files with 2,008 additions and 356 deletions.
diff --git a/AspNetCoreRequireMfaOidc/AspNetCoreRequireMfaOidc.csproj b/AspNetCoreRequireMfaOidc/AspNetCoreRequireMfaOidc.csproj
@@ -2,13 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-	<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.10" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
   </ItemGroup>
 
 </Project>
diff --git a/AspNetCoreRequireMfaOidc/Pages/Account/AccessDenied.cshtml.cs b/AspNetCoreRequireMfaOidc/Pages/Account/AccessDenied.cshtml.cs
@@ -6,6 +6,5 @@ public class AccessDeniedModel : PageModel
 {
     public void OnGet()
     {
-
     }
 }
diff --git a/AspNetCoreRequireMfaOidc/Pages/Error.cshtml.cs b/AspNetCoreRequireMfaOidc/Pages/Error.cshtml.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
 
 namespace AspNetCoreRequireMfaOidc.Pages;
 

diff --git a/AspNetCoreRequireMfaOidc/Pages/Index.cshtml.cs b/AspNetCoreRequireMfaOidc/Pages/Index.cshtml.cs
@@ -8,6 +8,5 @@ public class IndexModel : PageModel
 {
     public void OnGet()
     {
-
     }
 }
diff --git a/AspNetCoreRequireMfaOidc/Pages/Logout.cshtml.cs b/AspNetCoreRequireMfaOidc/Pages/Logout.cshtml.cs
@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/AspNetCoreRequireMfaOidc/Program.cs b/AspNetCoreRequireMfaOidc/Program.cs
@@ -1,6 +1,3 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
 namespace AspNetCoreRequireMfaOidc;
 
 public class Program

diff --git a/AspNetCoreRequireMfaOidc/RequireMfaHandler.cs b/AspNetCoreRequireMfaOidc/RequireMfaHandler.cs
@@ -1,7 +1,4 @@
 using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace AspNetCoreRequireMfaOidc;
 

diff --git a/AspNetCoreRequireMfaOidc/Startup.cs b/AspNetCoreRequireMfaOidc/Startup.cs
@@ -1,13 +1,7 @@
 using System.IdentityModel.Tokens.Jwt;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace AspNetCoreRequireMfaOidc;
 

diff --git a/DeviceFlowWeb/DeviceFlowService.cs b/DeviceFlowWeb/DeviceFlowService.cs
@@ -1,8 +1,5 @@
 using IdentityModel.Client;
 using Microsoft.Extensions.Options;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
 
 namespace DeviceFlowWeb;
 

diff --git a/DeviceFlowWeb/DeviceFlowWeb.csproj b/DeviceFlowWeb/DeviceFlowWeb.csproj
@@ -3,24 +3,25 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>7953929f-5999-4847-b4b8-2f6cf964f467</UserSecretsId>
-	<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
 
 
   <ItemGroup>
 	  <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
-	  <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.5" />
+	  <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.10" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
     <PackageReference Include="IdentityModel" Version="6.0.0" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
-    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.16.1" />
-    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="0.16.1" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.1" />
+    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.17.0" />
+    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders.TagHelpers" Version="0.17.0" />
   </ItemGroup>
 
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('node_modules') ">

diff --git a/DeviceFlowWeb/Pages/Login.cshtml.cs b/DeviceFlowWeb/Pages/Login.cshtml.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
+using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 

diff --git a/DeviceFlowWeb/Pages/Logout.cshtml.cs b/DeviceFlowWeb/Pages/Logout.cshtml.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Threading.Tasks;
 
 namespace DeviceFlowWeb.Pages;
 

diff --git a/DeviceFlowWeb/Program.cs b/DeviceFlowWeb/Program.cs
@@ -1,7 +1,4 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
-namespace DeviceFlowWeb;
+namespace DeviceFlowWeb;
 
 public class Program
 {

diff --git a/DeviceFlowWeb/Startup.cs b/DeviceFlowWeb/Startup.cs
@@ -1,11 +1,4 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
 
 namespace DeviceFlowWeb;
 

diff --git a/DeviceFlowWeb/bundleconfig.json b/DeviceFlowWeb/bundleconfig.json
@@ -7,7 +7,7 @@
     "inputFiles": [
       "wwwroot/css/site.css"
     ],
-    "minify": { "enabled": true }
+    "minify": { "enabled": false }
   },
   {
     "outputFileName": "wwwroot/js/site.min.js",
@@ -28,7 +28,7 @@
     "inputFiles": [
       "node_modules/bootstrap/dist/css/bootstrap.min.css"
     ],
-    "minify": { "enabled": true }
+    "minify": { "enabled": false }
   },
   // Vendor JS
   {
@@ -38,7 +38,7 @@
       "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
     ],
     "minify": {
-      "enabled": true,
+      "enabled": false,
       "renameLocals": true
     },
     "sourceMap": false
@@ -53,7 +53,7 @@
       "node_modules//jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js"
     ],
     "minify": {
-      "enabled": true,
+      "enabled": false,
       "renameLocals": true
     },
     "sourceMap": false

diff --git a/DeviceFlowWeb/package-lock.json b/DeviceFlowWeb/package-lock.json
diff --git a/DeviceFlowWeb/package.json b/DeviceFlowWeb/package.json
@@ -4,12 +4,10 @@
   "private": true,
   "devDependencies": {
     "bootstrap": "4.6.0",
-    "jquery": "3.6.0",
+    "jquery": "3.6.1",
     "jquery-ajax-unobtrusive": "3.2.6",
-    "jquery-validation": "1.19.3",
-    "jquery-validation-unobtrusive": "3.2.12"
-  },
-  "dependencies": {
+    "jquery-validation": "1.19.5",
+    "jquery-validation-unobtrusive": "4.0.0",
     "popper.js": "^1.16.1"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,5 @@ public class AccessDeniedModel : PageModel @@
     {
         public void OnGet()
         {
         }
     }