Targeting v4

Author: ig-sinicyn

Build/Build.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net47</TargetFramework>
+		<TargetFramework>net472</TargetFramework>
 	</PropertyGroup>
 </Project>

Build/BuildScripts/CodeJam.AppVeyor.NUnit.Tests.ps1

@@ -5,7 +5,7 @@ mkdir "$env:APPVEYOR_BUILD_FOLDER\_Results" -ErrorAction SilentlyContinue
 $wc = New-Object System.Net.WebClient
 
 #run .net tests
-$targetsDotNet = "net48","net472","net471","net47","net461","net45","net40","net35","net20"
+$targetsDotNet = "net48;net472;net471;net47;net461;net45;net40;net35;net20" -split ";"
 foreach ($target in $targetsDotNet) {
 	$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml"
 	$testAssemblies = (gci -include $include -r | `
@@ -25,7 +25,7 @@ foreach ($target in $targetsDotNet) {
 }
 
 #run .net core tests
-$targetsDotNetCore = "netcoreapp3.0","netcoreapp2.1","netcoreapp1.1"
+$targetsDotNetCore = "netcoreapp3.0;netcoreapp2.1;netcoreapp1.1" -split ";"
 foreach ($target in $targetsDotNetCore) {
 	$logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml"
 	$testAssemblies = (gci -include $include -r | `

Build/Props/CodeJam.Targeting.props

@@ -8,7 +8,7 @@
 		<RootNamespace>CodeJam</RootNamespace>
 		<ProjectGuid>{2A52D7F6-AAFC-4AC4-9901-252C13D96E53}</ProjectGuid>
 		<OutputType>Library</OutputType>
-		<TargetFrameworks>net472;net461;net45;net40;net35;net20;netcoreapp3.0;netcoreapp2.1;netcoreapp1.1</TargetFrameworks>
+		<TargetFrameworks>net48;net472;net471;net47;net461;net45;net40;net35;net20;netcoreapp3.0;netcoreapp2.1;netcoreapp1.1</TargetFrameworks>
 		<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
 	</PropertyGroup>
 

CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj

@@ -1,6 +1,4 @@
-#if LESSTHAN_NET40 // TODO: update after fixes in Theraot.Core
-// Some expression types are missing if targeting to these frameworks
-#else
+#if NET40_OR_GREATER || TARGETS_NETCOREAPP // TODO: update after fixes in Theraot.Core
 using System;
 
 using NUnit.Framework;

CodeJam.Blocks.Tests/Mapping/ChangeTypeTests.cs

@@ -1,6 +1,4 @@
-#if LESSTHAN_NET40 // TODO: update after fixes in Theraot.Core
-// Some expression types are missing if targeting to these frameworks
-#else
+#if NET40_OR_GREATER || TARGETS_NETCOREAPP // TODO: update after fixes in Theraot.Core
 using System;
 using System.Globalization;
 
@@ -132,9 +130,7 @@ public void ToStringTest()
 			Convert<DateTime,string>.Expression = null;
 		}
 
-#if LESSTHAN_NETCOREAPP20
-		// SqlInt32 is missing if targeting to these frameworks
-#else
+#if TARGETS_NET || NETCOREAPP20_OR_GREATER
 		[Test]
 		public void FromValue()
 		{

CodeJam.Blocks.Tests/Mapping/ConvertTests.cs

@@ -1,6 +1,4 @@
-#if LESSTHAN_NET40 // TODO: update after fixes in Theraot.Core
-// Some expression types are missing if targeting to these frameworks
-#else
+#if NET40_OR_GREATER || TARGETS_NETCOREAPP // TODO: update after fixes in Theraot.Core
 using System;
 
 using NUnit.Framework;

CodeJam.Blocks.Tests/Mapping/DefaultValueTests.cs

@@ -1,6 +1,4 @@
-#if LESSTHAN_NET40 // TODO: update after fixes in Theraot.Core
-// Some expression types are missing if targeting to these frameworks
-#else
+#if NET40_OR_GREATER || TARGETS_NETCOREAPP // TODO: update after fixes in Theraot.Core
 using System;
 
 using JetBrains.Annotations;

CodeJam.Blocks.Tests/Mapping/Examples/MapMemberTests.cs

@@ -1,6 +1,4 @@
-#if LESSTHAN_NET40 // TODO: update after fixes in Theraot.Core
-// Some expression types are missing if targeting to these frameworks
-#else
+#if NET40_OR_GREATER || TARGETS_NETCOREAPP // TODO: update after fixes in Theraot.Core
 using System;
 
 using CodeJam.Expressions;

CodeJam.Blocks.Tests/Mapping/Examples/MapTests.cs

@@ -1,6 +1,4 @@
-#if LESSTHAN_NET40 // TODO: update after fixes in Theraot.Core
-// Some expression types are missing if targeting to these frameworks
-#else
+#if NET40_OR_GREATER || TARGETS_NETCOREAPP // TODO: update after fixes in Theraot.Core
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -281,10 +279,10 @@ public void MapObjects2([Values(true,false)] bool useAction)
 			var map = new MapHelper<Source,Dest>().Map(useAction, m => m
 				.ToMapping      ("Field3", "Field2")
 				.ToMapping<Dest>("Field6", "Field7")
-#if LESSTHAN_NET45
-				.FromMapping(new DictionaryEx<string,string> { ["Field5"] = "Field4" }));
-#else
+#if NET45_OR_GREATER || TARGETS_NETCOREAPP
 				.FromMapping(new Dictionary<string,string> { ["Field5"] = "Field4" }));
+#else
+				.FromMapping(new DictionaryEx<string,string> { ["Field5"] = "Field4" }));
 #endif
 			Assert.That(map.To.Field1,             Is.EqualTo(1));
 			Assert.That(map.To.Field3,             Is.EqualTo(2));