Dev to master

.circleci/config.yml

@@ -19,18 +19,19 @@ jobs:
             curl -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
             dpkg -i packages-microsoft-prod.deb && rm packages-microsoft-prod.deb
             apt update && apt install -y dotnet-sdk-8.0
+            corepack enable
       - run:
           name: Show versions
           command: |
             dotnet --info
             node --version
-            npm --version
+            pnpm --version
       - run:
           name: Install project dependencies
           command: |
             dotnet restore
             cd DotnetPlayground.Web
-            npm i
+            pnpm i
             npx playwright install
             cd ..
       - run:
@@ -197,18 +198,19 @@ jobs:
             curl -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
             dpkg -i packages-microsoft-prod.deb && rm packages-microsoft-prod.deb
             apt update && apt install -y dotnet-sdk-8.0
+            corepack enable
       - run:
           name: Show versions
           command: |
             dotnet --info
             node --version
-            npm --version
+            pnpm --version
       - run:
           name: Install project dependencies
           command: |
             dotnet restore
             cd DotnetPlayground.Web
-            npm i
+            pnpm i
             npx playwright install chromium
             cd ..
       - run:
@@ -240,6 +242,7 @@ jobs:
             chmod 500 nsolid_setup_deb.sh
             ./nsolid_setup_deb.sh 20
             apt-get install -y nodejs
+            corepack enable
       - run:
           name: "Build Application according to some given configuration"
           command: dotnet publish -c Release --self-contained -r linux-x64 DotnetPlayground.Web

.github/workflows/codeql-analysis.yml

@@ -50,7 +50,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.x'
 

.github/workflows/dotnetcore.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         submodules: true # 'recursive' 'true' or 'false'
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
     - name: Build with dotnet

.gitignore

@@ -216,3 +216,4 @@ DotnetPlayground.Web/wwwroot/**/*.min.js
 DotnetPlayground.Web/wwwroot/**/*.map
 docker-*.env
 DotnetPlayground.Web/package-lock.json
+DotnetPlayground.Web/pnpm-lock.yaml

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "Caching-MySQL"]
 	path = Caching-MySQL
-	url = https://github.com/ChaosEngine/Caching-MySQL.git
+	url = https://github.com/PomeloFoundation/Caching-MySQL.git
 [submodule "InkBall"]
 	path = InkBall
 	url = https://github.com/ChaosEngine/InkBall.git

Dockerfile

@@ -1,10 +1,10 @@
 # syntax = docker/dockerfile:experimental
 FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
-RUN --mount=type=cache,target=/root/.nuget --mount=type=cache,target=/root/.local/share/NuGet --mount=type=cache,target=/root/.npm/ --mount=type=cache,target=./DotnetPlayground.Web/node_modules
+RUN --mount=type=cache,target=/root/.nuget --mount=type=cache,target=/root/.local/ --mount=type=cache,target=/root/.cache/ --mount=type=cache,target=./DotnetPlayground.Web/node_modules
 RUN curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh && \
     chmod 500 nsolid_setup_deb.sh && \
     ./nsolid_setup_deb.sh 20 && \
-    apt-get install -y nodejs
+    apt-get install -y nodejs && npm install -g pnpm
 WORKDIR /build
 
 ENV DBKind="sqlite" ConnectionStrings__Sqlite="Filename=./bin/Debug/net8.0/Blogging.db"

Dockerfile.alpine

@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:experimental
 FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
-RUN --mount=type=cache,target=/root/.nuget --mount=type=cache,target=/root/.local/share/NuGet --mount=type=cache,target=/root/.npm/ --mount=type=cache,target=./DotnetPlayground.Web/node_modules
-RUN apk add --update nodejs npm
+RUN --mount=type=cache,target=/root/.nuget --mount=type=cache,target=/root/.local/ --mount=type=cache,target=/root/.cache/ --mount=type=cache,target=./DotnetPlayground.Web/node_modules
+RUN apk add --update nodejs npm && npm install -g pnpm
 WORKDIR /build
 
 ENV DBKind="sqlite" ConnectionStrings__Sqlite="Filename=./bin/Debug/net8.0/Blogging.db"

