From b75304adcccb7b75d6e2d0abb4bfb3ca7cf686d9 Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Tue, 1 Dec 2020 11:45:00 -0600
Subject: [PATCH] Make Mono 6 builds work on Windows

---
 .github/workflows/build.yml                            | 2 +-
 .github/workflows/deploy.yml                           | 2 +-
 .github/workflows/release.yml                          | 2 +-
 GUI/Controls/ManageMods.resx                           | 3 ---
 GUI/Localization/de-DE/ManageMods.de-DE.resx           | 3 ---
 GUI/Localization/zh-CN/EditModSearch.zh-CN.resx        | 3 ---
 GUI/Localization/zh-CN/EditModSearchDetails.zh-CN.resx | 3 ---
 GUI/Localization/zh-CN/Main.zh-CN.resx                 | 3 ---
 GUI/Localization/zh-CN/ManageMods.zh-CN.resx           | 3 ---
 GUI/Main/Main.resx                                     | 3 ---
 10 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7515134e07..1ad7ab9f64 100644
--- 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
index 2a5f33363d..5629bc41a8 100644
--- 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
index b5dac324d2..8d5ec8f9db 100644
--- 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/GUI/Controls/ManageMods.resx b/GUI/Controls/ManageMods.resx
index ea50ec1605..2dcef4a6fb 100644
--- 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
index 72629caffc..bf05344f1e 100644
--- 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
index d6b58bf396..7c9e4bf54b 100644
--- 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
index 2866e2120b..ad2610bc72 100644
--- 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
index 4a8f49d93d..d128c04302 100644
--- 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
index 7f51c55087..4722edca26 100644
--- 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
index e2f4db738e..a8c7d08fe3 100644
--- 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>