Added several bug fixes

jeffcampbellmakesgames · Apr 18, 2022 · 3878401 · 3878401
2 parents b8108b4 + 72de2b8
commit 3878401
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/ExternalApp/Genesis.Unity.Factory.Plugin/CodeGenerators/ScriptableFactoryCodeGenerator.cs b/ExternalApp/Genesis.Unity.Factory.Plugin/CodeGenerators/ScriptableFactoryCodeGenerator.cs
@@ -203,7 +203,7 @@ public bool TryGetValue(${KeyFullType} key, out ${ValueFullType} value)
 
 			value = mapping.value;
 
-			return true;
+			return value != null;
 		}
 
 		#if ODIN_INSPECTOR && UNITY_EDITOR
@@ -356,7 +356,7 @@ public bool TryGetValue(${KeyFullType} key, out ${ValueFullType} value)
 
 			value = mapping.value;
 
-			return true;
+			return value != null;
 		}
 	}
 }

diff --git a/Unity/Assets/JCMG/Genesis/Scripts/Editor/CLI/GenesisCLIRunner.cs b/Unity/Assets/JCMG/Genesis/Scripts/Editor/CLI/GenesisCLIRunner.cs
@@ -256,8 +256,12 @@ private static string GetCodeGenerationCLIArguments(IEnumerable<GenesisSettings>
 
 		private static string GetConfigGenerationCLIArguments()
 		{
+			var cliInstallationPath = string.Format(
+				CommandLineConstants.QUOTATION_SURROUNDS_FORMAT,
+				GenesisPreferences.GetExecutablePath());
+
 			SB.Clear();
-			SB.Append(GenesisPreferences.GetExecutablePath());
+			SB.Append(cliInstallationPath);
 			SB.Append(EditorConstants.SPACE_STR);
 			SB.Append(CommandLineConstants.CONFIG_VERB_PARAM);
 			SB.Append(EditorConstants.SPACE_STR);

diff --git a/Unity/Packages/manifest.json b/Unity/Packages/manifest.json
@@ -2,10 +2,11 @@
   "dependencies": {
     "com.jeffcampbellmakesgames.packagetools": "1.5.1",
     "com.unity.ext.nunit": "1.0.6",
-    "com.unity.ide.rider": "1.1.4",
+    "com.unity.ide.rider": "1.2.1",
+    "com.unity.ide.visualstudio": "2.0.15",
     "com.unity.settings-manager": "1.0.3",
     "com.unity.sharp-zip-lib": "1.2.2-preview.2",
-    "com.unity.test-framework": "1.1.30",
+    "com.unity.test-framework": "1.1.31",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Unity/Packages/packages-lock.json b/Unity/Packages/packages-lock.json
@@ -15,14 +15,23 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "1.1.4",
+      "version": "1.2.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.15",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.settings-manager": {
       "version": "1.0.3",
       "depth": 0,
@@ -38,7 +47,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.30",
+      "version": "1.1.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/Unity/ProjectSettings/ProjectVersion.txt b/Unity/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.20f1
-m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa)
+m_EditorVersion: 2019.4.37f1
+m_EditorVersionWithRevision: 2019.4.37f1 (019e31cfdb15)