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

Direct .NET 4.x support

Author: jbogard

.github/workflows/ci.yml

@@ -5,8 +5,10 @@ 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}}
 permissions:
   contents: read
 concurrency:
@@ -19,7 +21,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v4.2.0
       with:
         fetch-depth: 0
     - name: Setup dotnet
@@ -44,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v4.2.0
       with:
         fetch-depth: 0
     - name: Setup dotnet
@@ -57,6 +59,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/automapper/nuget/index.json
         NUGET_API_KEY: ${{ secrets.FEEDZIO_ACCESS_TOKEN }}

src/AutoMapper/AutoMapper.csproj

@@ -29,6 +29,10 @@
     <AdditionalApiCompatOptions>--exclude-non-browsable --exclude-compiler-generated</AdditionalApiCompatOptions>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(IsWindows)' == 'true' ">
+    <TargetFrameworks>$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+  
   <ItemGroup>
     <ResolvedMatchingContract Include="..\LastMajorVersionBinary\AutoMapper.dll"/>
   </ItemGroup>
@@ -40,7 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, )"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )"/>
     <PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )"/>
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="[8.0.1, )"/>
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="[6.0.0, )" Condition="'$(TargetFramework)' == 'netstandard2.0'" />

src/IntegrationTests/AutoMapper.IntegrationTests.csproj

@@ -1,11 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <NoWarn>$(NoWarn);618</NoWarn>
     <AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(IsWindows)' == 'true' ">
+    <PublicSign>true</PublicSign>
+    <TargetFrameworks>$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/UnitTests/AutoMapper.UnitTests.csproj

@@ -1,14 +1,17 @@
 <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>
     <NoWarn>$(NoWarn);649;618</NoWarn>
     <AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(IsWindows)' == 'true' ">
+    <PublicSign>true</PublicSign>
+    <TargetFrameworks>$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\AutoMapper\AutoMapper.csproj" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.6.0" />