Merge branch 'develop'

NexusForever · Oct 11, 2021 · 5bc84a8 · 5bc84a8
2 parents bb3aff7 + f32b557
commit 5bc84a8
Show file tree

Hide file tree

Showing 314 changed files with 29,109 additions and 3,441 deletions.
diff --git a/.travis.yml → Obsolete/.travis.yml b/.travis.yml → Obsolete/.travis.yml
@@ -1,6 +1,6 @@
 language: csharp
 mono: none
-dotnet: 3.1.100
+dotnet: 5.0.101
 os: linux
 dist: xenial
 script:
@@ -14,19 +14,19 @@ before_deploy:
   - git tag $TRAVIS_TAG
   - baseDir=$(pwd)
   - dotnet publish -c Release -r win-x64 $baseDir/Source/NexusForever.ClientConnector --no-self-contained
-  - cd $baseDir/Source/NexusForever.ClientConnector/bin/Release/netcoreapp*.*/win-x64/publish/
+  - cd $baseDir/Source/NexusForever.ClientConnector/bin/Release/net*.*/win-x64/publish/
   - zip -9 ClientConnector *
   - dotnet publish -c Release -r win-x64 $baseDir/Source/NexusForever.MapGenerator --no-self-contained
-  - cd $baseDir/Source/NexusForever.MapGenerator/bin/Release/netcoreapp*.*/win-x64/publish/
+  - cd $baseDir/Source/NexusForever.MapGenerator/bin/Release/net*.*/win-x64/publish/
   - zip -9 MapGenerator *
   - dotnet publish -c Release -r win-x64 $baseDir/Source/NexusForever.AuthServer --no-self-contained
-  - cd $baseDir/Source/NexusForever.AuthServer/bin/Release/netcoreapp*.*/win-x64/publish/
+  - cd $baseDir/Source/NexusForever.AuthServer/bin/Release/net*.*/win-x64/publish/
   - zip -9 AuthServer *
   - dotnet publish -c Release -r win-x64 $baseDir/Source/NexusForever.StsServer --no-self-contained
-  - cd $baseDir/Source/NexusForever.StsServer/bin/Release/netcoreapp*.*/win-x64/publish/
+  - cd $baseDir/Source/NexusForever.StsServer/bin/Release/net*.*/win-x64/publish/
   - zip -9 StsServer *
   - dotnet publish -c Release -r win-x64 $baseDir/Source/NexusForever.WorldServer --no-self-contained
-  - cd $baseDir/Source/NexusForever.WorldServer/bin/Release/netcoreapp*.*/win-x64/publish/
+  - cd $baseDir/Source/NexusForever.WorldServer/bin/Release/net*.*/win-x64/publish/
   - zip -9 WorldServer *
   - cd $baseDir
 deploy:
@@ -35,7 +35,7 @@ deploy:
     secure: xCyivUEGRr0FbdJlJ0uwt2V6Eg25p7bMTpstzd1HvHEOjzz0bj2xMfhUorHs5RAF1XFe1x9HQPMCUGVfzr6WlGH/QfzNJpmc0BKegUX32NDfGEyFSyS32Jh97mrolzLqoO3ry4bmAyIo01Wje++IL1r+W9kGLRqOtcXz0GVocWM56kWJ0QV6r6KxbaZKoxu/7GKPKBPNdiEXqO/8tvw2t3xM1qEy69QlJGjYmEOutg/GPYB1nq14UbqFR5rvMqCdRd8dJiIrZYx44ypXW08assQMPDaHjXKZh62uQ4kEvm2jtKMGkWURdZ9tuk4tBEoHyqpjzpXQG4zN2zzjdm2ckmDMD6O/ZlkdEKi6lY3VYdJQv/mA0DjfwkWfWUa+5TX6B4ayirraLK9s37GFHYkcroh+y2fX6jUGWjxTst3G69hHiaPtTCwnU01yoEyeaj+ZoBoLw/Ixf40pUuzsGoXTWdVgQjlbPJjFiobHXTjE0WQZyPxdN2MRoegb8aQ7Wgmwq0W8795BV4xvWCGdF4QAJ/7wgRoPkUU9KGncXYa94XSWylCf2oRDQAvAGiaefnn17LRL1F0AwccCqoF2HsiY1XQcVWTvIahv2BYVNAGZNX3BBiPh/5wZoEFPM1hGCc4+44bkAiWUIZ8VNpmTmt5LmrSDZKFlXZHPBKF95J/k2Lk=
   file_glob: true
   file: 
