Skip to content

Commit

Permalink
Merge branch 'master' into issues/refactor/i318
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike-EEE authored Dec 2, 2019
2 parents 5f86fcc + a2fa09b commit 9a288db
Show file tree
Hide file tree
Showing 34 changed files with 100 additions and 76 deletions.
46 changes: 46 additions & 0 deletions ExtendedXmlSerializer Development.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

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
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
{5FF229B9-4E79-4C1B-B8B4-0ED5AD2823D3} = {2859812B-6D27-4A85-AC4A-8D3A55D9E3CD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0980EF53-85ED-482A-8798-690538C3F7A4}
EndGlobalSection
EndGlobal
File renamed without changes.
12 changes: 12 additions & 0 deletions ExtendedXmlSerializer.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@ Notable Contributors
Mentions
========

[<img src="https://github.com/DragonSpark/blog.dragonspark.us/blob/a49ead8aa87f61dd6c4d6f5999e6d01b8823d57b/static/images/ReSharper.png?raw=true" height="200" width="200" />](https://www.jetbrains.com/resharper/download/)

ExtendedXmlSerializer is proudly developed and maintained with ReSharper Ultimate.

[<img src="https://blog.dragonspark.us/images/ReSharper.png" height="200px"></a>](https://www.jetbrains.com/resharper/download/)
<br />
<br />

[<img src="https://raw.githubusercontent.com/DragonSpark/blog.dragonspark.us/a49ead8aa87f61dd6c4d6f5999e6d01b8823d57b/static/images/OzCode.svg?sanitize=true" height="200" />](https://www.oz-code.com/)

Magical debugging is courtesy of OzCode.

<br />
<br />

[<img src="https://raw.githubusercontent.com/SuperDotNet/superdotnet.run/c83812c7120c1d6a1cb0db13bee2d4ff0a5fc526/static/images/CodeCompare.svg?sanitize=true" height="200" />](https://www.devart.com/codecompare/)

File comparison and conflict resolution handled by DevArt's Code Compare.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
// SOFTWARE.

using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;

namespace ExtendedXmlSerializer.Samples.CustomSerializator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;
using System.Collections.Generic;
using System.IO;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.ExtensionModel.Encryption;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<IsPackable>false</IsPackable>
<VersionPrefix>0.0.0.0</VersionPrefix>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ExtendedXmlSerializer.Legacy" Version="2.0.0" />
<PackageReference Include="ExtendedXmlSerializer.Legacy" Version="2.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;
using System.IO;
using System.Xml;
Expand Down
16 changes: 10 additions & 6 deletions samples/ExtendedXmlSerializer.Samples/Extensibility/Converters.cs
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System.IO;
using System.Xml;
// ReSharper disable All
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Markup;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;

namespace ExtendedXmlSerializer.Samples.Extensibility
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System.Collections.Generic;
using System.IO;
using System.Xml;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions samples/ExtendedXmlSerializer.Samples/Extensibility/Tuples.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System.IO;
using System.Xml;

Expand Down
3 changes: 1 addition & 2 deletions samples/ExtendedXmlSerializer.Samples/Introduction/Member.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System.IO;
using System.Xml;

Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System.Xml;
// ReSharper disable UnusedVariable

Expand Down
3 changes: 1 addition & 2 deletions samples/ExtendedXmlSerializer.Samples/Introduction/Type.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System.IO;
using System.Xml;

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
// SOFTWARE.

using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;
using System.IO;
using System.Xml;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
// SOFTWARE.

using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.ExtensionModel.Xml;
using System;
using System.Collections.Generic;
using System.IO;
Expand All @@ -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
Expand Down
Loading

0 comments on commit 9a288db

Please sign in to comment.