Skip to content

Direct .NET 4.x support #4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2025
Merged

Direct .NET 4.x support #4569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fafa055
Adding direct .NET 4.x support
jbogard Jul 30, 2025
e7152f2
Fixing minver
jbogard Jul 30, 2025
c215fa7
Only pushing to feed on master branch
jbogard Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
6 changes: 5 additions & 1 deletion src/AutoMapper/AutoMapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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'" />
Expand Down
8 changes: 6 additions & 2 deletions src/IntegrationTests/AutoMapper.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
9 changes: 6 additions & 3 deletions src/UnitTests/AutoMapper.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
Loading