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