Draft console input

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "1.1.0",
       "commands": [
         "dotnet-cake"
       ]

.github/workflows/docker.yml

@@ -2,7 +2,7 @@ name: Docker
 
 on:
   push:
-    branches: dev
+    branches: master
     paths:
       - 'src/Impostor.Server/**'
       - 'src/Impostor.Shared/**'
@@ -33,22 +33,24 @@ jobs:
         run: |
           DOCKER_IMAGE=aeonlucid/impostor
           VERSION=noop
+          VERSIONSUFFIX=docker
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             VERSION=${GITHUB_REF#refs/tags/}
+            VERSIONSUFFIX=none
           elif [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
-            if [ "${{ github.event.repository.default_branch }}" = "dev" ]; then
-              VERSION=nightly
-            fi
+            VERSION=nightly
+            VERSIONSUFFIX=docker.${{ github.run_number }}
           elif [[ $GITHUB_REF == refs/pull/* ]]; then
             VERSION=pr-${{ github.event.number }}
+            VERSIONSUFFIX=pr.${{ github.event.number }}
           fi
           TAGS="${DOCKER_IMAGE}:${VERSION}"
           if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
             TAGS="$TAGS,${DOCKER_IMAGE}:latest"
           fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=versionsuffix::${VERSIONSUFFIX}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -68,3 +70,5 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
+          build-args: |
+            VERSIONSUFFIX=${{ steps.prep.outputs.versionsuffix }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/Impostor.Hazel"]
+	path = src/Impostor.Hazel
+	url = https://github.com/Impostor/Impostor.Hazel

Dockerfile

@@ -4,12 +4,14 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 # https://github.com/containerd/containerd/blob/master/platforms/platforms.go#L17
 ARG TARGETARCH
 
+ARG VERSIONSUFFIX="docker"
+
 WORKDIR /source
 
 # Copy csproj and restore.
 COPY src/Impostor.Server/Impostor.Server.csproj ./src/Impostor.Server/Impostor.Server.csproj
 COPY src/Impostor.Api/Impostor.Api.csproj ./src/Impostor.Api/Impostor.Api.csproj
-COPY src/Impostor.Hazel/Impostor.Hazel.csproj ./src/Impostor.Hazel/Impostor.Hazel.csproj
+COPY src/Impostor.Hazel/Hazel/Hazel.csproj ./src/Impostor.Hazel/Hazel/Hazel.csproj
 
 RUN case "$TARGETARCH" in \
     amd64)  NETCORE_PLATFORM='linux-x64';; \
@@ -19,7 +21,7 @@ RUN case "$TARGETARCH" in \
   esac && \
   dotnet restore -r "$NETCORE_PLATFORM" ./src/Impostor.Server/Impostor.Server.csproj && \
   dotnet restore -r "$NETCORE_PLATFORM" ./src/Impostor.Api/Impostor.Api.csproj && \
-  dotnet restore -r "$NETCORE_PLATFORM" ./src/Impostor.Hazel/Impostor.Hazel.csproj
+  dotnet restore -r "$NETCORE_PLATFORM" ./src/Impostor.Hazel/Hazel/Hazel.csproj
 
 # Copy everything else.
 COPY src/. ./src/
@@ -29,7 +31,8 @@ RUN case "$TARGETARCH" in \
     arm)    NETCORE_PLATFORM='linux-arm';; \
     *) echo "unsupported architecture"; exit 1 ;; \
   esac && \
-  dotnet publish -c release -o /app -r "$NETCORE_PLATFORM" --no-restore ./src/Impostor.Server/Impostor.Server.csproj
+  [[ $VERSIONSUFFIX = "none" ]] && VERSIONSUFFIX=; \
+  dotnet publish -c release -o /app -r "$NETCORE_PLATFORM" -p:VersionSuffix="$VERSIONSUFFIX" --no-restore ./src/Impostor.Server/Impostor.Server.csproj
 
 # Final image.
 FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime:5.0

README.md

@@ -1,16 +1,16 @@
 # Impostor
 
 [![Discord](https://img.shields.io/badge/Discord-chat-blue?style=flat-square)](https://discord.gg/Mk3w6Tb)
-[![AppVeyor](https://img.shields.io/appveyor/build/Impostor/Impostor/dev?style=flat-square)](https://ci.appveyor.com/project/Impostor/Impostor/branch/dev)
+[![AppVeyor](https://img.shields.io/appveyor/build/Impostor/Impostor/master?style=flat-square)](https://ci.appveyor.com/project/Impostor/Impostor/branch/master)
 
 Impostor is one of the first **Among Us** private servers, written in C#. 
 
-We support Steam, Itch, Android and iOS. The latest version supported is `2020.9.22`, the `dev` build currently supports `2020.11.17`.
-
 | Impostor version | Among Us version | Experimental | Download |
 |-|-|-|-|
 | 1.1.0 | 2020.09.07 - 2020.09.22 | No | [![Download](https://img.shields.io/badge/Download-v1.1.0-blue?style=flat-square)](https://github.com/Impostor/Impostor/releases/tag/v1.1.0) |
-| 1.2.2 | 2020.09.22 - 2020.11.17 | Yes | [![Download](https://img.shields.io/badge/Download-v1.2.2-blue?style=flat-square)](https://ci.appveyor.com/project/Impostor/Impostor/branch/dev/artifacts) |
+| 1.2.2 | 2020.09.22 - 2020.11.17 | No | [![Download](https://img.shields.io/badge/Download-v1.2.2-blue?style=flat-square)](https://github.com/Impostor/Impostor/releases/tag/v1.2.2) |
+| 1.3.0 | 2021.3.5 | No | [![Download](https://img.shields.io/badge/Download-v1.3.0-blue?style=flat-square)](https://github.com/Impostor/Impostor/releases/tag/v1.3.0) |
+| 1.4.0 | 2021.3.31 - 2021.4.2 | Yes | [![Download](https://img.shields.io/badge/Download-master-blue?style=flat-square)](https://ci.appveyor.com/project/Impostor/Impostor/branch/master/artifacts) |
 
 ## Features
 
@@ -27,9 +27,9 @@ If you just want to play on a server hosted by someone else, you need to follow
 #### Windows
 
 1. Find the [latest release](https://github.com/AeonLucid/Impostor/releases/latest).
-2. Download `Impostor-Client-win-x64.zip`.
+2. Download `Impostor-Patcher-win-x64.zip`.
 3. Extract the zip.
-4. Run `Impostor.Client.exe`.
+4. Run `Impostor.Patcher.exe`.
 5. Follow the instructions inside the application.
 
 ![Client](docs/images/client.jpg)

appveyor.yml

@@ -1,12 +1,11 @@
 version: '{build}'
 
 environment:
-  IMPOSTOR_VERSION: '1.2.2'
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
 branches:
   except:
-  - gh-pages
+    - gh-pages
 
 pull_requests:
   do_not_increment_build_number: true
@@ -17,7 +16,7 @@ assembly_info:
 dotnet_csproj:
   patch: false
 
-image: Visual Studio 2019 Preview
+image: Ubuntu2004
 
 install:
   - git submodule update --init --recursive

build.cake

@@ -1,20 +1,25 @@
-#addin "nuget:?package=SharpZipLib&Version=1.3.0"
-#addin "nuget:?package=Cake.Compression&Version=0.2.4"
-#addin "nuget:?package=Cake.FileHelpers&Version=3.3.0"
+#addin "nuget:?package=SharpZipLib&Version=1.3.1"
+#addin "nuget:?package=Cake.Compression&Version=0.2.6"
+#addin "nuget:?package=Cake.FileHelpers&Version=4.0.1"
 
-
-var buildId = EnvironmentVariable("APPVEYOR_BUILD_VERSION") ?? "0";
-var buildVersion = EnvironmentVariable("IMPOSTOR_VERSION") ?? "1.0.0";
-var buildBranch = EnvironmentVariable("APPVEYOR_REPO_BRANCH") ?? "dev";
+var buildId = EnvironmentVariable("GITHUB_RUN_NUMBER") ?? EnvironmentVariable("APPVEYOR_BUILD_VERSION");
+var buildRelease = EnvironmentVariable("APPVEYOR_REPO_TAG") == "true";
+var buildVersion = FindRegexMatchGroupInFile("./src/Directory.Build.props", @"\<VersionPrefix\>(.*?)\<\/VersionPrefix\>", 1, System.Text.RegularExpressions.RegexOptions.None).Value;
 var buildDir = MakeAbsolute(Directory("./build"));
 
-var prNumber = EnvironmentVariable("APPVEYOR_PULL_REQUEST_NUMBER");
 var target = Argument("target", "Deploy");
 var configuration = Argument("configuration", "Release");
 
-// On any branch that is not master, we need to tag the version as prerelease.
-if (buildBranch != "master") {
-    buildVersion = buildVersion + "-ci." + buildId;
+var msbuildSettings = new DotNetCoreMSBuildSettings();
+
+if (buildRelease) 
+{
+    msbuildSettings.Properties["Version"] = new[] { buildVersion };
+}
+else if (buildId != null) 
+{
+    msbuildSettings.Properties["VersionSuffix"] = new[] { "ci." + buildId };
+    buildVersion += "-ci." + buildId;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -34,7 +39,8 @@ private void ImpostorPublish(string name, string project, string runtime, bool i
         SelfContained = false,
         PublishSingleFile = true,
         PublishTrimmed = false,
-        OutputDirectory = projBuildDir
+        OutputDirectory = projBuildDir,
+        MSBuildSettings = msbuildSettings
     });
 
     if (isServer) {
@@ -62,7 +68,8 @@ private void ImpostorPublishNF(string name, string project) {
         Configuration = configuration,
         NoRestore = true,
         Framework = "net472",
-        OutputDirectory = projBuildDir
+        OutputDirectory = projBuildDir,
+        MSBuildSettings = msbuildSettings
     });
 
     Zip(projBuildDir, projBuildZip);
@@ -86,13 +93,6 @@ Task("Restore")
         DotNetCoreRestore("./src/Impostor.sln");
     });
 
-Task("Patch")
-    .WithCriteria(BuildSystem.AppVeyor.IsRunningOnAppVeyor)
-    .Does(() => {
-        ReplaceRegexInFiles("./src/**/*.csproj", @"<Version>.*?<\/Version>", "<Version>" + buildVersion + "</Version>");
-        ReplaceRegexInFiles("./src/**/*.props", @"<Version>.*?<\/Version>", "<Version>" + buildVersion + "</Version>");
-    });
-
 Task("Replay")
     .Does(() => {
         // D:\Projects\GitHub\Impostor\Impostor\src\Impostor.Tools.ServerReplay\sessions
@@ -107,7 +107,6 @@ Task("Replay")
 
 Task("Build")
     .IsDependentOn("Clean")
-    .IsDependentOn("Patch")
     .IsDependentOn("Restore")
     .IsDependentOn("Replay")
     .Does(() => {
@@ -116,44 +115,28 @@ Task("Build")
             Configuration = configuration,
         });
 
-        // Only build artifacts if;
-        // - buildBranch is master/dev
-        // - it is not a pull request
-        if ((buildBranch == "master" || buildBranch == "dev") && string.IsNullOrEmpty(prNumber)) {
-            // Client.
-            ImpostorPublishNF("Impostor-Patcher", "./src/Impostor.Patcher/Impostor.Patcher.WinForms/Impostor.Patcher.WinForms.csproj");
+        // Client.
+        ImpostorPublishNF("Impostor-Patcher", "./src/Impostor.Patcher/Impostor.Patcher.WinForms/Impostor.Patcher.WinForms.csproj");
 
-            ImpostorPublish("Impostor-Patcher-Cli", "./src/Impostor.Patcher/Impostor.Patcher.Cli/Impostor.Patcher.Cli.csproj", "win-x64");
-            ImpostorPublish("Impostor-Patcher-Cli", "./src/Impostor.Patcher/Impostor.Patcher.Cli/Impostor.Patcher.Cli.csproj", "osx-x64");
-            ImpostorPublish("Impostor-Patcher-Cli", "./src/Impostor.Patcher/Impostor.Patcher.Cli/Impostor.Patcher.Cli.csproj", "linux-x64");
+        ImpostorPublish("Impostor-Patcher-Cli", "./src/Impostor.Patcher/Impostor.Patcher.Cli/Impostor.Patcher.Cli.csproj", "win-x64");
+        ImpostorPublish("Impostor-Patcher-Cli", "./src/Impostor.Patcher/Impostor.Patcher.Cli/Impostor.Patcher.Cli.csproj", "osx-x64");
+        ImpostorPublish("Impostor-Patcher-Cli", "./src/Impostor.Patcher/Impostor.Patcher.Cli/Impostor.Patcher.Cli.csproj", "linux-x64");
 
-            // Server.
-            ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "win-x64", true);
-            ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "osx-x64", true);
-            ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "linux-x64", true);
-            ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "linux-arm", true);
-            ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "linux-arm64", true);
-
-            // API.
-            DotNetCorePack("./src/Impostor.Api/Impostor.Api.csproj", new DotNetCorePackSettings {
-                Configuration = configuration,
-                OutputDirectory = buildDir,
-                IncludeSource = true,
-                IncludeSymbols = true
-            });
-        } else {
-            DotNetCoreBuild("./src/Impostor.Patcher/Impostor.Patcher.WinForms/Impostor.Patcher.WinForms.csproj", new DotNetCoreBuildSettings {
-                Configuration = configuration,
-                NoRestore = true,
-                Framework = "net472"
-            });
-
-            DotNetCoreBuild("./src/Impostor.Server/Impostor.Server.csproj", new DotNetCoreBuildSettings {
-                Configuration = configuration,
-                NoRestore = true,
-                Framework = "net5.0"
-            });
-        }
+        // Server.
+        ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "win-x64", true);
+        ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "osx-x64", true);
+        ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "linux-x64", true);
+        ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "linux-arm", true);
+        ImpostorPublish("Impostor-Server", "./src/Impostor.Server/Impostor.Server.csproj", "linux-arm64", true);
+
+        // API.
+        DotNetCorePack("./src/Impostor.Api/Impostor.Api.csproj", new DotNetCorePackSettings {
+            Configuration = configuration,
+            OutputDirectory = buildDir,
+            IncludeSource = true,
+            IncludeSymbols = true,
+            MSBuildSettings = msbuildSettings
+        });
     });
 
 Task("Test")

