Merge branch 'master' into dev_1.6

# Conflicts: # .vssbe # Configurator/ConfVersion.cs
3F · Aug 11, 2017 · 0e0db7b · 0e0db7b
2 parents 43f57f0 + da0b72c
commit 0e0db7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/RGiesecke.DllExport.MSBuild/RGiesecke.DllExport.MSBuild/ExportTaskImplementation.cs b/RGiesecke.DllExport.MSBuild/RGiesecke.DllExport.MSBuild/ExportTaskImplementation.cs
@@ -906,7 +906,7 @@ private bool ValidateLibToolPath()
                 }
                 else
                 {
-                    this._ActualTask.Log.LogMessage(MessageImportance.Normal, Resources.Cannot_find_lib_exe_in_0_, (object)this.LibToolPath);
+                    this._ActualTask.Log.LogMessage(MessageImportance.Low, Resources.Cannot_find_lib_exe_in_0_, (object)this.LibToolPath);
                     this.LibToolPath = (string)null;
                     return false;
                 }

diff --git a/RGiesecke.DllExport/Parsing/ILAsm.cs b/RGiesecke.DllExport/Parsing/ILAsm.cs
@@ -198,7 +198,8 @@ private int RunLibTool(CpuPlatform cpu, string fileName, string directory)
                         $"/C \"\"{InputValues.VsDevCmd}\" -no_logo -arch={(cpu == CpuPlatform.X64 ? "amd64" : "x86")} && lib.exe {cfg}\""
                     );
 
-                    if(code != -1) {
+                    Notifier.Notify(-1, DllExportLogginCodes.LibToolLooging, $"lib tool via VsDevCmd: {code}");
+                    if(code == 0) {
                         return code;
                     }
                 }
@@ -207,7 +208,9 @@ private int RunLibTool(CpuPlatform cpu, string fileName, string directory)
                 {
                     string reqPath = (String.IsNullOrEmpty(InputValues.LibToolDllPath) || !Directory.Exists(InputValues.LibToolDllPath)) ? null : InputValues.LibToolDllPath;
                     int code = RunLibToolCore("Lib.exe", cfg, InputValues.LibToolPath, reqPath);
-                    if(code != -1) {
+
+                    Notifier.Notify(-1, DllExportLogginCodes.LibToolLooging, $"lib tool via LibToolPath: {code}");
+                    if(code == 0) {
                         return code;
                     }
                 }
@@ -219,12 +222,14 @@ private int RunLibTool(CpuPlatform cpu, string fileName, string directory)
                         $"/C \"\"{InputValues.VcVarsAll}\" {(cpu == CpuPlatform.X64 ? "x64" : "x86")} && lib.exe {cfg}\""
                     );
 
-                    if(code != -1) {
+                    Notifier.Notify(-1, DllExportLogginCodes.LibToolLooging, $"lib tool via VcVarsAll: {code}");
+                    if(code == 0) {
                         return code;
                     }
                 }
 
                 int ret = RunLibToolCore("lib.exe", cfg, String.Empty, InputValues.LibToolDllPath);
+                Notifier.Notify(0, DllExportLogginCodes.LibToolLooging, $"lib tool via LibToolDllPath: {ret}");
                 if(ret != -1) {
                     return ret;
                 }