From a6aab253de618c4186664021b58f76013dde6bd4 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:39:10 +0200 Subject: [PATCH 1/9] Update samples and tests projects to .NET 8 --- samples/WebAppPluginsLibrary/WebAppPluginsLibrary.csproj | 2 +- tests/Assemblies/JsonNetNew/JsonNetNew.csproj | 2 +- tests/Assemblies/JsonNetOld/JsonNetOld.csproj | 2 +- tests/Assemblies/TestAssembly1/TestAssembly1.csproj | 2 +- tests/Assemblies/TestAssembly2/TestAssembly2.csproj | 2 +- tests/Assemblies/TestAssembly3/TestAssembly3.csproj | 2 +- tests/Assemblies/TestIntefaces/TestIntefaces.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/WebAppPluginsLibrary/WebAppPluginsLibrary.csproj b/samples/WebAppPluginsLibrary/WebAppPluginsLibrary.csproj index 2756020..60520ee 100644 --- a/samples/WebAppPluginsLibrary/WebAppPluginsLibrary.csproj +++ b/samples/WebAppPluginsLibrary/WebAppPluginsLibrary.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 diff --git a/tests/Assemblies/JsonNetNew/JsonNetNew.csproj b/tests/Assemblies/JsonNetNew/JsonNetNew.csproj index 060466c..f1784c1 100644 --- a/tests/Assemblies/JsonNetNew/JsonNetNew.csproj +++ b/tests/Assemblies/JsonNetNew/JsonNetNew.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 diff --git a/tests/Assemblies/JsonNetOld/JsonNetOld.csproj b/tests/Assemblies/JsonNetOld/JsonNetOld.csproj index 6e39d8e..4d1bb6e 100644 --- a/tests/Assemblies/JsonNetOld/JsonNetOld.csproj +++ b/tests/Assemblies/JsonNetOld/JsonNetOld.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 diff --git a/tests/Assemblies/TestAssembly1/TestAssembly1.csproj b/tests/Assemblies/TestAssembly1/TestAssembly1.csproj index b148363..b9f31a4 100644 --- a/tests/Assemblies/TestAssembly1/TestAssembly1.csproj +++ b/tests/Assemblies/TestAssembly1/TestAssembly1.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 diff --git a/tests/Assemblies/TestAssembly2/TestAssembly2.csproj b/tests/Assemblies/TestAssembly2/TestAssembly2.csproj index 2ece7f5..9998230 100644 --- a/tests/Assemblies/TestAssembly2/TestAssembly2.csproj +++ b/tests/Assemblies/TestAssembly2/TestAssembly2.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 diff --git a/tests/Assemblies/TestAssembly3/TestAssembly3.csproj b/tests/Assemblies/TestAssembly3/TestAssembly3.csproj index b9b6595..39cb2cc 100644 --- a/tests/Assemblies/TestAssembly3/TestAssembly3.csproj +++ b/tests/Assemblies/TestAssembly3/TestAssembly3.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 diff --git a/tests/Assemblies/TestIntefaces/TestIntefaces.csproj b/tests/Assemblies/TestIntefaces/TestIntefaces.csproj index 4854cd7..774d229 100644 --- a/tests/Assemblies/TestIntefaces/TestIntefaces.csproj +++ b/tests/Assemblies/TestIntefaces/TestIntefaces.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net8.0 From 30d4d87743e26ba7069843f319a7bc5afb9dd1ea Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:49:42 +0200 Subject: [PATCH 2/9] Update Weikio.NugetDownloader to 3.0.1 --- .../Weikio.PluginFramework.Catalogs.NuGet.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj b/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj index a8ca285..ba8c5b7 100644 --- a/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj +++ b/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -16,7 +16,7 @@ - + From ac29f564d2dedf73cb05f69215537d852bb30608 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:51:09 +0200 Subject: [PATCH 3/9] Update Newtonsoft.Json to 13.0.3 --- samples/WebAppWithDelegate/WebAppWithDelegate.csproj | 4 ++-- samples/WebAppWithRoslyn/WebAppWithRoslyn.csproj | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/WebAppWithDelegate/WebAppWithDelegate.csproj b/samples/WebAppWithDelegate/WebAppWithDelegate.csproj index 1014a8f..bc6df3d 100644 --- a/samples/WebAppWithDelegate/WebAppWithDelegate.csproj +++ b/samples/WebAppWithDelegate/WebAppWithDelegate.csproj @@ -5,11 +5,11 @@ - + - + diff --git a/samples/WebAppWithRoslyn/WebAppWithRoslyn.csproj b/samples/WebAppWithRoslyn/WebAppWithRoslyn.csproj index 654eb0f..33aa7a2 100644 --- a/samples/WebAppWithRoslyn/WebAppWithRoslyn.csproj +++ b/samples/WebAppWithRoslyn/WebAppWithRoslyn.csproj @@ -5,12 +5,12 @@ - - + + - + From 2f2c5ded59481be60fec888898dcbc13b3e0ad14 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:51:27 +0200 Subject: [PATCH 4/9] Update Newtonsoft.Json to 13.0.3 --- tests/Assemblies/JsonNetNew/JsonNetNew.csproj | 2 +- tests/Assemblies/JsonNetOld/JsonNetOld.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Assemblies/JsonNetNew/JsonNetNew.csproj b/tests/Assemblies/JsonNetNew/JsonNetNew.csproj index f1784c1..3bc0d9d 100644 --- a/tests/Assemblies/JsonNetNew/JsonNetNew.csproj +++ b/tests/Assemblies/JsonNetNew/JsonNetNew.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/Assemblies/JsonNetOld/JsonNetOld.csproj b/tests/Assemblies/JsonNetOld/JsonNetOld.csproj index 4d1bb6e..a32a5de 100644 --- a/tests/Assemblies/JsonNetOld/JsonNetOld.csproj +++ b/tests/Assemblies/JsonNetOld/JsonNetOld.csproj @@ -9,12 +9,12 @@ - - + + - + From 6af481c8c9ffe44ed2579161e257b2f873090aae Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:53:03 +0200 Subject: [PATCH 5/9] Update all dependencies --- .../Weikio.PluginFramework.Abstractions.csproj | 2 +- .../Weikio.PluginFramework.AspNetCore.csproj | 2 +- .../Weikio.PluginFramework.Catalogs.NuGet.csproj | 2 +- .../Weikio.PluginFramework.Catalogs.Roslyn.csproj | 6 +++--- .../Weikio.PluginFramework.Configuration.csproj | 2 +- .../Weikio.PluginFramework.csproj | 4 ++-- tests/Assemblies/JsonNetOld/JsonNetOld.csproj | 2 +- ...inFramework.AspNetCore.IntegrationTests.csproj | 15 +++++++++------ ...io.PluginFramework.Catalogs.NuGet.Tests.csproj | 6 +++--- ...o.PluginFramework.Catalogs.Roslyn.Tests.csproj | 9 ++++++--- .../Weikio.PluginFramework.Tests.csproj | 9 ++++++--- 11 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj b/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj index 9e7578e..33e2a58 100644 --- a/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj +++ b/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj @@ -19,7 +19,7 @@ - + \ No newline at end of file diff --git a/src/Weikio.PluginFramework.AspNetCore/Weikio.PluginFramework.AspNetCore.csproj b/src/Weikio.PluginFramework.AspNetCore/Weikio.PluginFramework.AspNetCore.csproj index bbd1581..cb04589 100644 --- a/src/Weikio.PluginFramework.AspNetCore/Weikio.PluginFramework.AspNetCore.csproj +++ b/src/Weikio.PluginFramework.AspNetCore/Weikio.PluginFramework.AspNetCore.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj b/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj index ba8c5b7..fff1914 100644 --- a/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj +++ b/src/Weikio.PluginFramework.Catalogs.NuGet/Weikio.PluginFramework.Catalogs.NuGet.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Weikio.PluginFramework.Catalogs.Roslyn/Weikio.PluginFramework.Catalogs.Roslyn.csproj b/src/Weikio.PluginFramework.Catalogs.Roslyn/Weikio.PluginFramework.Catalogs.Roslyn.csproj index 813a5d0..be42cc6 100644 --- a/src/Weikio.PluginFramework.Catalogs.Roslyn/Weikio.PluginFramework.Catalogs.Roslyn.csproj +++ b/src/Weikio.PluginFramework.Catalogs.Roslyn/Weikio.PluginFramework.Catalogs.Roslyn.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj b/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj index 311749f..15576bc 100644 --- a/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj +++ b/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Weikio.PluginFramework/Weikio.PluginFramework.csproj b/src/Weikio.PluginFramework/Weikio.PluginFramework.csproj index 88b07e0..e95b49b 100644 --- a/src/Weikio.PluginFramework/Weikio.PluginFramework.csproj +++ b/src/Weikio.PluginFramework/Weikio.PluginFramework.csproj @@ -20,10 +20,10 @@ - + - + diff --git a/tests/Assemblies/JsonNetOld/JsonNetOld.csproj b/tests/Assemblies/JsonNetOld/JsonNetOld.csproj index a32a5de..99c5bc3 100644 --- a/tests/Assemblies/JsonNetOld/JsonNetOld.csproj +++ b/tests/Assemblies/JsonNetOld/JsonNetOld.csproj @@ -10,7 +10,7 @@ - + diff --git a/tests/integration/Weikio.PluginFramework.AspNetCore.IntegrationTests/Weikio.PluginFramework.AspNetCore.IntegrationTests.csproj b/tests/integration/Weikio.PluginFramework.AspNetCore.IntegrationTests/Weikio.PluginFramework.AspNetCore.IntegrationTests.csproj index c507ec0..c661c8c 100644 --- a/tests/integration/Weikio.PluginFramework.AspNetCore.IntegrationTests/Weikio.PluginFramework.AspNetCore.IntegrationTests.csproj +++ b/tests/integration/Weikio.PluginFramework.AspNetCore.IntegrationTests/Weikio.PluginFramework.AspNetCore.IntegrationTests.csproj @@ -5,12 +5,15 @@ - - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/tests/integration/Weikio.PluginFramework.Catalogs.NuGet.Tests/Weikio.PluginFramework.Catalogs.NuGet.Tests.csproj b/tests/integration/Weikio.PluginFramework.Catalogs.NuGet.Tests/Weikio.PluginFramework.Catalogs.NuGet.Tests.csproj index d434c4f..6331b76 100644 --- a/tests/integration/Weikio.PluginFramework.Catalogs.NuGet.Tests/Weikio.PluginFramework.Catalogs.NuGet.Tests.csproj +++ b/tests/integration/Weikio.PluginFramework.Catalogs.NuGet.Tests/Weikio.PluginFramework.Catalogs.NuGet.Tests.csproj @@ -5,9 +5,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/unit/Weikio.PluginFramework.Catalogs.Roslyn.Tests/Weikio.PluginFramework.Catalogs.Roslyn.Tests.csproj b/tests/unit/Weikio.PluginFramework.Catalogs.Roslyn.Tests/Weikio.PluginFramework.Catalogs.Roslyn.Tests.csproj index 35f4dcb..6a21ecd 100644 --- a/tests/unit/Weikio.PluginFramework.Catalogs.Roslyn.Tests/Weikio.PluginFramework.Catalogs.Roslyn.Tests.csproj +++ b/tests/unit/Weikio.PluginFramework.Catalogs.Roslyn.Tests/Weikio.PluginFramework.Catalogs.Roslyn.Tests.csproj @@ -5,9 +5,12 @@ - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/tests/unit/Weikio.PluginFramework.Tests/Weikio.PluginFramework.Tests.csproj b/tests/unit/Weikio.PluginFramework.Tests/Weikio.PluginFramework.Tests.csproj index 62dc0da..20d2a23 100644 --- a/tests/unit/Weikio.PluginFramework.Tests/Weikio.PluginFramework.Tests.csproj +++ b/tests/unit/Weikio.PluginFramework.Tests/Weikio.PluginFramework.Tests.csproj @@ -5,9 +5,12 @@ - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 83581a35a9ce6d80175910093909e3c231e90ea0 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:54:04 +0200 Subject: [PATCH 6/9] Update Weikio.PluginFramework.Abstractions to .NET 8 --- .../Weikio.PluginFramework.Abstractions.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj b/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj index 33e2a58..3b75e8b 100644 --- a/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj +++ b/src/Weikio.PluginFramework.Abstractions/Weikio.PluginFramework.Abstractions.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0 + net8.0 true true Abstractions for Plugin Framework. From cac9805c0c6ac92f4008d50a2e92d187c3801256 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:55:54 +0200 Subject: [PATCH 7/9] Switch Windows applications type to Microsoft.NET.Sdk --- samples/WinFormsApp/WinFormsApp.csproj | 2 +- samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj | 2 +- samples/WpfApp/WpfApp.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/WinFormsApp/WinFormsApp.csproj b/samples/WinFormsApp/WinFormsApp.csproj index 9f1ac05..6edf342 100644 --- a/samples/WinFormsApp/WinFormsApp.csproj +++ b/samples/WinFormsApp/WinFormsApp.csproj @@ -1,4 +1,4 @@ - + WinExe diff --git a/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj b/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj index 334b5b1..10bb80f 100644 --- a/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj +++ b/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj @@ -1,4 +1,4 @@ - + net8.0 diff --git a/samples/WpfApp/WpfApp.csproj b/samples/WpfApp/WpfApp.csproj index edbdb54..993be6b 100644 --- a/samples/WpfApp/WpfApp.csproj +++ b/samples/WpfApp/WpfApp.csproj @@ -1,4 +1,4 @@ - + WinExe From a45f29c97b213b4521fcb1cf20c774fd73b11e22 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 15:57:22 +0200 Subject: [PATCH 8/9] Use TargetFramework net8.0-windows for Windows projects --- samples/WinFormsApp/WinFormsApp.csproj | 6 +++--- .../WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj | 4 ++-- samples/WpfApp/WpfApp.csproj | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/WinFormsApp/WinFormsApp.csproj b/samples/WinFormsApp/WinFormsApp.csproj index 6edf342..15aa868 100644 --- a/samples/WinFormsApp/WinFormsApp.csproj +++ b/samples/WinFormsApp/WinFormsApp.csproj @@ -2,13 +2,13 @@ WinExe - net8.0 + net8.0-windows true - - + + \ No newline at end of file diff --git a/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj b/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj index 10bb80f..a00da4d 100644 --- a/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj +++ b/samples/WinFormsPluginsLibrary/WinFormsPluginsLibrary.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0-windows true @@ -15,7 +15,7 @@ - + diff --git a/samples/WpfApp/WpfApp.csproj b/samples/WpfApp/WpfApp.csproj index 993be6b..61bc76a 100644 --- a/samples/WpfApp/WpfApp.csproj +++ b/samples/WpfApp/WpfApp.csproj @@ -2,14 +2,14 @@ WinExe - net8.0 + net8.0-windows true - - - + + + \ No newline at end of file From 3093d78142d9d741215d391822eabc4f21446da4 Mon Sep 17 00:00:00 2001 From: Stanislav LESNIKOV Date: Wed, 2 Oct 2024 16:00:37 +0200 Subject: [PATCH 9/9] Add Microsoft.Extensions.Configuration.* dependencies to Weikio.PluginFramework.Configuration --- .../Weikio.PluginFramework.Configuration.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj b/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj index 15576bc..4cf646a 100644 --- a/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj +++ b/src/Weikio.PluginFramework.Configuration/Weikio.PluginFramework.Configuration.csproj @@ -16,6 +16,8 @@ + +