From a7788ba5a830ae26eea6641a462d8977b221f8b2 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Fri, 10 May 2019 19:41:42 +0200
Subject: [PATCH] Update the backport patches

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
---
 .../Kopernicus.Components.csproj.patch        | 53 -------------------
 .../packages.config.patch                     | 15 ------
 .../Kopernicus.OnDemand.csproj.patch          | 49 -----------------
 .../Kopernicus.OnDemand/packages.config.patch | 13 -----
 .../src/Kopernicus/Kopernicus.csproj.patch    | 18 +++----
 patches/src/Kopernicus/packages.config.patch  |  7 ++-
 .../src/Kopernicus.Parser.csproj.patch        | 19 ++-----
 .../config-parser/src/packages.config.patch   |  7 ++-
 8 files changed, 16 insertions(+), 165 deletions(-)
 delete mode 100644 patches/src/Kopernicus.Components/Kopernicus.Components.csproj.patch
 delete mode 100644 patches/src/Kopernicus.Components/packages.config.patch
 delete mode 100644 patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj.patch
 delete mode 100644 patches/src/Kopernicus.OnDemand/packages.config.patch

diff --git a/patches/src/Kopernicus.Components/Kopernicus.Components.csproj.patch b/patches/src/Kopernicus.Components/Kopernicus.Components.csproj.patch
deleted file mode 100644
index f989819..0000000
--- a/patches/src/Kopernicus.Components/Kopernicus.Components.csproj.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- Kopernicus/src/Kopernicus.Components/Kopernicus.Components.csproj	2018-10-12 15:32:31.154926172 +0200
-+++ Kopernicus-Backport/patches/src/Kopernicus.Components/Kopernicus.Components.csproj	2018-10-13 15:50:44.916145155 +0200
-@@ -18,7 +18,7 @@
-     <DebugType>full</DebugType>
-     <Optimize>false</Optimize>
-     <OutputPath>..\..\build\GameData\Kopernicus\Plugins\</OutputPath>
--    <DefineConstants>DEBUG;TRACE</DefineConstants>
-+    <DefineConstants>DEBUG;TRACE;{FLAG}</DefineConstants>
-     <ErrorReport>prompt</ErrorReport>
-     <WarningLevel>4</WarningLevel>
-   </PropertyGroup>
-@@ -26,17 +26,17 @@
-     <DebugType>none</DebugType>
-     <Optimize>true</Optimize>
-     <OutputPath>..\..\build\GameData\Kopernicus\Plugins\</OutputPath>
--    <DefineConstants>TRACE</DefineConstants>
-+    <DefineConstants>TRACE;{FLAG}</DefineConstants>
-     <ErrorReport>prompt</ErrorReport>
-     <WarningLevel>4</WarningLevel>
-   </PropertyGroup>
-   <ItemGroup>
-     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\Assembly-CSharp.{BASE}\lib\net35\Assembly-CSharp.dll</HintPath>
-+      <HintPath>..\..\packages\Assembly-CSharp.{BACKPORT}\lib\net35\Assembly-CSharp.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="ModularFlightIntegrator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\ModularFlightIntegrator.{MFIBASE}\lib\net35\ModularFlightIntegrator.dll</HintPath>
-+      <HintPath>..\..\packages\ModularFlightIntegrator.{MFIBACKPORT}\lib\net35\ModularFlightIntegrator.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="System">
-@@ -46,11 +46,11 @@
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\UnityEngine.{BASE}\lib\net35\UnityEngine.dll</HintPath>
-+      <HintPath>..\..\packages\UnityEngine.{BACKPORT}\lib\net35\UnityEngine.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\UnityEngine.UI.{BASE}\lib\net35\UnityEngine.UI.dll</HintPath>
-+      <HintPath>..\..\packages\UnityEngine.UI.{BACKPORT}\lib\net35\UnityEngine.UI.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-   </ItemGroup>
-@@ -115,4 +115,4 @@
-     <None Include="packages.config" />
-   </ItemGroup>
-   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
--</Project>
-\ Kein Zeilenumbruch am Dateiende.
-+</Project>
diff --git a/patches/src/Kopernicus.Components/packages.config.patch b/patches/src/Kopernicus.Components/packages.config.patch
deleted file mode 100644
index 6d1acdc..0000000
--- a/patches/src/Kopernicus.Components/packages.config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Kopernicus/src/Kopernicus.Components/packages.config	2018-08-05 20:24:54.972310317 +0200
-+++ Kopernicus-Backport/patches/src/Kopernicus.Components/packages.config	2018-10-13 15:50:44.916145155 +0200
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- <packages>
--  <package id="Assembly-CSharp" version="{BASE}" targetFramework="net35" />
--  <package id="ModularFlightIntegrator" version="{MFIBASE}" targetFramework="net35" />
--  <package id="UnityEngine" version="{BASE}" targetFramework="net35" />
--  <package id="UnityEngine.UI" version="{BASE}" targetFramework="net35" />
-+  <package id="Assembly-CSharp" version="{BACKPORT}" targetFramework="net35" />
-+  <package id="ModularFlightIntegrator" version="{MFIBACKPORT}" targetFramework="net35" />
-+  <package id="UnityEngine" version="{BACKPORT}" targetFramework="net35" />
-+  <package id="UnityEngine.UI" version="{BACKPORT}" targetFramework="net35" />
- </packages>
-\ Kein Zeilenumbruch am Dateiende.
diff --git a/patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj.patch b/patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj.patch
deleted file mode 100644
index 2492bd1..0000000
--- a/patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Kopernicus/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj	2018-08-05 20:24:54.972310317 +0200
-+++ Kopernicus-Backport/patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj	2018-10-13 15:50:44.916145155 +0200
-@@ -17,7 +17,7 @@
-     <DebugType>full</DebugType>
-     <Optimize>false</Optimize>
-     <OutputPath>..\..\build\GameData\Kopernicus\Plugins\</OutputPath>
--    <DefineConstants>DEBUG;TRACE</DefineConstants>
-+    <DefineConstants>DEBUG;TRACE;{FLAG}</DefineConstants>
-     <ErrorReport>prompt</ErrorReport>
-     <WarningLevel>4</WarningLevel>
-     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-@@ -26,14 +26,14 @@
-     <DebugType>none</DebugType>
-     <Optimize>true</Optimize>
-     <OutputPath>..\..\build\GameData\Kopernicus\Plugins\</OutputPath>
--    <DefineConstants>TRACE</DefineConstants>
-+    <DefineConstants>TRACE;{FLAG}</DefineConstants>
-     <ErrorReport>prompt</ErrorReport>
-     <WarningLevel>4</WarningLevel>
-     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-   </PropertyGroup>
-   <ItemGroup>
-     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\Assembly-CSharp.{BASE}\lib\net35\Assembly-CSharp.dll</HintPath>
-+      <HintPath>..\..\packages\Assembly-CSharp.{BACKPORT}\lib\net35\Assembly-CSharp.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="System">
-@@ -43,11 +43,11 @@
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\UnityEngine.{BASE}\lib\net35\UnityEngine.dll</HintPath>
-+      <HintPath>..\..\packages\UnityEngine.{BACKPORT}\lib\net35\UnityEngine.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
--      <HintPath>..\..\packages\UnityEngine.UI.{BASE}\lib\net35\UnityEngine.UI.dll</HintPath>
-+      <HintPath>..\..\packages\UnityEngine.UI.{BACKPORT}\lib\net35\UnityEngine.UI.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-   </ItemGroup>
-@@ -67,4 +67,4 @@
-     <None Include="packages.config" />
-   </ItemGroup>
-   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
--</Project>
-\ Kein Zeilenumbruch am Dateiende.
-+</Project>
diff --git a/patches/src/Kopernicus.OnDemand/packages.config.patch b/patches/src/Kopernicus.OnDemand/packages.config.patch
deleted file mode 100644
index ce931ef..0000000
--- a/patches/src/Kopernicus.OnDemand/packages.config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Kopernicus/src/Kopernicus.OnDemand/packages.config	2018-08-05 20:24:54.975643567 +0200
-+++ Kopernicus-Backport/patches/src/Kopernicus.OnDemand/packages.config	2018-10-13 15:50:44.916145155 +0200
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <packages>
--  <package id="Assembly-CSharp" version="{BASE}" targetFramework="net35" />
--  <package id="UnityEngine" version="{BASE}" targetFramework="net35" />
--  <package id="UnityEngine.UI" version="{BASE}" targetFramework="net35" />
-+  <package id="Assembly-CSharp" version="{BACKPORT}" targetFramework="net35" />
-+  <package id="UnityEngine" version="{BACKPORT}" targetFramework="net35" />
-+  <package id="UnityEngine.UI" version="{BACKPORT}" targetFramework="net35" />
- </packages>
-\ Kein Zeilenumbruch am Dateiende.
diff --git a/patches/src/Kopernicus/Kopernicus.csproj.patch b/patches/src/Kopernicus/Kopernicus.csproj.patch
index 03d3fe9..bf2d640 100644
--- a/patches/src/Kopernicus/Kopernicus.csproj.patch
+++ b/patches/src/Kopernicus/Kopernicus.csproj.patch
@@ -1,5 +1,5 @@
---- Kopernicus/src/Kopernicus/Kopernicus.csproj	2018-10-12 15:43:26.380249247 +0200
-+++ Kopernicus-Backport/patches/src/Kopernicus/Kopernicus.csproj	2018-10-13 15:50:44.916145155 +0200
+--- a/src/Kopernicus/Kopernicus.csproj	2019-05-10 19:19:10.348744438 +0200
++++ b/src/Kopernicus/Kopernicus.csproj	2019-05-10 19:35:28.740053886 +0200
 @@ -14,7 +14,7 @@
      <DebugType>full</DebugType>
      <Optimize>False</Optimize>