DotnetPlayground.Tests/DotnetPlayground.Tests.csproj

@@ -10,17 +10,17 @@
   </PropertyGroup>
 
   <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.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
 	<PackageReference Include="Moq" Version="4.20.70" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

DotnetPlayground.Web/DotnetPlayground.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-    <Version>1.0.26-dotnet8</Version>
+    <Version>1.0.27-dotnet8</Version>
 		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<AssemblyName>DotnetPlayground.Web</AssemblyName>
@@ -37,29 +37,29 @@
   </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
-		<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-silver.1.ci.20231204170005" Condition="$(DefineConstants.Contains('INCLUDE_MYSQL'))" />
-		<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" Condition="$(DefineConstants.Contains('INCLUDE_ORACLE'))" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.6" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.6" Condition="$(DefineConstants.Contains('INCLUDE_SQLSERVER'))" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" Condition="$(DefineConstants.Contains('INCLUDE_POSTGRES'))" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" Condition="$(DefineConstants.Contains('INCLUDE_MYSQL'))" />
+		<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.23.40" 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.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" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.1" />
-		<PackageReference Include="MessagePack" Version="2.5.140" />
+		<PackageReference Include="MongoDB.Driver" Version="2.27.0" Condition="$(DefineConstants.Contains('INCLUDE_MONGODB'))" />
+		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.68.0.3421" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.6" />
+		<PackageReference Include="MessagePack" Version="2.5.171" />
 	</ItemGroup>
 
 	<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
-		<Exec Command="npm install --unsafe-perm" />
+		<Exec Command="pnpm install --unsafe-perm" />
 		<Exec Command="npm run gulp -- --version=$(Version) --env=production" />
 	</Target>
 
@@ -77,9 +77,9 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(Configuration)'=='Debug'">
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.26" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.31" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

DotnetPlayground.Web/Helpers/ContextFactory.cs

@@ -126,7 +126,10 @@ internal static string ConfigureDBKind(DbContextOptionsBuilder dbContextOpts, IC
 							}
 						}
 
-						dbContextOpts.UseOracle(conn_str);
+						dbContextOpts.UseOracle(conn_str, builder =>
+							//enable compatibility with old bool and json handling: https://docs.oracle.com/en/database/oracle/oracle-database/21/odpnt/EFCoreAPI.html#GUID-41786CF0-11E3-4AD2-8ED1-3D31D5FE2082
+							builder .UseOracleSQLCompatibility(OracleSQLCompatibility.DatabaseVersion19)
+						);
 					}
 					break;
 #endif

DotnetPlayground.Web/Pages/PuzzleGenerator.cshtml

