From 1b129701128743c27d256de4603f3bbcfc539411 Mon Sep 17 00:00:00 2001
From: Jimmy Bogard <jimmy.bogard@gmail.com>
Date: Tue, 20 Mar 2018 14:29:38 -0500
Subject: [PATCH 1/2] Adding netstandard2.0 support plus more tests

---
 Build.ps1                                         |  4 ++--
 samples/MediatR.Examples/MediatR.Examples.csproj  |  4 ++--
 src/MediatR/MediatR.csproj                        |  6 +++---
 test/MediatR.Tests/GenericTypeConstraintsTests.cs |  3 ++-
 test/MediatR.Tests/MediatR.Tests.csproj           | 10 +++-------
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Build.ps1 b/Build.ps1
index 5625432d..d9a1a37d 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -36,11 +36,11 @@ $versionSuffix = @{ $true = "--version-suffix=$($suffix)"; $false = ""}[$suffix
 echo "build: Package version suffix is $suffix"
 echo "build: Build version suffix is $buildSuffix" 
 
-exec { & dotnet build MediatR.sln -c Release --version-suffix=$buildSuffix -v q /nologo }
+exec { & dotnet build MediatR.sln -c Release --version-suffix=$buildSuffix }
 
 Push-Location -Path .\test\MediatR.Tests
 
-exec { & dotnet xunit -configuration Release --fx-version 2.0.0 }
+exec { & dotnet xunit -configuration Release --no-build }
 
 Pop-Location
 
diff --git a/samples/MediatR.Examples/MediatR.Examples.csproj b/samples/MediatR.Examples/MediatR.Examples.csproj
index 4c78ff31..79cac95c 100644
--- a/samples/MediatR.Examples/MediatR.Examples.csproj
+++ b/samples/MediatR.Examples/MediatR.Examples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
     <AssemblyName>MediatR.Examples</AssemblyName>
     <PackageId>MediatR.Examples</PackageId>
   </PropertyGroup>
@@ -20,7 +20,7 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Linq" Version="4.3.0" />
diff --git a/src/MediatR/MediatR.csproj b/src/MediatR/MediatR.csproj
index e0055c3b..b190677c 100644
--- a/src/MediatR/MediatR.csproj
+++ b/src/MediatR/MediatR.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <Description>Simple, unambitious mediator implementation in .NET</Description>
     <Copyright>Copyright Jimmy Bogard</Copyright>
-    <VersionPrefix>4.0.1</VersionPrefix>
+    <VersionPrefix>4.1.0</VersionPrefix>
     <Authors>Jimmy Bogard</Authors>
-    <TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>MediatR</AssemblyName>
     <PackageId>MediatR</PackageId>
     <PackageTags>mediator;request;response;queries;commands;notifications</PackageTags>
@@ -16,7 +16,7 @@
     <RepositoryUrl>git://github.com/jbogard/mediatr</RepositoryUrl>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
diff --git a/test/MediatR.Tests/GenericTypeConstraintsTests.cs b/test/MediatR.Tests/GenericTypeConstraintsTests.cs
index da2d6002..02d5e7ff 100644
--- a/test/MediatR.Tests/GenericTypeConstraintsTests.cs
+++ b/test/MediatR.Tests/GenericTypeConstraintsTests.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Threading;
 
 namespace MediatR.Tests
@@ -31,7 +32,7 @@ public GenericTypeRequestHandlerTestClass()
             {
                 IsIRequest = typeof(IRequest).IsAssignableFrom(typeof(TRequest));
                 IsIRequestT = typeof(TRequest).GetInterfaces()
-                                                   .Any(x => x.IsGenericType &&
+                                                   .Any(x => x.GetTypeInfo().IsGenericType &&
                                                              x.GetGenericTypeDefinition() == typeof(IRequest<>));
 
                 IsIBaseRequest = typeof(IBaseRequest).IsAssignableFrom(typeof(TRequest));
diff --git a/test/MediatR.Tests/MediatR.Tests.csproj b/test/MediatR.Tests/MediatR.Tests.csproj
index 321d7de1..4f1dd42d 100644
--- a/test/MediatR.Tests/MediatR.Tests.csproj
+++ b/test/MediatR.Tests/MediatR.Tests.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>MediatR.Tests</AssemblyName>
     <PackageId>MediatR.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,8 +13,9 @@
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-    <PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
+    <PackageReference Include="Shouldly" Version="3.0.0" />
     <PackageReference Include="structuremap" Version="4.5.3" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -24,8 +24,4 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>

From 8c87a3cb5e67a97b1cf3c5d6f19ccacac84d3b20 Mon Sep 17 00:00:00 2001
From: Jimmy Bogard <jimmy.bogard@gmail.com>
Date: Tue, 20 Mar 2018 14:54:03 -0500
Subject: [PATCH 2/2] Specifying runtime framework version

---
 test/MediatR.Tests/MediatR.Tests.csproj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/MediatR.Tests/MediatR.Tests.csproj b/test/MediatR.Tests/MediatR.Tests.csproj
index 4f1dd42d..4334b2ac 100644
--- a/test/MediatR.Tests/MediatR.Tests.csproj
+++ b/test/MediatR.Tests/MediatR.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>MediatR.Tests</AssemblyName>
     <PackageId>MediatR.Tests</PackageId>
   </PropertyGroup>
@@ -24,4 +24,8 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <RuntimeFrameworkVersion>2.0.3</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
 </Project>