docs/Building-from-source.md

@@ -1,29 +1,20 @@
 # Building from source
 
-The solution contains two main projects, the Impostor client and server. The client is built using [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472) and the server with [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0).
-
-Currently .NET 5 is not yet officially released, so in order to build using Visual Studio, you should have Visual Studio 2019 **Preview** installed.
-This documentation will go over building both the [Server](#building-the-server) and the [Client](#building-the-client) and their requirements.
+The solution contains two main projects, the Impostor server and patcher. The server is built using [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0) and the winforms patcher is with [.NET Framework 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472).
 
 ## Cloning Impostor
 
-You need to clone Impostor with all submodules.
-
-```bash
-git clone --recursive https://github.com/AeonLucid/Impostor.git
-```
-
-If you already have cloned Impostor but have errors related to Hazel, run the following.
+You need to clone Impostor using git.
 
 ```bash
-git submodule update --init
+git clone https://github.com/AeonLucid/Impostor.git
 ```
 
 ## Building the server
 
 ### Dependencies
 - [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
-- [Visual Studio Preview](https://visualstudio.microsoft.com/vs/preview/) (Optional, only if you want the full IDE experience)
+- [Rider](https://www.jetbrains.com/rider/) or [Visual Studio](https://visualstudio.microsoft.com/vs/) (Optional, only if you want the full IDE experience)
 
 ### Build using the CLI
 
@@ -33,13 +24,13 @@ dotnet build
 ```
 To setup the server, please look at [Running the server](Running-the-server.md).
 
-## Building the client
+## Building the winforms patcher
 
 ### Dependencies
-* [.NET Framework 4.7.2 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/thank-you/net472-developer-pack-offline-installer)
+* [.NET Framework 4.7.2 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/thank-you/net472-developer-pack-offline-installer) or [Mono](https://www.mono-project.com/download/)
 
 ### Build using the CLI
 ```bash
-cd src/Impostor.Client/Impostor.Client.WinForms
+cd src/Impostor.Patcher/Impostor.Patcher.WinForms
 dotnet build
-```
+```

docs/Server-configuration.md

@@ -17,6 +17,7 @@ Some information about all the possible configurations. Click [here](https://git
 
 | Key | Default | Value |
 |-|-|-|
+| **Enabled** | `true` | Whether the anticheat should be enabled. |
 | **BanIpFromGame** | `true` | When a player is caught hacking, they will be kicked from the server. If this value is set to `true`, the player will be banned instead and will not be able to rejoin that specific game. **(Setting this to false does not disable the anti-cheat!)** |
 
 ### ServerRedirector
@@ -45,6 +46,7 @@ Server:PublicIp=127.0.0.1
 Server:PublicPort=22023
 Server:ListenIp=0.0.0.0
 Server:ListenPort=22023
+AntiCheat:Enabled=true
 AntiCheat:BanIpFromGame=true
 ServerRedirector:Enabled=false
 ServerRedirector:Master=true
@@ -65,6 +67,7 @@ IMPOSTOR_Server__PublicIp=127.0.0.1
 IMPOSTOR_Server__PublicPort=22023
 IMPOSTOR_Server__ListenIp=0.0.0.0
 IMPOSTOR_Server__ListenPort=22023
+IMPOSTOR_AntiCheat__Enabled=true
 IMPOSTOR_AntiCheat__BanIpFromGame=true
 IMPOSTOR_ServerRedirector__Enabled=false
 IMPOSTOR_ServerRedirector__Master=true