Merge branch 'main' into add-limit-break-loop

SapiensAnatis · May 30, 2024 · 9d2ef28 · 9d2ef28
2 parents e077563 + c12b850
commit 9d2ef28
Show file tree

Hide file tree

Showing 296 changed files with 75,235 additions and 3,444 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "csharpier": {
-      "version": "0.28.0",
+      "version": "0.28.2",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/.csharpierignore b/.csharpierignore
@@ -1 +1 @@
-DragaliaAPI/DragaliaAPI.Database/Migrations/*
+DragaliaAPI/DragaliaAPI.Database/Migrations/*
diff --git a/.csharpierrc b/.csharpierrc
diff --git a/.editorconfig b/.editorconfig
@@ -107,7 +107,7 @@ csharp_preferred_modifier_order = public,private,protected,internal,static,exter
 csharp_style_prefer_readonly_struct = true
 
 # Code-block preferences
-csharp_prefer_braces = when_multiline:warning
+csharp_prefer_braces = true:warning
 csharp_prefer_simple_using_statement = true:warning
 csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_prefer_method_group_conversion = true:warning

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -13,3 +13,18 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      microsoft-extensions:
+        patterns:
+          - "Microsoft.Extensions*"
+      microsoft-entityframeworkcore:
+        patterns:
+          - "Microsoft.EntityFrameworkCore*"
+  - package-ecosystem: "docker"
+    directory: "/DragaliaAPI"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/PhotonStateManager"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -78,9 +78,6 @@ jobs:
           context: .
           push: true
           file: ${{ inputs.dockerfile }}
-          build-args: |
-            CI=true
-            BASE_DOTNET_IMAGE=mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled
           tags: ghcr.io/sapiensanatis/${{ inputs.image-name }}:${{ steps.derive-tag.outputs.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max    
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -12,6 +12,9 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
+    concurrency: 
+      group: deploy
+      cancel-in-progress: false
     environment:
       name: ${{ inputs.github-environment }}
       url: https://dawnshard.co.uk

diff --git a/.github/workflows/missiondesigner.yaml b/.github/workflows/missiondesigner.yaml
diff --git a/.github/workflows/publish-api.yaml b/.github/workflows/publish-api.yaml
@@ -7,7 +7,6 @@ on:
     paths:
       - DragaliaAPI/**
       - Shared/**
-      - Directory.Build.props
       - Directory.Packages.props
 
 env:

diff --git a/.github/workflows/publish-statemanager.yaml b/.github/workflows/publish-statemanager.yaml
@@ -7,7 +7,6 @@ on:
     paths:
       - PhotonStateManager/**
       - Shared/**
-      - Directory.Build.props
       - Directory.Packages.props
 
 env:

diff --git a/.github/workflows/test-api.yaml b/.github/workflows/test-api.yaml
@@ -10,7 +10,6 @@ on:
     paths:
       - DragaliaAPI/**
       - Shared/**
-      - Directory.Build.props
       - Directory.Packages.props
 
 jobs:
@@ -32,11 +31,11 @@ jobs:
             "DragaliaAPI/DragaliaAPI.Test",
             "DragaliaAPI/DragaliaAPI.Database.Test",
             "DragaliaAPI/DragaliaAPI.Shared.Test",
-            "DragaliaAPI/DragaliaAPI.Shared.SourceGenerator.Test"
+            "DragaliaAPI/DragaliaAPI.Shared.SourceGenerator.Test",
           ]
     uses: ./.github/workflows/test.yaml
     with:
       project: ${{ matrix.project }}
       before-test: |
         dotnet restore DragaliaAPI/DragaliaAPI.MissionDesigner/DragaliaAPI.MissionDesigner.csproj
-        dotnet restore DragaliaAPI/DragaliaAPI.MasterAssetConverter/DragaliaAPI.MasterAssetConverter.csproj
+        dotnet restore DragaliaAPI/DragaliaAPI.MasterAssetConverter/DragaliaAPI.MasterAssetConverter.csproj
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ PhotonRealtimeDotnetSdk/**/*
 .run
 .env
 test_coverage.json
-launchSettings.json
 appsettings.Development.json
 test_coverage.json
 .run

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,17 @@
+# Contributing
+
+Dawnshard welcomes contributions from everyone!
+
+## Filing issues
+
+If you notice a bug with the server, or have a feature request, you can file an issue at https://github.com/SapiensAnatis/Dawnshard/issues, or make a thread in the `#dawnshard-support` channel on Discord.
+Please be sure to include an appropriate amount of context and details so that your issue can be thorougly investigated.
+
+## Development
+
+Pull requests to add new features or fix issues are welcome. Check the issues page to see if the task you want to work on has been noted already - it may include some good information about how to get started.
+
+### Development environment
+
+To set up a development environment to work on DragaliaAPI, the main server component, see the guidance README file in the component folder: [README.md](./DragaliaAPI/README.md)
+
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/Directory.Build.targets b/Directory.Build.targets
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,78 +3,80 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="AutoMapper" Version="12.0.1"/>
-        <PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1"/>
-        <PackageVersion Include="Basic.Reference.Assemblies" Version="1.5.0"/>
-        <PackageVersion Include="EntityGraphQL" Version="5.2.1"/>
-        <PackageVersion Include="EntityGraphQL.AspNet" Version="5.2.1"/>
-        <PackageVersion Include="FluentRandomPicker" Version="3.5.1"/>
-        <PackageVersion Include="FluentValidation" Version="11.9.0"/>
-        <PackageVersion Include="Hangfire.AspNetCore" Version="1.8.12"/>
-        <PackageVersion Include="Hangfire.Core" Version="1.8.12"/>
-        <PackageVersion Include="Hangfire.Postgresql" Version="1.20.8"/>
-        <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0"/>
-        <PackageVersion Include="MemoryPack" Version="1.20.5"/>
-        <PackageVersion Include="MessagePack" Version="2.5.140"/>
-        <PackageVersion Include="MessagePack.AspNetCoreMvcFormatter" Version="2.5.140"/>
-        <PackageVersion Include="MessagePackAnalyzer" Version="2.5.140"/>
-        <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.4"/>
-        <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.3"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2"/>
-        <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.4"/>
-        <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2"/>
-        <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.3.0"/>
-        <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
-        <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4"/>
-        <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2"/>
-        <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4"/>
-        <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.3"/>
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1"/>
-        <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.4"/>
-        <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1"/>
-        <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.5.1"/>
-        <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6"/>
-        <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2"/>
-        <PackageVersion Include="MudBlazor" Version="6.19.1"/>
-        <PackageVersion Include="PolySharp" Version="1.14.1"/>
-        <PackageVersion Include="Riok.Mapperly" Version="3.5.0-next.1"/>
-        <PackageVersion Include="Serilog.Exceptions" Version="8.4.0"/>
-        <PackageVersion Include="Serilog.Expressions" Version="4.0.0"/>
-        <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0"/>
-        <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0"/>
-        <PackageVersion Include="Serilog.Sinks.Seq" Version="7.0.0"/>
-        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1"/>
-        <PackageVersion Include="System.Text.Json" Version="8.0.3"/>
-        <PackageVersion Include="Serilog" Version="3.1.1"/>
-        <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1"/>
-        <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1"/>
-        <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0"/>
-        <PackageVersion Include="FluentAssertions" Version="6.12.0"/>
-        <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3"/>
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageVersion Include="MockQueryable.Moq" Version="7.0.1"/>
-        <PackageVersion Include="Moq" Version="4.20.70"/>
-        <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0"/>
-        <PackageVersion Include="Verify.XUnit" Version="24.1.0"/>
-        <PackageVersion Include="xunit" Version="2.7.1"/>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7"/>
-        <PackageVersion Include="GraphQL.Client" Version="6.0.2"/>
-        <PackageVersion Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.0.3"/>
-        <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0"/>
-        <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2"/>
-        <PackageVersion Include="Respawn" Version="6.2.1"/>
-        <PackageVersion Include="Snapshooter.Xunit" Version="0.14.1"/>
-        <PackageVersion Include="Testcontainers" Version="3.7.0"/>
-        <PackageVersion Include="Testcontainers.PostgreSql" Version="3.7.0"/>
-        <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.4"/>
-        <PackageVersion Include="Moq.EntityFrameworkCore" Version="8.0.1.2"/>
-        <PackageVersion Include="NSubstitute" Version="5.1.0"/>
-        <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17"/>
-        <PackageVersion Include="Redis.OM" Version="0.6.1"/>
-        <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1"/>
-        <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
-        <PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0"/>
+        <PackageVersion Include="AutoMapper" Version="12.0.1" />
+        <PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+        <PackageVersion Include="Basic.Reference.Assemblies" Version="1.7.2" />
+        <PackageVersion Include="EntityGraphQL" Version="5.3.0" />
+        <PackageVersion Include="EntityGraphQL.AspNet" Version="5.3.0" />
+        <PackageVersion Include="FluentRandomPicker" Version="3.5.1" />
+        <PackageVersion Include="FluentValidation" Version="11.9.1" />
+        <PackageVersion Include="Hangfire.AspNetCore" Version="1.8.12" />
+        <PackageVersion Include="Hangfire.Core" Version="1.8.12" />
+        <PackageVersion Include="Hangfire.Postgresql" Version="1.20.8" />
+        <PackageVersion Include="Immediate.Apis" Version="1.1.0" />
+        <PackageVersion Include="Immediate.Handlers" Version="1.4.0" />
+        <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
+        <PackageVersion Include="MessagePack" Version="2.5.140" />
+        <PackageVersion Include="MessagePack.AspNetCoreMvcFormatter" Version="2.5.140" />
+        <PackageVersion Include="MessagePackAnalyzer" Version="2.5.140" />
+        <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+        <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.5.0" />
+        <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+        <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+        <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
+        <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
+        <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
+        <PackageVersion Include="MudBlazor" Version="6.19.1" />
+        <PackageVersion Include="PolySharp" Version="1.14.1" />
+        <PackageVersion Include="Riok.Mapperly" Version="3.5.1" />
+        <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
+        <PackageVersion Include="Serilog.Expressions" Version="4.0.0" />
+        <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
+        <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
+        <PackageVersion Include="Serilog.Sinks.Seq" Version="7.0.0" />
+        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+        <PackageVersion Include="System.Text.Json" Version="8.0.3" />
+        <PackageVersion Include="Serilog" Version="3.1.1" />
+        <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
+        <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
+        <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+        <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+        <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.5" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageVersion Include="MockQueryable.Moq" Version="7.0.1" />
+        <PackageVersion Include="Moq" Version="4.20.70" />
+        <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
+        <PackageVersion Include="Verify.XUnit" Version="24.1.0" />
+        <PackageVersion Include="xunit" Version="2.8.1" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
+        <PackageVersion Include="GraphQL.Client" Version="6.1.0" />
+        <PackageVersion Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.0.3" />
+        <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.5" />
+        <PackageVersion Include="Respawn" Version="6.2.1" />
+        <PackageVersion Include="Snapshooter.Xunit" Version="0.14.1" />
+        <PackageVersion Include="Testcontainers" Version="3.8.0" />
+        <PackageVersion Include="Testcontainers.PostgreSql" Version="3.7.0" />
+        <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.5" />
+        <PackageVersion Include="Moq.EntityFrameworkCore" Version="8.0.1.2" />
+        <PackageVersion Include="NSubstitute" Version="5.1.0" />
+        <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
+        <PackageVersion Include="Redis.OM" Version="0.7.1" />
+        <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.5" />
+        <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+        <PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
     </ItemGroup>
 </Project>