Merge remote-tracking branch 'upstream/main' into experiments/moonsharp

IxxyXR · Aug 30, 2023 · dafcbf3 · dafcbf3
2 parents 71d68c9 + 2d350b1
commit dafcbf3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -8,8 +8,8 @@
     "com.unity.editorcoroutines": "1.0.0",
     "com.unity.formats.usd": "1.0.3-preview.2",
     "com.unity.ide.rider": "3.0.24",
-    "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
+    "com.unity.ide.visualstudio": "2.0.20",
     "com.unity.inputsystem": "https://github.com/icosa-mirror/com.unity.inputsystem.git#open-brush",
     "com.unity.localization": "1.4.2",
     "com.unity.mobile.android-logcat": "1.3.2",
@@ -90,6 +90,18 @@
         "com.meta.xr.sdk"
       ]
     },
+    {
+      "name": "package.openupm.com",
+      "url": "https://package.openupm.com",
+      "scopes": [
+        "com.openupm"
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.vectorgraphics": "https://github.com/icosa-gallery/com.unity.vectorgraphics.git#open-brush",
+    "moonsharp": "https://github.com/nothke/moonsharp-unity-upm.git",
+      ]
+    },
     {
       "name": "package.openupm.com",
       "url": "https://package.openupm.com",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -100,21 +100,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.20",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.inputsystem": {
       "version": "https://github.com/icosa-mirror/com.unity.inputsystem.git#open-brush",
       "depth": 0,