Merge #3218 Make Mono 6 builds work on Windows

KSP-CKAN · Dec 1, 2020 · 9b6d283 · 9b6d283
2 parents 4f08f2a + b75304a
commit 9b6d283
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mono: ['5.20', '6.4', '6.6', '6.8']
+        mono: ['5.20', '6.4', '6.6', '6.8', 'latest']
         configuration: [Debug, Release]
 
     container:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: mono:5.20
+      image: mono:latest
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: mono:5.20
+      image: mono:latest
 
     steps:
       - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## v1.29.3
 
+### Internal
+
+- [GUI] Make Mono 6 builds work on Windows (#3218 by: HebaruSan; reviewed: DasSkelett)
+
 ## v1.29.2 (Freedman)
 
 ### Features

diff --git a/GUI/Controls/ManageMods.resx b/GUI/Controls/ManageMods.resx
@@ -147,9 +147,6 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="launchKSPToolStripMenuItem.Text" xml:space="preserve"><value>Launch KSP</value></data>
   <data name="RefreshToolButton.Text" xml:space="preserve"><value>Refresh</value></data>
   <data name="UpdateAllToolButton.Text" xml:space="preserve"><value>Add available updates</value></data>

diff --git a/GUI/Localization/de-DE/ManageMods.de-DE.resx b/GUI/Localization/de-DE/ManageMods.de-DE.resx
@@ -147,9 +147,6 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="launchKSPToolStripMenuItem.Text" xml:space="preserve"><value>KSP starten</value></data>
   <data name="RefreshToolButton.Text" xml:space="preserve"><value>Aktualisieren</value></data>
   <data name="UpdateAllToolButton.Text" xml:space="preserve"><value>Verfügbare Updates auswählen</value></data>

diff --git a/GUI/Localization/zh-CN/EditModSearch.zh-CN.resx b/GUI/Localization/zh-CN/EditModSearch.zh-CN.resx
@@ -147,8 +147,5 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="FilterCombinedLabel.Text" xml:space="preserve"><value>搜索:</value></data>
 </root>
diff --git a/GUI/Localization/zh-CN/EditModSearchDetails.zh-CN.resx b/GUI/Localization/zh-CN/EditModSearchDetails.zh-CN.resx
@@ -147,9 +147,6 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="FilterByAuthorLabel.Text" xml:space="preserve"><value>按作者名筛选:</value></data>
   <data name="FilterByNameLabel.Text" xml:space="preserve"><value>按Mod名称筛选:</value></data>
   <data name="FilterByDescriptionLabel.Text" xml:space="preserve"><value>按描述筛选:</value></data>

diff --git a/GUI/Localization/zh-CN/Main.zh-CN.resx b/GUI/Localization/zh-CN/Main.zh-CN.resx
@@ -162,9 +162,6 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="fileToolStripMenuItem.Text" xml:space="preserve"><value>文件</value></data>
   <data name="manageKspInstancesMenuItem.Text" xml:space="preserve"><value>管理KSP实例</value></data>
   <data name="openKspDirectoryToolStripMenuItem.Text" xml:space="preserve"><value>打开KSP目录</value></data>

diff --git a/GUI/Localization/zh-CN/ManageMods.zh-CN.resx b/GUI/Localization/zh-CN/ManageMods.zh-CN.resx
@@ -147,9 +147,6 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="launchKSPToolStripMenuItem.Text" xml:space="preserve"><value>启动KSP</value></data>
   <data name="RefreshToolButton.Text" xml:space="preserve"><value>刷新</value></data>
   <data name="UpdateAllToolButton.Text" xml:space="preserve"><value>添加可用更新</value></data>

diff --git a/GUI/Main/Main.resx b/GUI/Main/Main.resx
@@ -135,9 +135,6 @@
   <data name="$this.Localizable" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib">
-    <value>(Default)</value>
-  </data>
   <data name="fileToolStripMenuItem.Text" xml:space="preserve"><value>File</value></data>
   <data name="manageKspInstancesMenuItem.Text" xml:space="preserve"><value>Manage KSP Instances</value></data>
   <data name="openKspDirectoryToolStripMenuItem.Text" xml:space="preserve"><value>Open KSP Directory</value></data>