From 62e98a3f93bc6e577a8b49fbf1640b575fc3ca84 Mon Sep 17 00:00:00 2001
From: Matteo Cominetti <matteo@speckle.systems>
Date: Sun, 1 Aug 2021 14:33:11 +0200
Subject: [PATCH] refractor: unity is updating some stuff

---
 Assets/SpecklePlayground.unity         |  6 +++---
 Packages/manifest.json                 | 10 ++++-----
 Packages/packages-lock.json            | 29 ++++++++++++++++++--------
 ProjectSettings/ProjectVersion.txt     |  4 ++--
 ProjectSettings/TimelineSettings.asset | 15 +++++++++++++
 5 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 ProjectSettings/TimelineSettings.asset

diff --git a/Assets/SpecklePlayground.unity b/Assets/SpecklePlayground.unity
index e3c21c8..8e8d107 100644
--- a/Assets/SpecklePlayground.unity
+++ b/Assets/SpecklePlayground.unity
@@ -4870,11 +4870,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SelectedAccountIndex: 0
-  SelectedStreamIndex: 0
-  SelectedBranchIndex: 0
+  SelectedStreamIndex: 7
+  SelectedBranchIndex: 1
   SelectedCommitIndex: 0
   OldSelectedAccountIndex: 0
-  OldSelectedStreamIndex: 0
+  OldSelectedStreamIndex: 7
 --- !u!114 &2060322469
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 69f98bb..4361f25 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,13 +1,13 @@
 {
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.collab-proxy": "1.3.9",
+    "com.unity.collab-proxy": "1.5.7",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.5",
+    "com.unity.ide.visualstudio": "2.0.9",
     "com.unity.ide.vscode": "1.2.3",
-    "com.unity.test-framework": "1.1.19",
-    "com.unity.textmeshpro": "3.0.1",
-    "com.unity.timeline": "1.4.4",
+    "com.unity.test-framework": "1.1.26",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.4.8",
     "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
index 94dc2bc..461202f 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -7,14 +7,16 @@
       "dependencies": {}
     },
     "com.unity.collab-proxy": {
-      "version": "1.3.9",
+      "version": "1.5.7",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "2.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.5",
+      "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -30,10 +32,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.5",
+      "version": "2.0.9",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
@@ -43,19 +47,26 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "2.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
-      "version": "1.1.19",
+      "version": "1.1.26",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.5",
+        "com.unity.ext.nunit": "1.0.6",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.1",
+      "version": "3.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -64,7 +75,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.4.4",
+      "version": "1.4.8",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index a328ffd..95c2fc9 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.2.1f1
-m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c)
+m_EditorVersion: 2020.3.13f1
+m_EditorVersionWithRevision: 2020.3.13f1 (71691879b7f5)
diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset
new file mode 100644
index 0000000..b4fbdb0
--- /dev/null
+++ b/ProjectSettings/TimelineSettings.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60