Merge branch 'moh-hassan-master'

dynamicexpresso · Jan 15, 2019 · 0b8c0c4 · 0b8c0c4
2 parents f75fc3b + 40f045c
commit 0b8c0c4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![NuGet version](https://badge.fury.io/nu/DynamicExpresso.Core.svg)](http://badge.fury.io/nu/DynamicExpresso.Core)
 ![build master](https://davideicardi.visualstudio.com/_apis/public/build/definitions/d6fd0002-6d51-417b-928e-27591379dfc4/4/badge)
 
-Available platforms: .NET Core 2.0, .NET 4.6.1
+Available platforms: .NET Core 2.0, .NET 4.5, .NET 4.6.1
 
 Dynamic Expresso is an interpreter for simple C# statements written in .NET Standard 2.0.
 Dynamic Expresso embeds its own parsing logic, really interprets C# statements by converting it to .NET lambda expressions or delegates.

diff --git a/src/DynamicExpresso.Core/DynamicExpresso.Core.csproj b/src/DynamicExpresso.Core/DynamicExpresso.Core.csproj
@@ -1,27 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-		<RootNamespace>DynamicExpresso</RootNamespace>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461;net45</TargetFrameworks>
+    <RootNamespace>DynamicExpresso</RootNamespace>
 
-		<Authors>Davide Icardi</Authors>
-		<Company>davideicardi.com</Company>
-		<Description>C# expression interpreter/evaluator</Description>
-		<Copyright>Davide Icardi</Copyright>
-		<PackageTags>dynamic expresso expression linq eval</PackageTags>
-		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<IncludeSymbols>True</IncludeSymbols>
-		<IncludeSource>True</IncludeSource>
-		<PackageProjectUrl>https://github.com/davideicardi/DynamicExpresso</PackageProjectUrl>
-		<PackageLicenseUrl>https://github.com/davideicardi/DynamicExpresso#license</PackageLicenseUrl>
-		<RepositoryUrl>https://github.com/davideicardi/DynamicExpresso.git</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-		<VersionPrefix>0.0.1</VersionPrefix>
-		<VersionSuffix></VersionSuffix>
-	</PropertyGroup>
+    <Authors>Davide Icardi</Authors>
+    <Company>davideicardi.com</Company>
+    <Description>C# expression interpreter/evaluator</Description>
+    <Copyright>Davide Icardi</Copyright>
+    <PackageTags>dynamic expresso expression linq eval</PackageTags>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSource>True</IncludeSource>
+    <PackageProjectUrl>https://github.com/davideicardi/DynamicExpresso</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/davideicardi/DynamicExpresso#license</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/davideicardi/DynamicExpresso.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <VersionPrefix>0.0.1</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+  </PropertyGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-		<Reference Include="Microsoft.CSharp" />
-	</ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
 
 </Project>
diff --git a/test/DynamicExpresso.UnitTest/DynamicExpresso.UnitTest.csproj b/test/DynamicExpresso.UnitTest/DynamicExpresso.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+		<TargetFrameworks>netcoreapp2.0;net461;net45</TargetFrameworks>
 
 		<IsPackable>false</IsPackable>		
 	</PropertyGroup>
@@ -11,8 +11,8 @@
 		<PackageReference Include="NUnit" Version="3.9.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
 	</ItemGroup>
-	
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
 		<Reference Include="Microsoft.CSharp" />
 	</ItemGroup>
 

diff --git a/test/DynamicExpresso.UnitTest/MemberInvocationTest.cs b/test/DynamicExpresso.UnitTest/MemberInvocationTest.cs
@@ -24,7 +24,6 @@ public void Method_Property_Field_basic_test()
 		public void Null_conditional_property()
 		{
 			var target = new Interpreter().SetVariable("x", null, typeof(MyTestService));
-			MyTestService x = null;
 			Assert.IsNull(target.Eval("x?.AProperty"));
 		}