Merge pull request #12 from NileshGhodekar/master

Error event logging logic in the RunPowerShellScript activity.Also made files in Src folder part of the solution.
microsoft · Mar 15, 2016 · 782c521 · 782c521
2 parents 8749915 + 1b242c6
commit 782c521
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -8,7 +8,7 @@ All notable changes to MIMWAL project will be documented in this file. The "Unre
 
 ------------
 
-### Version 2.16.0314.0
+### Version 2.16.0315.0
 
 #### Added
 
@@ -19,6 +19,10 @@ All notable changes to MIMWAL project will be documented in this file. The "Unre
 
 * Use of [EvaluateExpression][EvaluateExpressionFunction] function will now log a deprecation warning in the event log in favour of using the newly implemented Dynamic Grammar Resolution capability of the [Update Resources][UpdateResourcesActivity] activity.
 
+#### Fixed
+
+* Error event logging logic in the [Run PowerShell Script][RunPowerShellScriptActivity] activity.
+
 ------------
 
 ### Version 2.16.0305.0

diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
@@ -22,7 +22,7 @@ internal static class VersionInfo
         ///      Build Number (MMDD)
         ///      Revision (if any on the same day)
         /// </summary>
-        internal const string Version = "2.16.0314.0";
+        internal const string Version = "2.16.0315.0";
 
         /// <summary>
         /// File Version information for the assembly consists of the following four values:
@@ -31,6 +31,6 @@ internal static class VersionInfo
         ///      Build Number (MMDD)
         ///      Revision (if any on the same day)
         /// </summary>
-        internal const string FileVersion = "2.16.0314.0";
+        internal const string FileVersion = "2.16.0315.0";
     }
 }
diff --git a/src/WAL.sln b/src/WAL.sln
@@ -32,6 +32,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LanguagePacks", "LanguagePa
 		LanguagePacks\Messages.es.resx = LanguagePacks\Messages.es.resx
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SrcDocs", "SrcDocs", "{112DBE20-BAFC-467A-9145-6A5B1F94DA9D}"
+	ProjectSection(SolutionItems) = preProject
+		..\.gitattributes = ..\.gitattributes
+		..\.gitignore = ..\.gitignore
+		..\ChangeLog.md = ..\ChangeLog.md
+		..\CONTRIBUTING.md = ..\CONTRIBUTING.md
+		..\LICENSE.txt = ..\LICENSE.txt
+		..\README.md = ..\README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,5 +63,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{9B89C43C-1EA6-4128-95B7-F56401152246} = {2B90D189-D995-4304-8525-17D75B4C9907}
 		{1829DEFF-5553-4E93-9A9B-08118F3D2225} = {2B90D189-D995-4304-8525-17D75B4C9907}
+		{112DBE20-BAFC-467A-9145-6A5B1F94DA9D} = {2B90D189-D995-4304-8525-17D75B4C9907}
 	EndGlobalSection
 EndGlobal
diff --git a/src/WorkflowActivityLibrary/Activities/RunPowerShellScript.cs b/src/WorkflowActivityLibrary/Activities/RunPowerShellScript.cs
@@ -885,7 +885,7 @@ private object RunScript(string script, IEnumerable scriptArguments, Dictionary<
                         // Let's go soft on the the non-terminating errors and trapped exceptions.
                         // We'll just log the error streams.
                         // If script wants to kill the activity, it should throw an exception.
-                        if (shell.Streams.Error.Count == 0)
+                        if (shell.Streams.Error.Count != 0)
                         {
                             StringBuilder message = new StringBuilder();
                             message.AppendFormat(Messages.RunPowerShellScript_ScriptExecutionFailedError, shell.Streams.Error.Count);