From ff03ffda690943f17800d3a26b97ba0d6e753c33 Mon Sep 17 00:00:00 2001 From: Bertrand Guay-Paquet Date: Sat, 9 Mar 2024 22:47:14 +0100 Subject: [PATCH 1/4] Fix build on Windows --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 92930162..db5754da 100644 --- a/build.gradle +++ b/build.gradle @@ -126,7 +126,7 @@ project.ext { "MONO_EXE", false, { unityRootDirTree.matching { include (operatingSystem == OperatingSystem.WINDOWS ? - "**/bin/mono.bat" : "**/bin/mono") + "**/bin/mono.exe" : "**/bin/mono") exclude unitySearchDirExcludes } }) @@ -318,9 +318,9 @@ project.ext { pythonBootstrapDir = new File(externalToolsDir, "python_bootstrap") pythonBinDir = new File(new File(pythonBootstrapDir, "python"), "bin") // Python binary after it has been bootstrapped. - pythonExe = new File(pythonBinDir, "python3") + pythonExe = new File(new File(pythonBootstrapDir, "python"), "python") // Pip binary after it has been bootstrapped. - pipExe = new File(pythonBinDir, "pip3") + pipExe = new File(new File(new File(pythonBootstrapDir, "python"), "Scripts"), "pip3") // Python packages required by export_unity_package.py exportUnityPackageRequirements = ["absl-py", "PyYAML", "packaging"] // Python packages required by gen_guids.py From e48e5f86408edf6c877dc6d24410ff978dc4785f Mon Sep 17 00:00:00 2001 From: Bertrand Guay-Paquet Date: Sat, 9 Mar 2024 22:48:01 +0100 Subject: [PATCH 2/4] Don't save setting on each plugin init --- source/IOSResolver/src/IOSResolver.cs | 9 +++++++-- .../PackageManagerResolver/src/PackageManagerResolver.cs | 9 +++++++-- source/VersionHandlerImpl/src/VersionHandlerImpl.cs | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/source/IOSResolver/src/IOSResolver.cs b/source/IOSResolver/src/IOSResolver.cs index ab6c2cf1..c4b834d7 100644 --- a/source/IOSResolver/src/IOSResolver.cs +++ b/source/IOSResolver/src/IOSResolver.cs @@ -724,7 +724,7 @@ private static Assembly ResolveUnityEditoriOSXcodeExtension( /// static IOSResolver() { // Load log preferences. - VerboseLoggingEnabled = VerboseLoggingEnabled; + UpdateLoggerLevel(VerboseLoggingEnabled); // NOTE: We can't reference the UnityEditor.iOS.Xcode module in this // method as the Mono runtime in Unity 4 and below requires all @@ -1039,10 +1039,15 @@ public static bool VerboseLoggingEnabled { get { return settings.GetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, defaultValue: false); } set { settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value); - logger.Level = value ? LogLevel.Verbose : LogLevel.Info; + UpdateLoggerLevel(value); } } + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) + { + logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; + } + /// /// Skip pod install when using workspace integration, let user manually run it. /// diff --git a/source/PackageManagerResolver/src/PackageManagerResolver.cs b/source/PackageManagerResolver/src/PackageManagerResolver.cs index 03d18ddd..46825639 100644 --- a/source/PackageManagerResolver/src/PackageManagerResolver.cs +++ b/source/PackageManagerResolver/src/PackageManagerResolver.cs @@ -94,7 +94,7 @@ static PackageManagerResolver() { RunOnMainThread.Run(() => { // Load log preferences. - VerboseLoggingEnabled = VerboseLoggingEnabled; + UpdateLoggerLevel(VerboseLoggingEnabled); }, runNow: false); } @@ -645,9 +645,14 @@ public static bool VerboseLoggingEnabled { get { return settings.GetBool(PreferenceVerboseLoggingEnabled, defaultValue: false); } set { settings.SetBool(PreferenceVerboseLoggingEnabled, value); - logger.Level = value ? LogLevel.Verbose : LogLevel.Info; + UpdateLoggerLevel(value); } } + + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) + { + logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; + } /// /// Whether scoped registries are supported in current Unity editor. diff --git a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs index 36e32fe2..1904b63d 100644 --- a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs +++ b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs @@ -2290,7 +2290,7 @@ public static Logger Logger { /// Load log preferences. /// private static void LoadLogPreferences() { - VerboseLoggingEnabled = VerboseLoggingEnabled; + UpdateLoggerLevel(VerboseLoggingEnabled); } /// @@ -2512,9 +2512,14 @@ public static bool VerboseLoggingEnabled { defaultValue: false); } set { settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value); - logger.Level = value ? LogLevel.Verbose : LogLevel.Info; + UpdateLoggerLevel(value); } } + + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) + { + logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; + } /// /// Enable / disable verbose logging. From c51a28b0659d75ad4d021c4740bf5a0b6df3c163 Mon Sep 17 00:00:00 2001 From: Bertrand Guay-Paquet Date: Sat, 9 Mar 2024 22:48:12 +0100 Subject: [PATCH 3/4] Revert "Fix build on Windows" This reverts commit ff03ffda690943f17800d3a26b97ba0d6e753c33. --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index db5754da..92930162 100644 --- a/build.gradle +++ b/build.gradle @@ -126,7 +126,7 @@ project.ext { "MONO_EXE", false, { unityRootDirTree.matching { include (operatingSystem == OperatingSystem.WINDOWS ? - "**/bin/mono.exe" : "**/bin/mono") + "**/bin/mono.bat" : "**/bin/mono") exclude unitySearchDirExcludes } }) @@ -318,9 +318,9 @@ project.ext { pythonBootstrapDir = new File(externalToolsDir, "python_bootstrap") pythonBinDir = new File(new File(pythonBootstrapDir, "python"), "bin") // Python binary after it has been bootstrapped. - pythonExe = new File(new File(pythonBootstrapDir, "python"), "python") + pythonExe = new File(pythonBinDir, "python3") // Pip binary after it has been bootstrapped. - pipExe = new File(new File(new File(pythonBootstrapDir, "python"), "Scripts"), "pip3") + pipExe = new File(pythonBinDir, "pip3") // Python packages required by export_unity_package.py exportUnityPackageRequirements = ["absl-py", "PyYAML", "packaging"] // Python packages required by gen_guids.py From 5674c9d5844404962af600d02de203d140c92621 Mon Sep 17 00:00:00 2001 From: Bertrand Guay-Paquet Date: Sun, 10 Mar 2024 10:18:15 +0100 Subject: [PATCH 4/4] Fix code style --- source/IOSResolver/src/IOSResolver.cs | 3 +-- source/PackageManagerResolver/src/PackageManagerResolver.cs | 3 +-- source/VersionHandlerImpl/src/VersionHandlerImpl.cs | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/source/IOSResolver/src/IOSResolver.cs b/source/IOSResolver/src/IOSResolver.cs index c4b834d7..ea312fde 100644 --- a/source/IOSResolver/src/IOSResolver.cs +++ b/source/IOSResolver/src/IOSResolver.cs @@ -1043,8 +1043,7 @@ public static bool VerboseLoggingEnabled { } } - private static void UpdateLoggerLevel(bool verboseLoggingEnabled) - { + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) { logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; } diff --git a/source/PackageManagerResolver/src/PackageManagerResolver.cs b/source/PackageManagerResolver/src/PackageManagerResolver.cs index 46825639..d041cc26 100644 --- a/source/PackageManagerResolver/src/PackageManagerResolver.cs +++ b/source/PackageManagerResolver/src/PackageManagerResolver.cs @@ -649,8 +649,7 @@ public static bool VerboseLoggingEnabled { } } - private static void UpdateLoggerLevel(bool verboseLoggingEnabled) - { + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) { logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; } diff --git a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs index 1904b63d..dd15863e 100644 --- a/source/VersionHandlerImpl/src/VersionHandlerImpl.cs +++ b/source/VersionHandlerImpl/src/VersionHandlerImpl.cs @@ -2516,8 +2516,7 @@ public static bool VerboseLoggingEnabled { } } - private static void UpdateLoggerLevel(bool verboseLoggingEnabled) - { + private static void UpdateLoggerLevel(bool verboseLoggingEnabled) { logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info; }