Prepare for 1.8

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
Kopernicus · Feb 3, 2020 · fca4f6a · fca4f6a
1 parent 037a987
commit fca4f6a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 21 deletions.
diff --git a/src/KittopiaTech.cs b/src/KittopiaTech.cs
@@ -19,9 +19,6 @@ void Start()
         {
             // Stop the Garbage Collector
             DontDestroyOnLoad(this);
-
-            // Init the UI
-            PlanetSelector.Instance.Init();
         }
 
         void Update()
@@ -32,6 +29,8 @@ void Update()
                 // Open or close the main window
                 if (!PlanetSelector.Instance.IsOpen)
                 {
+                    // Init the UI
+                    PlanetSelector.Instance.Init();
                     PlanetSelector.Instance.Open();
                 }
                 else

diff --git a/src/KittopiaTech.csproj b/src/KittopiaTech.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KittopiaTech</RootNamespace>
     <AssemblyName>KittopiaTech</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -33,35 +33,51 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Assembly-CSharp.1.7.3\lib\net35\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\packages\Assembly-CSharp.1.8.1\lib\net40\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Assembly-CSharp-firstpass.1.7.3\lib\net35\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\packages\Assembly-CSharp-firstpass.1.8.1\lib\net40\Assembly-CSharp-firstpass.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Kopernicus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Kopernicus.1.7.3.2\lib\net35\Kopernicus.dll</HintPath>
+      <HintPath>..\packages\Kopernicus.1.8.1.1\lib\net40\Kopernicus.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Kopernicus.Parser, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Kopernicus.Parser.1.7.3.2\lib\net35\Kopernicus.Parser.dll</HintPath>
+      <HintPath>..\packages\Kopernicus.Parser.1.8.1.1\lib\net40\Kopernicus.Parser.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="ModularFlightIntegrator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\ModularFlightIntegrator.1.2.6.5\lib\net35\ModularFlightIntegrator.dll</HintPath>
+      <HintPath>..\packages\ModularFlightIntegrator.1.2.7.0\lib\net40\ModularFlightIntegrator.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\UnityEngine.1.7.3\lib\net35\UnityEngine.dll</HintPath>
+    <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UnityEngine.CoreModule.1.8.1\lib\net40\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UnityEngine.IMGUIModule.1.8.1\lib\net40\UnityEngine.IMGUIModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.InputLegacyModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UnityEngine.InputLegacyModule.1.8.1\lib\net40\UnityEngine.InputLegacyModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UnityEngine.TextRenderingModule.1.8.1\lib\net40\UnityEngine.TextRenderingModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\UnityEngine.UI.1.7.3\lib\net35\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\packages\UnityEngine.UI.1.8.1\lib\net40\UnityEngine.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\UnityEngine.UIModule.1.8.1\lib\net40\UnityEngine.UIModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -111,4 +127,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/UI/PlanetSelector.cs b/src/UI/PlanetSelector.cs
@@ -51,6 +51,8 @@ public override Single GetWidth()
         /// </summary>
         public void Init()
         {
+            Bodies.Clear();
+            Thumbnails.Clear();
             foreach (CelestialBody body in PSystemManager.Instance.localBodies)
             {
                 Thumbnails.Add(body.transform.name, GetPlanetThumbnail(body));

diff --git a/src/packages.config b/src/packages.config
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Assembly-CSharp" version="1.7.3" targetFramework="net35" />
-  <package id="Assembly-CSharp-firstpass" version="1.7.3" targetFramework="net35" />
-  <package id="Kopernicus" version="1.7.3.2" targetFramework="net35" />
-  <package id="Kopernicus.Parser" version="1.7.3.2" targetFramework="net35" />
-  <package id="ModularFlightIntegrator" version="1.2.6.5" targetFramework="net35" />
-  <package id="UnityEngine" version="1.7.3" targetFramework="net35" />
-  <package id="UnityEngine.UI" version="1.7.3" targetFramework="net35" />
-</packages>
+  <package id="Assembly-CSharp" version="1.8.1" targetFramework="net472" />
+  <package id="Assembly-CSharp-firstpass" version="1.8.1" targetFramework="net472" />
+  <package id="Kopernicus" version="1.8.1.1" targetFramework="net472" />
+  <package id="Kopernicus.Parser" version="1.8.1.1" targetFramework="net472" />
+  <package id="ModularFlightIntegrator" version="1.2.7.0" targetFramework="net472" />
+  <package id="UnityEngine.CoreModule" version="1.8.1" targetFramework="net472" />
+  <package id="UnityEngine.IMGUIModule" version="1.8.1" targetFramework="net472" />
+  <package id="UnityEngine.InputLegacyModule" version="1.8.1" targetFramework="net472" />
+  <package id="UnityEngine.TextRenderingModule" version="1.8.1" targetFramework="net472" />
+  <package id="UnityEngine.UI" version="1.8.1" targetFramework="net472" />
+  <package id="UnityEngine.UIModule" version="1.8.1" targetFramework="net472" />
+</packages>