Merge pull request #29 from ihsoft/next

Release v2.1
ihsoft · Mar 3, 2020 · 3ff34bd · 3ff34bd
2 parents 4284d28 + 93b41a1
commit 3ff34bd
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 147 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.1 (March, 3rd, 2020)
+* [Change] Switch to C# compiler v6.0.
+* [Change] Set maximum KSP version to `1.99` due to now Squad team increases the minor part on _any_ release, except a bugfix one (and it's the right way to treat versions!).
+* [Enhancement] Fixing typos in the default localization strings descriptions.
+
 # 2.0 (October 10th, 2019)
 * [Change] KSP 1.8 compatibility. __WARNING__ Mod versions of `v2.0` and higher are not compatible to KSP versions prior to `1.8`!
 * [Change] Upgrade to `C# .Net 4.5`.

diff --git a/EasyVesselSwitch.version b/EasyVesselSwitch.version
@@ -3,25 +3,22 @@
     "DOWNLOAD": "http://kerbal.curseforge.com/projects/easy-vessel-switch-evs", 
     "KSP_VERSION": {
         "MAJOR": 1, 
-        "MINOR": 8, 
-        "PATCH": 0
+        "MINOR": 9
     }, 
     "KSP_VERSION_MAX": {
         "MAJOR": 1, 
-        "MINOR": 8, 
-        "PATCH": 99
+        "MINOR": 99
     }, 
     "KSP_VERSION_MIN": {
         "MAJOR": 1, 
-        "MINOR": 8, 
-        "PATCH": 0
+        "MINOR": 8
     }, 
     "NAME": "Easy Vessel Switch", 
     "URL": "https://raw.githubusercontent.com/ihsoft/EasyVesselSwitch/master/EasyVesselSwitch.version", 
     "VERSION": {
-        "BUILD": 25545, 
+        "BUILD": 39779, 
         "MAJOR": 2, 
-        "MINOR": 0, 
-        "PATCH": 7235
+        "MINOR": 1, 
+        "PATCH": 7366
     }
 }
diff --git a/Source/Controller.cs b/Source/Controller.cs
diff --git a/Source/EasyVesselSwitch.csproj b/Source/EasyVesselSwitch.csproj
@@ -50,13 +50,11 @@
     <DocumentationFile>bin\Release\EasyVesselSwitch.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp">
+    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>Q:\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
     </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
+    <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>Q:\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="KSPDev_Utils.2.0">
       <HintPath>..\Binaries\KSPDev_Utils.2.0.dll</HintPath>

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -24,8 +24,8 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion ("2.0.*")]
-[assembly: AssemblyInformationalVersion ("2.0 for KSP v1.8")]
+[assembly: AssemblyVersion ("2.1.*")]
+[assembly: AssemblyInformationalVersion ("2.1 for KSP v1.*")]
 [assembly: Guid ("52fd90de-a2a6-4642-8fc4-50f8d938319c")]
-[assembly: KSPAssembly ("EasyVesselSwitch", 2, 0)]
+[assembly: KSPAssembly ("EasyVesselSwitch", 2, 1)]
 [assembly: AssemblyFlags (AssemblyNameFlags.PublicKey | AssemblyNameFlags.EnableJITcompileOptimizer)]
diff --git a/Tools/make_binary.cmd b/Tools/make_binary.cmd
@@ -1,4 +1,3 @@
 @echo off
-REM Until new major version of C# is released the build number in the path will keep counting.
-REM EVS *requires* .NET compiler version 4.0 or higher. Don't get confused with KSP run-time requirement of 3.5.
-C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild ..\Source\EasyVesselSwitch.csproj /t:Clean,Build /p:Configuration=Release
+REM EVS *requires* .NET compiler version 6.0 or higher and Framework version not less than 4.5.
+"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" ..\Source\EasyVesselSwitch.csproj /t:Clean,Build /p:Configuration=Release
diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt
@@ -3,4 +3,4 @@
 --changelog=../CHANGELOG.md
 --versions=latest_all_builds
 --title=EVS {tag}
---archive=../EasyVesselSwitch_v2.0.zip
+--archive=../EasyVesselSwitch_v2.1.zip
diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt
@@ -4,4 +4,4 @@
 --changelog=../CHANGELOG.md
 --as_draft
 --title=EVS v{tag}
---archive=../EasyVesselSwitch_v2.0.zip
+--archive=../EasyVesselSwitch_v2.1.zip
diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt
@@ -2,4 +2,4 @@
 --login=<<SECRET>>
 --changelog=../CHANGELOG.md
 --ksp_version=latest
---archive=../EasyVesselSwitch_v2.0.zip
+--archive=../EasyVesselSwitch_v2.1.zip