Merge pull request #1131 from LuckyPennySoftware/direct-net4x-support

Adding direct .NET 4.x support

Author: jbogard

.github/workflows/ci.yml

@@ -5,16 +5,19 @@ on:
     branches:
     - master
   pull_request:
-    branches:
-      - master
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  MINVERBUILDMETADATA: build.${{ github.run_id }}.${{ github.run_attempt}}
 jobs:
   build:
     runs-on: windows-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v4.2.0
       with:
         fetch-depth: 0
+        filter: tree:0
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
@@ -25,6 +28,7 @@ jobs:
       run: ./Build.ps1
       shell: pwsh
     - name: Push to MyGet
+      if: github.ref == 'refs/heads/master'
       env:
         NUGET_URL: https://f.feedz.io/lucky-penny-software/mediatr/nuget/index.json
         NUGET_API_KEY: ${{ secrets.FEEDZIO_ACCESS_TOKEN }}

.github/workflows/devskim.yml

@@ -4,6 +4,10 @@ on:
   push:
     tags:
     - '*.*.*'
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  MINVERBUILDMETADATA: build.${{ github.run_id }}.${{ github.run_attempt}}
 jobs:
   build:
     strategy:
@@ -16,6 +20,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        filter: tree:0
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:

.github/workflows/release.yml

@@ -1,6 +1,9 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>10.0</LangVersion>
+    <IsMac>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_OSX())))</IsMac>
+    <IsWindows>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::get_Windows())))</IsWindows>
+
+    <LangVersion>13.0</LangVersion>
     <NoWarn>$(NoWarn);CS1701;CS1702;CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>

Directory.Build.props

@@ -25,6 +25,10 @@
     <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(IsWindows)' == 'true' ">
+    <TargetFrameworks>$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="..\..\assets\logo\gradient_128x128.png" Pack="true" PackagePath="" />
     <None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
@@ -45,7 +49,7 @@
     <PackageReference Include="MediatR.Contracts" Version="[2.0.1, 3.0.0)" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[8.0.0, )" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0, )" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="[8.0.1, )" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />

src/MediatR/MediatR.csproj

@@ -5,7 +5,6 @@
 using MediatR.Pipeline;
 using MediatR.Registration;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection;
 

src/MediatR/MicrosoftExtensionsDI/MediatRServiceCollectionExtensions.cs

@@ -3,6 +3,7 @@
 
 namespace MediatR.Tests
 {
+    [Collection(nameof(ServiceFactoryCollectionBehavior))]
     public class GenericRequestHandlerTests : BaseGenericRequestHandlerTests
     {
 

test/MediatR.Tests/GenericRequestHandlerTests.cs

@@ -1,15 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">net9.0</TargetFramework>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net481;net9.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);CS8002;</NoWarn>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\MediatR.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(IsWindows)' == 'true' ">
+    <TargetFrameworks>$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\..\src\MediatR\MediatR.csproj"/>
   </ItemGroup>