Skip to content
This repository has been archived by the owner on Jan 1, 2025. It is now read-only.

Commit

Permalink
Merge branch 'GZTimeWalker:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@mnixry
mnixry authored Sep 13, 2024
2 parents bb71c6e + 81b1e13 commit c361865
Show file tree
Hide file tree
Showing 8 changed files with 293 additions and 258 deletions.
102 changes: 51 additions & 51 deletions src/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,61 +3,61 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aigamo.ResXGenerator" Version="4.2.0"/>
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0"/>
<PackageVersion Include="Docker.DotNet" Version="3.125.15"/>
<PackageVersion Include="Docker.DotNet.BasicAuth" Version="3.125.15"/>
<PackageVersion Include="KubernetesClient" Version="14.0.9"/>
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8"/>
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="8.0.8"/>
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.8"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.8"/>
<PackageVersion Include="Aigamo.ResXGenerator" Version="4.2.0" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
<PackageVersion Include="Docker.DotNet" Version="3.125.15" />
<PackageVersion Include="Docker.DotNet.BasicAuth" Version="3.125.15" />
<PackageVersion Include="KubernetesClient" Version="14.0.12" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4"/>
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.3"/>
<PackageVersion Include="NPOI" Version="2.7.1"/>
<PackageVersion Include="NSwag.AspNetCore" Version="14.1.0"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.3" />
<PackageVersion Include="NPOI" Version="2.7.1" />
<PackageVersion Include="NSwag.AspNetCore" Version="14.1.0" />
<PackageVersion Include="NSwag.MSBuild" Version="14.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2"/>
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.6"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.9.0-beta.1"/>
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.2"/>
<PackageVersion Include="Serilog.Expressions" Version="5.0.0"/>
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0"/>
<PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0"/>
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageVersion Include="Serilog.Sinks.File.Archive" Version="1.0.5"/>
<PackageVersion Include="MailKit" Version="4.7.1.1"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.8"/>
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8"/>
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.8"/>
<PackageVersion Include="MemoryPack" Version="1.21.1"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2"/>
<PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0"/>
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5"/>
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0"/>
<PackageVersion Include="PacketDotNet" Version="1.4.7"/>
<PackageVersion Include="SharpPcap" Version="6.3.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8"/>
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.8"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
<PackageVersion Include="Ulid" Version="1.3.4"/>
<PackageVersion Include="xunit" Version="2.9.0"/>
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.6" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.9.0-beta.1" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.File.Archive" Version="1.0.5" />
<PackageVersion Include="MailKit" Version="4.7.1.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.8" />
<PackageVersion Include="MemoryPack" Version="1.21.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageVersion Include="PacketDotNet" Version="1.4.7" />
<PackageVersion Include="SharpPcap" Version="6.3.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Ulid" Version="1.3.4" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -66,8 +66,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="coverlet.collector" Version="6.0.2"/>
<PackageVersion Include="coverlet.msbuild" Version="6.0.2"/>
<PackageVersion Include="ZstdSharp.Port" Version="0.8.1"/>
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
<PackageVersion Include="ZstdSharp.Port" Version="0.8.1" />
</ItemGroup>
</Project>
</Project>
26 changes: 13 additions & 13 deletions src/GZCTF/ClientApp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@mantine/hooks": "^7.12.2",
"@mantine/modals": "^7.12.2",
"@mantine/notifications": "^7.12.2",
"@marsidev/react-turnstile": "^1.0.1",
"@marsidev/react-turnstile": "^1.0.2",
"@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1",
"@microsoft/signalr": "^8.0.7",
Expand All @@ -33,14 +33,14 @@
"dayjs": "^1.11.13",
"echarts": "^5.5.1",
"echarts-for-react": "^3.0.2",
"embla-carousel": "^8.2.0",
"embla-carousel-autoplay": "^8.2.0",
"embla-carousel-react": "^8.2.0",
"embla-carousel": "^8.2.1",
"embla-carousel-autoplay": "^8.2.1",
"embla-carousel-react": "^8.2.1",
"i18next": "^23.14.0",
"i18next-browser-languagedetector": "^8.0.0",
"katex": "^0.16.11",
"lz-string": "^1.5.0",
"marked": "^14.1.0",
"marked": "^14.1.1",
"marked-highlight": "^2.1.4",
"pdfjs-dist": "4.4.168",
"prismjs": "^1.29.0",
Expand All @@ -58,13 +58,13 @@
"@babel/eslint-parser": "^7.25.1",
"@eslint/compat": "^1.1.1",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.9.1",
"@eslint/js": "^9.10.0",
"@kainstar/vite-plugin-i18next-loader": "^1.0.3",
"@nabla/vite-plugin-eslint": "^2.0.4",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/chroma-js": "^2.4.4",
"@types/katex": "^0.16.7",
"@types/node": "22.5.2",
"@types/node": "22.5.4",
"@types/prismjs": "^1.26.4",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
Expand All @@ -73,15 +73,15 @@
"@vitejs/plugin-react": "^4.3.1",
"axios": "^1.7.7",
"babel-plugin-prismjs": "^2.1.0",
"eslint": "^9.9.1",
"eslint-plugin-oxlint": "^0.9.2",
"eslint-plugin-react": "^7.35.1",
"eslint": "^9.10.0",
"eslint-plugin-oxlint": "^0.9.3",
"eslint-plugin-react": "^7.35.2",
"eslint-plugin-react-hooks": "5.1.0-rc-1d989965-20240821",
"form-data": "~4.0.0",
"globals": "^15.9.0",
"lodash": "^4.17.21",
"oxlint": "^0.9.2",
"postcss": "^8.4.44",
"oxlint": "^0.9.3",
"postcss": "^8.4.45",
"postcss-preset-mantine": "^1.17.0",
"postcss-simple-vars": "^7.0.1",
"prettier": "~3.3.3",
Expand All @@ -90,7 +90,7 @@
"swagger-typescript-api": "^13.0.22",
"tslib": "^2.7.0",
"typescript": "5.5.4",
"vite": "^5.4.2",
"vite": "^5.4.3",
"vite-plugin-pages": "^0.32.3",
"vite-plugin-prismjs": "^0.0.11",
"vite-plugin-webfont-dl": "^3.9.5",
Expand Down
Loading

0 comments on commit c361865

Please sign in to comment.