Merge e857401 into 6a55f95

ExtendedXmlSerializer · Nov 30, 2019 · 0b4d30b · 0b4d30b
2 parents 6a55f95 + e857401
commit 0b4d30b
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 70 deletions.
diff --git a/ExtendedXmlSerializer Development.sln b/ExtendedXmlSerializer Development.sln
@@ -0,0 +1,55 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29503.13
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2859812B-6D27-4A85-AC4A-8D3A55D9E3CD}"
+	ProjectSection(SolutionItems) = preProject
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtendedXmlSerializer", "src\ExtendedXmlSerializer\ExtendedXmlSerializer.csproj", "{474C8CF3-1FBB-4507-9156-D5DC153F4EB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtendedXmlSerializer.Tests", "test\ExtendedXmlSerializer.Tests\ExtendedXmlSerializer.Tests.csproj", "{5FF229B9-4E79-4C1B-B8B4-0ED5AD2823D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtendedXmlSerializer.Tests.ReportedIssues", "test\ExtendedXmlSerializer.Tests.ReportedIssues\ExtendedXmlSerializer.Tests.ReportedIssues.csproj", "{301C9F7B-C375-404D-A07D-6C8C334D3C4A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{DE813CE8-58FB-473D-A10E-CDDFF2A58FBF}"
+	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
+		.build\Common.ps1 = .build\Common.ps1
+		documentation\docfx.json = documentation\docfx.json
+		.build\Install.ps1 = .build\Install.ps1
+		.build\Success.ps1 = .build\Success.ps1
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{474C8CF3-1FBB-4507-9156-D5DC153F4EB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{474C8CF3-1FBB-4507-9156-D5DC153F4EB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{474C8CF3-1FBB-4507-9156-D5DC153F4EB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{474C8CF3-1FBB-4507-9156-D5DC153F4EB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FF229B9-4E79-4C1B-B8B4-0ED5AD2823D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FF229B9-4E79-4C1B-B8B4-0ED5AD2823D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FF229B9-4E79-4C1B-B8B4-0ED5AD2823D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FF229B9-4E79-4C1B-B8B4-0ED5AD2823D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{DE813CE8-58FB-473D-A10E-CDDFF2A58FBF} = {2859812B-6D27-4A85-AC4A-8D3A55D9E3CD}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0980EF53-85ED-482A-8798-690538C3F7A4}
+	EndGlobalSection
+EndGlobal
diff --git a/ExtendedXmlSerializer.sln.DotSettings → ...XmlSerializer Development.sln.DotSettings b/ExtendedXmlSerializer.sln.DotSettings → ...XmlSerializer Development.sln.DotSettings
diff --git a/ExtendedXmlSerializer.sln b/ExtendedXmlSerializer.sln
@@ -24,6 +24,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{DE813C
 		.build\Success.ps1 = .build\Success.ps1
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtendedXmlSerializer.Tests.Performance", "test\ExtendedXmlSerializer.Tests.Performance\ExtendedXmlSerializer.Tests.Performance.csproj", "{6255260E-7A32-4B40-90CE-8729F6903E54}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExtendedXmlSerializer.Samples", "samples\ExtendedXmlSerializer.Samples\ExtendedXmlSerializer.Samples.csproj", "{935EB8FE-A9E5-4DC7-8CBB-7A32E2A56C9E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,6 +46,14 @@ Global
 		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{301C9F7B-C375-404D-A07D-6C8C334D3C4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6255260E-7A32-4B40-90CE-8729F6903E54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6255260E-7A32-4B40-90CE-8729F6903E54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6255260E-7A32-4B40-90CE-8729F6903E54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6255260E-7A32-4B40-90CE-8729F6903E54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{935EB8FE-A9E5-4DC7-8CBB-7A32E2A56C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{935EB8FE-A9E5-4DC7-8CBB-7A32E2A56C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{935EB8FE-A9E5-4DC7-8CBB-7A32E2A56C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{935EB8FE-A9E5-4DC7-8CBB-7A32E2A56C9E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/samples/ExtendedXmlSerializer.Samples/CustomSerializator/CustomSerializatorSamples.cs b/samples/ExtendedXmlSerializer.Samples/CustomSerializator/CustomSerializatorSamples.cs
@@ -22,7 +22,6 @@
 // SOFTWARE.
 
 using ExtendedXmlSerializer.Configuration;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 
 namespace ExtendedXmlSerializer.Samples.CustomSerializator

diff --git a/samples/ExtendedXmlSerializer.Samples/Dictianary/DictianarySamples.cs b/samples/ExtendedXmlSerializer.Samples/Dictianary/DictianarySamples.cs
@@ -1,5 +1,4 @@
 using ExtendedXmlSerializer.Configuration;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/samples/ExtendedXmlSerializer.Samples/Encrypt/EncryptSamples.cs b/samples/ExtendedXmlSerializer.Samples/Encrypt/EncryptSamples.cs
@@ -23,7 +23,6 @@
 
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.ExtensionModel.Encryption;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,7 +39,7 @@ public static void RunSimpleConfig()
 // Configuration
 
 IExtendedXmlSerializer serializer = new ConfigurationContainer().UseEncryptionAlgorithm(new CustomEncryption())
-																.ConfigureType<Person>()
+																.Type<Person>()
 																.Member(p => p.Password)
 																.Encrypt()
 																.Create();

diff --git a/samples/ExtendedXmlSerializer.Samples/ExtendedXmlSerializer.Samples.csproj b/samples/ExtendedXmlSerializer.Samples/ExtendedXmlSerializer.Samples.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtendedXmlSerializer.Legacy" Version="2.0.0" />
+    <PackageReference Include="ExtendedXmlSerializer.Legacy" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/AttachedProperties.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/AttachedProperties.cs
@@ -1,7 +1,6 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
 using ExtendedXmlSerializer.ExtensionModel.AttachedProperties;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 // ReSharper disable All

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/AutoFormatting.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/AutoFormatting.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.IO;
 using System.Xml;

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/Converters.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/Converters.cs
@@ -1,29 +1,33 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Content;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
+
 // ReSharper disable UnusedVariable
 
 namespace ExtendedXmlSerializer.Samples.Extensibility
 {
 	public sealed class Converters : ICommand<object>
 	{
 		public static Converters Default { get; } = new Converters();
+
 		Converters() {}
 
 		public void Execute(object parameter)
 		{
 // Converter
-IExtendedXmlSerializer serializer = new ConfigurationContainer().Register(CustomStructConverter.Default).Create();
-CustomStruct subject = new CustomStruct(123);
-string contents = serializer.Serialize(subject);
+IExtendedXmlSerializer serializer = new ConfigurationContainer().Type<CustomStruct>()
+                                                                .Register()
+                                                                .Converter()
+                                                                .Using(CustomStructConverter.Default)
+                                                                .Create();
+CustomStruct subject  = new CustomStruct(123);
+string       contents = serializer.Serialize(subject);
 // ...
 // EndConverter
 
 			string data = serializer.Serialize(new XmlWriterSettings {Indent = true}, subject);
 			File.WriteAllText(@"bin\Extensibility.Converters.xml", data);
 		}
 	}
-}
+}
diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/ImplicitTypes.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/ImplicitTypes.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 // ReSharper disable All

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/MarkupExtensions.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/MarkupExtensions.cs
@@ -1,7 +1,6 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
 using ExtendedXmlSerializer.ExtensionModel.Markup;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 
 namespace ExtendedXmlSerializer.Samples.Extensibility

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/OptimizedNamespaces.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/OptimizedNamespaces.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/ParameterizedContent.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/ParameterizedContent.cs
@@ -1,7 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Content;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.IO;
 using System.Xml;

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/PrivateConstructors.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/PrivateConstructors.cs
@@ -1,7 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Types;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 // ReSharper disable All

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/Tuples.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/Tuples.cs
@@ -1,7 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Content;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.IO;
 using System.Xml;

diff --git a/samples/ExtendedXmlSerializer.Samples/Extensibility/VerbatimContent.cs b/samples/ExtendedXmlSerializer.Samples/Extensibility/VerbatimContent.cs
@@ -1,7 +1,6 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.ContentModel.Content;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 // ReSharper disable UnusedVariable

diff --git a/samples/ExtendedXmlSerializer.Samples/FluentApi/FluentApiSamples.cs b/samples/ExtendedXmlSerializer.Samples/FluentApi/FluentApiSamples.cs
@@ -6,8 +6,6 @@ namespace ExtendedXmlSerializer.Samples.FluentApi
 	using Configuration;
 	using CustomSerializator;
 	using Encrypt;
-	using ExtensionModel.Encryption;
-	using ExtensionModel.Xml;
 	using System.Linq;
 
 	public class FluentApiSamples

diff --git a/samples/ExtendedXmlSerializer.Samples/Generics/GenericSerializer.cs b/samples/ExtendedXmlSerializer.Samples/Generics/GenericSerializer.cs
@@ -1,15 +1,10 @@
 using ExtendedXmlSerializer.Configuration;
-using ExtendedXmlSerializer.ExtensionModel.Content;
-using ExtendedXmlSerializer.ExtensionModel.Types;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 
 namespace ExtendedXmlSerializer.Samples.Generics
 {
-    public class GenericSerializer
+	public class GenericSerializer
     {
         private IExtendedXmlSerializer serializer;
 
@@ -136,21 +131,13 @@ public class FirstRecipe : RecipeBase
             public override string Name => nameof(FirstRecipe);
 
             public double Lenght { get; set; } = 23;
-
-            public FirstRecipe()
-            {
-            }
         }
 
         public class SecondRecipe : RecipeBase
         {
             public override string Name => nameof(SecondRecipe);
 
             public double Thickness { get; set; } = 100;
-
-            public SecondRecipe()
-            {
-            }
         }
 
         public interface IActivityParameters

diff --git a/samples/ExtendedXmlSerializer.Samples/Introduction/Create.cs b/samples/ExtendedXmlSerializer.Samples/Introduction/Create.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 

diff --git a/samples/ExtendedXmlSerializer.Samples/Introduction/Member.cs b/samples/ExtendedXmlSerializer.Samples/Introduction/Member.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 
@@ -14,7 +13,7 @@ public sealed class Member : ICommand<object>
 		public void Execute(object parameter)
 		{
 // Member
-IExtendedXmlSerializer serializer = new ConfigurationContainer().ConfigureType<Subject>()
+IExtendedXmlSerializer serializer = new ConfigurationContainer().Type<Subject>()
                                                                 .Member(x => x.Message)
                                                                 .Name("Text")
                                                                 .Create();

diff --git a/samples/ExtendedXmlSerializer.Samples/Introduction/Settings.cs b/samples/ExtendedXmlSerializer.Samples/Introduction/Settings.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.Xml;
 // ReSharper disable UnusedVariable
 

diff --git a/samples/ExtendedXmlSerializer.Samples/Introduction/Type.cs b/samples/ExtendedXmlSerializer.Samples/Introduction/Type.cs
@@ -1,6 +1,5 @@
 using ExtendedXmlSerializer.Configuration;
 using ExtendedXmlSerializer.Core;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System.IO;
 using System.Xml;
 
@@ -14,7 +13,7 @@ public sealed class Type : ICommand<object>
 		public void Execute(object parameter)
 		{
 // Type
-IExtendedXmlSerializer serializer = new ConfigurationContainer().ConfigureType<Subject>()
+IExtendedXmlSerializer serializer = new ConfigurationContainer().Type<Subject>()
                                                                 .Name("ModifiedSubject")
                                                                 .Create();
 // EndType

diff --git a/samples/ExtendedXmlSerializer.Samples/MigrationMap/MigrationMapSamples.cs b/samples/ExtendedXmlSerializer.Samples/MigrationMap/MigrationMapSamples.cs
@@ -22,7 +22,6 @@
 // SOFTWARE.
 
 using ExtendedXmlSerializer.Configuration;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.IO;
 using System.Xml;
@@ -36,7 +35,7 @@ public static void RunSimpleConfig()
 			Program.PrintHeader("Deserialization old version of xml");
 // MigrationsConfiguration
 
-IExtendedXmlSerializer serializer = new ConfigurationContainer().ConfigureType<TestClass>()
+IExtendedXmlSerializer serializer = new ConfigurationContainer().Type<TestClass>()
 																.AddMigration(new TestClassMigrations())
 																.Create();
 // EndMigrationsConfiguration

diff --git a/samples/ExtendedXmlSerializer.Samples/MigrationMap/TestClassMigrations.cs b/samples/ExtendedXmlSerializer.Samples/MigrationMap/TestClassMigrations.cs
@@ -21,7 +21,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -31,7 +30,7 @@ namespace ExtendedXmlSerializer.Samples.MigrationMap
 {
 	// TestClassMigrations
 
-public class TestClassMigrations : IEnumerable<Action<XElement>>
+	public class TestClassMigrations : IEnumerable<Action<XElement>>
 {
 	public static void MigrationV0(XElement node)
 	{

diff --git a/samples/ExtendedXmlSerializer.Samples/ObjectReference/ObjectReferenceSamples.cs b/samples/ExtendedXmlSerializer.Samples/ObjectReference/ObjectReferenceSamples.cs
@@ -22,7 +22,6 @@
 // SOFTWARE.
 
 using ExtendedXmlSerializer.Configuration;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -38,7 +37,7 @@ public static void RunSimpleConfig()
 
 // Configure
 
-IExtendedXmlSerializer serializer = new ConfigurationContainer().ConfigureType<Person>()
+IExtendedXmlSerializer serializer = new ConfigurationContainer().Type<Person>()
                                                                 .EnableReferences(p => p.Id)
                                                                 .Create();
 // EndConfigure

diff --git a/samples/ExtendedXmlSerializer.Samples/Parametrized/ParametrizedConstructors.cs b/samples/ExtendedXmlSerializer.Samples/Parametrized/ParametrizedConstructors.cs
@@ -1,16 +1,9 @@
 using ExtendedXmlSerializer.Configuration;
-using ExtendedXmlSerializer.ExtensionModel.Content;
-using ExtendedXmlSerializer.ExtensionModel.Types;
-using ExtendedXmlSerializer.ExtensionModel.Xml;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ExtendedXmlSerializer.Samples.Parametrized
 {
-    public static class ParametrizedConstructors
+	public static class ParametrizedConstructors
     {
         public static void SerializeAndDeserialize()
         {