Merge branch 'master' into naming-strategy

This commit is contained in:
James Newton-King
2016-05-28 10:03:56 +12:00
79 changed files with 2206 additions and 566 deletions
@@ -197,7 +197,7 @@
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
<Compile Include="TestObjects\Content.cs" />
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
@@ -225,10 +225,10 @@
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
<Compile Include="TestObjects\PropertyItemConverter.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
<Compile Include="TestObjects\Ratio.cs" />
<Compile Include="TestObjects\RequiredObject.cs" />
<Compile Include="TestObjects\SearchResult.cs" />