@@ -9,7 +9,7 @@
      <ErrorReport>prompt</ErrorReport>
      <WarningLevel>4</WarningLevel>
      <ConsolePause>False</ConsolePause>
-@@ -23,17 +23,18 @@
+@@ -24,6 +24,7 @@
      <DebugType>none</DebugType>
      <Optimize>True</Optimize>
      <OutputPath>..\..\build\GameData\Kopernicus\Plugins\</OutputPath>
@@ -17,6 +17,7 @@
      <ErrorReport>prompt</ErrorReport>
      <WarningLevel>4</WarningLevel>
      <ConsolePause>False</ConsolePause>
+@@ -31,11 +32,11 @@
    </PropertyGroup>
    <ItemGroup>
      <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
@@ -30,7 +31,7 @@
        <Private>False</Private>
      </Reference>
      <Reference Include="System">
-@@ -43,11 +44,11 @@
+@@ -45,11 +46,11 @@
        <Private>False</Private>
      </Reference>
      <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
@@ -43,11 +44,4 @@
 +      <HintPath>..\..\packages\UnityEngine.UI.{BACKPORT}\lib\net35\UnityEngine.UI.dll</HintPath>
        <Private>False</Private>
      </Reference>
-   </ItemGroup>
-@@ -243,4 +244,4 @@
-     <None Include="packages.config" />
-   </ItemGroup>
-   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
--</Project>
-\ Kein Zeilenumbruch am Dateiende.
-+</Project>
+   </ItemGroup>
\ No newline at end of file
diff --git a/patches/src/Kopernicus/packages.config.patch b/patches/src/Kopernicus/packages.config.patch
index c053c11..67f847e 100644
--- a/patches/src/Kopernicus/packages.config.patch
+++ b/patches/src/Kopernicus/packages.config.patch
@@ -1,5 +1,5 @@
---- Kopernicus/src/Kopernicus/packages.config	2018-08-05 20:24:54.985643320 +0200
-+++ Kopernicus-Backport/patches/src/Kopernicus/packages.config	2018-10-13 15:50:44.916145155 +0200
+--- a/src/Kopernicus/packages.config	2019-05-10 19:19:10.324744576 +0200
++++ b/src/Kopernicus/packages.config	2019-05-10 19:31:10.432538199 +0200
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="utf-8"?>
  <packages>
