From 8f95149bc040a1d8590d1f280c5e9b677765b389 Mon Sep 17 00:00:00 2001 From: Antoine Griffard Date: Fri, 17 Nov 2023 11:24:53 +0100 Subject: [PATCH 1/2] Update dependencies, Remove "-pre01" --- src/Benchmark/Benchmark.csproj | 6 +++--- src/ExpressionDebugger/ExpressionDebugger.csproj | 2 +- src/ExpressionTranslator/ExpressionTranslator.csproj | 2 +- src/Mapster.Async.Tests/Mapster.Async.Tests.csproj | 4 ++-- src/Mapster.Async/Mapster.Async.csproj | 2 +- src/Mapster.Core/Mapster.Core.csproj | 2 +- .../Mapster.DependencyInjection.Tests.csproj | 4 ++-- .../Mapster.DependencyInjection.csproj | 2 +- src/Mapster.EF6/Mapster.EF6.csproj | 2 +- src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj | 6 +++--- src/Mapster.EFCore/Mapster.EFCore.csproj | 2 +- .../Mapster.Immutable.Tests.csproj | 6 +++--- src/Mapster.Immutable/Mapster.Immutable.csproj | 2 +- .../Mapster.JsonNet.Tests.csproj | 4 ++-- src/Mapster.JsonNet/Mapster.JsonNet.csproj | 4 ++-- .../Mapster.SourceGenerator.csproj | 4 ++-- src/Mapster.Tests/Mapster.Tests.csproj | 6 +++--- src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj | 12 ++++++------ src/Mapster.Tool/Mapster.Tool.csproj | 4 ++-- src/Mapster/Mapster.csproj | 2 +- src/Sample.AspNetCore/Sample.AspNetCore.csproj | 4 ++-- src/Sample.CodeGen/Sample.CodeGen.csproj | 6 +++--- src/TemplateTest/TemplateTest.csproj | 7 +++++-- 23 files changed, 49 insertions(+), 46 deletions(-) diff --git a/src/Benchmark/Benchmark.csproj b/src/Benchmark/Benchmark.csproj index 739dc721..9eec91f6 100644 --- a/src/Benchmark/Benchmark.csproj +++ b/src/Benchmark/Benchmark.csproj @@ -19,11 +19,11 @@ - + - - + + diff --git a/src/ExpressionDebugger/ExpressionDebugger.csproj b/src/ExpressionDebugger/ExpressionDebugger.csproj index 8b5e81f6..9155609c 100644 --- a/src/ExpressionDebugger/ExpressionDebugger.csproj +++ b/src/ExpressionDebugger/ExpressionDebugger.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/ExpressionTranslator/ExpressionTranslator.csproj b/src/ExpressionTranslator/ExpressionTranslator.csproj index 0bad5ffc..4af6c2a1 100644 --- a/src/ExpressionTranslator/ExpressionTranslator.csproj +++ b/src/ExpressionTranslator/ExpressionTranslator.csproj @@ -26,6 +26,6 @@ - + diff --git a/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj b/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj index 835d8547..16b28243 100644 --- a/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj +++ b/src/Mapster.Async.Tests/Mapster.Async.Tests.csproj @@ -7,10 +7,10 @@ - + - + diff --git a/src/Mapster.Async/Mapster.Async.csproj b/src/Mapster.Async/Mapster.Async.csproj index 9ec82a66..046fee0b 100644 --- a/src/Mapster.Async/Mapster.Async.csproj +++ b/src/Mapster.Async/Mapster.Async.csproj @@ -7,7 +7,7 @@ Mapster;Async true Mapster.Async.snk - 2.0.2-pre01 + 2.0.2 diff --git a/src/Mapster.Core/Mapster.Core.csproj b/src/Mapster.Core/Mapster.Core.csproj index 5bfd0a54..0e7c3b78 100644 --- a/src/Mapster.Core/Mapster.Core.csproj +++ b/src/Mapster.Core/Mapster.Core.csproj @@ -4,7 +4,7 @@ net8.0;net7.0;net6.0 Mapster.Core mapster - 1.2.2-pre01 + 1.2.2 enable true true diff --git a/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj b/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj index 4f02a26a..b2b726ac 100644 --- a/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj +++ b/src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj @@ -8,10 +8,10 @@ - + - + diff --git a/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj b/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj index f806c551..0513aa1f 100644 --- a/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj +++ b/src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj @@ -7,7 +7,7 @@ Mapster;DependencyInjection true Mapster.DependencyInjection.snk - 1.0.2-pre01 + 1.0.2 diff --git a/src/Mapster.EF6/Mapster.EF6.csproj b/src/Mapster.EF6/Mapster.EF6.csproj index 2f4b1b25..28308833 100644 --- a/src/Mapster.EF6/Mapster.EF6.csproj +++ b/src/Mapster.EF6/Mapster.EF6.csproj @@ -8,7 +8,7 @@ True true Mapster.EF6.snk - 2.0.2-pre01 + 2.0.2 diff --git a/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj b/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj index e0a55450..dfd9c4dd 100644 --- a/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj +++ b/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj @@ -8,14 +8,14 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Mapster.EFCore/Mapster.EFCore.csproj b/src/Mapster.EFCore/Mapster.EFCore.csproj index db82d4b6..0bd55183 100644 --- a/src/Mapster.EFCore/Mapster.EFCore.csproj +++ b/src/Mapster.EFCore/Mapster.EFCore.csproj @@ -8,7 +8,7 @@ True true Mapster.EFCore.snk - 5.1.2-pre01 + 5.1.2 diff --git a/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj b/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj index bbb9f594..51ccf1f7 100644 --- a/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj +++ b/src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj @@ -7,14 +7,14 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Mapster.Immutable/Mapster.Immutable.csproj b/src/Mapster.Immutable/Mapster.Immutable.csproj index 6bfa1057..c9a682b2 100644 --- a/src/Mapster.Immutable/Mapster.Immutable.csproj +++ b/src/Mapster.Immutable/Mapster.Immutable.csproj @@ -7,7 +7,7 @@ Mapster;Immutable true Mapster.Immutable.snk - 1.0.2-pre01 + 1.0.2 enable diff --git a/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj b/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj index 1841f5c6..0ab8ffc6 100644 --- a/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj +++ b/src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj @@ -7,10 +7,10 @@ - + - + diff --git a/src/Mapster.JsonNet/Mapster.JsonNet.csproj b/src/Mapster.JsonNet/Mapster.JsonNet.csproj index 0101057d..75964592 100644 --- a/src/Mapster.JsonNet/Mapster.JsonNet.csproj +++ b/src/Mapster.JsonNet/Mapster.JsonNet.csproj @@ -7,11 +7,11 @@ Mapster;Json.net true Mapster.JsonNet.snk - 1.1.2-pre01 + 1.1.2 - + diff --git a/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj b/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj index 74dbf23e..96dd4be9 100644 --- a/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj +++ b/src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/Mapster.Tests/Mapster.Tests.csproj b/src/Mapster.Tests/Mapster.Tests.csproj index 4121ac36..38cdff56 100644 --- a/src/Mapster.Tests/Mapster.Tests.csproj +++ b/src/Mapster.Tests/Mapster.Tests.csproj @@ -9,11 +9,11 @@ true - + - - + + diff --git a/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj b/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj index f5797195..5fe2094c 100644 --- a/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj +++ b/src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj @@ -9,15 +9,15 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Mapster.Tool/Mapster.Tool.csproj b/src/Mapster.Tool/Mapster.Tool.csproj index d7921c64..5b2fc1f0 100644 --- a/src/Mapster.Tool/Mapster.Tool.csproj +++ b/src/Mapster.Tool/Mapster.Tool.csproj @@ -10,7 +10,7 @@ Mapster;Tool true Mapster.Tool.snk - 8.4.1-pre01 + 8.4.1 enable @@ -19,7 +19,7 @@ - + diff --git a/src/Mapster/Mapster.csproj b/src/Mapster/Mapster.csproj index 60ff3663..2b8fbeeb 100644 --- a/src/Mapster/Mapster.csproj +++ b/src/Mapster/Mapster.csproj @@ -16,7 +16,7 @@ true Mapster - 7.4.1-pre01 + 7.4.1 enable 1701;1702;8618 diff --git a/src/Sample.AspNetCore/Sample.AspNetCore.csproj b/src/Sample.AspNetCore/Sample.AspNetCore.csproj index 7cf57a89..a82846ec 100644 --- a/src/Sample.AspNetCore/Sample.AspNetCore.csproj +++ b/src/Sample.AspNetCore/Sample.AspNetCore.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/src/Sample.CodeGen/Sample.CodeGen.csproj b/src/Sample.CodeGen/Sample.CodeGen.csproj index f288e135..93cc9bd6 100644 --- a/src/Sample.CodeGen/Sample.CodeGen.csproj +++ b/src/Sample.CodeGen/Sample.CodeGen.csproj @@ -6,11 +6,11 @@ - + - + - + diff --git a/src/TemplateTest/TemplateTest.csproj b/src/TemplateTest/TemplateTest.csproj index 8a3bc1b3..57aa2409 100644 --- a/src/TemplateTest/TemplateTest.csproj +++ b/src/TemplateTest/TemplateTest.csproj @@ -8,10 +8,13 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From d29d6e3e061f199b6ae4973e89ad4c6d817cb2f6 Mon Sep 17 00:00:00 2001 From: Antoine Griffard Date: Fri, 17 Nov 2023 11:30:49 +0100 Subject: [PATCH 2/2] Add Conditions on TargetFrameworks for Microsoft.EntityFrameworkCore package references --- .../Mapster.EFCore.Tests.csproj | 47 +++++++++++-------- src/Mapster.EFCore/Mapster.EFCore.csproj | 44 +++++++++-------- 2 files changed, 53 insertions(+), 38 deletions(-) diff --git a/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj b/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj index dfd9c4dd..2ecd1535 100644 --- a/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj +++ b/src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj @@ -1,26 +1,35 @@  - - net8.0;net7.0;net6.0 + + net8.0;net7.0;net6.0 - false - + false + - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - - + + + + diff --git a/src/Mapster.EFCore/Mapster.EFCore.csproj b/src/Mapster.EFCore/Mapster.EFCore.csproj index 0bd55183..5fbe8117 100644 --- a/src/Mapster.EFCore/Mapster.EFCore.csproj +++ b/src/Mapster.EFCore/Mapster.EFCore.csproj @@ -1,25 +1,31 @@  - - net8.0;net7.0;net6.0 - EFCore plugin for Mapster - true - Mapster;EFCore - True - true - Mapster.EFCore.snk - 5.1.2 - + + net6.0;net7.0;net8.0 + EFCore plugin for Mapster + true + Mapster;EFCore + True + true + Mapster.EFCore.snk + 5.1.2 + - - - + + + + + + + + + - - - + + + - - - + + + \ No newline at end of file