Merge pull request #249 from PowershellFrameworkCollective/module-root

Include PSFramework in logging runspace

Author: FriedrichWeinmann

PSFramework/bin/PSFramework.dll

@@ -11,6 +11,7 @@
  - Upd: PsfValidateScript will now understand both $_ and $args[0]
  - Upd: PsfValidateSet now supports localized strings using the `ErrorString` property.
  - Upd: PsfValidateScript now supports localized strings using the `ErrorString` property.
+ - Upd: Logging runspace now loads the same copy of PSFramework that spawned it (#238)
  - Fix: PsfValidateSet fails on completion scriptblock with whitespace value
  - Fix: Get-PSFConfig will show bad value in default table. Correct data still stored (#243)
 

PSFramework/bin/PSFramework.pdb

@@ -3,6 +3,8 @@
 	{
 		$script:___ScriptName = 'PSFramework.Logging'
 
+		Import-Module (Join-Path ([PSFramework.PSFCore.PSFCoreHost]::ModuleRoot) 'PSFramework.psd1')
+		
 		while ($true)
 		{
 			# This portion is critical to gracefully closing the script

PSFramework/bin/PSFramework.xml

@@ -85,4 +85,6 @@ if (($PSVersionTable.PSVersion.Major -ge 6) -and ($PSVersionTable.OS -notlike "*
 	$script:NoRegistry = $true
 }
 
-if (-not ([PSFramework.Message.LogHost]::LoggingPath)) { [PSFramework.Message.LogHost]::LoggingPath = $script:path_Logging }
+if (-not ([PSFramework.Message.LogHost]::LoggingPath)) { [PSFramework.Message.LogHost]::LoggingPath = $script:path_Logging }
+
+[PSFramework.PSFCore.PSFCoreHost]::ModuleRoot = $script:ModuleRoot

PSFramework/changelog.md

@@ -15,5 +15,19 @@ public static class PSFCoreHost
         /// Whether the current console is in unattended mode
         /// </summary>
         public static bool Unattended = false;
+
+        /// <summary>
+        /// The path to where the module was imported from
+        /// </summary>
+        public static string ModuleRoot
+        {
+            get { return _ModuleRoot; }
+            set
+            {
+                if (String.IsNullOrEmpty(_ModuleRoot))
+                    _ModuleRoot = value;
+            }
+        }
+        private static string _ModuleRoot;
     }
 }