diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml index 4405a1f..305102f 100644 --- a/.gitea/workflows/server.yaml +++ b/.gitea/workflows/server.yaml @@ -29,7 +29,7 @@ jobs: run: dotnet restore - name: Build run: | - dotnet build Server -c Release + dotnet build Continuity.AuthServer -c Release # dotnet test Server.Tests -c Release sonarqube: @@ -57,7 +57,7 @@ jobs: dotnet sonarscanner begin /key:"${{ secrets.SONAR_PROJECT_KEY }}" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="${{ secrets.SONAR_HOST_URL }}" - name: Sonarqube Scan run: | - dotnet build Server -c Release + dotnet build Continuity.AuthServer -c Release # dotnet test --collect "Code Coverage" --logger trx --results-directory "TestsResults" # dotnet-coverage collect 'dotnet test' -f xml -o 'coverage.xml' - name: Sonarqube End @@ -84,7 +84,7 @@ jobs: dotnet tool install --global CycloneDX - name: Generate SBOM run: | - dotnet CycloneDX Server/Server.csproj -o . -dgl + dotnet CycloneDX Continuity.AuthServer/Continuity.AuthServer.csproj -o . -dgl - name: Upload SBOM uses: https://github.com/DependencyTrack/gh-upload-sbom@v2.0.1 with: @@ -122,7 +122,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: Server/Dockerfile + file: Continuity.AuthServer/Dockerfile push: true tags: forge.rainote.dev/${{ github.repository }}:${{ needs.preprocess.outputs.sanitized_branch_name }} platforms: linux/amd64,linux/arm64 @@ -131,7 +131,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: Server/Dockerfile + file: Continuity.AuthServer/Dockerfile push: true tags: forge.rainote.dev/${{ github.repository }}:latest platforms: linux/amd64, linux/arm64 diff --git a/Server/.dockerignore b/Continuity.AuthServer/.dockerignore similarity index 100% rename from Server/.dockerignore rename to Continuity.AuthServer/.dockerignore diff --git a/Server/AuthSession.cs b/Continuity.AuthServer/AuthSession.cs similarity index 100% rename from Server/AuthSession.cs rename to Continuity.AuthServer/AuthSession.cs diff --git a/Server/ChannelSession.cs b/Continuity.AuthServer/ChannelSession.cs similarity index 100% rename from Server/ChannelSession.cs rename to Continuity.AuthServer/ChannelSession.cs diff --git a/Server/Consumers/PacketConsumer.cs b/Continuity.AuthServer/Consumers/PacketConsumer.cs similarity index 100% rename from Server/Consumers/PacketConsumer.cs rename to Continuity.AuthServer/Consumers/PacketConsumer.cs diff --git a/Server/Server.csproj b/Continuity.AuthServer/Continuity.AuthServer.csproj similarity index 99% rename from Server/Server.csproj rename to Continuity.AuthServer/Continuity.AuthServer.csproj index 37ca425..5dbd6a9 100644 --- a/Server/Server.csproj +++ b/Continuity.AuthServer/Continuity.AuthServer.csproj @@ -5,7 +5,6 @@ enable warnings Linux - Server default true true diff --git a/Server/DB/Documents/Account.cs b/Continuity.AuthServer/DB/Documents/Account.cs similarity index 100% rename from Server/DB/Documents/Account.cs rename to Continuity.AuthServer/DB/Documents/Account.cs diff --git a/Server/DB/Documents/Character.cs b/Continuity.AuthServer/DB/Documents/Character.cs similarity index 100% rename from Server/DB/Documents/Character.cs rename to Continuity.AuthServer/DB/Documents/Character.cs diff --git a/Server/DB/Documents/Guild.cs b/Continuity.AuthServer/DB/Documents/Guild.cs similarity index 100% rename from Server/DB/Documents/Guild.cs rename to Continuity.AuthServer/DB/Documents/Guild.cs diff --git a/Server/DB/Documents/GuildMember.cs b/Continuity.AuthServer/DB/Documents/GuildMember.cs similarity index 100% rename from Server/DB/Documents/GuildMember.cs rename to Continuity.AuthServer/DB/Documents/GuildMember.cs diff --git a/Server/DB/Documents/GuildRank.cs b/Continuity.AuthServer/DB/Documents/GuildRank.cs similarity index 100% rename from Server/DB/Documents/GuildRank.cs rename to Continuity.AuthServer/DB/Documents/GuildRank.cs diff --git a/Server/DB/Documents/InventoryItem.cs b/Continuity.AuthServer/DB/Documents/InventoryItem.cs similarity index 100% rename from Server/DB/Documents/InventoryItem.cs rename to Continuity.AuthServer/DB/Documents/InventoryItem.cs diff --git a/Server/DB/Documents/InventoryTab.cs b/Continuity.AuthServer/DB/Documents/InventoryTab.cs similarity index 100% rename from Server/DB/Documents/InventoryTab.cs rename to Continuity.AuthServer/DB/Documents/InventoryTab.cs diff --git a/Server/DB/Migrations/20230814114414_Initial.Designer.cs b/Continuity.AuthServer/DB/Migrations/20230814114414_Initial.Designer.cs similarity index 95% rename from Server/DB/Migrations/20230814114414_Initial.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20230814114414_Initial.Designer.cs index 9cb6461..cc6b32f 100644 --- a/Server/DB/Migrations/20230814114414_Initial.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20230814114414_Initial.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() diff --git a/Server/DB/Migrations/20230814114414_Initial.cs b/Continuity.AuthServer/DB/Migrations/20230814114414_Initial.cs similarity index 100% rename from Server/DB/Migrations/20230814114414_Initial.cs rename to Continuity.AuthServer/DB/Migrations/20230814114414_Initial.cs diff --git a/Server/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs b/Continuity.AuthServer/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs similarity index 88% rename from Server/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs index 22b50ac..73e95aa 100644 --- a/Server/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20230817230423_CharacterDataDraft.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -51,7 +51,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -94,9 +94,9 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -105,7 +105,7 @@ namespace Server.DB.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); diff --git a/Server/DB/Migrations/20230817230423_CharacterDataDraft.cs b/Continuity.AuthServer/DB/Migrations/20230817230423_CharacterDataDraft.cs similarity index 100% rename from Server/DB/Migrations/20230817230423_CharacterDataDraft.cs rename to Continuity.AuthServer/DB/Migrations/20230817230423_CharacterDataDraft.cs diff --git a/Server/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs similarity index 87% rename from Server/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs index 86952dc..bc18ac5 100644 --- a/Server/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231108143729_AddInventoryToCharacter.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -51,7 +51,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -94,7 +94,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -146,9 +146,9 @@ namespace Server.DB.Migrations b.ToTable("InventoryItem"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -157,9 +157,9 @@ namespace Server.DB.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -168,12 +168,12 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); diff --git a/Server/DB/Migrations/20231108143729_AddInventoryToCharacter.cs b/Continuity.AuthServer/DB/Migrations/20231108143729_AddInventoryToCharacter.cs similarity index 100% rename from Server/DB/Migrations/20231108143729_AddInventoryToCharacter.cs rename to Continuity.AuthServer/DB/Migrations/20231108143729_AddInventoryToCharacter.cs diff --git a/Server/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs similarity index 91% rename from Server/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs index 345b7b3..83feb7d 100644 --- a/Server/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231113192405_AdditionalCharacterData.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -51,7 +51,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -100,7 +100,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -152,9 +152,9 @@ namespace Server.DB.Migrations b.ToTable("InventoryItem"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -223,9 +223,9 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -234,12 +234,12 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); diff --git a/Server/DB/Migrations/20231113192405_AdditionalCharacterData.cs b/Continuity.AuthServer/DB/Migrations/20231113192405_AdditionalCharacterData.cs similarity index 100% rename from Server/DB/Migrations/20231113192405_AdditionalCharacterData.cs rename to Continuity.AuthServer/DB/Migrations/20231113192405_AdditionalCharacterData.cs diff --git a/Server/DB/Migrations/20231114203409_AddGuildData.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231114203409_AddGuildData.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231114203409_AddGuildData.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231114203409_AddGuildData.Designer.cs index fcae940..99c3160 100644 --- a/Server/DB/Migrations/20231114203409_AddGuildData.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231114203409_AddGuildData.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -54,7 +54,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -111,7 +111,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -128,7 +128,7 @@ namespace Server.DB.Migrations b.ToTable("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -152,7 +152,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -204,15 +204,15 @@ namespace Server.DB.Migrations b.ToTable("InventoryItem"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade) @@ -283,15 +283,15 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade) @@ -302,9 +302,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -313,17 +313,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231114203409_AddGuildData.cs b/Continuity.AuthServer/DB/Migrations/20231114203409_AddGuildData.cs similarity index 100% rename from Server/DB/Migrations/20231114203409_AddGuildData.cs rename to Continuity.AuthServer/DB/Migrations/20231114203409_AddGuildData.cs diff --git a/Server/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs index c5b763c..22f2442 100644 --- a/Server/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231115174714_GuildIsNotRequired.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -54,7 +54,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -111,7 +111,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -128,7 +128,7 @@ namespace Server.DB.Migrations b.ToTable("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -152,7 +152,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -204,15 +204,15 @@ namespace Server.DB.Migrations b.ToTable("InventoryItem"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade) @@ -283,15 +283,15 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade) @@ -302,9 +302,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -313,17 +313,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231115174714_GuildIsNotRequired.cs b/Continuity.AuthServer/DB/Migrations/20231115174714_GuildIsNotRequired.cs similarity index 100% rename from Server/DB/Migrations/20231115174714_GuildIsNotRequired.cs rename to Continuity.AuthServer/DB/Migrations/20231115174714_GuildIsNotRequired.cs diff --git a/Server/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs similarity index 87% rename from Server/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs index 907419e..c3cbcd6 100644 --- a/Server/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231115183824_SwitchToDataAnnotations.Designer.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -57,7 +57,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -125,7 +125,7 @@ namespace Server.DB.Migrations b.ToTable("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -149,7 +149,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -201,13 +201,13 @@ namespace Server.DB.Migrations b.ToTable("InventoryItem"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId"); @@ -276,13 +276,13 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId"); @@ -291,9 +291,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -302,17 +302,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231115183824_SwitchToDataAnnotations.cs b/Continuity.AuthServer/DB/Migrations/20231115183824_SwitchToDataAnnotations.cs similarity index 100% rename from Server/DB/Migrations/20231115183824_SwitchToDataAnnotations.cs rename to Continuity.AuthServer/DB/Migrations/20231115183824_SwitchToDataAnnotations.cs diff --git a/Server/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs index 932bf0b..0b9ebc6 100644 --- a/Server/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.Designer.cs @@ -28,7 +28,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -61,7 +61,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -119,7 +119,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace Server.DB.Migrations b.ToTable("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -160,7 +160,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -212,13 +212,13 @@ namespace Server.DB.Migrations b.ToTable("InventoryItem"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId"); @@ -287,13 +287,13 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId"); @@ -302,9 +302,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -313,17 +313,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.cs b/Continuity.AuthServer/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.cs similarity index 100% rename from Server/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.cs rename to Continuity.AuthServer/DB/Migrations/20231116110504_DBPoolingAndLazyLoadingSupport.cs diff --git a/Server/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs index 097b08e..f519bfa 100644 --- a/Server/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231120162002_FixInventoryItemAsDbset.Designer.cs @@ -28,7 +28,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -61,7 +61,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -119,7 +119,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace Server.DB.Migrations b.ToTable("Guilds"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -160,7 +160,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -212,13 +212,13 @@ namespace Server.DB.Migrations b.ToTable("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId"); @@ -293,13 +293,13 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId"); @@ -308,26 +308,26 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId"); b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231120162002_FixInventoryItemAsDbset.cs b/Continuity.AuthServer/DB/Migrations/20231120162002_FixInventoryItemAsDbset.cs similarity index 100% rename from Server/DB/Migrations/20231120162002_FixInventoryItemAsDbset.cs rename to Continuity.AuthServer/DB/Migrations/20231120162002_FixInventoryItemAsDbset.cs diff --git a/Server/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs index 4549898..ca84bf5 100644 --- a/Server/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.Designer.cs @@ -28,7 +28,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -61,7 +61,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -119,7 +119,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace Server.DB.Migrations b.ToTable("Guilds"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -160,7 +160,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -212,13 +212,13 @@ namespace Server.DB.Migrations b.ToTable("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId"); @@ -293,13 +293,13 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId"); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId"); @@ -308,9 +308,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade); @@ -318,17 +318,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.cs b/Continuity.AuthServer/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.cs similarity index 100% rename from Server/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.cs rename to Continuity.AuthServer/DB/Migrations/20231121205726_MissingCascadeDeletionOnCharacter.cs diff --git a/Server/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs similarity index 89% rename from Server/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs index 46a0608..dfb0d5c 100644 --- a/Server/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.Designer.cs @@ -28,7 +28,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -61,7 +61,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -119,7 +119,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -143,7 +143,7 @@ namespace Server.DB.Migrations b.ToTable("Guilds"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -170,7 +170,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -222,14 +222,14 @@ namespace Server.DB.Migrations b.ToTable("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Restrict); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Restrict); @@ -305,14 +305,14 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Restrict); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade); @@ -322,9 +322,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade); @@ -332,17 +332,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.cs b/Continuity.AuthServer/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.cs similarity index 100% rename from Server/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.cs rename to Continuity.AuthServer/DB/Migrations/20231122064508_IndexingAndVariousOtherAnnotations.cs diff --git a/Server/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs index 7d0911c..97c8385 100644 --- a/Server/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231122091030_VariousDeletionBehaviours.Designer.cs @@ -28,7 +28,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -66,7 +66,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -124,7 +124,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -148,7 +148,7 @@ namespace Server.DB.Migrations b.ToTable("Guilds"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -175,7 +175,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -227,9 +227,9 @@ namespace Server.DB.Migrations b.ToTable("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { - b.HasOne("Server.DB.Documents.GuildMember", "GuildMember") + b.HasOne("Continuity.AuthServer.DB.Documents.GuildMember", "GuildMember") .WithMany() .HasForeignKey("GuildMemberId") .OnDelete(DeleteBehavior.Cascade); @@ -237,14 +237,14 @@ namespace Server.DB.Migrations b.Navigation("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany() .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Restrict); @@ -320,14 +320,14 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Restrict); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade); @@ -337,9 +337,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade); @@ -347,17 +347,17 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231122091030_VariousDeletionBehaviours.cs b/Continuity.AuthServer/DB/Migrations/20231122091030_VariousDeletionBehaviours.cs similarity index 100% rename from Server/DB/Migrations/20231122091030_VariousDeletionBehaviours.cs rename to Continuity.AuthServer/DB/Migrations/20231122091030_VariousDeletionBehaviours.cs diff --git a/Server/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs b/Continuity.AuthServer/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs similarity index 88% rename from Server/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs rename to Continuity.AuthServer/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs index 42bdf25..45241c0 100644 --- a/Server/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs +++ b/Continuity.AuthServer/DB/Migrations/20231125112400_FixEntityRelationships.Designer.cs @@ -28,7 +28,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -61,7 +61,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -114,7 +114,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -138,7 +138,7 @@ namespace Server.DB.Migrations b.ToTable("Guilds"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -166,7 +166,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -218,9 +218,9 @@ namespace Server.DB.Migrations b.ToTable("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -295,15 +295,15 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithOne("GuildMember") - .HasForeignKey("Server.DB.Documents.GuildMember", "CharacterId") + .HasForeignKey("Continuity.AuthServer.DB.Documents.GuildMember", "CharacterId") .OnDelete(DeleteBehavior.Restrict) .IsRequired(); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade) @@ -314,9 +314,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -325,19 +325,19 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("GuildMember"); b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/Migrations/20231125112400_FixEntityRelationships.cs b/Continuity.AuthServer/DB/Migrations/20231125112400_FixEntityRelationships.cs similarity index 100% rename from Server/DB/Migrations/20231125112400_FixEntityRelationships.cs rename to Continuity.AuthServer/DB/Migrations/20231125112400_FixEntityRelationships.cs diff --git a/Server/DB/Migrations/WonderkingContextModelSnapshot.cs b/Continuity.AuthServer/DB/Migrations/WonderkingContextModelSnapshot.cs similarity index 88% rename from Server/DB/Migrations/WonderkingContextModelSnapshot.cs rename to Continuity.AuthServer/DB/Migrations/WonderkingContextModelSnapshot.cs index 9568719..8fb7a97 100644 --- a/Server/DB/Migrations/WonderkingContextModelSnapshot.cs +++ b/Continuity.AuthServer/DB/Migrations/WonderkingContextModelSnapshot.cs @@ -25,7 +25,7 @@ namespace Server.DB.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -58,7 +58,7 @@ namespace Server.DB.Migrations b.ToTable("Accounts"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -111,7 +111,7 @@ namespace Server.DB.Migrations b.ToTable("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -135,7 +135,7 @@ namespace Server.DB.Migrations b.ToTable("Guilds"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -163,7 +163,7 @@ namespace Server.DB.Migrations b.ToTable("GuildMember"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -215,9 +215,9 @@ namespace Server.DB.Migrations b.ToTable("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { - b.HasOne("Server.DB.Documents.Account", "Account") + b.HasOne("Continuity.AuthServer.DB.Documents.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -292,15 +292,15 @@ namespace Server.DB.Migrations b.Navigation("JobData"); }); - modelBuilder.Entity("Server.DB.Documents.GuildMember", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.GuildMember", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithOne("GuildMember") - .HasForeignKey("Server.DB.Documents.GuildMember", "CharacterId") + .HasForeignKey("Continuity.AuthServer.DB.Documents.GuildMember", "CharacterId") .OnDelete(DeleteBehavior.Restrict) .IsRequired(); - b.HasOne("Server.DB.Documents.Guild", "Guild") + b.HasOne("Continuity.AuthServer.DB.Documents.Guild", "Guild") .WithMany("GuildMembers") .HasForeignKey("GuildId") .OnDelete(DeleteBehavior.Cascade) @@ -311,9 +311,9 @@ namespace Server.DB.Migrations b.Navigation("Guild"); }); - modelBuilder.Entity("Server.DB.Documents.InventoryItem", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.InventoryItem", b => { - b.HasOne("Server.DB.Documents.Character", "Character") + b.HasOne("Continuity.AuthServer.DB.Documents.Character", "Character") .WithMany("InventoryItems") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -322,19 +322,19 @@ namespace Server.DB.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.DB.Documents.Account", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Account", b => { b.Navigation("Characters"); }); - modelBuilder.Entity("Server.DB.Documents.Character", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Character", b => { b.Navigation("GuildMember"); b.Navigation("InventoryItems"); }); - modelBuilder.Entity("Server.DB.Documents.Guild", b => + modelBuilder.Entity("Continuity.AuthServer.DB.Documents.Guild", b => { b.Navigation("GuildMembers"); }); diff --git a/Server/DB/WonderkingContext.cs b/Continuity.AuthServer/DB/WonderkingContext.cs similarity index 100% rename from Server/DB/WonderkingContext.cs rename to Continuity.AuthServer/DB/WonderkingContext.cs diff --git a/Server/Dockerfile b/Continuity.AuthServer/Dockerfile similarity index 75% rename from Server/Dockerfile rename to Continuity.AuthServer/Dockerfile index 54c4c82..62fb1ba 100644 --- a/Server/Dockerfile +++ b/Continuity.AuthServer/Dockerfile @@ -10,12 +10,12 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN echo "Target: $TARGETARCH" && echo "Build: $BUILDPLATFORM" WORKDIR /src COPY ["Wonderking/Wonderking.csproj", "Wonderking/"] -COPY ["Server/Server.csproj", "Server/"] +COPY ["Continuity.AuthServer/Continuity.AuthServer.csproj", "Continuity.AuthServer/"] RUN dotnet restore "Wonderking/Wonderking.csproj" -a $TARGETARCH && dotnet restore "Server/Server.csproj" -a $TARGETARCH COPY . . FROM build AS publish -RUN dotnet publish "Server/Server.csproj" -c Release -a $TARGETARCH --no-restore -f net8.0 -o /app +RUN dotnet publish "Continuity.AuthServer/Continuity.AuthServer.csproj" -c Release -a $TARGETARCH --no-restore -f net8.0 -o /app COPY ../config /app/config FROM base AS final diff --git a/Server/LoggerMessages/LoginHandlerLoggerMessages.cs b/Continuity.AuthServer/LoggerMessages/LoginHandlerLoggerMessages.cs similarity index 100% rename from Server/LoggerMessages/LoginHandlerLoggerMessages.cs rename to Continuity.AuthServer/LoggerMessages/LoginHandlerLoggerMessages.cs diff --git a/Server/LoggerMessages/PacketLoggerMessages.cs b/Continuity.AuthServer/LoggerMessages/PacketLoggerMessages.cs similarity index 100% rename from Server/LoggerMessages/PacketLoggerMessages.cs rename to Continuity.AuthServer/LoggerMessages/PacketLoggerMessages.cs diff --git a/Server/PacketHandlers/ChannelSelectionHandler.Projections.cs b/Continuity.AuthServer/PacketHandlers/ChannelSelectionHandler.Projections.cs similarity index 100% rename from Server/PacketHandlers/ChannelSelectionHandler.Projections.cs rename to Continuity.AuthServer/PacketHandlers/ChannelSelectionHandler.Projections.cs diff --git a/Server/PacketHandlers/ChannelSelectionHandler.cs b/Continuity.AuthServer/PacketHandlers/ChannelSelectionHandler.cs similarity index 100% rename from Server/PacketHandlers/ChannelSelectionHandler.cs rename to Continuity.AuthServer/PacketHandlers/ChannelSelectionHandler.cs diff --git a/Server/PacketHandlers/CharacterCreationHandler.cs b/Continuity.AuthServer/PacketHandlers/CharacterCreationHandler.cs similarity index 100% rename from Server/PacketHandlers/CharacterCreationHandler.cs rename to Continuity.AuthServer/PacketHandlers/CharacterCreationHandler.cs diff --git a/Server/PacketHandlers/CharacterDeletionHandler.cs b/Continuity.AuthServer/PacketHandlers/CharacterDeletionHandler.cs similarity index 100% rename from Server/PacketHandlers/CharacterDeletionHandler.cs rename to Continuity.AuthServer/PacketHandlers/CharacterDeletionHandler.cs diff --git a/Server/PacketHandlers/CharacterMappingItemEntry.cs b/Continuity.AuthServer/PacketHandlers/CharacterMappingItemEntry.cs similarity index 100% rename from Server/PacketHandlers/CharacterMappingItemEntry.cs rename to Continuity.AuthServer/PacketHandlers/CharacterMappingItemEntry.cs diff --git a/Server/PacketHandlers/CharacterNameCheckHandler.cs b/Continuity.AuthServer/PacketHandlers/CharacterNameCheckHandler.cs similarity index 100% rename from Server/PacketHandlers/CharacterNameCheckHandler.cs rename to Continuity.AuthServer/PacketHandlers/CharacterNameCheckHandler.cs diff --git a/Server/PacketHandlers/IPacketHandler.cs b/Continuity.AuthServer/PacketHandlers/IPacketHandler.cs similarity index 100% rename from Server/PacketHandlers/IPacketHandler.cs rename to Continuity.AuthServer/PacketHandlers/IPacketHandler.cs diff --git a/Server/PacketHandlers/LoginHandler.cs b/Continuity.AuthServer/PacketHandlers/LoginHandler.cs similarity index 100% rename from Server/PacketHandlers/LoginHandler.cs rename to Continuity.AuthServer/PacketHandlers/LoginHandler.cs diff --git a/Server/Packets/RawPacket.cs b/Continuity.AuthServer/Packets/RawPacket.cs similarity index 100% rename from Server/Packets/RawPacket.cs rename to Continuity.AuthServer/Packets/RawPacket.cs diff --git a/Server/Program.cs b/Continuity.AuthServer/Program.cs similarity index 96% rename from Server/Program.cs rename to Continuity.AuthServer/Program.cs index 3327bb6..05026e6 100644 --- a/Server/Program.cs +++ b/Continuity.AuthServer/Program.cs @@ -33,8 +33,8 @@ builder.Configuration.AddJsonFile("settings.json", true, true) builder.Services.AddLogging(); var loggerFactory = LoggerFactory.Create(loggingBuilder => { - loggingBuilder.AddFile("logs/Server-{Date}.log", LogLevel.Trace); - loggingBuilder.AddFile("logs/Server-{Date}.json.log", LogLevel.Trace, isJson: true); + loggingBuilder.AddFile("logs/Continuity.AuthServer-{Date}.log", LogLevel.Trace); + loggingBuilder.AddFile("logs/Continuity.AuthServer-{Date}.json.log", LogLevel.Trace, isJson: true); loggingBuilder.AddConsole(); }); diff --git a/Server/Services/ItemObjectPoolService.cs b/Continuity.AuthServer/Services/ItemObjectPoolService.cs similarity index 100% rename from Server/Services/ItemObjectPoolService.cs rename to Continuity.AuthServer/Services/ItemObjectPoolService.cs diff --git a/Server/Services/PacketDistributorService.cs b/Continuity.AuthServer/Services/PacketDistributorService.cs similarity index 100% rename from Server/Services/PacketDistributorService.cs rename to Continuity.AuthServer/Services/PacketDistributorService.cs diff --git a/Server/Services/WonderkingAuthServer.cs b/Continuity.AuthServer/Services/WonderkingAuthServer.cs similarity index 100% rename from Server/Services/WonderkingAuthServer.cs rename to Continuity.AuthServer/Services/WonderkingAuthServer.cs diff --git a/Server/settings.Development.json b/Continuity.AuthServer/settings.Development.json similarity index 100% rename from Server/settings.Development.json rename to Continuity.AuthServer/settings.Development.json diff --git a/Continuity.sln b/Continuity.sln index a8a1984..ebb8be6 100644 --- a/Continuity.sln +++ b/Continuity.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{7EDA8B31-3E03-4CA3-87D1-CFEB05C277D6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Continuity.AuthServer", "Continuity.AuthServer\Continuity.AuthServer.csproj", "{7EDA8B31-3E03-4CA3-87D1-CFEB05C277D6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{7D560FA1-A61C-4B67-8300-835CA5814621}" EndProject