Merge branch 'main' into preview

CCQ3245 · Nov 6, 2022 · e46b9d4 · e46b9d4
2 parents f82a586 + 87d17b0
commit e46b9d4
Show file tree

Hide file tree

Showing 9 changed files with 260 additions and 189 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,15 +31,17 @@ jobs:
         with:
           node-version: 18
 
+      - run: npm i -g pnpm
+
       - run: dotnet build "CTFServer.csproj" -c Release -o build
 
-      - run: dotnet publish "CTFServer.csproj" -c Release -o publish/linux/amd64 -r linux-x64 --no-self-contained /p:PublishReadyToRun=true /p:UseNpm=true
+      - run: dotnet publish "CTFServer.csproj" -c Release -o publish/linux/amd64 -r linux-x64 --no-self-contained /p:PublishReadyToRun=true
         env:
           VITE_APP_BUILD_TIMESTAMP: ${{ steps.time.outputs.time }}
           VITE_APP_GIT_SHA: ${{ github.sha }}
           VITE_APP_GIT_NAME: ${{ github.ref_name }}
 
-      - run: dotnet publish "CTFServer.csproj" -c Release -o publish/linux/arm64 -r linux-arm64 --no-self-contained /p:PublishReadyToRun=true /p:UseNpm=true
+      - run: dotnet publish "CTFServer.csproj" -c Release -o publish/linux/arm64 -r linux-arm64 --no-self-contained /p:PublishReadyToRun=true
         env:
           VITE_APP_BUILD_TIMESTAMP: ${{ steps.time.outputs.time }}
           VITE_APP_GIT_SHA: ${{ github.sha }}

diff --git a/Dockerfile b/Dockerfile
@@ -13,13 +13,15 @@ RUN apt update && \
     wget -qO- https://deb.nodesource.com/setup_18.x | bash - && \
     apt install -y build-essential nodejs
 
+RUN npm i -g pnpm
+
 COPY ["GZCTF", "/src/GZCTF/"]
 WORKDIR "/src/GZCTF"
 RUN dotnet restore "CTFServer.csproj"
 RUN dotnet build "CTFServer.csproj" -c Release -o /app/build --no-restore
 
 FROM build AS publish
-RUN dotnet publish "CTFServer.csproj" -c Release -o /app/publish -r linux-x64 --no-self-contained /p:PublishReadyToRun=true /p:UseNpm=true
+RUN dotnet publish "CTFServer.csproj" -c Release -o /app/publish -r linux-x64 --no-self-contained /p:PublishReadyToRun=true
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
 WORKDIR /app

diff --git a/GZCTF.Test/CTFServer.Test.csproj b/GZCTF.Test/CTFServer.Test.csproj
@@ -26,11 +26,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/GZCTF/ClientApp/package.json b/GZCTF/ClientApp/package.json
@@ -10,16 +10,16 @@
     "genapi": "swagger-typescript-api -p template/swagger.json -t template -o src --module-name-first-tag"
   },
   "dependencies": {
-    "@babel/core": "^7.19.6",
+    "@babel/core": "^7.20.2",
     "@emotion/react": "^11.10.5",
-    "@mantine/carousel": "^5.6.4",
-    "@mantine/core": "^5.6.4",
-    "@mantine/dates": "^5.6.4",
-    "@mantine/dropzone": "^5.6.4",
-    "@mantine/form": "^5.6.4",
-    "@mantine/hooks": "^5.6.4",
-    "@mantine/modals": "^5.6.4",
-    "@mantine/notifications": "^5.6.4",
+    "@mantine/carousel": "=5.6.4",
+    "@mantine/core": "=5.6.4",
+    "@mantine/dates": "=5.6.4",
+    "@mantine/dropzone": "=5.6.4",
+    "@mantine/form": "=5.6.4",
+    "@mantine/hooks": "=5.6.4",
+    "@mantine/modals": "=5.6.4",
+    "@mantine/notifications": "=5.6.4",
     "@mdi/js": "^7.0.96",
     "@mdi/react": "^1.6.1",
     "@microsoft/signalr": "^6.0.10",
@@ -30,7 +30,7 @@
     "embla-carousel-autoplay": "^7.0.4",
     "embla-carousel-react": "^7.0.4",
     "katex": "^0.16.3",
-    "marked": "^4.2.1",
+    "marked": "^4.2.2",
     "prismjs": "^1.29.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -47,19 +47,19 @@
     "@types/marked": "^4.0.7",
     "@types/node": "18.11.9",
     "@types/prismjs": "^1.26.0",
-    "@types/react": "^18.0.24",
+    "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
     "@typescript-eslint/parser": "^5.42.0",
     "@vitejs/plugin-react": "^2.2.0",
     "axios": "^1.1.3",
     "babel-plugin-prismjs": "^2.1.0",
-    "eslint": "8.26.0",
+    "eslint": "8.27.0",
     "form-data": "~4.0.0",
     "lodash": "^4.17.21",
     "prettier": "~2.7.1",
     "rollup": "^3.2.5",
-    "swagger-typescript-api": "^11.1.2",
+    "swagger-typescript-api": "^11.1.3",
     "tslib": "^2.4.1",
     "typescript": "4.8.4",
     "vite": "^3.2.2",