Skip to content

Commit ba97060

Browse files
committed
Add net5.0 and net6.0 as target
1 parent 9563300 commit ba97060

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Company>Coding Seb</Company>
55
<Product>CodingSeb.ExpressionEvaluator.Tests</Product>
66
<Copyright>Copyright © Coding Seb 2018</Copyright>
7-
<TargetFrameworks>net47;netcoreapp2.1</TargetFrameworks>
7+
<TargetFrameworks>net47;netcoreapp2.1;net5.0;net6.0</TargetFrameworks>
88
<UserSecretsId>c4ac27fa-8b9c-4784-a284-7a9a06320537</UserSecretsId>
99
</PropertyGroup>
1010
<ItemGroup>

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Shouldly;
44
using System;
55
using System.Collections.Generic;
6+
using System.IO;
67
using System.Linq;
78
using System.Text.RegularExpressions;
89

@@ -1837,8 +1838,22 @@ public void Evaluate_DoubleDoubleQuotesInEscapedStringThrowException()
18371838
evaluator.Evaluate("@\"Hello \"\" Joe\"").ShouldBe(@"Hello "" Joe");
18381839
}
18391840

1841+
//[Test]
1842+
//[Category("Bug")]
1843+
//[Category("#135")]
1844+
//public void Evaluate_MultiLevelPropertyAccessAfterConditionalAndBeforeDoubleEquals()
1845+
//{
1846+
// ExpressionEvaluator ee = new ExpressionEvaluator();
1847+
1848+
// ee.Variables["A"] = new Dictionary<string, FileStream>();
1849+
1850+
// ee.Evaluate<bool>("A.TryGetValue(\"NotExist\", out FileStream fs) && fs.SafeFileHandle.IsClosed == true").ShouldBe<bool>(false);
1851+
//}
1852+
18401853
#endregion
18411854

1855+
1856+
18421857
#region EvaluateWithSpecificEvaluator
18431858

18441859
#region TestCasesEvaluateWithSpecificEvaluator

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageLicenseUrl></PackageLicenseUrl>
1515
<PackageProjectUrl>https://github.com/codingseb/ExpressionEvaluator</PackageProjectUrl>
1616
<PackageTags>expression-evaluator evaluation math expression evaluate parser mathematical-expressions-evaluator mathematical-expressions script scripting evaluator csharp-script eval execute executescript evaluate-expressions expression-parser fluid calculations formula netcore netstandard net45 interpreter</PackageTags>
17-
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
17+
<TargetFrameworks>net45;net5.0;net6.0;netstandard2.0</TargetFrameworks>
1818
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1919
<PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
2020
<PackageIcon>Icon.png</PackageIcon>
@@ -25,7 +25,8 @@
2525
- InlineNamespacesEvaluationRule.AllowOnlyInlineNamespacesList
2626
- InlineNamespacesEvaluationRule.BlockOnlyInlineNamespacesList
2727
- InlineNamespacesEvaluationRule.BlockAll
28-
* Throw better exception and get better exception context with ExceptionDispatchInfo on TargetInvocationException.InnerException and BubbleExceptionContainer</PackageReleaseNotes>
28+
* Throw better exception and get better exception context with ExceptionDispatchInfo on TargetInvocationException.InnerException and BubbleExceptionContainer
29+
* Add net5.0 and net6.0 as target</PackageReleaseNotes>
2930
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
3031
<RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
3132
<GenerateDocumentationFile>true</GenerateDocumentationFile>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,8 @@ public object Evaluate(string expression)
16371637
}
16381638
}
16391639

1640+
1641+
16401642
result = ProcessStack(stack);
16411643

16421644
expressionEvaluationEventArg = new ExpressionEvaluationEventArg(expression, this, result);

0 commit comments

Comments
 (0)