From c6526c63f556147efa76755033bf15c550109862 Mon Sep 17 00:00:00 2001 From: Blaise Taylor Date: Sun, 15 Nov 2026 08:33:05 -0500 Subject: [PATCH 1/2] Supporting AutoMapper v17 and .NET v11 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- global.json | 5 +++++ ...Mapper.Extensions.ExpressionMapping.csproj | 10 +++++----- ...ensions.ExpressionMapping.UnitTests.csproj | 19 ++++++++----------- 5 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c30c05d..dbd6c87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: run: dotnet nuget add source https://www.myget.org/F/automapperdev/api/v3/index.json -n automappermyget - name: Test - run: dotnet test --configuration Release --verbosity normal /p:CollectCoverage=true /p:Threshold=94 /p:ThresholdType=line /p:ThresholdStat=Average /p:CoverletOutputFormat=opencover /p:CoverletOutput=./TestResults/ /p:ExcludeByAttribute="GeneratedCodeAttribute" + run: dotnet test --configuration Release --verbosity normal --results-directory ./TestResults/ -- --coverage --coverage-output-format xml --coverage-output coverage.xml - name: Pack and push env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1d27ff..600d9fd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: fetch-depth: 0 - name: Test - run: dotnet test --configuration Release --verbosity normal /p:CollectCoverage=true /p:Threshold=94 /p:ThresholdType=line /p:ThresholdStat=Average /p:CoverletOutputFormat=opencover /p:CoverletOutput=./TestResults/ /p:ExcludeByAttribute="GeneratedCodeAttribute" + run: dotnet test --configuration Release --verbosity normal --results-directory ./TestResults/ -- --coverage --coverage-output-format xml --coverage-output coverage.xml - name: Pack and push env: diff --git a/global.json b/global.json new file mode 100644 index 0000000..802ab21 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "test": { + "runner": "Microsoft.Testing.Platform" + } +} \ No newline at end of file diff --git a/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj b/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj index 62769d8..8963c8b 100644 --- a/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj +++ b/src/AutoMapper.Extensions.ExpressionMapping/AutoMapper.Extensions.ExpressionMapping.csproj @@ -3,7 +3,7 @@ Expression mapping (OData) extensions for AutoMapper Expression mapping (OData) extensions for AutoMapper - netstandard2.0;net8.0;net9.0;net10.0 + netstandard2.0;net10.0;net11.0 true ..\..\AutoMapper.snk true @@ -11,7 +11,7 @@ AutoMapper.Extensions.ExpressionMapping icon.png README.md - Removing obsolete methods and classes. Making AutoMapper v16.1.1 the minimum supported version. + Supporting AutoMapper v17 and .NET v11. https://automapper.org MIT git @@ -31,12 +31,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/AutoMapper.Extensions.ExpressionMapping.UnitTests.csproj b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/AutoMapper.Extensions.ExpressionMapping.UnitTests.csproj index db0f13d..dc601ac 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/AutoMapper.Extensions.ExpressionMapping.UnitTests.csproj +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/AutoMapper.Extensions.ExpressionMapping.UnitTests.csproj @@ -1,8 +1,8 @@  - net10.0 - net481;net10.0 + net11.0 + net481;net11.0 Exe false ..\..\AutoMapper.snk @@ -11,18 +11,15 @@ - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - From 4f0154631fd89eaa6f8791e3279d368e11779ab0 Mon Sep 17 00:00:00 2001 From: Blaise Taylor Date: Sun, 15 Nov 2026 08:39:39 -0500 Subject: [PATCH 2/2] Setup .NET --- .github/workflows/ci.yml | 5 +++++ .github/workflows/release.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbd6c87..2d784d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,11 @@ jobs: with: fetch-depth: 0 + - name: Setup .NET + uses: actions/setup-dotnet@v5 + with: + dotnet-version: 11.x + - name: Add AutoMapper Myget Source run: dotnet nuget add source https://www.myget.org/F/automapperdev/api/v3/index.json -n automappermyget diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 600d9fd..0c1c15f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,11 @@ jobs: with: fetch-depth: 0 + - name: Setup .NET + uses: actions/setup-dotnet@v5 + with: + dotnet-version: 11.x + - name: Test run: dotnet test --configuration Release --verbosity normal --results-directory ./TestResults/ -- --coverage --coverage-output-format xml --coverage-output coverage.xml