Skip to content

Commit 1f7b896

Browse files
codingsebcodingseb
authored
Merge pull request #151 from codingseb/dev
Dev
2 parents c2201bb + cc08607 commit 1f7b896

16 files changed

+239
-524
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.cs]
2+
3+
# CS1591:
4+
dotnet_diagnostic.CS1591.severity = none

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
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</TargetFrameworks>
88
<UserSecretsId>c4ac27fa-8b9c-4784-a284-7a9a06320537</UserSecretsId>
9+
<Nullable>disable</Nullable>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

‎CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
namespace CodingSeb.ExpressionEvaluator.Tests
1010
{
1111
[TestFixture]
12+
[DefaultFloatingPointTolerance(0.00001)]
1213
public class ExpressionEvaluatorTests
1314
{
1415
#region Type testing
@@ -1837,6 +1838,18 @@ 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

18421855
#region EvaluateWithSpecificEvaluator

‎CodingSeb.ExpressionEvaluator.sln‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28729.10
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.2.32630.192
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingSeb.ExpressionEvaluator", "CodingSeb.ExpressionEvaluator\CodingSeb.ExpressionEvaluator.csproj", "{21F19149-EED6-4856-AB9A-701C41F86F66}"
76
EndProject
87
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodingSeb.ExpressionEvaluator.Tests", "CodingSeb.ExpressionEvaluator.Tests\CodingSeb.ExpressionEvaluator.Tests.csproj", "{8794CB3B-EAB2-411D-B912-7AD3425D6C62}"
98
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TryWindow", "TryWindow\TryWindow.csproj", "{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}"
9+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TryWindow", "TryWindow\TryWindow.csproj", "{D699FC0D-BE4C-4CDD-864F-E4C7821E1A21}"
10+
EndProject
11+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{402E2A75-2113-4744-8251-02E8C6A60BC8}"
12+
ProjectSection(SolutionItems) = preProject
13+
.editorconfig = .editorconfig
14+
EndProjectSection
1115
EndProject
1216
Global
1317
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,10 +27,10 @@ Global
2327
{8794CB3B-EAB2-411D-B912-7AD3425D6C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
2428
{8794CB3B-EAB2-411D-B912-7AD3425D6C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
2529
{8794CB3B-EAB2-411D-B912-7AD3425D6C62}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{8BB2AC61-77C6-42B9-82E3-44C88F29FD4E}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{D699FC0D-BE4C-4CDD-864F-E4C7821E1A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{D699FC0D-BE4C-4CDD-864F-E4C7821E1A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{D699FC0D-BE4C-4CDD-864F-E4C7821E1A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{D699FC0D-BE4C-4CDD-864F-E4C7821E1A21}.Release|Any CPU.Build.0 = Release|Any CPU
3034
EndGlobalSection
3135
GlobalSection(SolutionProperties) = preSolution
3236
HideSolutionNode = FALSE

‎CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,23 @@
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.38.0</Version>
9-
<AssemblyVersion>1.4.38.0</AssemblyVersion>
10-
<FileVersion>1.4.38.0</FileVersion>
8+
<Version>1.4.39.0</Version>
9+
<AssemblyVersion>1.4.39.0</AssemblyVersion>
10+
<FileVersion>1.4.39.0</FileVersion>
1111
<OutputPath>bin\$(Configuration)\</OutputPath>
1212
<Authors>Coding Seb</Authors>
1313
<PackageId>CodingSeb.ExpressionEvaluator</PackageId>
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>net47;netstandard2.0</TargetFrameworks>
17+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
1818
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
19+
<Nullable>disable</Nullable>
1920
<PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
2021
<PackageIcon>Icon.png</PackageIcon>
2122
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
22-
<PackageReleaseNotes>* OptionInlineNamespacesEvaluationActive become OptionInlineNamespacesEvaluationRule and allow more possibilities with the addition of InlineNamespacesList
23-
This option can now be one of those :
24-
- InlineNamespacesEvaluationRule.AllowAll
25-
- InlineNamespacesEvaluationRule.AllowOnlyInlineNamespacesList
26-
- InlineNamespacesEvaluationRule.BlockOnlyInlineNamespacesList
27-
- InlineNamespacesEvaluationRule.BlockAll
28-
* Throw better exception and get better exception context with ExceptionDispatchInfo on TargetInvocationException.InnerException and BubbleExceptionContainer</PackageReleaseNotes>
23+
<PackageReleaseNotes>* net45 target is now net462 because (net45 is not supported anymore)
24+
* Match function arguments considering implicit casts</PackageReleaseNotes>
2925
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
3026
<RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
3127
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -47,6 +43,7 @@
4743
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
4844
</ItemGroup>
4945
<ItemGroup>
46+
<None Include="..\.editorconfig" Link=".editorconfig" />
5047
<None Include="..\Icon.png">
5148
<Pack>True</Pack>
5249
<PackagePath></PackagePath>

0 commit comments

Comments
 (0)