Merge pull request #2 from Digitalroot-Valheim/develop

Update for race bug
Digitalroot-Valheim · Dec 8, 2021 · d7c3df7 · d7c3df7
2 parents afff1bf + 8018917
commit d7c3df7
Show file tree

Hide file tree

Showing 5 changed files with 214 additions and 225 deletions.
diff --git a/src/Digitalroot.OdinPlusModUploader/Digitalroot.OdinPlusModUploader.csproj b/src/Digitalroot.OdinPlusModUploader/Digitalroot.OdinPlusModUploader.csproj
@@ -29,7 +29,7 @@
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-    <VersionPrefix>1.0.6</VersionPrefix>
+    <VersionPrefix>1.0.7</VersionPrefix>
     <RestoreAdditionalProjectSources>
       https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json;
       https://digitalroot-valheim-nuget.s3.us-west-2.amazonaws.com/index.json

diff --git a/src/Digitalroot.OdinPlusModUploader/Http/Message.cs b/src/Digitalroot.OdinPlusModUploader/Http/Message.cs
@@ -1,18 +1,8 @@
 using Digitalroot.OdinPlusModUploader.Models;
 using Digitalroot.OdinPlusModUploader.Protocol;
-using System;
 
 namespace Digitalroot.OdinPlusModUploader.Http
 {
-  [Obsolete]
-  public sealed class Message
-  {
-    public AbstractRequest Request { get; set; }
-    public AbstractRequestModel RequestModel { get; set; }
-    public AbstractResponse Response { get; set; }
-    public AbstractResponseModel ResponseModel { get; set; }
-  }
-
   public sealed class Message<TRequest, TRequestModel, TResponse, TResponseModel>
     where TRequest : AbstractRequest
     where TRequestModel : AbstractRequestModel
@@ -24,6 +14,5 @@ public sealed class Message<TRequest, TRequestModel, TResponse, TResponseModel>
     public TResponse Response { get; set; }
     public TResponseModel ResponseModel { get; set; }
     public ErrorResponseModel ErrorResponseModel { get; set; }
-
   }
 }
diff --git a/src/Digitalroot.OdinPlusModUploader/Program.cs b/src/Digitalroot.OdinPlusModUploader/Program.cs
@@ -61,7 +61,7 @@ public static async Task<int> Main(string[] args)
 
     private static IHelpBuilder GetHelpBuilder(BindingContext arg)
     {
-      #if DEBUG2
+      #if DEBUG
       return GetUnMaskingHelpBuilder(Console.WindowWidth);
       #else
       return GetMaskingHelpBuilder(Console.WindowWidth);
@@ -70,7 +70,7 @@ private static IHelpBuilder GetHelpBuilder(BindingContext arg)
 
     private static IHelpBuilder GetHelpBuilder(int maxWidth)
     {
-      #if DEBUG2
+      #if DEBUG
       return GetUnMaskingHelpBuilder(maxWidth);
       #else
       return GetMaskingHelpBuilder(maxWidth);