From 59d5fad5d5fed81239d94f4b4dcb6c0220d6431c Mon Sep 17 00:00:00 2001 From: F K <54195004+fredjk-gh@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:37:57 -0500 Subject: [PATCH] [Core] Fix "not all code paths return a value" error when publishing (#139) Just shuffled code within conditional compiler directives because when publishing, it seems "RELEASE" is not set. This ensures in the non PORTABLE case, the default path is set. (Discovered while testing my publishing script with signing.) --- ObservatoryCore/PluginManagement/PluginCore.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ObservatoryCore/PluginManagement/PluginCore.cs b/ObservatoryCore/PluginManagement/PluginCore.cs index b4bf280..5e919f0 100644 --- a/ObservatoryCore/PluginManagement/PluginCore.cs +++ b/ObservatoryCore/PluginManagement/PluginCore.cs @@ -156,7 +156,11 @@ namespace Observatory.PluginManagement get { var context = new System.Diagnostics.StackFrame(1).GetMethod(); -#if DEBUG || RELEASE +#if PORTABLE + string? observatoryLocation = System.Diagnostics.Process.GetCurrentProcess()?.MainModule?.FileName; + var obsDir = new FileInfo(observatoryLocation ?? String.Empty).DirectoryName; + return $"{obsDir}{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}{context?.DeclaringType?.Assembly.GetName().Name}-Data{Path.DirectorySeparatorChar}"; +#else string folderLocation = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + $"{Path.DirectorySeparatorChar}ObservatoryCore{Path.DirectorySeparatorChar}{context?.DeclaringType?.Assembly.GetName().Name}{Path.DirectorySeparatorChar}"; @@ -164,10 +168,6 @@ namespace Observatory.PluginManagement Directory.CreateDirectory(folderLocation); return folderLocation; -#elif PORTABLE - string? observatoryLocation = System.Diagnostics.Process.GetCurrentProcess()?.MainModule?.FileName; - var obsDir = new FileInfo(observatoryLocation ?? String.Empty).DirectoryName; - return $"{obsDir}{Path.DirectorySeparatorChar}plugins{Path.DirectorySeparatorChar}{context?.DeclaringType?.Assembly.GetName().Name}-Data{Path.DirectorySeparatorChar}"; #endif } }