From 268789af6d28da5d0e5c4863c4a9f1823b8f8586 Mon Sep 17 00:00:00 2001
From: thomas <thpouget@microsoft.com>
Date: Mon, 28 Jan 2019 00:08:36 +0100
Subject: [PATCH 1/2] Clear up log message when importing module

---
 .../engine/Modules/ModuleCmdletBase.cs                     | 7 +++++++
 .../engine/Modules/ModuleIntrinsics.cs                     | 3 ++-
 src/System.Management.Automation/resources/Modules.resx    | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 46ba23bbc0e..f7be6e29df3 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -7356,6 +7356,13 @@ private static void ImportFunctions(FunctionInfo func, SessionStateInternal targ
                 message = StringUtil.Format(Modules.ImportingFunction, prefixedName);
                 cmdlet.WriteVerbose(message);
             }
+            else
+            {
+                string manifestFilename = Path.GetFileName(cmdlet.Context.PreviousModuleProcessed);
+                string moduleFileName = Path.GetFileName(sourceModule.Path);
+                message = StringUtil.Format(Modules.NotImportingFunction, func.Name, moduleFileName, manifestFilename);
+                cmdlet.WriteVerbose(message);
+            }
         }
 
         private static void SetCommandVisibility(bool isImportModulePrivate, CommandInfo command)
diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index 73baaf94f8b..49d257fe085 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -1566,7 +1566,8 @@ internal static void ExportModuleMembers(
                     if (SessionStateUtilities.MatchesAnyWildcardPattern(entry.Key, functionPatterns, false))
                     {
                         sessionState.ExportedFunctions.Add(entry.Value);
-                        string message = StringUtil.Format(Modules.ExportingFunction, entry.Key);
+                        string filename = Path.GetFileName(sessionState.Module.Path);
+                        string message = StringUtil.Format(Modules.ExportingFunction, entry.Key, filename);
                         cmdlet.WriteVerbose(message);
                     }
                 }
diff --git a/src/System.Management.Automation/resources/Modules.resx b/src/System.Management.Automation/resources/Modules.resx
index 477600724ff..4e54450986f 100644
--- a/src/System.Management.Automation/resources/Modules.resx
+++ b/src/System.Management.Automation/resources/Modules.resx
@@ -294,6 +294,9 @@
   <data name="ImportingFunction" xml:space="preserve">
     <value>Importing function '{0}'.</value>
   </data>
+  <data name="NotImportingFunction" xml:space="preserve">
+    <value>Not exporting function '{0}' from '{1}' via '{2}'.</value>
+  </data>
   <data name="ImportingCmdlet" xml:space="preserve">
     <value>Importing cmdlet '{0}'.</value>
   </data>
@@ -307,7 +310,7 @@
     <value>Exporting cmdlet '{0}'.</value>
   </data>
   <data name="ExportingFunction" xml:space="preserve">
-    <value>Exporting function '{0}'.</value>
+    <value>Exporting function '{0}' from '{1}'.</value>
   </data>
   <data name="ExportingAlias" xml:space="preserve">
     <value>Exporting alias '{0}'.</value>

From cecca54bfbcac53e3b93169302c479c8346e5a09 Mon Sep 17 00:00:00 2001
From: pougetat <thpouget@microsoft.com>
Date: Thu, 7 Feb 2019 09:42:41 +0100
Subject: [PATCH 2/2] Fixing PR comment

---
 .../engine/Modules/ModuleCmdletBase.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index f7be6e29df3..7b3c5127824 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -7359,8 +7359,8 @@ private static void ImportFunctions(FunctionInfo func, SessionStateInternal targ
             else
             {
                 string manifestFilename = Path.GetFileName(cmdlet.Context.PreviousModuleProcessed);
-                string moduleFileName = Path.GetFileName(sourceModule.Path);
-                message = StringUtil.Format(Modules.NotImportingFunction, func.Name, moduleFileName, manifestFilename);
+                string moduleFilename = Path.GetFileName(sourceModule.Path);
+                message = StringUtil.Format(Modules.NotImportingFunction, func.Name, moduleFilename, manifestFilename);
                 cmdlet.WriteVerbose(message);
             }
         }