From: AeonLucid <aeonlucid@gmail.com>
Date: Wed, 14 Oct 2020 12:57:02 +0000 (+0200)
Subject: AppVeyor
X-Git-Tag: v1.2.2~113^2~4
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=790e563d087d53df55194412d652507e96e8c820;p=rhonda%2Fimpostor.git

AppVeyor
---

diff --git a/appveyor.yml b/appveyor.yml
index 4f40b3a..a85d5de 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,19 +40,19 @@ build_script:
   - dotnet build "src/Impostor.Client/Impostor.Client.WinForms/Impostor.Client.WinForms.csproj" /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
   # Server win-x64
   - dotnet publish -c release -o build/win-x64 -f net5.0 -r win-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
-  - 7z a -r build/win-x64.zip %APPVEYOR_BUILD_FOLDER%/build/win-x64/*
+  - ps: 7z a -r build/Impostor-Server-win-x64-$(APPVEYOR_BUILD_VERSION).zip %APPVEYOR_BUILD_FOLDER%/build/win-x64/*
   # Server linux-x64
   - dotnet publish -c release -o ./build/linux-x64 -f net5.0 -r linux-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
-  - 7z a -r build/linux-x64.zip %APPVEYOR_BUILD_FOLDER%/build/linux-x64/*
+  - ps: z a -r build/Impostor-Server-linux-x64-$(APPVEYOR_BUILD_VERSION).zip %APPVEYOR_BUILD_FOLDER%/build/linux-x64/*
 
 test_script:
   - dotnet test --no-build --no-restore -v normal -f net5.0 -c Release "src/Impostor.Tests"
 
 artifacts:
-  - path: build/win-x64.zip
-    name: Impostor-Server-win-x64.zip
-  - path: build/linux-x64.zip
-    name: Impostor-Server-linux-x64.zip
+  - path: build/Impostor-Server-win-x64-$(APPVEYOR_BUILD_VERSION).zip
+    name: Impostor-Server-win-x64-$(APPVEYOR_BUILD_VERSION).zip
+  - path: build/Impostor-Server-linux-x64-$(APPVEYOR_BUILD_VERSION).zip
+    name: Impostor-Server-linux-x64-$(APPVEYOR_BUILD_VERSION).zip
 
 only_commits:
   files:
diff --git a/src/Impostor.Server.Api/Impostor.Server.Api.csproj b/src/Impostor.Server.Api/Impostor.Server.Api.csproj
index 8a568af..1518fb6 100644
--- a/src/Impostor.Server.Api/Impostor.Server.Api.csproj
+++ b/src/Impostor.Server.Api/Impostor.Server.Api.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>Impostor.Server</RootNamespace>
         <Nullable>enable</Nullable>
+        <DebugType Condition=" '$(Configuration)' == 'Release' ">None</DebugType>
         <CodeAnalysisRuleSet>ProjectRules.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
 
diff --git a/src/Impostor.Server.Hazel/Impostor.Server.Hazel.csproj b/src/Impostor.Server.Hazel/Impostor.Server.Hazel.csproj
index 7d37edf..df3f8c9 100644
--- a/src/Impostor.Server.Hazel/Impostor.Server.Hazel.csproj
+++ b/src/Impostor.Server.Hazel/Impostor.Server.Hazel.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <DebugType Condition=" '$(Configuration)' == 'Release' ">None</DebugType>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Impostor.Server/Net/MatchmakerService.cs b/src/Impostor.Server/Net/MatchmakerService.cs
index db2b38e..1405b97 100644
--- a/src/Impostor.Server/Net/MatchmakerService.cs
+++ b/src/Impostor.Server/Net/MatchmakerService.cs
@@ -17,8 +17,8 @@ namespace Impostor.Server.Net
         private readonly IMatchmaker _matchmaker;
 
         public MatchmakerService(
-            ILogger<MatchmakerService> logger, 
-            IOptions<ServerConfig> serverConfig, 
+            ILogger<MatchmakerService> logger,
+            IOptions<ServerConfig> serverConfig,
             IOptions<ServerRedirectorConfig> redirectorConfig,
             IMatchmaker matchmaker)
         {
@@ -27,17 +27,18 @@ namespace Impostor.Server.Net
             _redirectorConfig = redirectorConfig.Value;
             _matchmaker = matchmaker;
         }
-        
+
         public async Task StartAsync(CancellationToken cancellationToken)
         {
             var endpoint = new IPEndPoint(IPAddress.Parse(_serverConfig.ListenIp), _serverConfig.ListenPort);
-            
+
             await _matchmaker.StartAsync(endpoint);
-            
-            _logger.LogInformation("Matchmaker is listening on {0}:{1}, the public server ip is {2}:{3}.", 
-                endpoint.Address, 
+
+            _logger.LogInformation(
+                "Matchmaker is listening on {0}:{1}, the public server ip is {2}:{3}.", 
+                endpoint.Address,
                 endpoint.Port,
-                _serverConfig.PublicIp, 
+                _serverConfig.PublicIp,
                 _serverConfig.PublicPort);
 
             if (_redirectorConfig.Enabled)
diff --git a/src/Impostor.Server/ProjectRules.ruleset b/src/Impostor.Server/ProjectRules.ruleset
index f3b4dc5..3654bc3 100644
--- a/src/Impostor.Server/ProjectRules.ruleset
+++ b/src/Impostor.Server/ProjectRules.ruleset
@@ -15,6 +15,7 @@
         <Rule Id="SA1309" Action="None" />
     </Rules>
     <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.CSharp.SpacingRules">
+        <Rule Id="SA1003" Action="None" />
         <Rule Id="SA1009" Action="None" />
     </Rules>
 </RuleSet>
\ No newline at end of file