Update the backport patches

Signed-off-by: Dorian Stoll <[email protected]>
Kopernicus · May 10, 2019 · a7788ba · a7788ba
1 parent 81fd4fc
commit a7788ba
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 165 deletions.
diff --git a/patches/src/Kopernicus.Components/Kopernicus.Components.csproj.patch b/patches/src/Kopernicus.Components/Kopernicus.Components.csproj.patch
diff --git a/patches/src/Kopernicus.Components/packages.config.patch b/patches/src/Kopernicus.Components/packages.config.patch
diff --git a/patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj.patch b/patches/src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj.patch
diff --git a/patches/src/Kopernicus.OnDemand/packages.config.patch b/patches/src/Kopernicus.OnDemand/packages.config.patch
diff --git 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,14 +9,15 @@
      <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>
 +    <DefineConstants>{FLAG}</DefineConstants>
      <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>
diff --git 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>
diff --git 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>
diff --git 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>