diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..e226e7a --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,62 @@ + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..a88eba4 --- /dev/null +++ b/nuget.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/samples/Context/DataAccess/DataAccess.csproj b/samples/Context/DataAccess/DataAccess.csproj index ab6afd4..145a5aa 100644 --- a/samples/Context/DataAccess/DataAccess.csproj +++ b/samples/Context/DataAccess/DataAccess.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/samples/Context/Domain/Domain.csproj b/samples/Context/Domain/Domain.csproj index 738561e..2862d55 100644 --- a/samples/Context/Domain/Domain.csproj +++ b/samples/Context/Domain/Domain.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/samples/Context/Host/Host.csproj b/samples/Context/Host/Host.csproj index 0288f9e..6178047 100644 --- a/samples/Context/Host/Host.csproj +++ b/samples/Context/Host/Host.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -10,9 +10,9 @@ - - - + + + diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props new file mode 100644 index 0000000..7a6c695 --- /dev/null +++ b/samples/Directory.Packages.props @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/samples/Migration/Migration.csproj b/samples/Migration/Migration.csproj index a057396..1340d3a 100644 --- a/samples/Migration/Migration.csproj +++ b/samples/Migration/Migration.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/samples/MongoDB.Extensions.Samples.sln b/samples/MongoDB.Extensions.Samples.sln index e8832b1..33fc83c 100644 --- a/samples/MongoDB.Extensions.Samples.sln +++ b/samples/MongoDB.Extensions.Samples.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29519.87 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33110.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataAccess", "Context\DataAccess\DataAccess.csproj", "{B08692DA-8E74-4F3D-9B8E-66C5962BD7D1}" EndProject @@ -19,9 +19,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3_DataAccess", "3_DataAcces EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SimpleBlog", "SimpleBlog", "{1B6D9C2E-9D39-49E2-8522-29049C3D4821}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Context\Host\Host.csproj", "{0CCED088-DBB6-4DA2-8DFC-D9968EEBB9FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host", "Context\Host\Host.csproj", "{0CCED088-DBB6-4DA2-8DFC-D9968EEBB9FA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migration", "Migration\Migration.csproj", "{8226313B-FAC9-4D0F-AEE8-424DD310BBFB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migration", "Migration\Migration.csproj", "{8226313B-FAC9-4D0F-AEE8-424DD310BBFB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{5366F688-8087-42D7-BBB3-3D8E6391AD44}" + ProjectSection(SolutionItems) = preProject + ..\Directory.Packages.props = ..\Directory.Packages.props + ..\global.json = ..\global.json + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{ED7512B7-0598-4815-9DE5-B3BE0F55C1D2}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -60,8 +71,10 @@ Global {C4DEA4A3-B50A-4ACD-9017-4919576CE069} = {1B6D9C2E-9D39-49E2-8522-29049C3D4821} {229E6D6C-AB33-4095-A09B-647434079280} = {1B6D9C2E-9D39-49E2-8522-29049C3D4821} {A880C40E-8DAF-4EFF-AE50-B8983AF424D3} = {1B6D9C2E-9D39-49E2-8522-29049C3D4821} - {1B6D9C2E-9D39-49E2-8522-29049C3D4821} = {27E20B8D-3948-41A2-9271-69D850357C35} + {1B6D9C2E-9D39-49E2-8522-29049C3D4821} = {ED7512B7-0598-4815-9DE5-B3BE0F55C1D2} {0CCED088-DBB6-4DA2-8DFC-D9968EEBB9FA} = {C4DEA4A3-B50A-4ACD-9017-4919576CE069} + {8226313B-FAC9-4D0F-AEE8-424DD310BBFB} = {ED7512B7-0598-4815-9DE5-B3BE0F55C1D2} + {ED7512B7-0598-4815-9DE5-B3BE0F55C1D2} = {5366F688-8087-42D7-BBB3-3D8E6391AD44} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E28A6DDE-2575-483D-8C8B-7929357BA44A} diff --git a/src/Context.AllowedTypes.Tests/Context.AllowedTypes.Tests.csproj b/src/Context.AllowedTypes.Tests/Context.AllowedTypes.Tests.csproj index 28001f2..ae481c1 100644 --- a/src/Context.AllowedTypes.Tests/Context.AllowedTypes.Tests.csproj +++ b/src/Context.AllowedTypes.Tests/Context.AllowedTypes.Tests.csproj @@ -11,8 +11,4 @@ - - - - diff --git a/src/Context.AllowedTypes.Tests/Helpers/TestHelpers.cs b/src/Context.AllowedTypes.Tests/Helpers/TestHelpers.cs new file mode 100644 index 0000000..86d91bf --- /dev/null +++ b/src/Context.AllowedTypes.Tests/Helpers/TestHelpers.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using System.Linq; +using MongoDB.Extensions.Context.Internal; + +namespace MongoDB.Extensions.Context.AllowedTypes.Tests.Helpers; + +internal static class TestHelpers +{ + public static object GetTypeObjectSerializerContent() + { + return new + { + AllowedTypes = TypeObjectSerializer.AllowedTypes + .Select(pair => new KeyValuePair(pair.Key.FullName, pair.Value)) + .OrderBy(pair => pair.Key), + TypeObjectSerializer.AllowedTypesByNamespaces, + TypeObjectSerializer.AllowedTypesByDependencies + }; + } +} diff --git a/src/Context.AllowedTypes.Tests/MongoDatabaseBuilderTests.cs b/src/Context.AllowedTypes.Tests/MongoDatabaseBuilderTests.cs index bba22b1..a6d9657 100644 --- a/src/Context.AllowedTypes.Tests/MongoDatabaseBuilderTests.cs +++ b/src/Context.AllowedTypes.Tests/MongoDatabaseBuilderTests.cs @@ -1,6 +1,8 @@ +using System.Collections.Generic; using System.Linq; using MongoDB.Bson.Serialization; using MongoDB.Driver; +using MongoDB.Extensions.Context.AllowedTypes.Tests.Helpers; using MongoDB.Extensions.Context.Internal; using Snapshooter.Xunit; using Squadron; @@ -56,10 +58,7 @@ public void AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success() BsonSerializer.LookupSerializer(); Assert.True(registeredSerializer is TypeObjectSerializer); - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -79,10 +78,7 @@ public void AddAllowedTypes_AddAllowedTypesByNamespaces_Success() BsonSerializer.LookupSerializer(); Assert.True(registeredSerializer is TypeObjectSerializer); - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -102,10 +98,7 @@ public void AddAllowedTypes_AddAllowedTypesByTypes_Success() BsonSerializer.LookupSerializer(); Assert.True(registeredSerializer is TypeObjectSerializer); - Snapshot.Match(new { - AllowedTypes = TypeObjectSerializer.AllowedTypes.OrderBy(k => k.Key.FullName), - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } public class Bar diff --git a/src/Context.AllowedTypes.Tests/TypeObjectSerializerTests.cs b/src/Context.AllowedTypes.Tests/TypeObjectSerializerTests.cs index 58e8c4d..a8b0735 100644 --- a/src/Context.AllowedTypes.Tests/TypeObjectSerializerTests.cs +++ b/src/Context.AllowedTypes.Tests/TypeObjectSerializerTests.cs @@ -1,4 +1,4 @@ -using System.Linq; +using MongoDB.Extensions.Context.AllowedTypes.Tests.Helpers; using MongoDB.Extensions.Context.Internal; using Snapshooter.Xunit; using Xunit; @@ -19,10 +19,7 @@ public void AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success() TypeObjectSerializer.AddAllowedTypesOfAllDependencies(); // Assert - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -35,10 +32,7 @@ public void AddAllowedTypes_AddAllowedTypesByNamespaces_Success() TypeObjectSerializer.AddAllowedTypes("Mongo", "SwissLife"); // Assert - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -51,10 +45,7 @@ public void AddAllowedTypes_AddAllowedTypesByTypes_Success() TypeObjectSerializer.AddAllowedTypes(typeof(Foo), typeof(Bar)); // Assert - Snapshot.Match(new { - AllowedTypes = TypeObjectSerializer.AllowedTypes.OrderBy(k => k.Key.FullName), - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -69,10 +60,7 @@ public void IsTypeAllowed_InAllowedTypes_True() // Assert Assert.True(isAllowed); - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -87,10 +75,7 @@ public void IsTypeAllowed_InAllowedTypes_False() // Assert Assert.False(isAllowed); - Snapshot.Match(new { - AllowedTypes = TypeObjectSerializer.AllowedTypes.OrderBy(k => k.Key.FullName), - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -105,10 +90,7 @@ public void IsTypeAllowed_InAllowedNamespaces_True() // Assert Assert.True(isAllowed); - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -123,10 +105,7 @@ public void IsTypeAllowed_InAllowedNamespaces_False() // Assert Assert.False(isAllowed); - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } [Fact] @@ -141,9 +120,6 @@ public void IsTypeAllowed_InAllowedTypesInDependencies_True() // Assert Assert.True(isAllowed); - Snapshot.Match(new { - TypeObjectSerializer.AllowedTypes, - TypeObjectSerializer.AllowedTypesByNamespaces, - TypeObjectSerializer.AllowedTypesByDependencies }); + Snapshot.Match(TestHelpers.GetTypeObjectSerializerContent()); } } diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap b/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap index 6507567..69087b0 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap @@ -1,5 +1,5 @@ { - "AllowedTypes": {}, + "AllowedTypes": [], "AllowedTypesByNamespaces": [ "Mongo", "SwissLife" diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap b/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap index abe2f4b..0c76f8e 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap @@ -1,11 +1,11 @@ { "AllowedTypes": [ { - "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.MongoDatabaseBuilderTests+Bar, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.MongoDatabaseBuilderTests+Bar", "Value": true }, { - "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.MongoDatabaseBuilderTests+Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.MongoDatabaseBuilderTests+Foo", "Value": true } ], diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap b/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap index 6291fff..86c92ba 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/MongoDatabaseBuilderTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap @@ -1,5 +1,5 @@ { - "AllowedTypes": {}, + "AllowedTypes": [], "AllowedTypesByNamespaces": [], "AllowedTypesByDependencies": [ "Newtonsoft", diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap index 6507567..69087b0 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByNamespaces_Success.snap @@ -1,5 +1,5 @@ { - "AllowedTypes": {}, + "AllowedTypes": [], "AllowedTypesByNamespaces": [ "Mongo", "SwissLife" diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap index 0227ec6..1d5b0c7 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesByTypes_Success.snap @@ -1,11 +1,11 @@ { "AllowedTypes": [ { - "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Bar, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Bar", "Value": true }, { - "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo", "Value": true } ], diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap index e6a35c8..86c92ba 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.AddAllowedTypes_AddAllowedTypesOfAllDependencies_Success.snap @@ -1,5 +1,5 @@ -{ - "AllowedTypes": {}, +{ + "AllowedTypes": [], "AllowedTypesByNamespaces": [], "AllowedTypesByDependencies": [ "Newtonsoft", diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_False.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_False.snap index 8b6b360..5b87fd2 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_False.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_False.snap @@ -1,7 +1,10 @@ { - "AllowedTypes": { - "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": false - }, + "AllowedTypes": [ + { + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo", + "Value": false + } + ], "AllowedTypesByNamespaces": [ "MongoDB.Extensions.Context" ], diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_True.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_True.snap index 2ef0665..fff878f 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_True.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedNamespaces_True.snap @@ -1,7 +1,10 @@ { - "AllowedTypes": { - "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": true - }, + "AllowedTypes": [ + { + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo", + "Value": true + } + ], "AllowedTypesByNamespaces": [ "MongoDB.Extensions.Context.AllowedTypes.Tests" ], diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypesInDependencies_True.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypesInDependencies_True.snap index e1a4579..25fdb9b 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypesInDependencies_True.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypesInDependencies_True.snap @@ -1,7 +1,10 @@ { - "AllowedTypes": { - "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": true - }, + "AllowedTypes": [ + { + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo", + "Value": true + } + ], "AllowedTypesByNamespaces": [], "AllowedTypesByDependencies": [ "Newtonsoft", diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_False.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_False.snap index 08b95e1..69681c8 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_False.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_False.snap @@ -1,11 +1,11 @@ { "AllowedTypes": [ { - "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Bar, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Bar", "Value": false }, { - "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo", "Value": true } ], diff --git a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_True.snap b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_True.snap index 891fdf2..84849c2 100644 --- a/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_True.snap +++ b/src/Context.AllowedTypes.Tests/__snapshots__/TypeObjectSerializerTests.IsTypeAllowed_InAllowedTypes_True.snap @@ -1,7 +1,10 @@ { - "AllowedTypes": { - "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo, MongoDB.Extensions.Context.AllowedTypes.Tests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": true - }, + "AllowedTypes": [ + { + "Key": "MongoDB.Extensions.Context.AllowedTypes.Tests.Foo", + "Value": true + } + ], "AllowedTypesByNamespaces": [], "AllowedTypesByDependencies": [] } diff --git a/src/Context.InterferingTests/Context.InterferingTests.csproj b/src/Context.InterferingTests/Context.InterferingTests.csproj index cf1733e..c6411f1 100644 --- a/src/Context.InterferingTests/Context.InterferingTests.csproj +++ b/src/Context.InterferingTests/Context.InterferingTests.csproj @@ -1,6 +1,6 @@ - + MongoDB.Extensions.Context.InterferingTests MongoDB.Extensions.Context.InterferingTests @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Context/Context.csproj b/src/Context/Context.csproj index bab0ada..a5338cb 100644 --- a/src/Context/Context.csproj +++ b/src/Context/Context.csproj @@ -8,32 +8,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/Migration/Migration.csproj b/src/Migration/Migration.csproj index 687c068..b3a8c6b 100644 --- a/src/Migration/Migration.csproj +++ b/src/Migration/Migration.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Package.props b/src/Package.props index 6c3b14b..66e653f 100644 --- a/src/Package.props +++ b/src/Package.props @@ -11,8 +11,8 @@ MongoDB Extensions DbContext Context Boostrap Mongo .Net true https://github.com/SwissLife-OSS/mongo-extensions-docs/raw/master/logo.png - false - 10.0 + false + 10.0 @@ -26,7 +26,7 @@ - + diff --git a/src/Prime.Extensions.Tests/Prime.Extensions.Tests.csproj b/src/Prime.Extensions.Tests/Prime.Extensions.Tests.csproj index 84ecd7d..b412507 100644 --- a/src/Prime.Extensions.Tests/Prime.Extensions.Tests.csproj +++ b/src/Prime.Extensions.Tests/Prime.Extensions.Tests.csproj @@ -10,8 +10,4 @@ - - - - diff --git a/src/Prime.Extensions/Prime.Extensions.csproj b/src/Prime.Extensions/Prime.Extensions.csproj index 92af7dc..32536c0 100644 --- a/src/Prime.Extensions/Prime.Extensions.csproj +++ b/src/Prime.Extensions/Prime.Extensions.csproj @@ -8,32 +8,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/Session/Session.csproj b/src/Session/Session.csproj index c638034..02b41b9 100644 --- a/src/Session/Session.csproj +++ b/src/Session/Session.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/TestProject.props b/src/TestProject.props index 17fa412..f98c48b 100644 --- a/src/TestProject.props +++ b/src/TestProject.props @@ -7,17 +7,17 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Transactions/Transactions.csproj b/src/Transactions/Transactions.csproj index 4e049b4..1b8e7a2 100644 --- a/src/Transactions/Transactions.csproj +++ b/src/Transactions/Transactions.csproj @@ -8,7 +8,7 @@ - +