Project update to 2020.3, simplify using

Joserbala · May 7, 2021 · 2e90294 · 2e90294
1 parent f3b2c2b
commit 2e90294
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 27 deletions.
diff --git a/Assets/Fonts/ShareTechMono-Regular SDF.asset b/Assets/Fonts/ShareTechMono-Regular SDF.asset
@@ -112,11 +112,11 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
-  m_Name: ShareTechMono-Regular SDF 1
+  m_Name: ShareTechMono-Regular SDF
   m_EditorClassIdentifier: 
-  hashCode: 639859459
+  hashCode: 911641234
   material: {fileID: -5570966773077350204}
-  materialHashCode: 1141220035
+  materialHashCode: -1419221006
   m_Version: 1.1.0
   m_SourceFontFileGUID: 320b1d016ac906f48877ff9f553c1d5c
   m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 320b1d016ac906f48877ff9f553c1d5c,

diff --git a/Assets/Scripts/File Handling/FileManager.cs b/Assets/Scripts/File Handling/FileManager.cs
@@ -94,12 +94,11 @@ public string Read(string path)
 
         public void Write(string path, string text)
         {
-            using (var writer = new StreamWriter(path, false))
-            {
-                writer.WriteLine(text);
+            using var writer = new StreamWriter(path, false);
 
-                writer.Close();
-            }
+            writer.WriteLine(text);
+
+            writer.Close();
         }
 
         #endregion

diff --git a/Assets/Scripts/File Handling/SerializerManager.cs b/Assets/Scripts/File Handling/SerializerManager.cs
@@ -1,12 +1,11 @@
 using System.IO;
-using System.Xml;
 using UnityEngine;
 using Joserbala.Utils;
 using Joserbala.Data;
 
 namespace Joserbala.Serialization
 {
-    public class SerializerManager : Singleton<SerializerManager> // TODO: remove unused methods
+    public class SerializerManager : Singleton<SerializerManager>
     {
 
         #region BINARY
@@ -18,10 +17,9 @@ public class SerializerManager : Singleton<SerializerManager> // TODO: remove un
         /// <param name="content">The content that will be stored in <paramref name="path"/>.</param>
         public void WriteBinary(string path, string content)
         {
-            using (BinaryWriter writer = new BinaryWriter(File.Open(path, FileMode.Create)))
-            {
-                writer.Write(content);
-            }
+            using var writer = new BinaryWriter(File.Open(path, FileMode.Create));
+
+            writer.Write(content);
         }
 
         #endregion

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,12 +1,13 @@
 {
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ide.rider": "1.1.4",
+    "com.unity.collab-proxy": "1.3.9",
+    "com.unity.ide.rider": "2.0.7",
+    "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.ide.vscode": "1.2.3",
-    "com.unity.test-framework": "1.1.20",
-    "com.unity.textmeshpro": "2.1.6",
-    "com.unity.timeline": "1.2.17",
+    "com.unity.test-framework": "1.1.24",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.4.7",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -7,7 +7,7 @@
       "dependencies": {}
     },
     "com.unity.collab-proxy": {
-      "version": "1.2.16",
+      "version": "1.3.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -21,14 +21,23 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "1.1.4",
+      "version": "2.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.7",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ide.vscode": {
       "version": "1.2.3",
       "depth": 0,
@@ -37,7 +46,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.20",
+      "version": "1.1.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -48,7 +57,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "2.1.6",
+      "version": "3.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -57,10 +66,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.2.17",
+      "version": "1.4.7",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
@@ -205,6 +219,18 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.uielementsnative": "1.0.0"
+      }
+    },
+    "com.unity.modules.uielementsnative": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       }

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.18f1
-m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880)
+m_EditorVersion: 2020.3.7f1
+m_EditorVersionWithRevision: 2020.3.7f1 (dd97f2c94397)
diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,8 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_CollabEditorSettings:
+    inProgressEnabled: 1