@@ -11,5 +11,4 @@
 +  <package id="ModularFlightIntegrator" version="{MFIBACKPORT}" targetFramework="net35" />
 +  <package id="UnityEngine" version="{BACKPORT}" targetFramework="net35" />
 +  <package id="UnityEngine.UI" version="{BACKPORT}" targetFramework="net35" />
- </packages>
-\ Kein Zeilenumbruch am Dateiende.
+ </packages>
\ No newline at end of file
diff --git a/patches/src/external/config-parser/src/Kopernicus.Parser.csproj.patch b/patches/src/external/config-parser/src/Kopernicus.Parser.csproj.patch
index d42a857..9f44055 100644
--- a/patches/src/external/config-parser/src/Kopernicus.Parser.csproj.patch
+++ b/patches/src/external/config-parser/src/Kopernicus.Parser.csproj.patch
@@ -1,5 +1,5 @@
---- Kopernicus/src/external/config-parser/src/Kopernicus.Parser.csproj	2018-08-05 20:24:58.665552562 +0200
-+++ Kopernicus-Backport/patches/src/external/config-parser/src/Kopernicus.Parser.csproj	2018-10-13 16:05:49.950054019 +0200
+--- a/src/external/config-parser/src/Kopernicus.Parser.csproj	2019-05-10 19:02:30.326439772 +0200
++++ b/src/external/config-parser/src/Kopernicus.Parser.csproj	2019-05-10 19:33:06.752869768 +0200
 @@ -17,7 +17,7 @@
      <DebugType>full</DebugType>
      <Optimize>false</Optimize>