-    - ./Source/NexusForever.*/bin/Release/netcoreapp*.*/*-x64/publish/*.zip
+    - ./Source/NexusForever.*/bin/Release/net*.*/*-x64/publish/*.zip
   skip_cleanup: true
   on:
     branch: master
diff --git a/Tools/Linux/nexus.sh → Obsolete/Tools/Linux/nexus.sh b/Tools/Linux/nexus.sh → Obsolete/Tools/Linux/nexus.sh
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 ## NexusForever
-[![Build Status](https://travis-ci.com/NexusForever/NexusForever.svg?branch=master)](https://travis-ci.com/NexusForever/NexusForever)
 [![Discord](https://img.shields.io/discord/499473932131500034.svg?style=flat&logo=discord)](https://discord.gg/8wT3GEQ)
 
 ### Information
@@ -9,7 +8,7 @@ A server emulator for WildStar written in C# that supports build 16042.
 [Server Setup Guide](https://github.com/Rawaho/NexusForever/wiki/Installation)
 
 ### Requirements
- * Visual Studio 2019 (.NET Core 3.1 and C# 8 support required)
+ * Visual Studio 2019 (.NET 5 and C# 9 support required)
  * MySQL Server (or equivalent, eg: MariaDB)
  * WildStar 16042 client
 
@@ -28,3 +27,20 @@ Active development branch of the communities housing feature.
  * [Website](https://emulator.ws)
  * [Discord](https://discord.gg/8wT3GEQ)
  * [World Database](https://github.com/NexusForever/NexusForever.WorldDatabase)
+
+## Build Status
+### Windows
+Automated builds that will run on Windows or Windows Server.
+
+Master:  
+![Master](https://dev.azure.com/NexusForever/NexusForever/_apis/build/status/NexusForever%20Master%20Windows)  
+Development:  
+![Development](https://dev.azure.com/NexusForever/NexusForever/_apis/build/status/NexusForever%20Develop%20Windows?branchName=develop)
+### Linux
+Automated builds that will run on various Linux distributions.  
+See the [.NET runtime identifer documentation](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#linux-rids)  for more information on exact distributions.
+
+Master:  
+![Master](https://dev.azure.com/NexusForever/NexusForever/_apis/build/status/NexusForever%20Master%20Linux)  
+Development:  
+![Development](https://dev.azure.com/NexusForever/NexusForever/_apis/build/status/NexusForever%20Develop%20Linux?branchName=develop)
diff --git a/Source/NexusForever.AuthServer/Network/Message/Handler/AuthenticationHandler.cs b/Source/NexusForever.AuthServer/Network/Message/Handler/AuthenticationHandler.cs
@@ -34,7 +34,7 @@ void SendServerAuthDenied(NpLoginResult result)
             string gameToken = helloAuth.GameToken.Guid
                 .ToByteArray()
                 .ToHexString();
-            session.EnqueueEvent(new TaskGenericEvent<AccountModel>(DatabaseManager.Instance.AuthDatabase.GetAccountByGameTokenAsync(helloAuth.Email, gameToken),
+            session.Events.EnqueueEvent(new TaskGenericEvent<AccountModel>(DatabaseManager.Instance.AuthDatabase.GetAccountByGameTokenAsync(helloAuth.Email, gameToken),
                 account =>
             {
                 if (account == null)
@@ -64,7 +64,7 @@ void SendServerAuthDenied(NpLoginResult result)
                 });
 
                 byte[] sessionKey = RandomProvider.GetBytes(16u);
-                session.EnqueueEvent(new TaskEvent(DatabaseManager.Instance.AuthDatabase.UpdateAccountSessionKey(account, sessionKey.ToHexString()),
+                session.Events.EnqueueEvent(new TaskEvent(DatabaseManager.Instance.AuthDatabase.UpdateAccountSessionKey(account, sessionKey.ToHexString()),
                     () =>
                 {
                     session.EnqueueMessageEncrypted(new ServerRealmInfo

diff --git a/Source/NexusForever.AuthServer/NexusForever.AuthServer.csproj b/Source/NexusForever.AuthServer/NexusForever.AuthServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Source/NexusForever.ClientConnector/NexusForever.ClientConnector.csproj b/Source/NexusForever.ClientConnector/NexusForever.ClientConnector.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Source/NexusForever.ClientConnector/Program.cs b/Source/NexusForever.ClientConnector/Program.cs
@@ -35,7 +35,7 @@ public static void Main()
                 Console.Write("Type in your language: [en,de]");
                 string language = Console.ReadLine();
 
-                ClientConfiguration clientConfig = new ClientConfiguration
+                var clientConfig = new ClientConfiguration
                 {
                     HostName = hostName,
                     Language = language
@@ -50,8 +50,8 @@ public static void Main()
 
         private static void LaunchClient(ClientConfiguration config)
         {
-            STARTUPINFO si = new STARTUPINFO();
-            PROCESS_INFORMATION pi = new PROCESS_INFORMATION();
+            var si = new STARTUPINFO();
+            var pi = new PROCESS_INFORMATION();
 
             string client = "WildStar64.exe";
             if (!File.Exists(client))

diff --git a/Source/NexusForever.Database.Auth/AuthContext.cs b/Source/NexusForever.Database.Auth/AuthContext.cs
@@ -42,13 +42,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.ToTable("account");
 
                 entity.HasIndex(e => e.Email)
-                    .HasName("email");
+                    .HasDatabaseName("email");
 
                 entity.HasIndex(e => e.GameToken)
-                    .HasName("gameToken");
+                    .HasDatabaseName("gameToken");
 
                 entity.HasIndex(e => e.SessionKey)
-                    .HasName("sessionKey");
+                    .HasDatabaseName("sessionKey");
 
                 entity.Property(e => e.Id)
                     .HasColumnName("id")
@@ -846,6 +846,41 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                         Name = "Command: ReputationUpdate"
                     },
                     new PermissionModel
+                    {
+                        Id   = 100,
+                        Name = "Category: Guild"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 101,
+                        Name = "Command: GuildRegister"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 102,
+                        Name = "Command: GuildJoin"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 103,
+                        Name = "Category: Map"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 104,
+                        Name = "Command: MapUnload"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 105,
+                        Name = "Command: MapPlayerRemove"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 106,
+                        Name = "Command: MapPlayerRemoveCancel"
+                    },
+                    new PermissionModel
                     {
                         Id   = 10000,
                         Name = "Other: InstantLogout"
@@ -854,6 +889,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                     {
                         Id   = 10001,
                         Name = "Other: Signature"
+                    },
+                    new PermissionModel
+                    {
+                        Id   = 10002,
+                        Name = "Other: BypassInstanceLimits"
                     });
             });
 

diff --git a/Source/NexusForever.Database.Auth/Migrations/20200521145304_AccountRBAC.cs b/Source/NexusForever.Database.Auth/Migrations/20200521145304_AccountRBAC.cs
@@ -40,7 +40,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_account_permission", x => x.id);
+                    table.PrimaryKey("PK_account_permission", x => new { x.id, x.permissionId });
                     table.ForeignKey(
                         name: "FK__account_permission_id__account_id",
                         column: x => x.id,
@@ -64,7 +64,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_account_role", x => x.id);
+                    table.PrimaryKey("PK_account_role", x => new { x.id, x.roleId });
                     table.ForeignKey(
                         name: "FK__account_role_id__account_id",
                         column: x => x.id,
@@ -88,7 +88,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_role_permission", x => x.id);
+                    table.PrimaryKey("PK_role_permission", x => new { x.id, x.permissionId });
                     table.ForeignKey(
                         name: "FK__role_permission_id__role_id",
                         column: x => x.id,

diff --git a/Source/NexusForever.Database.Auth/Migrations/20200627002155_RBACPrimaryKeys.cs b/Source/NexusForever.Database.Auth/Migrations/20200627002155_RBACPrimaryKeys.cs
@@ -7,7 +7,7 @@ public partial class RBACPrimaryKeys : Migration
         // This migration was manually edited due to a bug #678 in Pomelo.EntityFrameworkCore.MySql
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropForeignKey(
+            /*migrationBuilder.DropForeignKey(
                 name: "FK__account_permission_id__account_id",
                 table: "account_permission");
 
@@ -114,12 +114,12 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 principalTable: "permission",
                 principalColumn: "id",
                 onUpdate: ReferentialAction.Restrict,
-                onDelete: ReferentialAction.Cascade);
+                onDelete: ReferentialAction.Cascade);*/
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropForeignKey(
+            /*migrationBuilder.DropForeignKey(
                 name: "FK__account_permission_id__account_id",
                 table: "account_permission");
 
@@ -226,7 +226,7 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 principalTable: "permission",
                 principalColumn: "id",
                 onUpdate: ReferentialAction.Restrict,
-                onDelete: ReferentialAction.Cascade);
+                onDelete: ReferentialAction.Cascade);*/
         }
     }
 }