Skip to content

Commit 99011fd

Browse files
authored
Merge pull request #120 from codingseb/dev
Dev
2 parents d9e4baa + ba4654b commit 99011fd

File tree

6 files changed

+24
-25
lines changed

6 files changed

+24
-25
lines changed

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
15411541
.SetCategory("new Exception must not throw the exception")
15421542
.Returns(3);
15431543

1544-
yield return new TestCaseData(Resources.Script0102, null, null, null, null)
1544+
yield return new TestCaseData(Resources.Script0105, null, null, null, null)
15451545
.SetCategory("Script")
15461546
.SetCategory("variable with prefix 'test'")
15471547
.SetCategory("new function test")

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,13 @@
337337
<data name="Script0101" type="System.Resources.ResXFileRef, System.Windows.Forms">
338338
<value>resources\script0101.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
339339
</data>
340-
<data name="Script0102" type="System.Resources.ResXFileRef, System.Windows.Forms">
341-
<value>resources\script0102.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
342-
</data>
343340
<data name="Script0103" type="System.Resources.ResXFileRef, System.Windows.Forms">
344341
<value>resources\script0103.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
345342
</data>
346343
<data name="Script0104" type="System.Resources.ResXFileRef, System.Windows.Forms">
347344
<value>resources\script0104.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
348345
</data>
346+
<data name="Script0105" type="System.Resources.ResXFileRef, System.Windows.Forms">
347+
<value>resources\script0105.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
348+
</data>
349349
</root>

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0102.txt renamed to CodingSeb.ExpressionEvaluator.Tests/Resources/Script0105.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Script0102*/
1+
/* Script0105*/
22
var newList = new(List<string>);
33

44
newList.Add("hello");

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Product>CodingSeb.ExpressionEvaluator</Product>
66
<Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
77
<Copyright>Copyright © Coding Seb 2017</Copyright>
8-
<Version>1.4.32.0</Version>
9-
<AssemblyVersion>1.4.32.0</AssemblyVersion>
10-
<FileVersion>1.4.32.0</FileVersion>
8+
<Version>1.4.33.0</Version>
9+
<AssemblyVersion>1.4.33.0</AssemblyVersion>
10+
<FileVersion>1.4.33.0</FileVersion>
1111
<OutputPath>bin\$(Configuration)\</OutputPath>
1212
<Authors>Coding Seb</Authors>
1313
<PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,8 +19,7 @@
1919
<PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
2020
<PackageIcon>Icon.png</PackageIcon>
2121
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
22-
<PackageReleaseNotes>* Correction of a bug when variable start with new
23-
* Correction of assignation of strongly typed variables (Not really as C# but better than before)</PackageReleaseNotes>
22+
<PackageReleaseNotes>* Fix return null when return within Foreach</PackageReleaseNotes>
2423
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
2524
<RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
2625
</PropertyGroup>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************************************
22
Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
3-
Version : 1.4.32.0
3+
Version : 1.4.33.0
44
(if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
55
66
Author : Coding Seb

0 commit comments

Comments
 (0)