From e09a296ab26a34775aa917b5d29fada4e9cad443 Mon Sep 17 00:00:00 2001 From: Jeff Campbell Date: Wed, 13 Apr 2022 07:29:47 -0400 Subject: [PATCH 1/3] Applied same path fix for auto-import * Fixed path error for CLI installation where it could not handle paths with spaces in folder name when auto-importing plugins --- .../JCMG/Genesis/Scripts/Editor/CLI/GenesisCLIRunner.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Unity/Assets/JCMG/Genesis/Scripts/Editor/CLI/GenesisCLIRunner.cs b/Unity/Assets/JCMG/Genesis/Scripts/Editor/CLI/GenesisCLIRunner.cs index 09106e4..3730e46 100644 --- 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 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); From 9874b3f25aae570febe765bf0389c92fd4e9386a Mon Sep 17 00:00:00 2001 From: Jeff Campbell Date: Wed, 13 Apr 2022 09:07:37 -0400 Subject: [PATCH 2/3] Updated Unity proj to v2019.4.37f1 * Updated Unity proj to v2019.4.37f1 --- Unity/Packages/manifest.json | 5 +++-- Unity/Packages/packages-lock.json | 13 +++++++++++-- Unity/ProjectSettings/ProjectVersion.txt | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Unity/Packages/manifest.json b/Unity/Packages/manifest.json index ffc09b5..27b8c7e 100644 --- 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 index d919ba9..8ba5e3b 100644 --- a/Unity/Packages/packages-lock.json +++ b/Unity/Packages/packages-lock.json @@ -15,7 +15,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "1.2.1", "depth": 0, "source": "registry", "dependencies": { @@ -23,6 +23,15 @@ }, "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 index e8a0ab9..3b38506 100644 --- 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) From 72de2b8b55b28f1c1f1c8244ccd63f346e354c1e Mon Sep 17 00:00:00 2001 From: Jeff Campbell Date: Mon, 18 Apr 2022 07:00:46 -0400 Subject: [PATCH 3/3] Fixed bug with scriptable factory * Fixed bug with scriptable factory where there could be a mapped out value for a key, but that it could be null. This is now returned checking for null on the out value rather than returning true. --- .../CodeGenerators/ScriptableFactoryCodeGenerator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ExternalApp/Genesis.Unity.Factory.Plugin/CodeGenerators/ScriptableFactoryCodeGenerator.cs b/ExternalApp/Genesis.Unity.Factory.Plugin/CodeGenerators/ScriptableFactoryCodeGenerator.cs index 9cbd8cc..85dc90b 100644 --- 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; } } }