Merge pull request #45 from monaverse/tm/lts-2022.3.6f1-upgrade

TomMoore515 · web-flow · commit 0619f1072d53 · 2023-08-15T16:11:38.000+01:00
upgrade project to 2022.3.6f1 LTS
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+      "visualstudiotoolsforunity.vstuc"
+    ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,10 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Unity",
+            "type": "vstuc",
+            "request": "attach",
+        }
+     ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -73,5 +73,6 @@
         "titleBar.inactiveForeground": "#21152b"
       },
     "peacock.color": "#7a69c9",
-    "prettier.enable": false
+    "prettier.enable": false,
+    "dotnet.defaultSolution": "spacestarter.sln"
 }
diff --git a/Assets/Mona/QualityAssurance/QualityAssurance.Tests.cs b/Assets/Mona/QualityAssurance/QualityAssurance.Tests.cs
@@ -32,7 +32,7 @@ private static void TestSceneLayer(string sceneName, string layerTag, string mis
             bool found = false;
             foreach (var rootObject in rootObjects)
             {
-                if (rootObject.tag != layerTag) continue;
+                if (!rootObject.CompareTag(layerTag)) continue;
 
                 found = true;
                 break;
@@ -47,6 +47,7 @@ private static void TestSceneLayer(string sceneName, string layerTag, string mis
                 if (
                     !rootObject.tag.Equals(layerTag)
                     && !rootObject.name.StartsWith("!ftraceLightmaps")
+                    && !rootObject.name.Equals("VisualScripting SceneVariables")
                     && !rootObject.name.Equals("PDC")
                     && rootObject.activeSelf
                 )
@@ -95,7 +96,7 @@ public static void TestLayerContents(string layerName, string[] validTags, strin
 
                 foreach (string tag in validTags)
                 {
-                    if (rootObject.tag == tag) isValid = true;
+                    if (rootObject.CompareTag(tag)) isValid = true;
                 }
 
                 if (isValid) continue;
@@ -104,7 +105,7 @@ public static void TestLayerContents(string layerName, string[] validTags, strin
                 {
                     foreach (string tag in validTags)
                     {
-                        if (child.tag != tag) continue;
+                        if (!child.CompareTag(tag)) continue;
                         isValid = true;
                         break;
                     }
diff --git a/Assets/Mona/TemplateHelper/TemplateVersion.cs b/Assets/Mona/TemplateHelper/TemplateVersion.cs
@@ -6,8 +6,8 @@ namespace Mona
 {
     public static class TemplateInfo
     {
-        public static readonly string Version = "2.0.4";
-        public static readonly string UnityVer = "2022.2.3";
+        public static readonly string Version = "2.0.5";
+        public static readonly string UnityVer = "2022.3.6";
     }
 }
 #endif
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
-    "com.unity.ai.navigation": "1.1.1",
-    "com.unity.collab-proxy": "1.17.7",
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.collab-proxy": "2.0.5",
     "com.unity.editorcoroutines": "1.0.0",
-    "com.unity.ide.rider": "3.0.17",
-    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.20",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.7.2",
+    "com.unity.timeline": "1.7.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
     "com.unity.modules.ai": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -7,7 +7,7 @@
       "dependencies": {}
     },
     "com.unity.ai.navigation": {
-      "version": "1.1.1",
+      "version": "1.1.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -16,12 +16,10 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "1.17.7",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.services.core": "1.0.1"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.editorcoroutines": {
@@ -39,7 +37,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.17",
+      "version": "3.0.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -48,7 +46,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.20",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -63,24 +61,6 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.services.core": {
-      "version": "1.7.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.test-framework": {
       "version": "1.1.33",
       "depth": 0,
@@ -102,7 +82,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.7.2",
+      "version": "1.7.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.2.3f1
-m_EditorVersionWithRevision: 2022.2.3f1 (55531d7fa82e)
+m_EditorVersion: 2022.3.6f1
+m_EditorVersionWithRevision: 2022.3.6f1 (b9e6e7e9fa2d)
diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 <p align="center">Start building your own custom Mona Space using our official template</p>
 
 ## ⬇️ Unity Version
-This template requires the ```Unity 2022.2.3f1``` version. You can download it here:
-https://unity.com/releases/editor/whats-new/2022.2.3
+This template requires the ```Unity 2022.3.6f1``` version. You can download it here:
+https://unity.com/releases/editor/qa/lts-releases
 
-Be sure to also install ```WebGL Build Support```.
+Be sure to also install ```WebGL Build Support``` or you won't be able to export your space.
 
 
 ## 📃 Documentation
@@ -20,4 +20,4 @@ Mona [Video tutorials here](https://docs.monaverse.com/create/resources/mona-tut
 For support, join our [Discord support channel](https://discord.gg/gcrGHzTerU)
 
 ## ⚙️ Template version
-2.0.4
+2.0.5

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "recommendations": [
 +      "visualstudiotoolsforunity.vstuc"
 +    ]
 +}
Original file line number	Diff line number	Diff line change
`@@ -73,5 +73,6 @@`
`73`	`73`	`"titleBar.inactiveForeground": "#21152b"`
`74`	`74`	`},`
`75`	`75`	`"peacock.color": "#7a69c9",`
`76`		`- "prettier.enable": false`
	`76`	`+ "prettier.enable": false,`
	`77`	`+ "dotnet.defaultSolution": "spacestarter.sln"`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ private static void TestSceneLayer(string sceneName, string layerTag, string mis`
`32`	`32`	`bool found = false;`
`33`	`33`	`foreach (var rootObject in rootObjects)`
`34`	`34`	`{`
`35`		`- if (rootObject.tag != layerTag) continue;`
	`35`	`+ if (!rootObject.CompareTag(layerTag)) continue;`
`36`	`36`
`37`	`37`	`found = true;`
`38`	`38`	`break;`
`@@ -47,6 +47,7 @@ private static void TestSceneLayer(string sceneName, string layerTag, string mis`
`47`	`47`	`if (`
`48`	`48`	`!rootObject.tag.Equals(layerTag)`
`49`	`49`	`&& !rootObject.name.StartsWith("!ftraceLightmaps")`
	`50`	`+ && !rootObject.name.Equals("VisualScripting SceneVariables")`
`50`	`51`	`&& !rootObject.name.Equals("PDC")`
`51`	`52`	`&& rootObject.activeSelf`
`52`	`53`	`)`
`@@ -95,7 +96,7 @@ public static void TestLayerContents(string layerName, string[] validTags, strin`
`95`	`96`
`96`	`97`	`foreach (string tag in validTags)`
`97`	`98`	`{`
`98`		`- if (rootObject.tag == tag) isValid = true;`
	`99`	`+ if (rootObject.CompareTag(tag)) isValid = true;`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`if (isValid) continue;`
`@@ -104,7 +105,7 @@ public static void TestLayerContents(string layerName, string[] validTags, strin`
`104`	`105`	`{`
`105`	`106`	`foreach (string tag in validTags)`
`106`	`107`	`{`
`107`		`- if (child.tag != tag) continue;`
	`108`	`+ if (!child.CompareTag(tag)) continue;`
`108`	`109`	`isValid = true;`
`109`	`110`	`break;`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ namespace Mona`
`6`	`6`	`{`
`7`	`7`	`public static class TemplateInfo`
`8`	`8`	`{`
`9`		`- public static readonly string Version = "2.0.4";`
`10`		`- public static readonly string UnityVer = "2022.2.3";`
	`9`	`+ public static readonly string Version = "2.0.5";`
	`10`	`+ public static readonly string UnityVer = "2022.3.6";`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`#endif`