diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8c8f8f1bb..289db94912 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Build and Test run: ./Build.ps1 shell: pwsh @@ -49,6 +50,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Build and Test run: ./Build.ps1 shell: pwsh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e434574c3..b36d61c8e3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Build and Test run: ./Build.ps1 shell: pwsh @@ -40,6 +41,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Build and Test run: ./Build.ps1 shell: pwsh diff --git a/src/AutoMapper.DI.Tests/AutoMapper.DI.Tests.csproj b/src/AutoMapper.DI.Tests/AutoMapper.DI.Tests.csproj index 8f4bcbe920..1ae0467efc 100644 --- a/src/AutoMapper.DI.Tests/AutoMapper.DI.Tests.csproj +++ b/src/AutoMapper.DI.Tests/AutoMapper.DI.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true AutoMapper.Extensions.Microsoft.DependencyInjection.Tests AutoMapper.Extensions.Microsoft.DependencyInjection.Tests @@ -19,7 +19,7 @@ - + diff --git a/src/AutoMapper/AutoMapper.csproj b/src/AutoMapper/AutoMapper.csproj index 0e183d062c..4474733c0f 100644 --- a/src/AutoMapper/AutoMapper.csproj +++ b/src/AutoMapper/AutoMapper.csproj @@ -3,8 +3,8 @@ A convention-based object-object mapper. A convention-based object-object mapper. - netstandard2.0;net8.0;net9.0 - 13.0 + netstandard2.0;net8.0;net9.0;net10.0 + 14.0 true AutoMapper ..\..\AutoMapper.snk @@ -44,8 +44,8 @@ - - + + diff --git a/src/Benchmark/Benchmark.csproj b/src/Benchmark/Benchmark.csproj index 338eb6067b..0667bca2d9 100644 --- a/src/Benchmark/Benchmark.csproj +++ b/src/Benchmark/Benchmark.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 Exe diff --git a/src/IntegrationTests/AutoMapper.IntegrationTests.csproj b/src/IntegrationTests/AutoMapper.IntegrationTests.csproj index ccbd115d90..c45d47acaa 100644 --- a/src/IntegrationTests/AutoMapper.IntegrationTests.csproj +++ b/src/IntegrationTests/AutoMapper.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 $(NoWarn);618 ..\..\AutoMapper.snk true @@ -13,7 +13,7 @@ - + diff --git a/src/TestApp/TestApp.csproj b/src/TestApp/TestApp.csproj index 43d1d11683..8d7b9ec4b1 100644 --- a/src/TestApp/TestApp.csproj +++ b/src/TestApp/TestApp.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 TestApp Exe enable @@ -13,7 +13,7 @@ - + diff --git a/src/UnitTests/AutoMapper.UnitTests.csproj b/src/UnitTests/AutoMapper.UnitTests.csproj index 5e37fcc40c..4dc25a1377 100644 --- a/src/UnitTests/AutoMapper.UnitTests.csproj +++ b/src/UnitTests/AutoMapper.UnitTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 $(NoWarn);649;618 ..\..\AutoMapper.snk true @@ -14,7 +14,7 @@ - + diff --git a/src/UnitTests/Bug/MultiThreadingIssues.cs b/src/UnitTests/Bug/MultiThreadingIssues.cs index 8bbf0e3145..1caa962e30 100644 --- a/src/UnitTests/Bug/MultiThreadingIssues.cs +++ b/src/UnitTests/Bug/MultiThreadingIssues.cs @@ -1,4 +1,6 @@ -namespace AutoMapper.UnitTests.Bug; +using System.Linq; + +namespace AutoMapper.UnitTests.Bug; public class MultiThreadingIssues { public class Type1 @@ -641,7 +643,7 @@ public async Task Should_work() }; var tasks = types - .Concat(types.Select(t => t.Reverse().ToArray())) + .Concat(types.Select(t => Enumerable.Reverse(t).ToArray())) .Select(t=>(SourceType: sourceType.MakeGenericType(t[0]), DestinationType: destinationType.MakeGenericType(t[1]))) .ToArray() .Select(s => Task.Factory.StartNew(() => c.ResolveTypeMap(s.SourceType, s.DestinationType))) @@ -1173,7 +1175,7 @@ public async Task Should_work() }; var tasks = types - .Concat(types.Select(t => t.Reverse().ToArray())) + .Concat(types.Select(t => Enumerable.Reverse(t).ToArray())) .Select(t=>(SourceType: sourceType.MakeGenericType(t[0]), DestinationType: destinationType.MakeGenericType(t[1]))) .ToArray() .Select(s => Task.Factory.StartNew(() => mapper.Map(null, s.SourceType, s.DestinationType)))