Merge remote-tracking branch 'origin/dev' into dev

Author: codingseb

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.32.0</Version>
-    <AssemblyVersion>1.4.32.0</AssemblyVersion>
-    <FileVersion>1.4.32.0</FileVersion>
+    <Version>1.4.33.0</Version>
+    <AssemblyVersion>1.4.33.0</AssemblyVersion>
+    <FileVersion>1.4.33.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,8 +19,7 @@
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Correction of a bug when variable start with new
-* Correction of assignation of strongly typed variables (Not really as C# but better than before)</PackageReleaseNotes>
+    <PackageReleaseNotes>* Fix return null when return within Foreach</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.4.32.0 
+    Version : 1.4.33.0 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -1447,7 +1447,7 @@ void forAction(int index)
 
                                     lastResult = ScriptEvaluate(subScript, ref isReturn, ref isBreak, ref isContinue);
 
-                                    if (isBreak)
+                                    if (isBreak || isReturn)
                                     {
                                         isBreak = false;
                                         break;