From e5ace5a97b566e7da482c03b7690a49bd5b5f7a4 Mon Sep 17 00:00:00 2001
From: Anthony Simmon <simmon.anthony@gmail.com>
Date: Tue, 21 Feb 2023 00:05:48 -0500
Subject: [PATCH 1/2] Downgrade 7.x Microsoft extensions packages to 6.x, do
 not reference BCL package on .NET 6+

---
 .../MediatR.Examples.AspNetCore.csproj                      | 2 +-
 .../MediatR.Examples.Autofac.csproj                         | 2 +-
 .../MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj  | 2 +-
 .../MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj    | 2 +-
 .../MediatR.Examples.LightInject.csproj                     | 2 +-
 .../MediatR.Examples.PublishStrategies.csproj               | 2 +-
 .../MediatR.Examples.SimpleInjector.csproj                  | 2 +-
 .../MediatR.Examples.Stashbox.csproj                        | 2 +-
 src/MediatR/MediatR.csproj                                  | 6 +++---
 test/MediatR.Tests/MediatR.Tests.csproj                     | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
index adbc35b8..201f9a3a 100644
--- a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
+++ b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
index 5e43f26d..6dc8561a 100644
--- a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
+++ b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="6.5.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
index 5fbd1f21..7c234d30 100644
--- a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
+++ b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
index 46d8990e..cd1f681b 100644
--- a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
+++ b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Lamar" Version="8.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
index 6d7e32f2..5169872c 100644
--- a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
+++ b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="LightInject" Version="6.6.1" />
     <PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.6.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.PublishStrategies/MediatR.Examples.PublishStrategies.csproj b/samples/MediatR.Examples.PublishStrategies/MediatR.Examples.PublishStrategies.csproj
index 062e6f68..5511431c 100644
--- a/samples/MediatR.Examples.PublishStrategies/MediatR.Examples.PublishStrategies.csproj
+++ b/samples/MediatR.Examples.PublishStrategies/MediatR.Examples.PublishStrategies.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
index f0348223..d5bc5856 100644
--- a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
+++ b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="SimpleInjector" Version="5.4.1" />
     <PackageReference Include="SimpleInjector.Integration.ServiceCollection" Version="5.4.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj b/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj
index 61575bf3..bc2d1194 100644
--- a/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj
+++ b/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Stashbox" Version="5.5.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MediatR/MediatR.csproj b/src/MediatR/MediatR.csproj
index bb8ef6b1..57aa4286 100644
--- a/src/MediatR/MediatR.csproj
+++ b/src/MediatR/MediatR.csproj
@@ -4,7 +4,7 @@
     <Authors>Jimmy Bogard</Authors>
     <Description>Simple, unambitious mediator implementation in .NET</Description>
     <Copyright>Copyright Jimmy Bogard</Copyright>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <Features>strict</Features>
     <PackageTags>mediator;request;response;queries;commands;notifications</PackageTags>
@@ -32,8 +32,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MediatR.Contracts" Version="[2.0.0, 3.0.0)" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
   </ItemGroup>
diff --git a/test/MediatR.Tests/MediatR.Tests.csproj b/test/MediatR.Tests/MediatR.Tests.csproj
index 6a430757..a4330339 100644
--- a/test/MediatR.Tests/MediatR.Tests.csproj
+++ b/test/MediatR.Tests/MediatR.Tests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

From cc005bc2700d9b6184b66ee21f1ff86adde4f294 Mon Sep 17 00:00:00 2001
From: Anthony Simmon <simmon.anthony@gmail.com>
Date: Tue, 21 Feb 2023 23:52:55 -0500
Subject: [PATCH 2/2] Single target netstandard2.0

---
 src/MediatR/MediatR.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MediatR/MediatR.csproj b/src/MediatR/MediatR.csproj
index 57aa4286..90fc32f1 100644
--- a/src/MediatR/MediatR.csproj
+++ b/src/MediatR/MediatR.csproj
@@ -4,7 +4,7 @@
     <Authors>Jimmy Bogard</Authors>
     <Description>Simple, unambitious mediator implementation in .NET</Description>
     <Copyright>Copyright Jimmy Bogard</Copyright>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <Features>strict</Features>
     <PackageTags>mediator;request;response;queries;commands;notifications</PackageTags>
@@ -32,7 +32,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MediatR.Contracts" Version="[2.0.0, 3.0.0)" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />