From f41a92d536837fca877a35bbcdf7283254c3e47c Mon Sep 17 00:00:00 2001
From: Halak <halakshin@gmail.com>
Date: Mon, 27 Jul 2020 18:00:43 +0900
Subject: [PATCH] Upgrade Unity-2020.1.0f1

---
 Packages/manifest.json                       |  1 +
 Packages/packages-lock.json                  | 11 +++++++++++
 ProjectSettings/ProjectVersion.txt           |  3 ++-
 ProjectSettings/VersionControlSettings.asset |  8 ++++++++
 ProjectSettings/XRSettings.asset             | 10 ++++++++++
 UserSettings/EditorUserSettings.asset        | 19 +++++++++++++++++++
 6 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 Packages/packages-lock.json
 create mode 100644 ProjectSettings/VersionControlSettings.asset
 create mode 100644 ProjectSettings/XRSettings.asset
 create mode 100644 UserSettings/EditorUserSettings.asset

diff --git a/Packages/manifest.json b/Packages/manifest.json
index 9664f260..6331c80a 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,4 +1,5 @@
 {
   "dependencies": {
+    "com.unity.ide.visualstudio": "2.0.2"
   }
 }
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
new file mode 100644
index 00000000..bae62427
--- /dev/null
+++ b/Packages/packages-lock.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.2",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    }
+  }
+}
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index ca32b1e0..e18cabd3 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1 +1,2 @@
-m_EditorVersion: 2018.3.0f2
+m_EditorVersion: 2020.1.0f1
+m_EditorVersionWithRevision: 2020.1.0f1 (2ab9c4179772)
diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset
new file mode 100644
index 00000000..dca28814
--- /dev/null
+++ 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
diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset
new file mode 100644
index 00000000..482590c1
--- /dev/null
+++ b/ProjectSettings/XRSettings.asset
@@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}
\ No newline at end of file
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
new file mode 100644
index 00000000..4681d1d2
--- /dev/null
+++ b/UserSettings/EditorUserSettings.asset
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!162 &1
+EditorUserSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 4
+  m_ConfigSettings:
+    vcSharedLogLevel:
+      value: 0d5e400f0650
+      flags: 0
+  m_VCAutomaticAdd: 1
+  m_VCDebugCom: 0
+  m_VCDebugCmd: 0
+  m_VCDebugOut: 0
+  m_SemanticMergeMode: 2
+  m_VCShowFailedCheckout: 1
+  m_VCOverwriteFailedCheckoutAssets: 1
+  m_VCOverlayIcons: 1
+  m_VCAllowAsyncUpdate: 0