diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83b2e11f..206e99bd 100644
--- a/.circleci/config.yml
+++ b/.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
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 627a24f4..73bfb266 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.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'
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 3176baaa..c91ba4a1 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.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
diff --git a/.gitignore b/.gitignore
index f9d6272e..4eaa614f 100644
--- a/.gitignore
+++ b/.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
diff --git a/.gitmodules b/.gitmodules
index 53a8d850..1f260c76 100644
--- a/.gitmodules
+++ b/.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
diff --git a/Caching-MySQL b/Caching-MySQL
index 00731ced..db69b6d4 160000
--- a/Caching-MySQL
+++ b/Caching-MySQL
@@ -1 +1 @@
-Subproject commit 00731cedd5c42468289d226a886058432e0617b5
+Subproject commit db69b6d4d0531652b3a00e4ccefc6ebb5db3adc1
diff --git a/Dockerfile b/Dockerfile
index 2141c03f..26f59125 100644
--- a/Dockerfile
+++ b/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"
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index d41c4d56..1b479c3b 100644
--- a/Dockerfile.alpine
+++ b/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"
diff --git a/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj b/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj
index f47c8057..30a9d5d5 100644
--- a/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj
+++ b/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj
@@ -10,17 +10,17 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/DotnetPlayground.Web/DotnetPlayground.Web.csproj b/DotnetPlayground.Web/DotnetPlayground.Web.csproj
index 68529e69..e3780d0a 100644
--- a/DotnetPlayground.Web/DotnetPlayground.Web.csproj
+++ b/DotnetPlayground.Web/DotnetPlayground.Web.csproj
@@ -1,7 +1,7 @@
- 1.0.26-dotnet8
+ 1.0.27-dotnet8
net8.0
latest
DotnetPlayground.Web
@@ -37,29 +37,29 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -77,9 +77,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/DotnetPlayground.Web/Helpers/ContextFactory.cs b/DotnetPlayground.Web/Helpers/ContextFactory.cs
index 746c1a34..d848a121 100644
--- a/DotnetPlayground.Web/Helpers/ContextFactory.cs
+++ b/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
diff --git a/DotnetPlayground.Web/Pages/PuzzleGenerator.cshtml b/DotnetPlayground.Web/Pages/PuzzleGenerator.cshtml
index 8f4aa980..d64ae70b 100644
--- a/DotnetPlayground.Web/Pages/PuzzleGenerator.cshtml
+++ b/DotnetPlayground.Web/Pages/PuzzleGenerator.cshtml
@@ -63,10 +63,10 @@
@section scripts
{
-
+
-
+
-
+
-
-
+
+
-
+
-
+
+
-
-
+
+
}
diff --git a/DotnetPlayground.Web/Views/Hashes/Index.cshtml b/DotnetPlayground.Web/Views/Hashes/Index.cshtml
index abac42ba..906215a3 100644
--- a/DotnetPlayground.Web/Views/Hashes/Index.cshtml
+++ b/DotnetPlayground.Web/Views/Hashes/Index.cshtml
@@ -74,10 +74,10 @@
@await Html.PartialAsync("_CryptoJSScriptsPartial")
-
+
-
+
-
+
-
-
+
@await Html.PartialAsync("_CryptoJSScriptsPartial")
diff --git a/DotnetPlayground.Web/Views/Shared/_Layout.cshtml b/DotnetPlayground.Web/Views/Shared/_Layout.cshtml
index 9e5c18c0..c7ef79ff 100644
--- a/DotnetPlayground.Web/Views/Shared/_Layout.cshtml
+++ b/DotnetPlayground.Web/Views/Shared/_Layout.cshtml
@@ -17,14 +17,14 @@
-
+
-
-
+
@RenderSection("headElements", required: false)
@@ -129,20 +129,20 @@
-
+
@*This is the fix, to enforce manual loading, but why? https://github.com/dotnet/aspnetcore/issues/39715 *@
-
+ @* *@
-
-
+
@RenderSection("scripts", required: false)
diff --git a/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml b/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml
index 3bd0e28e..d0bca55d 100644
--- a/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -3,7 +3,7 @@
-
diff --git a/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml b/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml
index ace2e3fe..adc19ad0 100644
--- a/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml
+++ b/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml
@@ -13,17 +13,17 @@
@section Scripts
{
-
-
+
+
-
-
-
+