@@ -9,7 +9,7 @@
      <ErrorReport>prompt</ErrorReport>
      <WarningLevel>4</WarningLevel>
    </PropertyGroup>
-@@ -25,26 +25,26 @@
+@@ -25,23 +25,23 @@
      <DebugType>pdbonly</DebugType>
      <Optimize>true</Optimize>
      <OutputPath>bin\Release\</OutputPath>
@@ -36,15 +36,4 @@
 +      <HintPath>..\..\..\..\packages\UnityEngine.UI.{BACKPORT}\lib\net35\UnityEngine.UI.dll</HintPath>
        <Private>False</Private>
      </Reference>
--  </ItemGroup>
-+  </ItemGroup>  
-   <ItemGroup>
-     <Compile Include="Attributes\ParserTarget.cs" />
-     <Compile Include="Attributes\ParserTargetCollection.cs" />
-@@ -84,4 +84,4 @@
-   <Target Name="AfterBuild">
-   </Target>
-   -->
--</Project>
-\ Kein Zeilenumbruch am Dateiende.
-+</Project>
+   </ItemGroup>
\ No newline at end of file
diff --git a/patches/src/external/config-parser/src/packages.config.patch b/patches/src/external/config-parser/src/packages.config.patch
index 7252213..0441931 100644
--- a/patches/src/external/config-parser/src/packages.config.patch
+++ b/patches/src/external/config-parser/src/packages.config.patch
@@ -1,5 +1,5 @@
---- Kopernicus/src/external/config-parser/src/packages.config	2018-08-05 20:24:58.665552562 +0200
-+++ Kopernicus-Backport/patches/src/external/config-parser/src/packages.config	2018-10-13 16:05:49.950054019 +0200
+--- a/src/external/config-parser/src/packages.config	2019-04-28 21:18:05.562777702 +0200
++++ b/src/external/config-parser/src/packages.config	2019-05-10 19:32:09.466198966 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="utf-8"?>
  <packages>
@@ -9,5 +9,4 @@
 +  <package id="Assembly-CSharp" version="{BACKPORT}" targetFramework="net35" />
 +  <package id="UnityEngine" version="{BACKPORT}" targetFramework="net35" />
 +  <package id="UnityEngine.UI" version="{BACKPORT}" targetFramework="net35" />
- </packages>
-\ Kein Zeilenumbruch am Dateiende.
+ </packages>
\ No newline at end of file