From 3b6a30c238e98d5bd1955df76e6b43f9089f8d94 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 26 Mar 2024 22:45:39 +0100 Subject: [PATCH] Switch to central package management --- Analysis.Build.props | 8 +- Directory.Packages.props | 74 ++++++++++++++++ build/build.csproj | 12 +-- .../AspNetCoreWithMarten.csproj | 8 +- .../CommandLineRunner.csproj | 6 +- src/CoreTests/CoreTests.csproj | 22 ++--- src/DocumentDbTests/DocumentDbTests.csproj | 20 ++--- src/EventPublisher/EventPublisher.csproj | 6 +- .../EventSourceWorker.csproj | 6 +- .../EventSourcingTests.csproj | 24 +++--- src/IssueService/IssueService.csproj | 4 +- src/LinqTests/LinqTests.csproj | 18 ++-- .../Marten.AspNetCore.Testing.csproj | 14 +-- .../Marten.AspNetCore.csproj | 12 +-- .../Marten.AsyncDaemon.Testing.csproj | 26 +++--- .../Marten.CommandLine.Tests.csproj | 16 ++-- .../Marten.CommandLine.csproj | 12 +-- .../Marten.NodaTime.Testing.csproj | 16 ++-- src/Marten.NodaTime/Marten.NodaTime.csproj | 12 +-- .../Marten.PLv8.Testing.csproj | 22 ++--- src/Marten.PLv8/Marten.PLv8.csproj | 8 +- src/Marten.Testing/Marten.Testing.csproj | 22 ++--- src/Marten.sln | 85 ++++++++++--------- src/Marten/Marten.csproj | 30 +++---- src/MartenBenchmarks/MartenBenchmarks.csproj | 8 +- .../MultiTenancyTests.csproj | 14 +-- src/PatchingTests/PatchingTests.csproj | 16 ++-- src/TestingSupport/TestingSupport.csproj | 18 ++-- .../Helpdesk.Api.Tests.csproj | 26 +++--- .../Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj | 6 +- src/samples/MinimalAPI/MinimalAPI.csproj | 10 +-- 31 files changed, 328 insertions(+), 253 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Analysis.Build.props b/Analysis.Build.props index 26c32f2806..39d3730136 100644 --- a/Analysis.Build.props +++ b/Analysis.Build.props @@ -1,4 +1,4 @@ - + true @@ -6,17 +6,17 @@ latest - + all none all - + all none all - + all none all diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..c76c5fe35b --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,74 @@ + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/build.csproj b/build/build.csproj index 727ba7ba9e..006242fb27 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,13 +7,13 @@ - + - - - - + + + + diff --git a/src/AspNetCoreWithMarten/AspNetCoreWithMarten.csproj b/src/AspNetCoreWithMarten/AspNetCoreWithMarten.csproj index 380049f410..227b38f37b 100644 --- a/src/AspNetCoreWithMarten/AspNetCoreWithMarten.csproj +++ b/src/AspNetCoreWithMarten/AspNetCoreWithMarten.csproj @@ -7,13 +7,13 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/CommandLineRunner/CommandLineRunner.csproj b/src/CommandLineRunner/CommandLineRunner.csproj index c8c2b37006..4287ba1054 100644 --- a/src/CommandLineRunner/CommandLineRunner.csproj +++ b/src/CommandLineRunner/CommandLineRunner.csproj @@ -7,11 +7,11 @@ - + - - + + diff --git a/src/CoreTests/CoreTests.csproj b/src/CoreTests/CoreTests.csproj index 6df66a292e..6303e2cfd8 100644 --- a/src/CoreTests/CoreTests.csproj +++ b/src/CoreTests/CoreTests.csproj @@ -16,19 +16,19 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + @@ -122,7 +122,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/DocumentDbTests/DocumentDbTests.csproj b/src/DocumentDbTests/DocumentDbTests.csproj index 4bf47d9803..d3dcfef934 100644 --- a/src/DocumentDbTests/DocumentDbTests.csproj +++ b/src/DocumentDbTests/DocumentDbTests.csproj @@ -12,22 +12,22 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/EventPublisher/EventPublisher.csproj b/src/EventPublisher/EventPublisher.csproj index cd04d5fbf7..bf6bdeb890 100644 --- a/src/EventPublisher/EventPublisher.csproj +++ b/src/EventPublisher/EventPublisher.csproj @@ -7,11 +7,11 @@ - - + + - + diff --git a/src/EventSourceWorker/EventSourceWorker.csproj b/src/EventSourceWorker/EventSourceWorker.csproj index 85fc1fce94..ba332fddd3 100644 --- a/src/EventSourceWorker/EventSourceWorker.csproj +++ b/src/EventSourceWorker/EventSourceWorker.csproj @@ -7,11 +7,11 @@ - + - - + + diff --git a/src/EventSourcingTests/EventSourcingTests.csproj b/src/EventSourcingTests/EventSourcingTests.csproj index 5c6fff5d8a..35680eb2e9 100644 --- a/src/EventSourcingTests/EventSourcingTests.csproj +++ b/src/EventSourcingTests/EventSourcingTests.csproj @@ -12,24 +12,24 @@ - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/IssueService/IssueService.csproj b/src/IssueService/IssueService.csproj index 6daf9ce288..f6a1c57f08 100644 --- a/src/IssueService/IssueService.csproj +++ b/src/IssueService/IssueService.csproj @@ -5,11 +5,11 @@ - + - + diff --git a/src/LinqTests/LinqTests.csproj b/src/LinqTests/LinqTests.csproj index 134fd3a0f6..ad5eb99577 100644 --- a/src/LinqTests/LinqTests.csproj +++ b/src/LinqTests/LinqTests.csproj @@ -12,21 +12,21 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj b/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj index 7c33197e66..d0a6693c00 100644 --- a/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj +++ b/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj @@ -6,22 +6,22 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Marten.AspNetCore/Marten.AspNetCore.csproj b/src/Marten.AspNetCore/Marten.AspNetCore.csproj index d2c63f2cae..f7543f13a6 100644 --- a/src/Marten.AspNetCore/Marten.AspNetCore.csproj +++ b/src/Marten.AspNetCore/Marten.AspNetCore.csproj @@ -16,24 +16,24 @@ - + - + - + - + - + - + diff --git a/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj b/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj index d8855981d4..68afeea062 100644 --- a/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj +++ b/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj @@ -5,26 +5,26 @@ latest - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers - + - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj b/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj index 509e6ec9d4..305951330a 100644 --- a/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj +++ b/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj @@ -8,23 +8,23 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/src/Marten.CommandLine/Marten.CommandLine.csproj b/src/Marten.CommandLine/Marten.CommandLine.csproj index 0f73fca32b..f6dca2fb8e 100644 --- a/src/Marten.CommandLine/Marten.CommandLine.csproj +++ b/src/Marten.CommandLine/Marten.CommandLine.csproj @@ -15,7 +15,7 @@ - + @@ -33,10 +33,10 @@ - - - - + + + + - + diff --git a/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj b/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj index 1098f3c620..e3482a8e37 100644 --- a/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj +++ b/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj @@ -1,4 +1,4 @@ - + net6.0;net7.0;net8.0 @@ -6,21 +6,21 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers - + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Marten.NodaTime/Marten.NodaTime.csproj b/src/Marten.NodaTime/Marten.NodaTime.csproj index 2f1208d502..d905852f51 100644 --- a/src/Marten.NodaTime/Marten.NodaTime.csproj +++ b/src/Marten.NodaTime/Marten.NodaTime.csproj @@ -1,4 +1,4 @@ - + NodaTime extension for Marten 7.0.0-beta.5 @@ -28,12 +28,12 @@ $(EnableSourceLink) - - - - + + + + - + diff --git a/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj b/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj index 2e1fa62a86..f0cb15c627 100644 --- a/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj +++ b/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj @@ -7,35 +7,35 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - - + + PreserveNewest - + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Marten.PLv8/Marten.PLv8.csproj b/src/Marten.PLv8/Marten.PLv8.csproj index 91529f6be2..20933ac4ec 100644 --- a/src/Marten.PLv8/Marten.PLv8.csproj +++ b/src/Marten.PLv8/Marten.PLv8.csproj @@ -29,15 +29,15 @@ - + - + - + - + diff --git a/src/Marten.Testing/Marten.Testing.csproj b/src/Marten.Testing/Marten.Testing.csproj index b4454c99ae..c938175c6e 100644 --- a/src/Marten.Testing/Marten.Testing.csproj +++ b/src/Marten.Testing/Marten.Testing.csproj @@ -1,4 +1,4 @@ - + net6.0;net7.0;net8.0 true @@ -21,18 +21,18 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + @@ -40,7 +40,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Marten.sln b/src/Marten.sln index 2bf04b13ea..fecd3ce77f 100644 --- a/src/Marten.sln +++ b/src/Marten.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30709.64 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten", "Marten\Marten.csproj", "{FCCA5D3A-B632-4D81-B839-F6344FDD01F1}" EndProject @@ -19,29 +19,30 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MartenBenchmarks", "MartenB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A91B8F9-52F8-4322-BE34-E3A281902BEC}" ProjectSection(SolutionItems) = preProject - ..\Directory.Build.props = ..\Directory.Build.props - ..\README.md = ..\README.md - ..\Analysis.Build.props = ..\Analysis.Build.props .editorconfig = .editorconfig + ..\Analysis.Build.props = ..\Analysis.Build.props + ..\Directory.Build.props = ..\Directory.Build.props + ..\Directory.Packages.props = ..\Directory.Packages.props ..\docker-compose.yml = ..\docker-compose.yml ..\package.json = ..\package.json + ..\README.md = ..\README.md EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreWithMarten", "AspNetCoreWithMarten\AspNetCoreWithMarten.csproj", "{739B657C-4E0D-40E8-853E-ADF5C2D3D89D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.AsyncDaemon.Testing", "Marten.AsyncDaemon.Testing\Marten.AsyncDaemon.Testing.csproj", "{5F7D1952-24BB-4A60-8C45-DF1911097A4F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.AsyncDaemon.Testing", "Marten.AsyncDaemon.Testing\Marten.AsyncDaemon.Testing.csproj", "{5F7D1952-24BB-4A60-8C45-DF1911097A4F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventSourceWorker", "EventSourceWorker\EventSourceWorker.csproj", "{3688AF80-FB24-4C3C-95FD-A2AB4680CD67}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourceWorker", "EventSourceWorker\EventSourceWorker.csproj", "{3688AF80-FB24-4C3C-95FD-A2AB4680CD67}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPublisher", "EventPublisher\EventPublisher.csproj", "{BA27DA3D-74CA-4891-ADCE-889FA0C2D123}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPublisher", "EventPublisher\EventPublisher.csproj", "{BA27DA3D-74CA-4891-ADCE-889FA0C2D123}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLineRunner", "CommandLineRunner\CommandLineRunner.csproj", "{B297B011-B5D1-4B3C-8503-484A93F2F073}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandLineRunner", "CommandLineRunner\CommandLineRunner.csproj", "{B297B011-B5D1-4B3C-8503-484A93F2F073}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.PLv8", "Marten.PLv8\Marten.PLv8.csproj", "{25357907-98A3-49E7-A4C9-E366EA56B364}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.PLv8", "Marten.PLv8\Marten.PLv8.csproj", "{25357907-98A3-49E7-A4C9-E366EA56B364}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.PLv8.Testing", "Marten.PLv8.Testing\Marten.PLv8.Testing.csproj", "{8CBEFD7A-C757-43FE-A1C8-62FBE98178C8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.PLv8.Testing", "Marten.PLv8.Testing\Marten.PLv8.Testing.csproj", "{8CBEFD7A-C757-43FE-A1C8-62FBE98178C8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoryUsageChecker", "MemoryUsageChecker\MemoryUsageChecker.csproj", "{7825A721-7B23-4007-B6EA-8F6E9590F6FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MemoryUsageChecker", "MemoryUsageChecker\MemoryUsageChecker.csproj", "{7825A721-7B23-4007-B6EA-8F6E9590F6FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandLine", "CommandLine", "{DA7EC300-12F5-4B80-B5DF-B7B71E344E24}" EndProject @@ -51,52 +52,52 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NodaTime", "NodaTime", "{50 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCore", "AspNetCore", "{B64DB93D-C374-4F49-ADB9-8A398D14AE2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.AspNetCore", "Marten.AspNetCore\Marten.AspNetCore.csproj", "{ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.AspNetCore", "Marten.AspNetCore\Marten.AspNetCore.csproj", "{ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.AspNetCore.Testing", "Marten.AspNetCore.Testing\Marten.AspNetCore.Testing.csproj", "{7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.AspNetCore.Testing", "Marten.AspNetCore.Testing\Marten.AspNetCore.Testing.csproj", "{7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IssueService", "IssueService\IssueService.csproj", "{B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IssueService", "IssueService\IssueService.csproj", "{B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.Testing.ThirdAssembly", "Marten.Testing.ThirdAssembly\Marten.Testing.ThirdAssembly.csproj", "{5897FB86-03BD-42EE-8FD0-808FD56DB0CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.Testing.ThirdAssembly", "Marten.Testing.ThirdAssembly\Marten.Testing.ThirdAssembly.csproj", "{5897FB86-03BD-42EE-8FD0-808FD56DB0CA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{91D87D73-EC07-4067-8A64-26A2E4F6BC83}" ProjectSection(SolutionItems) = preProject TestSetup.cs = TestSetup.cs EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreTests", "CoreTests\CoreTests.csproj", "{5D24D07B-BABC-41B0-A057-D7E914DB37E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreTests", "CoreTests\CoreTests.csproj", "{5D24D07B-BABC-41B0-A057-D7E914DB37E6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocumentDbTests", "DocumentDbTests\DocumentDbTests.csproj", "{CE932887-AFB1-46BD-B5B6-4F96B92CB201}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentDbTests", "DocumentDbTests\DocumentDbTests.csproj", "{CE932887-AFB1-46BD-B5B6-4F96B92CB201}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventSourcingTests", "EventSourcingTests\EventSourcingTests.csproj", "{D8C569BD-A2A5-471B-9C00-18F5981FC552}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourcingTests", "EventSourcingTests\EventSourcingTests.csproj", "{D8C569BD-A2A5-471B-9C00-18F5981FC552}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiDatabaseCommandLineRunner", "MultiDatabaseCommandLineRunner\MultiDatabaseCommandLineRunner.csproj", "{29691E7B-2F1B-4F58-8B5E-AD58C5732D1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiDatabaseCommandLineRunner", "MultiDatabaseCommandLineRunner\MultiDatabaseCommandLineRunner.csproj", "{29691E7B-2F1B-4F58-8B5E-AD58C5732D1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStoreMigrations", "EventStoreMigrations\EventStoreMigrations.csproj", "{EB30BFF6-86EF-4053-B2BF-4D65CF76C874}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStoreMigrations", "EventStoreMigrations\EventStoreMigrations.csproj", "{EB30BFF6-86EF-4053-B2BF-4D65CF76C874}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{79961196-DB50-4AD3-B749-D231799BCF2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventSourcingIntro", "samples\EventSourcingIntro\EventSourcingIntro.csproj", "{41FC568A-72A2-46A3-A2DA-4C85E4512090}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourcingIntro", "samples\EventSourcingIntro\EventSourcingIntro.csproj", "{41FC568A-72A2-46A3-A2DA-4C85E4512090}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalAPI", "samples\MinimalAPI\MinimalAPI.csproj", "{7B710A53-373B-4A7D-B49E-53C15E6A8CA8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalAPI", "samples\MinimalAPI\MinimalAPI.csproj", "{7B710A53-373B-4A7D-B49E-53C15E6A8CA8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marten.CommandLine.Tests", "Marten.CommandLine.Tests\Marten.CommandLine.Tests.csproj", "{0962E83F-482B-4316-A8AB-3B714EEEC3AA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.CommandLine.Tests", "Marten.CommandLine.Tests\Marten.CommandLine.Tests.csproj", "{0962E83F-482B-4316-A8AB-3B714EEEC3AA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqTests", "LinqTests\LinqTests.csproj", "{94EF979D-F2C0-4479-9D1D-63647042E915}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqTests", "LinqTests\LinqTests.csproj", "{94EF979D-F2C0-4479-9D1D-63647042E915}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Helpdesk", "Helpdesk", "{F3DADE49-9C89-4F74-BCCE-7DAFD35675E9}" ProjectSection(SolutionItems) = preProject - samples\Helpdesk\README.md = samples\Helpdesk\README.md samples\Helpdesk\docker-compose.yml = samples\Helpdesk\docker-compose.yml + samples\Helpdesk\README.md = samples\Helpdesk\README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Helpdesk.Api", "samples\Helpdesk\Helpdesk.Api\Helpdesk.Api.csproj", "{5E18DEBD-C768-4636-B167-7DA2A4954F43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Helpdesk.Api", "samples\Helpdesk\Helpdesk.Api\Helpdesk.Api.csproj", "{5E18DEBD-C768-4636-B167-7DA2A4954F43}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Helpdesk.Api.Tests", "samples\Helpdesk\Helpdesk.Api.Tests\Helpdesk.Api.Tests.csproj", "{B0629D41-CA4E-4123-BC98-79A04D708A3E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Helpdesk.Api.Tests", "samples\Helpdesk\Helpdesk.Api.Tests\Helpdesk.Api.Tests.csproj", "{B0629D41-CA4E-4123-BC98-79A04D708A3E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PatchingTests", "PatchingTests\PatchingTests.csproj", "{EE82EFC4-FBC1-4181-9AB8-671222B60C3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PatchingTests", "PatchingTests\PatchingTests.csproj", "{EE82EFC4-FBC1-4181-9AB8-671222B60C3F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTenancyTests", "MultiTenancyTests\MultiTenancyTests.csproj", "{34AE89FF-76B5-4B50-9190-4E7C602F5C2F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTenancyTests", "MultiTenancyTests\MultiTenancyTests.csproj", "{34AE89FF-76B5-4B50-9190-4E7C602F5C2F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -236,32 +237,29 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {52B7158F-0A24-47D9-9CF7-3FA94170041A} - EndGlobalSection GlobalSection(NestedProjects) = preSolution + {D5E592AD-5368-4E97-A3AC-6729FA43CB51} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {8478E6CB-FE2E-4476-B4B5-60F61DA16D74} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} - {25357907-98A3-49E7-A4C9-E366EA56B364} = {ADA0C720-8095-44CA-917B-BAC97DD85A96} - {8CBEFD7A-C757-43FE-A1C8-62FBE98178C8} = {ADA0C720-8095-44CA-917B-BAC97DD85A96} {7B9552F4-9102-4A89-A150-C2F916CFF11E} = {505E6CF5-1BCD-4C18-BAE3-03C7872A7FBB} {1B5F9030-63ED-49B2-B001-F58E899CCA5F} = {505E6CF5-1BCD-4C18-BAE3-03C7872A7FBB} + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D} = {79961196-DB50-4AD3-B749-D231799BCF2E} + {5F7D1952-24BB-4A60-8C45-DF1911097A4F} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} + {3688AF80-FB24-4C3C-95FD-A2AB4680CD67} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} + {BA27DA3D-74CA-4891-ADCE-889FA0C2D123} = {79961196-DB50-4AD3-B749-D231799BCF2E} + {B297B011-B5D1-4B3C-8503-484A93F2F073} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} + {25357907-98A3-49E7-A4C9-E366EA56B364} = {ADA0C720-8095-44CA-917B-BAC97DD85A96} + {8CBEFD7A-C757-43FE-A1C8-62FBE98178C8} = {ADA0C720-8095-44CA-917B-BAC97DD85A96} {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3} = {B64DB93D-C374-4F49-ADB9-8A398D14AE2E} {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86} = {B64DB93D-C374-4F49-ADB9-8A398D14AE2E} {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7} = {B64DB93D-C374-4F49-ADB9-8A398D14AE2E} - {B297B011-B5D1-4B3C-8503-484A93F2F073} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} - {5F7D1952-24BB-4A60-8C45-DF1911097A4F} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} - {D5E592AD-5368-4E97-A3AC-6729FA43CB51} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} - {B88916DD-8CAF-42F8-BB40-7CE6C4E49491} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {5897FB86-03BD-42EE-8FD0-808FD56DB0CA} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {5D24D07B-BABC-41B0-A057-D7E914DB37E6} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {CE932887-AFB1-46BD-B5B6-4F96B92CB201} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {D8C569BD-A2A5-471B-9C00-18F5981FC552} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {29691E7B-2F1B-4F58-8B5E-AD58C5732D1F} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} {EB30BFF6-86EF-4053-B2BF-4D65CF76C874} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} - {739B657C-4E0D-40E8-853E-ADF5C2D3D89D} = {79961196-DB50-4AD3-B749-D231799BCF2E} - {BA27DA3D-74CA-4891-ADCE-889FA0C2D123} = {79961196-DB50-4AD3-B749-D231799BCF2E} {41FC568A-72A2-46A3-A2DA-4C85E4512090} = {79961196-DB50-4AD3-B749-D231799BCF2E} - {3688AF80-FB24-4C3C-95FD-A2AB4680CD67} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {7B710A53-373B-4A7D-B49E-53C15E6A8CA8} = {79961196-DB50-4AD3-B749-D231799BCF2E} {0962E83F-482B-4316-A8AB-3B714EEEC3AA} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} {94EF979D-F2C0-4479-9D1D-63647042E915} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} @@ -271,4 +269,7 @@ Global {EE82EFC4-FBC1-4181-9AB8-671222B60C3F} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {34AE89FF-76B5-4B50-9190-4E7C602F5C2F} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {52B7158F-0A24-47D9-9CF7-3FA94170041A} + EndGlobalSection EndGlobal diff --git a/src/Marten/Marten.csproj b/src/Marten/Marten.csproj index bd71094e0c..b904d1e52d 100644 --- a/src/Marten/Marten.csproj +++ b/src/Marten/Marten.csproj @@ -23,31 +23,31 @@ - + - + - + - - - - + + + + - - + + - - - - - + + + + + @@ -63,7 +63,7 @@ snupkg - + diff --git a/src/MartenBenchmarks/MartenBenchmarks.csproj b/src/MartenBenchmarks/MartenBenchmarks.csproj index a48c53b7e4..f9eedac2af 100644 --- a/src/MartenBenchmarks/MartenBenchmarks.csproj +++ b/src/MartenBenchmarks/MartenBenchmarks.csproj @@ -8,13 +8,13 @@ - - + + - + - + diff --git a/src/MultiTenancyTests/MultiTenancyTests.csproj b/src/MultiTenancyTests/MultiTenancyTests.csproj index d1e4c5114a..dea204b342 100644 --- a/src/MultiTenancyTests/MultiTenancyTests.csproj +++ b/src/MultiTenancyTests/MultiTenancyTests.csproj @@ -17,19 +17,19 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + @@ -120,7 +120,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/PatchingTests/PatchingTests.csproj b/src/PatchingTests/PatchingTests.csproj index c8c1f71fc7..954233e8e7 100644 --- a/src/PatchingTests/PatchingTests.csproj +++ b/src/PatchingTests/PatchingTests.csproj @@ -7,19 +7,19 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + @@ -34,7 +34,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/TestingSupport/TestingSupport.csproj b/src/TestingSupport/TestingSupport.csproj index 4936c7bf8c..91613c1e7f 100644 --- a/src/TestingSupport/TestingSupport.csproj +++ b/src/TestingSupport/TestingSupport.csproj @@ -8,17 +8,17 @@ - - - + + + - - - - - - + + + + + + diff --git a/src/samples/Helpdesk/Helpdesk.Api.Tests/Helpdesk.Api.Tests.csproj b/src/samples/Helpdesk/Helpdesk.Api.Tests/Helpdesk.Api.Tests.csproj index 9abfcbcf72..8b1c63af47 100644 --- a/src/samples/Helpdesk/Helpdesk.Api.Tests/Helpdesk.Api.Tests.csproj +++ b/src/samples/Helpdesk/Helpdesk.Api.Tests/Helpdesk.Api.Tests.csproj @@ -5,25 +5,25 @@ - - - - - - - - - - - - + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/samples/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj b/src/samples/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj index 5c73482366..e40262d92c 100644 --- a/src/samples/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj +++ b/src/samples/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/samples/MinimalAPI/MinimalAPI.csproj b/src/samples/MinimalAPI/MinimalAPI.csproj index ece54e9bc8..cddc35d422 100644 --- a/src/samples/MinimalAPI/MinimalAPI.csproj +++ b/src/samples/MinimalAPI/MinimalAPI.csproj @@ -7,14 +7,14 @@ - + - - - - + + + +