From 1acb8bb370240a8d8284ebfabf3b0a1751eed43d Mon Sep 17 00:00:00 2001 From: "Jeremy D. Miller" Date: Mon, 9 Jun 2025 06:47:34 -0500 Subject: [PATCH 1/2] Upgrades to JasperFx & Weasel for CLI improvements Fixed a persistence test w/ bad data Big cleanup of dotnet run -- describe presentation Feeling good about Weasel commands --- src/Marten.sln | 276 ++++++++++++++++++ src/Marten/Marten.csproj | 9 +- .../MartenServiceCollectionExtensions.cs | 9 + src/Marten/MartenSystemPart.cs | 4 +- src/Marten/Schema/DocumentMapping.cs | 3 +- src/Marten/Storage/MartenDatabase.cs | 2 + 6 files changed, 297 insertions(+), 6 deletions(-) diff --git a/src/Marten.sln b/src/Marten.sln index ab5b2a8119..8de4ec0244 100644 --- a/src/Marten.sln +++ b/src/Marten.sln @@ -104,145 +104,421 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Debug|x64.ActiveCfg = Debug|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Debug|x64.Build.0 = Debug|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Debug|x86.ActiveCfg = Debug|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Debug|x86.Build.0 = Debug|Any CPU {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Release|Any CPU.Build.0 = Release|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Release|x64.ActiveCfg = Release|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Release|x64.Build.0 = Release|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Release|x86.ActiveCfg = Release|Any CPU + {FCCA5D3A-B632-4D81-B839-F6344FDD01F1}.Release|x86.Build.0 = Release|Any CPU {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Debug|x64.ActiveCfg = Debug|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Debug|x64.Build.0 = Debug|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Debug|x86.ActiveCfg = Debug|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Debug|x86.Build.0 = Debug|Any CPU {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Release|Any CPU.ActiveCfg = Release|Any CPU {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Release|Any CPU.Build.0 = Release|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Release|x64.ActiveCfg = Release|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Release|x64.Build.0 = Release|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Release|x86.ActiveCfg = Release|Any CPU + {D5E592AD-5368-4E97-A3AC-6729FA43CB51}.Release|x86.Build.0 = Release|Any CPU {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Debug|x64.ActiveCfg = Debug|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Debug|x64.Build.0 = Debug|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Debug|x86.ActiveCfg = Debug|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Debug|x86.Build.0 = Debug|Any CPU {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Release|Any CPU.ActiveCfg = Release|Any CPU {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Release|Any CPU.Build.0 = Release|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Release|x64.ActiveCfg = Release|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Release|x64.Build.0 = Release|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Release|x86.ActiveCfg = Release|Any CPU + {B88916DD-8CAF-42F8-BB40-7CE6C4E49491}.Release|x86.Build.0 = Release|Any CPU {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Debug|x64.ActiveCfg = Debug|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Debug|x64.Build.0 = Debug|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Debug|x86.ActiveCfg = Debug|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Debug|x86.Build.0 = Debug|Any CPU {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Release|Any CPU.Build.0 = Release|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Release|x64.ActiveCfg = Release|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Release|x64.Build.0 = Release|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Release|x86.ActiveCfg = Release|Any CPU + {7B9552F4-9102-4A89-A150-C2F916CFF11E}.Release|x86.Build.0 = Release|Any CPU {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Debug|x64.ActiveCfg = Debug|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Debug|x64.Build.0 = Debug|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Debug|x86.ActiveCfg = Debug|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Debug|x86.Build.0 = Debug|Any CPU {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Release|Any CPU.Build.0 = Release|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Release|x64.ActiveCfg = Release|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Release|x64.Build.0 = Release|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Release|x86.ActiveCfg = Release|Any CPU + {1B5F9030-63ED-49B2-B001-F58E899CCA5F}.Release|x86.Build.0 = Release|Any CPU {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Debug|x64.ActiveCfg = Debug|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Debug|x64.Build.0 = Debug|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Debug|x86.ActiveCfg = Debug|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Debug|x86.Build.0 = Debug|Any CPU {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Release|Any CPU.ActiveCfg = Release|Any CPU {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Release|Any CPU.Build.0 = Release|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Release|x64.ActiveCfg = Release|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Release|x64.Build.0 = Release|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Release|x86.ActiveCfg = Release|Any CPU + {739B657C-4E0D-40E8-853E-ADF5C2D3D89D}.Release|x86.Build.0 = Release|Any CPU {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Debug|x64.ActiveCfg = Debug|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Debug|x64.Build.0 = Debug|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Debug|x86.ActiveCfg = Debug|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Debug|x86.Build.0 = Debug|Any CPU {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Release|Any CPU.Build.0 = Release|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Release|x64.ActiveCfg = Release|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Release|x64.Build.0 = Release|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Release|x86.ActiveCfg = Release|Any CPU + {7825A721-7B23-4007-B6EA-8F6E9590F6FD}.Release|x86.Build.0 = Release|Any CPU {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Debug|x64.ActiveCfg = Debug|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Debug|x64.Build.0 = Debug|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Debug|x86.ActiveCfg = Debug|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Debug|x86.Build.0 = Debug|Any CPU {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Release|Any CPU.Build.0 = Release|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Release|x64.ActiveCfg = Release|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Release|x64.Build.0 = Release|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Release|x86.ActiveCfg = Release|Any CPU + {ADD3C5F7-BAC9-4AB8-9E09-8D7A2EE17AD3}.Release|x86.Build.0 = Release|Any CPU {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Debug|x64.ActiveCfg = Debug|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Debug|x64.Build.0 = Debug|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Debug|x86.ActiveCfg = Debug|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Debug|x86.Build.0 = Debug|Any CPU {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Release|Any CPU.ActiveCfg = Release|Any CPU {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Release|Any CPU.Build.0 = Release|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Release|x64.ActiveCfg = Release|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Release|x64.Build.0 = Release|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Release|x86.ActiveCfg = Release|Any CPU + {7CD2A84A-CD1B-44F5-AB94-ADE5D644AA86}.Release|x86.Build.0 = Release|Any CPU {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Debug|x64.ActiveCfg = Debug|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Debug|x64.Build.0 = Debug|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Debug|x86.ActiveCfg = Debug|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Debug|x86.Build.0 = Debug|Any CPU {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Release|Any CPU.Build.0 = Release|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Release|x64.ActiveCfg = Release|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Release|x64.Build.0 = Release|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Release|x86.ActiveCfg = Release|Any CPU + {B4F97F16-9FF3-4BC6-9B25-2FD2BD91F5E7}.Release|x86.Build.0 = Release|Any CPU {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Debug|x64.ActiveCfg = Debug|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Debug|x64.Build.0 = Debug|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Debug|x86.ActiveCfg = Debug|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Debug|x86.Build.0 = Debug|Any CPU {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Release|Any CPU.ActiveCfg = Release|Any CPU {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Release|Any CPU.Build.0 = Release|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Release|x64.ActiveCfg = Release|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Release|x64.Build.0 = Release|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Release|x86.ActiveCfg = Release|Any CPU + {5897FB86-03BD-42EE-8FD0-808FD56DB0CA}.Release|x86.Build.0 = Release|Any CPU {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Debug|x64.ActiveCfg = Debug|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Debug|x64.Build.0 = Debug|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Debug|x86.ActiveCfg = Debug|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Debug|x86.Build.0 = Debug|Any CPU {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Release|Any CPU.Build.0 = Release|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Release|x64.ActiveCfg = Release|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Release|x64.Build.0 = Release|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Release|x86.ActiveCfg = Release|Any CPU + {5D24D07B-BABC-41B0-A057-D7E914DB37E6}.Release|x86.Build.0 = Release|Any CPU {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Debug|x64.ActiveCfg = Debug|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Debug|x64.Build.0 = Debug|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Debug|x86.ActiveCfg = Debug|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Debug|x86.Build.0 = Debug|Any CPU {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Release|Any CPU.ActiveCfg = Release|Any CPU {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Release|Any CPU.Build.0 = Release|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Release|x64.ActiveCfg = Release|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Release|x64.Build.0 = Release|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Release|x86.ActiveCfg = Release|Any CPU + {CE932887-AFB1-46BD-B5B6-4F96B92CB201}.Release|x86.Build.0 = Release|Any CPU {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Debug|x64.ActiveCfg = Debug|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Debug|x64.Build.0 = Debug|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Debug|x86.ActiveCfg = Debug|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Debug|x86.Build.0 = Debug|Any CPU {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Release|Any CPU.Build.0 = Release|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Release|x64.ActiveCfg = Release|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Release|x64.Build.0 = Release|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Release|x86.ActiveCfg = Release|Any CPU + {D8C569BD-A2A5-471B-9C00-18F5981FC552}.Release|x86.Build.0 = Release|Any CPU {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Debug|x64.ActiveCfg = Debug|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Debug|x64.Build.0 = Debug|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Debug|x86.ActiveCfg = Debug|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Debug|x86.Build.0 = Debug|Any CPU {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Release|Any CPU.Build.0 = Release|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Release|x64.ActiveCfg = Release|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Release|x64.Build.0 = Release|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Release|x86.ActiveCfg = Release|Any CPU + {EB30BFF6-86EF-4053-B2BF-4D65CF76C874}.Release|x86.Build.0 = Release|Any CPU {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Debug|x64.ActiveCfg = Debug|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Debug|x64.Build.0 = Debug|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Debug|x86.ActiveCfg = Debug|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Debug|x86.Build.0 = Debug|Any CPU {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Release|Any CPU.ActiveCfg = Release|Any CPU {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Release|Any CPU.Build.0 = Release|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Release|x64.ActiveCfg = Release|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Release|x64.Build.0 = Release|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Release|x86.ActiveCfg = Release|Any CPU + {41FC568A-72A2-46A3-A2DA-4C85E4512090}.Release|x86.Build.0 = Release|Any CPU {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|Any CPU.Build.0 = Debug|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|x64.ActiveCfg = Debug|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|x64.Build.0 = Debug|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|x86.ActiveCfg = Debug|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|x86.Build.0 = Debug|Any CPU {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|Any CPU.ActiveCfg = Release|Any CPU {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|Any CPU.Build.0 = Release|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|x64.ActiveCfg = Release|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|x64.Build.0 = Release|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|x86.ActiveCfg = Release|Any CPU + {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|x86.Build.0 = Release|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|x64.ActiveCfg = Debug|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|x64.Build.0 = Debug|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|x86.ActiveCfg = Debug|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|x86.Build.0 = Debug|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|Any CPU.Build.0 = Release|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|x64.ActiveCfg = Release|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|x64.Build.0 = Release|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|x86.ActiveCfg = Release|Any CPU + {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|x86.Build.0 = Release|Any CPU {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Debug|x64.ActiveCfg = Debug|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Debug|x64.Build.0 = Debug|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Debug|x86.ActiveCfg = Debug|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Debug|x86.Build.0 = Debug|Any CPU {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Release|Any CPU.Build.0 = Release|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Release|x64.ActiveCfg = Release|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Release|x64.Build.0 = Release|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Release|x86.ActiveCfg = Release|Any CPU + {34AE89FF-76B5-4B50-9190-4E7C602F5C2F}.Release|x86.Build.0 = Release|Any CPU {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Debug|x64.ActiveCfg = Debug|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Debug|x64.Build.0 = Debug|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Debug|x86.ActiveCfg = Debug|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Debug|x86.Build.0 = Debug|Any CPU {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Release|Any CPU.ActiveCfg = Release|Any CPU {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Release|Any CPU.Build.0 = Release|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Release|x64.ActiveCfg = Release|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Release|x64.Build.0 = Release|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Release|x86.ActiveCfg = Release|Any CPU + {93298A4C-2B88-4EF3-9FC8-6B2AEF52F628}.Release|x86.Build.0 = Release|Any CPU {364A165E-965E-4AFD-92AC-8447FB114C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {364A165E-965E-4AFD-92AC-8447FB114C60}.Debug|Any CPU.Build.0 = Debug|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Debug|x64.ActiveCfg = Debug|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Debug|x64.Build.0 = Debug|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Debug|x86.ActiveCfg = Debug|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Debug|x86.Build.0 = Debug|Any CPU {364A165E-965E-4AFD-92AC-8447FB114C60}.Release|Any CPU.ActiveCfg = Release|Any CPU {364A165E-965E-4AFD-92AC-8447FB114C60}.Release|Any CPU.Build.0 = Release|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Release|x64.ActiveCfg = Release|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Release|x64.Build.0 = Release|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Release|x86.ActiveCfg = Release|Any CPU + {364A165E-965E-4AFD-92AC-8447FB114C60}.Release|x86.Build.0 = Release|Any CPU {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Debug|x64.ActiveCfg = Debug|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Debug|x64.Build.0 = Debug|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Debug|x86.Build.0 = Debug|Any CPU {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Release|Any CPU.ActiveCfg = Release|Any CPU {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Release|Any CPU.Build.0 = Release|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Release|x64.ActiveCfg = Release|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Release|x64.Build.0 = Release|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Release|x86.ActiveCfg = Release|Any CPU + {B1F935FC-55DC-418B-A5DC-6049A5C06871}.Release|x86.Build.0 = Release|Any CPU {2B5A28C6-2369-4554-B131-C42907E8BA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2B5A28C6-2369-4554-B131-C42907E8BA83}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Debug|x64.ActiveCfg = Debug|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Debug|x64.Build.0 = Debug|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Debug|x86.ActiveCfg = Debug|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Debug|x86.Build.0 = Debug|Any CPU {2B5A28C6-2369-4554-B131-C42907E8BA83}.Release|Any CPU.ActiveCfg = Release|Any CPU {2B5A28C6-2369-4554-B131-C42907E8BA83}.Release|Any CPU.Build.0 = Release|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Release|x64.ActiveCfg = Release|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Release|x64.Build.0 = Release|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Release|x86.ActiveCfg = Release|Any CPU + {2B5A28C6-2369-4554-B131-C42907E8BA83}.Release|x86.Build.0 = Release|Any CPU {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Debug|x64.ActiveCfg = Debug|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Debug|x64.Build.0 = Debug|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Debug|x86.Build.0 = Debug|Any CPU {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Release|Any CPU.Build.0 = Release|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Release|x64.ActiveCfg = Release|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Release|x64.Build.0 = Release|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Release|x86.ActiveCfg = Release|Any CPU + {CABC0D08-208B-4EAD-A53F-ED60845F18D9}.Release|x86.Build.0 = Release|Any CPU {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Debug|x64.ActiveCfg = Debug|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Debug|x64.Build.0 = Debug|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Debug|x86.ActiveCfg = Debug|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Debug|x86.Build.0 = Debug|Any CPU {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Release|Any CPU.ActiveCfg = Release|Any CPU {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Release|Any CPU.Build.0 = Release|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Release|x64.ActiveCfg = Release|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Release|x64.Build.0 = Release|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Release|x86.ActiveCfg = Release|Any CPU + {6DF238FD-E5D0-45DC-B8DE-5EEDE191850E}.Release|x86.Build.0 = Release|Any CPU {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Debug|x64.ActiveCfg = Debug|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Debug|x64.Build.0 = Debug|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Debug|x86.ActiveCfg = Debug|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Debug|x86.Build.0 = Debug|Any CPU {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Release|Any CPU.Build.0 = Release|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Release|x64.ActiveCfg = Release|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Release|x64.Build.0 = Release|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Release|x86.ActiveCfg = Release|Any CPU + {03CC8A34-5F73-46E5-A018-C116C138BFD9}.Release|x86.Build.0 = Release|Any CPU {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Debug|x64.ActiveCfg = Debug|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Debug|x64.Build.0 = Debug|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Debug|x86.ActiveCfg = Debug|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Debug|x86.Build.0 = Debug|Any CPU {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Release|Any CPU.ActiveCfg = Release|Any CPU {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Release|Any CPU.Build.0 = Release|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Release|x64.ActiveCfg = Release|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Release|x64.Build.0 = Release|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Release|x86.ActiveCfg = Release|Any CPU + {A192E730-7C5F-4D26-9A44-60E6FE73DBA8}.Release|x86.Build.0 = Release|Any CPU {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Debug|x64.ActiveCfg = Debug|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Debug|x64.Build.0 = Debug|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Debug|x86.ActiveCfg = Debug|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Debug|x86.Build.0 = Debug|Any CPU {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Release|Any CPU.Build.0 = Release|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Release|x64.ActiveCfg = Release|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Release|x64.Build.0 = Release|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Release|x86.ActiveCfg = Release|Any CPU + {3AE63ADF-11AD-4491-800F-7DDB2D3D9773}.Release|x86.Build.0 = Release|Any CPU {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Debug|x64.ActiveCfg = Debug|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Debug|x64.Build.0 = Debug|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Debug|x86.ActiveCfg = Debug|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Debug|x86.Build.0 = Debug|Any CPU {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Release|Any CPU.Build.0 = Release|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Release|x64.ActiveCfg = Release|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Release|x64.Build.0 = Release|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Release|x86.ActiveCfg = Release|Any CPU + {5153B23E-6661-40D7-8F01-82FD1484E8DF}.Release|x86.Build.0 = Release|Any CPU {C7320E24-95D7-40B3-A542-1181225F2600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7320E24-95D7-40B3-A542-1181225F2600}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Debug|x64.ActiveCfg = Debug|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Debug|x64.Build.0 = Debug|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Debug|x86.ActiveCfg = Debug|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Debug|x86.Build.0 = Debug|Any CPU {C7320E24-95D7-40B3-A542-1181225F2600}.Release|Any CPU.ActiveCfg = Release|Any CPU {C7320E24-95D7-40B3-A542-1181225F2600}.Release|Any CPU.Build.0 = Release|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Release|x64.ActiveCfg = Release|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Release|x64.Build.0 = Release|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Release|x86.ActiveCfg = Release|Any CPU + {C7320E24-95D7-40B3-A542-1181225F2600}.Release|x86.Build.0 = Release|Any CPU {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Debug|x64.ActiveCfg = Debug|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Debug|x64.Build.0 = Debug|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Debug|x86.ActiveCfg = Debug|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Debug|x86.Build.0 = Debug|Any CPU {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Release|Any CPU.ActiveCfg = Release|Any CPU {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Release|Any CPU.Build.0 = Release|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Release|x64.ActiveCfg = Release|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Release|x64.Build.0 = Release|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Release|x86.ActiveCfg = Release|Any CPU + {F1B14148-6D25-4F48-943B-07D48B7FAD84}.Release|x86.Build.0 = Release|Any CPU {80B073DB-6364-4CF3-A794-4C4F96401700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80B073DB-6364-4CF3-A794-4C4F96401700}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Debug|x64.ActiveCfg = Debug|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Debug|x64.Build.0 = Debug|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Debug|x86.ActiveCfg = Debug|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Debug|x86.Build.0 = Debug|Any CPU {80B073DB-6364-4CF3-A794-4C4F96401700}.Release|Any CPU.ActiveCfg = Release|Any CPU {80B073DB-6364-4CF3-A794-4C4F96401700}.Release|Any CPU.Build.0 = Release|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Release|x64.ActiveCfg = Release|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Release|x64.Build.0 = Release|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Release|x86.ActiveCfg = Release|Any CPU + {80B073DB-6364-4CF3-A794-4C4F96401700}.Release|x86.Build.0 = Release|Any CPU {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Debug|x64.ActiveCfg = Debug|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Debug|x64.Build.0 = Debug|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Debug|x86.ActiveCfg = Debug|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Debug|x86.Build.0 = Debug|Any CPU {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Release|Any CPU.ActiveCfg = Release|Any CPU {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Release|Any CPU.Build.0 = Release|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Release|x64.ActiveCfg = Release|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Release|x64.Build.0 = Release|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Release|x86.ActiveCfg = Release|Any CPU + {931E4B08-6A37-44CC-AE8B-97D9FC9B1E85}.Release|x86.Build.0 = Release|Any CPU {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Debug|x64.ActiveCfg = Debug|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Debug|x64.Build.0 = Debug|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Debug|x86.ActiveCfg = Debug|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Debug|x86.Build.0 = Debug|Any CPU {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Release|Any CPU.Build.0 = Release|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Release|x64.ActiveCfg = Release|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Release|x64.Build.0 = Release|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Release|x86.ActiveCfg = Release|Any CPU + {B9CF8AA4-ABB1-442E-B3D3-760A448286A6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Marten/Marten.csproj b/src/Marten/Marten.csproj index ababba7736..098e3dd392 100644 --- a/src/Marten/Marten.csproj +++ b/src/Marten/Marten.csproj @@ -32,14 +32,15 @@ - - - - + + + + + diff --git a/src/Marten/MartenServiceCollectionExtensions.cs b/src/Marten/MartenServiceCollectionExtensions.cs index 1e26281988..f7447c57dd 100644 --- a/src/Marten/MartenServiceCollectionExtensions.cs +++ b/src/Marten/MartenServiceCollectionExtensions.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using JasperFx; using JasperFx.CodeGeneration; +using JasperFx.CommandLine; using JasperFx.CommandLine.Descriptions; using JasperFx.Core.Reflection; using JasperFx.Events; @@ -185,6 +186,14 @@ Func optionSource services.AddSingleton(s => { var options = s.GetRequiredService(); + + // for the purpose of not losing your sanity + // when running command line tools + if (JasperFxEnvironment.RunQuiet) + { + options.DisableNpgsqlLogging = true; + } + if (options.Logger().GetType() != typeof(NulloMartenLogger)) { return new DocumentStore(options); diff --git a/src/Marten/MartenSystemPart.cs b/src/Marten/MartenSystemPart.cs index a7b1247224..442ce7a194 100644 --- a/src/Marten/MartenSystemPart.cs +++ b/src/Marten/MartenSystemPart.cs @@ -12,6 +12,8 @@ namespace Marten; internal class MartenSystemPart : SystemPartBase { + public static Uri MartenStoreUri { get; } = new Uri("marten://store"); + private readonly IDocumentStore _store; protected MartenSystemPart(IDocumentStore store, string title, Uri subjectUri) : base(title, subjectUri) @@ -19,7 +21,7 @@ protected MartenSystemPart(IDocumentStore store, string title, Uri subjectUri) : _store = store; } - public MartenSystemPart(IDocumentStore store) : this(store, "Marten", new Uri("marten://documentstore")) + public MartenSystemPart(IDocumentStore store) : this(store, "Marten", MartenStoreUri) { } diff --git a/src/Marten/Schema/DocumentMapping.cs b/src/Marten/Schema/DocumentMapping.cs index 3d09cac65f..325a34551d 100644 --- a/src/Marten/Schema/DocumentMapping.cs +++ b/src/Marten/Schema/DocumentMapping.cs @@ -149,6 +149,7 @@ public DocumentMapping(Type documentType, StoreOptions storeOptions) public IPartitionStrategy? Partitioning { get; set; } + [IgnoreDescription] public DocumentCodeGen? CodeGen { get; private set; } internal DocumentQueryableMemberCollection QueryMembers { get; } @@ -443,7 +444,7 @@ public DocumentIndex AddLastModifiedIndex(Action? configure = nul } /// - /// Creates an index on the tenantId column. + /// Creates an index on the tenantId column. /// /// /// Only applicable when using multi-tenancy for this table diff --git a/src/Marten/Storage/MartenDatabase.cs b/src/Marten/Storage/MartenDatabase.cs index 7489c3cbbe..83a9533d58 100644 --- a/src/Marten/Storage/MartenDatabase.cs +++ b/src/Marten/Storage/MartenDatabase.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using JasperFx.Core; using JasperFx.Core.Reflection; using JasperFx.Descriptors; using JasperFx.Events.Daemon; @@ -101,6 +102,7 @@ public void Dispose() public override DatabaseDescriptor Describe() { var descriptor = base.Describe(); + descriptor.SubjectUri = MartenSystemPart.MartenStoreUri; descriptor.SchemaOrNamespace = Options.DatabaseSchemaName; return descriptor; } From e4256026e3a00a54ab0fb3dd305f4ddd82248c0f Mon Sep 17 00:00:00 2001 From: "Jeremy D. Miller" Date: Mon, 9 Jun 2025 17:32:20 -0500 Subject: [PATCH 2/2] another upgrade of Weasel, fixed a CLI test --- src/CoreTests/jasper_fx_mechanics.cs | 2 +- src/Marten/Marten.csproj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CoreTests/jasper_fx_mechanics.cs b/src/CoreTests/jasper_fx_mechanics.cs index 1f329a6c21..ad2469cb51 100644 --- a/src/CoreTests/jasper_fx_mechanics.cs +++ b/src/CoreTests/jasper_fx_mechanics.cs @@ -57,7 +57,7 @@ public async Task build_system_part_for_single_document_store_and_single_tenancy .SingleOrDefault(); part.ShouldNotBeNull(); - part.SubjectUri.ShouldBe(new Uri("marten://documentstore")); + part.SubjectUri.ShouldBe(new Uri("marten://store")); part.Title.ShouldBe("Marten"); var resources = await part.FindResources(); diff --git a/src/Marten/Marten.csproj b/src/Marten/Marten.csproj index 098e3dd392..3ab538508d 100644 --- a/src/Marten/Marten.csproj +++ b/src/Marten/Marten.csproj @@ -19,6 +19,7 @@ + @@ -39,7 +40,7 @@ - +