@@ -63,10 +63,10 @@
 @section scripts
 {
 	<environment include="Development">
-		<script type="text/javascript" src="~/js/Puzzles.js"></script>
+		<script type="text/javascript" src="~/js/Puzzles.js" asp-append-version="true"></script>
 	</environment>
 	<environment exclude="Development">
-		<script type="text/javascript" src="~/js/Puzzles.min.js"></script>
+		<script type="text/javascript" src="~/js/Puzzles.min.js" asp-append-version="true"></script>
 	</environment>
 	<script type="text/javascript">
 		window.addEventListener('load', PuzzlesOnLoad);

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.11.0/video-js.min.css" integrity="sha512-7ygWwJCkEsI7sNqXtHyZv+W9eCZwAgNcYwaV7tdLvWtDxTmASJLyigHOhufdziF812S99GnAM8JuDIc2+Ppkiw==" crossorigin="anonymous" referrerpolicy="no-referrer"
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.12.0/video-js.min.css" integrity="sha512-qdNDoWK29TwXVKBtiWgkyY6zUC/2Ml5mVT6tQr7cPBraxBnSNgPuKt484AHwTqOBZmm4LPG+qBp3F3/419kzAA==" 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>
@@ -131,16 +131,16 @@
 	<environment include="Development">
 		<script type="text/javascript" defer src="~/lib/blueimp-gallery/js/blueimp-gallery.min.js"></script>
 		<script type="text/javascript" defer src="~/lib/video.js/alt/video.core.novtt.min.js"></script>
-		<script type="text/javascript" defer src="~/js/WebCamGallery.js"></script>
+		<script type="text/javascript" defer src="~/js/WebCamGallery.js" asp-append-version="true"></script>
 	</environment>
     <environment exclude="Development">
         <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.11.0/alt/video.core.novtt.min.js" integrity="sha512-p9d30oe622MK6XAd6FKeqoc6B1FU2qhUq90BMbJILoRAMoaiekDIsAXiMQIMbxIamjvAS/1BbX33JcROet3GPg==" crossorigin="anonymous" referrerpolicy="no-referrer"
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.12.0/alt/video.core.novtt.min.js" integrity="sha512-Ge2v3kusPKpj4BTKTIg1hCXVDEmc4gGDvGS6zIPAfiBnBkxhcU8sc+w30MloRknqq7WKFc2uWzbe9erNnARMVg==" 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>
+		<script type="text/javascript" src="~/js/WebCamGallery.min.js" asp-append-version="true"></script>
     </environment>
     <script type="text/javascript">
         window.addEventListener('load', function () {

DotnetPlayground.Web/Startup.cs

@@ -87,11 +87,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
         [RequiresUnreferencedCode("Contains trimming unsafe calls")]
         static async Task Main(string[] args)
         {
-            //// Adding following lines in order to mitigate:
-            //// https://github.com/aspnet/Announcements/issues/405
-            //// https://github.com/neuecc/MessagePack-CSharp/security/advisories/GHSA-7q36-4xx7-xcxf
-            //// Enable additional security in MessagePack to handle untrusted data.
-            //MessagePackSecurity.Active = MessagePackSecurity.UntrustedData;
+            //Populate inkball resource cache early
+            var dummy = Constants.WwwIncludeInkballJS;
 
 
             //await CreateHostBuilder(args).Build().RunAsync();

DotnetPlayground.Web/Views/Blogs/Index.cshtml

@@ -27,10 +27,10 @@
 @section scripts
 {
     <environment include="Development">
-        <script type="text/javascript" src="~/js/Blogs.js"></script>
+        <script type="text/javascript" src="~/js/Blogs.js" asp-append-version="true"></script>
     </environment>
     <environment exclude="Development">
-        <script type="text/javascript" src="~/js/Blogs.min.js"></script>
+        <script type="text/javascript" src="~/js/Blogs.min.js" asp-append-version="true"></script>
     </environment>
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function () {

DotnetPlayground.Web/Views/Hashes/BruteForce.cshtml

@@ -40,17 +40,15 @@
 	@await Html.PartialAsync("_CryptoJSScriptsPartial")
 
 	<environment include="Development">
-		<script src="~/js/workers/shared.js"></script>
-		<script src="~/js/BruteForce.js"></script>
+		<script src="~/js/workers/shared.js" asp-append-version="true"></script>
+		<script src="~/js/BruteForce.js" asp-append-version="true"></script>
 	</environment>
 	<environment exclude="Development">
-		<script src="~/js/workers/shared.min.js"></script>
-		<script src="~/js/BruteForce.min.js"></script>
+		<script src="~/js/workers/shared.min.js" asp-append-version="true"></script>
+		<script src="~/js/BruteForce.min.js" asp-append-version="true"></script>
 	</environment>
 
 	<script type="text/javascript">
-        window.addEventListener('load', function () {
-			BruteForceOnLoad();
-		});
+        window.addEventListener('load', BruteForceOnLoad);
 	</script>
 }

DotnetPlayground.Web/Views/Hashes/Index.cshtml

@@ -74,10 +74,10 @@
 	@await Html.PartialAsync("_CryptoJSScriptsPartial")
 
 	<environment include="Development">
-		<script type="text/javascript" src="~/js/Hashes.js"></script>
+		<script type="text/javascript" src="~/js/Hashes.js" asp-append-version="true"></script>
 	</environment>
 	<environment exclude="Development">
-		<script type="text/javascript" src="~/js/Hashes.min.js"></script>
+		<script type="text/javascript" src="~/js/Hashes.min.js" asp-append-version="true"></script>
 	</environment>
 	<script type="text/javascript">
 		window.addEventListener('load', HashesOnLoad);