Merge Dev to Master

.github/workflows/anchore.yml

@@ -0,0 +1,50 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# This workflow checks out code, builds an image, performs a container image
+# vulnerability scan with Anchore's Grype tool, and integrates the results with GitHub Advanced Security
+# code scanning feature.  For more information on the Anchore scan action usage
+# and parameters, see https://github.com/anchore/scan-action. For more
+# information on Anchore's container image scanning tool Grype, see
+# https://github.com/anchore/grype
+name: Anchore Grype vulnerability scan
+
+on:
+  push:
+    branches: [ "master", "dev" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master", "dev" ]
+  schedule:
+    - cron: '16 16 * * 2'
+
+permissions:
+  contents: read
+
+jobs:
+  Anchore-Build-Scan:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out the code
+      uses: actions/checkout@v4
+      with:
+        submodules: true # 'recursive' 'true' or 'false'
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile.alpine --tag localbuild/testimage:latest
+    - name: Run the Anchore Grype scan action
+      uses: anchore/scan-action@v3
+      id: scan
+      with:
+        image: "localbuild/testimage:latest"
+        fail-build: true
+        severity-cutoff: critical
+    - name: Upload vulnerability report
+      uses: github/codeql-action/upload-sarif@v3
+      with:
+        sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, dev, dotnet-8 ]
+    branches: [ master, dev ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
@@ -35,13 +35,13 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true # 'recursive' 'true' or 'false'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,4 +71,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/docker-publish.yml

@@ -9,24 +9,24 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true # 'recursive' 'true' or 'false'
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile.alpine

.github/workflows/dotnetcore.yml

@@ -5,15 +5,14 @@ on:
     branches: 
       - master
       - dev
-      - dotnet-8
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true # 'recursive' 'true' or 'false'
     - name: Setup .NET Core

.github/workflows/trivy-analysis.yml

@@ -1,15 +1,15 @@
 name: Trivy scan
 on:
   push:
-    branches: [ master, dev, dotnet-8 ]
+    branches: [ master, dev ]
   pull_request:
 jobs:
   build:
     name: Build
-    runs-on: "ubuntu-20.04"
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true # 'recursive' 'true' or 'false'
 
@@ -27,6 +27,6 @@ jobs:
           severity: 'CRITICAL,HIGH'
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'trivy-results.sarif'

Dockerfile

@@ -22,12 +22,12 @@ COPY ./IdentityManager2/src/IdentityManager2/IdentityManager2.csproj ./IdentityM
 COPY ./IdentityManager2/src/IdentityManager2/Assets/ ./IdentityManager2/src/IdentityManager2/Assets/
 COPY ./DotnetPlayground.Web/DotnetPlayground.Web.csproj ./DotnetPlayground.Web/DotnetPlayground.Web.csproj
 COPY ./*.sln ./NuGet.config ./
-RUN dotnet restore -r linux-x64
+RUN dotnet restore -r linux-x64 /p:Configuration=Release
 
 COPY . .
 RUN sed -i -e "s/GIT_HASH/$SOURCE_COMMIT/g" -e "s/GIT_BRANCH/$SOURCE_BRANCH/g" DotnetPlayground.Web/wwwroot/js/site.js
-RUN dotnet test --no-restore -v m
-RUN dotnet publish --no-restore -c $BUILD_CONFIG --self-contained -r linux-x64 \
+RUN dotnet test -v m
+RUN dotnet publish -c $BUILD_CONFIG --self-contained -r linux-x64 \
     #-p:PublishTrimmed=true \
     DotnetPlayground.Web
 

Dockerfile.alpine

@@ -19,12 +19,12 @@ COPY ./IdentityManager2/src/IdentityManager2/IdentityManager2.csproj ./IdentityM
 COPY ./IdentityManager2/src/IdentityManager2/Assets/ ./IdentityManager2/src/IdentityManager2/Assets/
 COPY ./DotnetPlayground.Web/DotnetPlayground.Web.csproj ./DotnetPlayground.Web/DotnetPlayground.Web.csproj
 COPY ./*.sln ./NuGet.config ./
-RUN dotnet restore -r linux-musl-x64
+RUN dotnet restore -r linux-musl-x64 /p:Configuration=Release
 
 COPY . .
 RUN sed -i -e "s/GIT_HASH/$SOURCE_COMMIT/g" -e "s/GIT_BRANCH/$SOURCE_BRANCH/g" DotnetPlayground.Web/wwwroot/js/site.js
-RUN dotnet test --no-restore -v m
-RUN dotnet publish --no-restore -c $BUILD_CONFIG --self-contained -r linux-musl-x64 \
+RUN dotnet test -v m
+RUN dotnet publish -c $BUILD_CONFIG --self-contained -r linux-musl-x64 \
     #-p:PublishTrimmed=true \
     DotnetPlayground.Web
 

DotnetPlayground.Tests/DotnetPlayground.Tests.csproj

@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.5" />
+    <PackageReference Include="xunit" Version="2.6.6" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

DotnetPlayground.Tests/IntegrationTest.cs

@@ -314,7 +314,7 @@ public async Task Index()
 				response.EnsureSuccessStatusCode();
 
 				var responseString = await response.Content.ReadAsStringAsync();
-				Assert.Contains("<button id=\"btninfo\" class=\"btn btn-secondary\" type=\"button\" data-bs-toggle=\"modal\" data-bs-target=\"#divModal\">&#9432;&nbsp;Row info</button>",
+				Assert.Contains("""<button id="btninfo" class="btn btn-secondary" type="button">&#9432;&nbsp;Row info</button>""",
 					responseString);
 				Assert.Contains("data-page-list=\"[50,500,2000,10000]\"", responseString);
 			}

DotnetPlayground.Web/DotnetPlayground.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-    <Version>1.0.25-dotnet8</Version>
+    <Version>1.0.26-dotnet8</Version>
 		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<AssemblyName>DotnetPlayground.Web</AssemblyName>
@@ -44,13 +44,13 @@
 		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.1" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" Condition="$(DefineConstants.Contains('INCLUDE_POSTGRES'))" />
-		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2.ci.20231014172607" Condition="$(DefineConstants.Contains('INCLUDE_MYSQL'))" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-silver.1.ci.20231204170005" Condition="$(DefineConstants.Contains('INCLUDE_MYSQL'))" />
 		<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" Condition="$(DefineConstants.Contains('INCLUDE_ORACLE'))" />
 		<PackageReference Include="IdentityManager2.AspNetIdentity" Version="1.0.0" />
 		<PackageReference Include="Lib.AspNetCore.ServerTiming" Version="6.0.0" />
 		<!--<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.16.2" Condition="$(DefineConstants.Contains('INCLUDE_COSMOSDB'))" />-->
 		<PackageReference Include="MongoDB.Driver" Version="2.23.1" Condition="$(DefineConstants.Contains('INCLUDE_MONGODB'))" />
-		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.65.0.3205" />
+		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.66.0.3309" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.1" />

DotnetPlayground.Web/Pages/PuzzleGenerator.cshtml

@@ -5,7 +5,7 @@
 	ViewData["Title"] = "Puzzle Generator";
 }
 
-<div class="puzzles">
+<div class="puzzles mt-4 mt-sm-0">
 	<h1>Puzzle Generator</h1>
 	<h3>Combine PNG/JPG/AVIF image with SVG puzzle pattern. Apply scaling, rotation, transform design to fit your needs.</h3>
 

DotnetPlayground.Web/Pages/WebCamGallery.cshtml

@@ -17,7 +17,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/blueimp-gallery/3.4.0/css/blueimp-gallery.min.css" integrity="sha512-8z9zEPEYVxCX7hdM+6hA0RMSW42V+XtqsyXSbNkujXYclFqhRV8J4+MasIpuYZODoHJuQgxGjcRKm//sWEQm6w==" crossorigin="anonymous" 
               asp-fallback-href="~/lib/blueimp-gallery/css/blueimp-gallery.min.css"
               asp-fallback-test-class="blueimp-gallery" asp-fallback-test-property="position" asp-fallback-test-value="fixed" />
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.9.0/video-js.min.css" integrity="sha512-NtJr0XsYNMpoCPVgJeYyWDMrTBgUzFDu7nrn45XOMMMS5q1EirTPx3NTWfgyZK7QLz/WbveVaYh2sjnIKq8ZjQ==" crossorigin="anonymous" referrerpolicy="no-referrer"
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.11.0/video-js.min.css" integrity="sha512-7ygWwJCkEsI7sNqXtHyZv+W9eCZwAgNcYwaV7tdLvWtDxTmASJLyigHOhufdziF812S99GnAM8JuDIc2+Ppkiw==" crossorigin="anonymous" referrerpolicy="no-referrer"
               asp-fallback-href="~/lib/video.js/video-js.min.css"
               asp-fallback-test-class="video-js" asp-fallback-test-property="position" asp-fallback-test-value="relative" />
     </environment>
@@ -137,7 +137,7 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/blueimp-gallery/3.4.0/js/blueimp-gallery.min.js" integrity="sha512-Tt9Ui0O6Sg6FjAK5XpAIM7PCMhaXCL+i13IHLZYuluoDXlesfg+JzVI86rgUU2YnfEz2ZEDHXkRkPnHlyWnqzg==" crossorigin="anonymous"
                 asp-fallback-src="~/lib/blueimp-gallery/js/blueimp-gallery.min.js"
                 asp-fallback-test="window.jQuery && window.blueimp"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.9.0/alt/video.core.novtt.min.js" integrity="sha512-4248JsUYQYkKEKXcNquczGtdhppLF3p6FAgajAmiosavR25QyqgJdpNLsoyZWMKlcRNTyWOiTE6o3fEZKbxJiA==" crossorigin="anonymous" referrerpolicy="no-referrer"
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.11.0/alt/video.core.novtt.min.js" integrity="sha512-p9d30oe622MK6XAd6FKeqoc6B1FU2qhUq90BMbJILoRAMoaiekDIsAXiMQIMbxIamjvAS/1BbX33JcROet3GPg==" crossorigin="anonymous" referrerpolicy="no-referrer"
                 asp-fallback-src="~/lib/video.js/alt/video.core.novtt.min.js"
                 asp-fallback-test="window.jQuery && videojs.options"></script>
 		<script type="text/javascript" src="~/js/WebCamGallery.min.js"></script>

DotnetPlayground.Web/Startup.cs

@@ -104,7 +104,7 @@ static async Task Main(string[] args)
                         .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", optional: true)
                         .AddEnvironmentVariables();
                     if (hostingContext.HostingEnvironment.IsDevelopment())
-                        config.AddUserSecrets<Startup>(optional: true);
+                        config.AddUserSecrets<Startup>(optional: true, reloadOnChange: true);
                 })
                 .ConfigureWebHost(webBuilder =>
                 {

DotnetPlayground.Web/Views/Hashes/VirtualScroll.cshtml

@@ -3,7 +3,7 @@
 }
 
 <div id="toolbar">
-	<button id="btninfo" class="btn btn-secondary" type="button" data-bs-toggle="modal" data-bs-target="#divModal">&#9432;&nbsp;Row info</button>
+	<button id="btninfo" class="btn btn-secondary" type="button">&#9432;&nbsp;Row info</button>
 	&nbsp;&nbsp;<span id="spTimeToLoad"></span>
 </div>
 

DotnetPlayground.Web/Views/Shared/_Layout.cshtml

@@ -126,23 +126,6 @@
         <noscript>Your browser does not support JavaScript! REALLY?!</noscript>
         <p id="spVersion">&copy; 2022 - @Conf["AppTitleName"]</p>
     </footer>
-	<!-- Modal -->
-	<div class="modal fade" id="divModal" tabindex="-1" aria-labelledby="divModalLabel" aria-hidden="true">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title text-break" id="divModalLabel">Modal title</h5>
-					<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-				</div>
-                <div class="modal-body text-break">
-                    Content
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
-                </div>
-            </div>
-        </div>
-    </div>
     <environment include="Development">
         <script src="~/lib/jquery/jquery.min.js"></script>
         <script src="~/lib/bootstrap/js/bootstrap.bundle.min.js"></script>

DotnetPlayground.Web/Views/Shared/_LoginPartial.cshtml

@@ -2,6 +2,8 @@
 @using DotnetPlayground.Helpers
 @using Microsoft.AspNetCore.Identity
 
+<cache vary-by-user="true">
+
 @inject UserManager<ApplicationUser> UserManager
 
 <ul class="navbar-nav ms-auto">
@@ -28,3 +30,4 @@
         }
     </li>
 </ul>
+</cache>

DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml

@@ -17,13 +17,13 @@
         <script src="~/lib/ace-builds/mode-csharp.js" type="text/javascript" charset="utf-8"></script>
     </environment>
     <environment exclude="Development">
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.3/ace.min.js" integrity="sha512-v4FCpndHUTAcQ0BeBMQMj7+JFXJYD2ABCX3wUcnWI18lKCr7DpqcaGXLUyooBbnCtTzLfsoXef40p3EaGHPRFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.5/ace.min.js" integrity="sha512-4jIkBpqqFqGrEbYKdA9em7OdCGyPlaximONDoUQ18wjw84zv7sUAqWLVb7pRjP5YyrWk0MDGFfom1zPUd6K+ng==" crossorigin="anonymous" referrerpolicy="no-referrer"
                 asp-fallback-src="~/lib/ace-builds/ace.js"
                 asp-fallback-test="window.ace"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.3/mode-csharp.min.js" integrity="sha512-bpUtjuiLuiWrGs59SuLfrRn83dkGQUS9zExE9Ejp2qphmI0Qg5C+iaP8Isz9uDGhNkqvDL91GSrTLJZjAX82Pw==" crossorigin="anonymous" referrerpolicy="no-referrer"
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.5/mode-csharp.min.js" integrity="sha512-bpUtjuiLuiWrGs59SuLfrRn83dkGQUS9zExE9Ejp2qphmI0Qg5C+iaP8Isz9uDGhNkqvDL91GSrTLJZjAX82Pw==" crossorigin="anonymous" referrerpolicy="no-referrer"
                 asp-fallback-src="~/lib/ace-builds/mode-csharp.js"
                 asp-fallback-test="(window.ace && window.ace.require('ace/mode/csharp') !== undefined)"></script>
-        <script async src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.3/theme-chaos.min.js" integrity="sha512-UKt6dcPMJtmddFb7cmXrwCGhGpvMC7Q+x4C2bQix7E30llOPEVZ638nQ0jcbfHQ9sDgVUwdXUbItJutpkgooSg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script async src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.5/theme-chaos.min.js" integrity="sha512-UKt6dcPMJtmddFb7cmXrwCGhGpvMC7Q+x4C2bQix7E30llOPEVZ638nQ0jcbfHQ9sDgVUwdXUbItJutpkgooSg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     </environment>
     <script type="text/javascript">
         function AceSetCommandEnabled(ed, name, enabled) {

DotnetPlayground.Web/package.json

@@ -60,15 +60,15 @@
 		"gulp-rename": "2.0.0",
 		"gulp-sass": "5.1.0",
 		"gulp-sourcemaps": "3.0.0",
-		"sass": "1.69.7",
+		"sass": "1.70.0",
 		"gulp-header": "2.0.9",
 		"tiny-glob": "0.2.9",
 		"concaveman": "1.2.1",
-		"webpack": "5.89.0",
+		"webpack": "5.90.0",
 		"webpack-stream": "7.0.0",
 		"javascript-astar": "0.4.1",
 		"worker-plugin": "5.0.1",
-		"@playwright/test": "1.40.1",
+		"@playwright/test": "1.41.1",
 		"density-clustering": "1.3.0"
 	},
 	"dependencies": {
@@ -79,12 +79,12 @@
 		"jquery-validation": "1.20.0",
 		"jquery-validation-unobtrusive": "4.0.0",
 		"blueimp-gallery": "3.4.0",
-		"video.js": "8.9.0",
+		"video.js": "8.10.0",
 		"qrcodejs": "1.0.0",
 		"@microsoft/signalr": "8.0.0",
 		"@microsoft/signalr-protocol-msgpack": "8.0.0",
 		"msgpack5": "6.0.2",
-		"ace-builds": "1.32.3",
+		"ace-builds": "1.32.5",
 		"chance": "1.1.11"
 	},
 	"scripts": {

DotnetPlayground.Web/wwwroot/css/site.css

@@ -61,13 +61,18 @@ main.container > hr {
 	background-color: darkred;
 }*/
 .bg-my-theme {
-  background-color: darkslateblue; /*$themeColor is an injectted variable on gulp build pipeline by gulp-sass, gulp-header */
+  background-color: darkslateblue; /*$themeColor is an injected variable on gulp build pipeline by gulp-sass, gulp-header */
 }
 
 .navbar-dark .navbar-nav .nav-link {
   color: #fff;
 }
 
+.nav-link:focus-visible {
+  outline-offset: 1px;
+  outline: 0.8px auto rgb(16, 16, 16);
+}
+
 #offlineIndicator {
   position: absolute;
   top: 0;