From 9f4881b866a1b727e5ba07b71b87162a1ef3c2dd Mon Sep 17 00:00:00 2001 From: Andreas Ravnestad Date: Thu, 21 Sep 2023 23:36:05 +0200 Subject: [PATCH 1/3] Add net8.0 framework moniker and update test-related packages --- src/ExpressionDebugger/ExpressionDebugger.csproj | 2 +- src/ExpressionTranslator/ExpressionTranslator.csproj | 2 +- src/Mapster.Async.Tests/Mapster.Async.Tests.csproj | 10 +++++----- src/Mapster.Async/Mapster.Async.csproj | 2 +- src/Mapster.Core/Mapster.Core.csproj | 2 +- .../Mapster.DependencyInjection.Tests.csproj | 10 +++++----- .../Mapster.DependencyInjection.csproj | 2 +- src/Mapster.EF6/Mapster.EF6.csproj | 2 +- src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj | 10 +++++----- src/Mapster.EFCore/Mapster.EFCore.csproj | 2 +- .../Mapster.Immutable.Tests.csproj | 10 +++++----- src/Mapster.Immutable/Mapster.Immutable.csproj | 2 +- src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj | 10 +++++----- src/Mapster.JsonNet/Mapster.JsonNet.csproj | 2 +- .../Mapster.SourceGenerator.csproj | 2 +- src/Mapster.Tests/Mapster.Tests.csproj | 8 ++++---- src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj | 4 ++-- src/Mapster.Tool/Mapster.Tool.csproj | 2 +- src/Mapster/Mapster.csproj | 2 +- src/Sample.AspNetCore/Sample.AspNetCore.csproj | 2 +- src/Sample.CodeGen/Sample.CodeGen.csproj | 2 +- src/TemplateTest/TemplateTest.csproj | 10 +++++----- 22 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/ExpressionDebugger/ExpressionDebugger.csproj b/src/ExpressionDebugger/ExpressionDebugger.csproj index 530de3d6..8b5e81f6 100644 --- a/src/ExpressionDebugger/ExpressionDebugger.csproj +++ b/src/ExpressionDebugger/ExpressionDebugger.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0; True Chaowlert Chaisrichalermpol Step into debugging from linq expressions diff --git a/src/ExpressionTranslator/ExpressionTranslator.csproj b/src/ExpressionTranslator/ExpressionTranslator.csproj index 8d4f5de6..0bad5ffc 100644 --- a/src/ExpressionTranslator/ExpressionTranslator.csproj +++ b/src/ExpressionTranslator/ExpressionTranslator.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0; True Chaowlert Chaisrichalermpol Translate from linq expressions to C# code diff --git a/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj b/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj index fea91e85..835d8547 100644 --- a/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj +++ b/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj @@ -1,15 +1,15 @@ - + - net7.0;net6.0 + net8.0;net7.0;net6.0 false - - - + + + diff --git a/src/Mapster.Async/Mapster.Async.csproj b/src/Mapster.Async/Mapster.Async.csproj index dc1b1d76..ea7f0594 100644 --- a/src/Mapster.Async/Mapster.Async.csproj +++ b/src/Mapster.Async/Mapster.Async.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 Async supports for Mapster true Mapster;Async diff --git a/src/Mapster.Core/Mapster.Core.csproj b/src/Mapster.Core/Mapster.Core.csproj index df7ee33b..63602c75 100644 --- a/src/Mapster.Core/Mapster.Core.csproj +++ b/src/Mapster.Core/Mapster.Core.csproj @@ -1,7 +1,7 @@  Lightweight library for Mapster and Mapster CodeGen - net7.0;net6.0 + net8.0;net7.0;net6.0 Mapster.Core mapster 1.2.1 diff --git a/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj b/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj index e0b62dae..4f02a26a 100644 --- a/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj +++ b/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj @@ -1,16 +1,16 @@ - + - net7.0;net6.0 + net8.0;net7.0;net6.0 false - - - + + + diff --git a/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj b/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj index 6a9be860..c6ce1228 100644 --- a/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj +++ b/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 Dependency Injection supports for Mapster true Mapster;DependencyInjection diff --git a/src/Mapster.EF6/Mapster.EF6.csproj b/src/Mapster.EF6/Mapster.EF6.csproj index d73d7e87..df5936c1 100644 --- a/src/Mapster.EF6/Mapster.EF6.csproj +++ b/src/Mapster.EF6/Mapster.EF6.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 EF6 plugin for Mapster true Mapster;EF6 diff --git a/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj b/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj index ca407d5b..e0a55450 100644 --- a/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj +++ b/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj @@ -1,16 +1,16 @@ - + - net7.0;net6.0 + net8.0;net7.0;net6.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Mapster.EFCore/Mapster.EFCore.csproj b/src/Mapster.EFCore/Mapster.EFCore.csproj index e4e75b39..e33a9436 100644 --- a/src/Mapster.EFCore/Mapster.EFCore.csproj +++ b/src/Mapster.EFCore/Mapster.EFCore.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 EFCore plugin for Mapster true Mapster;EFCore diff --git a/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj b/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj index 4b52ed69..bbb9f594 100644 --- a/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj +++ b/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj @@ -1,15 +1,15 @@ - + - net7.0;net6.0 + net8.0;net7.0;net6.0 false - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Mapster.Immutable/Mapster.Immutable.csproj b/src/Mapster.Immutable/Mapster.Immutable.csproj index e072691b..b035613b 100644 --- a/src/Mapster.Immutable/Mapster.Immutable.csproj +++ b/src/Mapster.Immutable/Mapster.Immutable.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 Immutable collection supports for Mapster true Mapster;Immutable diff --git a/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj b/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj index b7173dfe..1841f5c6 100644 --- a/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj +++ b/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj @@ -1,15 +1,15 @@ - + - net7.0;net6.0 + net8.0;net7.0;net6.0 false - - - + + + diff --git a/src/Mapster.JsonNet/Mapster.JsonNet.csproj b/src/Mapster.JsonNet/Mapster.JsonNet.csproj index a08db26e..8c2f8dd3 100644 --- a/src/Mapster.JsonNet/Mapster.JsonNet.csproj +++ b/src/Mapster.JsonNet/Mapster.JsonNet.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 Json.net conversion supports for Mapster true Mapster;Json.net diff --git a/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj b/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj index f436bada..74dbf23e 100644 --- a/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj +++ b/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 Source generator to generate mapping using Mapster source-generator;mapster true diff --git a/src/Mapster.Tests/Mapster.Tests.csproj b/src/Mapster.Tests/Mapster.Tests.csproj index 1ea56308..4121ac36 100644 --- a/src/Mapster.Tests/Mapster.Tests.csproj +++ b/src/Mapster.Tests/Mapster.Tests.csproj @@ -1,7 +1,7 @@ - net7.0;net6.0 + net8.0;net7.0;net6.0 false Mapster.Tests Mapster.Tests.snk @@ -9,9 +9,9 @@ true - - - + + + diff --git a/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj b/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj index 9ddf4c8d..c42d2964 100644 --- a/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj +++ b/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -10,7 +10,7 @@ - + diff --git a/src/Mapster.Tool/Mapster.Tool.csproj b/src/Mapster.Tool/Mapster.Tool.csproj index 17e614a6..6798003f 100644 --- a/src/Mapster.Tool/Mapster.Tool.csproj +++ b/src/Mapster.Tool/Mapster.Tool.csproj @@ -2,7 +2,7 @@ Exe - net7.0;net6.0 + net8.0;net7.0;net6.0 true true dotnet-mapster diff --git a/src/Mapster/Mapster.csproj b/src/Mapster/Mapster.csproj index 6526c895..f67277cc 100644 --- a/src/Mapster/Mapster.csproj +++ b/src/Mapster/Mapster.csproj @@ -4,7 +4,7 @@ A fast, fun and stimulating object to object mapper. Kind of like AutoMapper, just simpler and way, way faster. Copyright (c) 2016 Chaowlert Chaisrichalermpol, Eric Swann chaowlert;eric_swann - net7.0;net6.0 + net8.0;net7.0;net6.0 Mapster A fast, fun and stimulating object to object mapper. Kind of like AutoMapper, just simpler and way, way faster. Mapster diff --git a/src/Sample.AspNetCore/Sample.AspNetCore.csproj b/src/Sample.AspNetCore/Sample.AspNetCore.csproj index c5761156..7cf57a89 100644 --- a/src/Sample.AspNetCore/Sample.AspNetCore.csproj +++ b/src/Sample.AspNetCore/Sample.AspNetCore.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 diff --git a/src/Sample.CodeGen/Sample.CodeGen.csproj b/src/Sample.CodeGen/Sample.CodeGen.csproj index 27485d31..f288e135 100644 --- a/src/Sample.CodeGen/Sample.CodeGen.csproj +++ b/src/Sample.CodeGen/Sample.CodeGen.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0 + net8.0;net7.0;net6.0 enable diff --git a/src/TemplateTest/TemplateTest.csproj b/src/TemplateTest/TemplateTest.csproj index 2f6524f3..8a3bc1b3 100644 --- a/src/TemplateTest/TemplateTest.csproj +++ b/src/TemplateTest/TemplateTest.csproj @@ -1,16 +1,16 @@ - + - net7.0;net6.0 + net8.0;net7.0;net6.0 enable false - - - + + + From 5026e650dbe6dbdb04e07b7bb097a55d6960a29e Mon Sep 17 00:00:00 2001 From: Andreas Ravnestad Date: Thu, 21 Sep 2023 23:42:34 +0200 Subject: [PATCH 2/3] Add .net7.0 moniker to Mapster.Tool.Tests.csproj and upgrade the Mapster.Tool install to 8.4.0. --- src/Mapster.Tool.Tests/.config/dotnet-tools.json | 2 +- src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mapster.Tool.Tests/.config/dotnet-tools.json b/src/Mapster.Tool.Tests/.config/dotnet-tools.json index 0c61f2d3..db4df7b6 100644 --- a/src/Mapster.Tool.Tests/.config/dotnet-tools.json +++ b/src/Mapster.Tool.Tests/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "mapster.tool": { - "version": "8.3.0", + "version": "8.4.0", "commands": [ "dotnet-mapster" ] diff --git a/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj b/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj index c42d2964..f5797195 100644 --- a/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj +++ b/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0;net6.0 enable enable From 7f1935cf375ca2b2259d59a289f5c86e6544575d Mon Sep 17 00:00:00 2001 From: Andreas Ravnestad Date: Thu, 21 Sep 2023 23:50:02 +0200 Subject: [PATCH 3/3] Upgrade build pipeline to .NET 8. This still won't build until 8.0.x is available on GitHub. --- .github/workflows/dotnet-buildandtest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-buildandtest.yml b/.github/workflows/dotnet-buildandtest.yml index efad3f06..7e30a04a 100644 --- a/.github/workflows/dotnet-buildandtest.yml +++ b/.github/workflows/dotnet-buildandtest.yml @@ -16,12 +16,12 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Show dotnet version run: | dotnet --list-sdks dotnet --list-runtimes - name: Build with dotnet run: dotnet build ./src/Mapster.sln - - name: Run tests on .NET 7.0 + - name: Run tests on .NET 8.0 run: dotnet test --verbosity normal ./src/Mapster.sln