Skip to content

Commit

Permalink
net 6
Browse files Browse the repository at this point in the history
  • Loading branch information
Florin Rotaru committed Nov 21, 2021
1 parent dfeef49 commit 274041c
Show file tree
Hide file tree
Showing 15 changed files with 345 additions and 288 deletions.
16 changes: 8 additions & 8 deletions Statics.Compare/Statics.Compare.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@

<PropertyGroup>
<PackageId>Statics.Compare</PackageId>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Florin Rotaru</Authors>
<Company />
<Version>5.0.1</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<RepositoryUrl>https://github.com/florin-rotaru/Statics.Compare</RepositoryUrl>
<PackageTags>compare, compareobjects, compare-objects, comparison, equal, equality, none-equal, deep-equal, deep-equals, diffs, difference</PackageTags>
<Version>6.0.0</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<RepositoryUrl>https://github.com/florin-rotaru/Statics.Compare</RepositoryUrl>
<PackageTags>compare, compareobjects, compare-objects, comparison, equal, equality, none-equal, deep-equal, deep-equals, diffs, difference</PackageTags>
<LangVersion>9.0</LangVersion>
<Description>Compares members of two objects and evaluates if they are equal or none equal based on conventions (public properties with the same names and same/derived/convertible types). Provides also few tweak options</Description>
<Description>Compares members of two objects and evaluates if they are equal or none equal based on conventions (public properties with the same names and same/derived/convertible types). Provides also few tweak options</Description>
</PropertyGroup>

<ItemGroup>
<None Include="LICENSE" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Statics.Reflection" Version="5.0.2" />
<PackageReference Include="Statics.Reflection" Version="6.0.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions Tests/Models/FromTo_N0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private static void GetMembers(Type sourceType, Type destinationType, out List<M
destinationMembers = outDestinationMembers.Where(s => outSourceMembers.Exists(m => m.Name == s.Name)).OrderBy(o => o.Name).ToList();
}

public void ToClass<D>(bool hasReadonlyMembers, bool hasStaticMembers) where D : new()
public void ToClass<D>(bool hasReadonlyMembers) where D : new()
{
if (hasReadonlyMembers)
return;
Expand All @@ -223,7 +223,7 @@ private static void GetMembers(Type sourceType, Type destinationType, out List<M
var map = Mapper<S, D>.CompileFunc();

S source = NewSource();
D destination = new D();
D destination = new();

// =======
destination = map(source);
Expand All @@ -232,7 +232,7 @@ private static void GetMembers(Type sourceType, Type destinationType, out List<M
CompareConvert<D>(sourceType, destinationType);
}

public void ToStruct<D>(bool hasReadonlyMembers, bool hasStaticMembers) where D : struct
public void ToStruct<D>(bool hasReadonlyMembers) where D : struct
{
if (hasReadonlyMembers)
return;
Expand All @@ -252,7 +252,7 @@ public void ToStruct<D>(bool hasReadonlyMembers, bool hasStaticMembers) where D
CompareConvert<D>(sourceType, destinationType);
}

public void ToNullableStruct<D>(bool hasReadonlyMembers, bool hasStaticMembers) where D : struct
public void ToNullableStruct<D>(bool hasReadonlyMembers) where D : struct
{
if (hasReadonlyMembers)
return;
Expand Down
32 changes: 16 additions & 16 deletions Tests/Models/FromTo_N0_Members.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,41 @@ public FromTo_N0_Members(ITestOutputHelper console) : base(console) { }

#region To C0
[Fact]
public void To_C0_I0_Members() => ToClass<TC0_I0_Members>(false, false);
public void To_C0_I0_Members() => ToClass<TC0_I0_Members>(false);
[Fact]
public void To_C0_I1_Nullable_Members() => ToClass<TC0_I1_Nullable_Members>(false, false);
public void To_C0_I1_Nullable_Members() => ToClass<TC0_I1_Nullable_Members>(false);
[Fact]
public void To_C0_I2_Literal_Members() => ToClass<TC0_I2_Literal_Members>(true, false);
public void To_C0_I2_Literal_Members() => ToClass<TC0_I2_Literal_Members>(true);
[Fact]
public void To_C0_I3_Readonly_Members() => ToClass<TC0_I3_Readonly_Members>(true, false);
public void To_C0_I3_Readonly_Members() => ToClass<TC0_I3_Readonly_Members>(true);
[Fact]
public void To_C0_I4_Static_Members() => ToClass<TC0_I4_Static_Members>(false, true);
public void To_C0_I4_Static_Members() => ToClass<TC0_I4_Static_Members>(false);
[Fact]
public void To_C0_I5_StaticNullable_Members() => ToClass<TC0_I5_StaticNullable_Members>(false, true);
public void To_C0_I5_StaticNullable_Members() => ToClass<TC0_I5_StaticNullable_Members>(false);
#endregion
#region To S0
[Fact]
public void To_S0_I0_Members() => ToStruct<TS0_I0_Members>(false, false);
public void To_S0_I0_Members() => ToStruct<TS0_I0_Members>(false);
[Fact]
public void To_S0_I1_Nullable_Members() => ToStruct<TS0_I1_Nullable_Members>(false, false);
public void To_S0_I1_Nullable_Members() => ToStruct<TS0_I1_Nullable_Members>(false);
[Fact]
public void To_S0_I2_Literal_Members() => ToStruct<TS0_I2_Literal_Members>(true, false);
public void To_S0_I2_Literal_Members() => ToStruct<TS0_I2_Literal_Members>(true);
[Fact]
public void To_S0_I3_Static_Members() => ToStruct<TS0_I3_Static_Members>(false, true);
public void To_S0_I3_Static_Members() => ToStruct<TS0_I3_Static_Members>(false);
[Fact]
public void To_S0_I4_StaticNullable_Members() => ToStruct<TS0_I4_StaticNullable_Members>(false, true);
public void To_S0_I4_StaticNullable_Members() => ToStruct<TS0_I4_StaticNullable_Members>(false);
#endregion
#region To NS0
[Fact]
public void To_NS0_I0_Members() => ToNullableStruct<TS0_I0_Members>(false, false);
public void To_NS0_I0_Members() => ToNullableStruct<TS0_I0_Members>(false);
[Fact]
public void To_NS0_I1_Nullable_Members() => ToNullableStruct<TS0_I1_Nullable_Members>(false, false);
public void To_NS0_I1_Nullable_Members() => ToNullableStruct<TS0_I1_Nullable_Members>(false);
[Fact]
public void To_NS0_I2_Literal_Members() => ToNullableStruct<TS0_I2_Literal_Members>(true, false);
public void To_NS0_I2_Literal_Members() => ToNullableStruct<TS0_I2_Literal_Members>(true);
[Fact]
public void To_NS0_I3_Static_Members() => ToNullableStruct<TS0_I3_Static_Members>(false, true);
public void To_NS0_I3_Static_Members() => ToNullableStruct<TS0_I3_Static_Members>(false);
[Fact]
public void To_NS0_I4_StaticNullable_Members() => ToNullableStruct<TS0_I4_StaticNullable_Members>(false, true);
public void To_NS0_I4_StaticNullable_Members() => ToNullableStruct<TS0_I4_StaticNullable_Members>(false);
#endregion
}
}
60 changes: 30 additions & 30 deletions Tests/Models/FromTo_N0_NonStatic_Members.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@

namespace Internal
{
public class FromTo_N0_NonStatic_Members<S> : FromTo_N0<S> where S : new()
{
public FromTo_N0_NonStatic_Members(ITestOutputHelper console) : base(console) { }
public class FromTo_N0_NonStatic_Members<S> : FromTo_N0<S> where S : new()
{
public FromTo_N0_NonStatic_Members(ITestOutputHelper console) : base(console) { }

#region To C0
[Fact]
public void To_C0_I0_Members() => ToClass<TC0_I0_Members>(false, false);
[Fact]
public void To_C0_I1_Nullable_Members() => ToClass<TC0_I1_Nullable_Members>(false, false);
[Fact]
public void To_C0_I2_Literal_Members() => ToClass<TC0_I2_Literal_Members>(true, false);
[Fact]
public void To_C0_I3_Readonly_Members() => ToClass<TC0_I3_Readonly_Members>(true, false);
#endregion
#region To S0
[Fact]
public void To_S0_I0_Members() => ToStruct<TS0_I0_Members>(false, false);
[Fact]
public void To_S0_I1_Nullable_Members() => ToStruct<TS0_I1_Nullable_Members>(false, false);
[Fact]
public void To_S0_I2_Literal_Members() => ToStruct<TS0_I2_Literal_Members>(true, false);
#endregion
#region To NS0
[Fact]
public void To_NS0_I0_Members() => ToNullableStruct<TS0_I0_Members>(false, false);
[Fact]
public void To_NS0_I1_Nullable_Members() => ToNullableStruct<TS0_I1_Nullable_Members>(false, false);
[Fact]
public void To_NS0_I2_Literal_Members() => ToNullableStruct<TS0_I2_Literal_Members>(true, false);
#endregion
}
#region To C0
[Fact]
public void To_C0_I0_Members() => ToClass<TC0_I0_Members>(false);
[Fact]
public void To_C0_I1_Nullable_Members() => ToClass<TC0_I1_Nullable_Members>(false);
[Fact]
public void To_C0_I2_Literal_Members() => ToClass<TC0_I2_Literal_Members>(true);
[Fact]
public void To_C0_I3_Readonly_Members() => ToClass<TC0_I3_Readonly_Members>(true);
#endregion
#region To S0
[Fact]
public void To_S0_I0_Members() => ToStruct<TS0_I0_Members>(false);
[Fact]
public void To_S0_I1_Nullable_Members() => ToStruct<TS0_I1_Nullable_Members>(false);
[Fact]
public void To_S0_I2_Literal_Members() => ToStruct<TS0_I2_Literal_Members>(true);
#endregion
#region To NS0
[Fact]
public void To_NS0_I0_Members() => ToNullableStruct<TS0_I0_Members>(false);
[Fact]
public void To_NS0_I1_Nullable_Members() => ToNullableStruct<TS0_I1_Nullable_Members>(false);
[Fact]
public void To_NS0_I2_Literal_Members() => ToNullableStruct<TS0_I2_Literal_Members>(true);
#endregion
}
}
44 changes: 22 additions & 22 deletions Tests/Models/FromTo_N0_Static_Members.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@

namespace Internal
{
public class FromTo_N0_Static_Members<S> : FromTo_N0<S> where S : new()
{
public FromTo_N0_Static_Members(ITestOutputHelper console) : base(console) { }
public class FromTo_N0_Static_Members<S> : FromTo_N0<S> where S : new()
{
public FromTo_N0_Static_Members(ITestOutputHelper console) : base(console) { }

#region To C0
[Fact]
public void To_C0_I4_Static_Members() => ToClass<TC0_I4_Static_Members>(false, true);
[Fact]
public void To_C0_I5_StaticNullable_Members() => ToClass<TC0_I5_StaticNullable_Members>(false, true);
#endregion
#region To S0
[Fact]
public void To_S0_I3_Static_Members() => ToStruct<TS0_I3_Static_Members>(false, true);
[Fact]
public void To_S0_I4_StaticNullable_Members() => ToStruct<TS0_I4_StaticNullable_Members>(false, true);
#endregion
#region To NS0
[Fact]
public void To_NS0_I3_Static_Members() => ToNullableStruct<TS0_I3_Static_Members>(false, true);
[Fact]
public void To_NS0_I4_StaticNullable_Members() => ToNullableStruct<TS0_I4_StaticNullable_Members>(false, true);
#endregion
}
#region To C0
[Fact]
public void To_C0_I4_Static_Members() => ToClass<TC0_I4_Static_Members>(false);
[Fact]
public void To_C0_I5_StaticNullable_Members() => ToClass<TC0_I5_StaticNullable_Members>(false);
#endregion
#region To S0
[Fact]
public void To_S0_I3_Static_Members() => ToStruct<TS0_I3_Static_Members>(false);
[Fact]
public void To_S0_I4_StaticNullable_Members() => ToStruct<TS0_I4_StaticNullable_Members>(false);
#endregion
#region To NS0
[Fact]
public void To_NS0_I3_Static_Members() => ToNullableStruct<TS0_I3_Static_Members>(false);
[Fact]
public void To_NS0_I4_StaticNullable_Members() => ToNullableStruct<TS0_I4_StaticNullable_Members>(false);
#endregion
}
}
10 changes: 5 additions & 5 deletions Tests/Models/Models.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName></AssemblyName>
<RootNamespace>Models</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Air.Mapper" Version="5.0.1" />
<PackageReference Include="AutoFixture" Version="4.16.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="AutoFixture" Version="4.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Statics.Mapper" Version="6.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions Tests/N0/C0/C0.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName></AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Tests/N0/C0/From_C0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Xunit;
using Xunit.Abstractions;

namespace C0
namespace C0.Tests
{
public class From_NS_C0_I0_Members : FromTo_N0_NonStatic_Members<TC0_I0_Members> { public From_NS_C0_I0_Members(ITestOutputHelper console) : base(console) {} }

Expand Down
2 changes: 1 addition & 1 deletion Tests/N0/NS0/From_NS0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Xunit;
using Xunit.Abstractions;

namespace NS0
namespace NS0.Tests
{
public class From_NS_NS0_I0_Members : FromTo_N0_NonStatic_Members<TS0_I0_Members?> { public From_NS_NS0_I0_Members(ITestOutputHelper console) : base(console) {} }

Expand Down
6 changes: 3 additions & 3 deletions Tests/N0/NS0/NS0.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName></AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Tests/N0/S0/From_S0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Xunit;
using Xunit.Abstractions;

namespace S0
namespace S0.Tests
{
public class From_NS_S0_I0_Members : FromTo_N0_NonStatic_Members<TS0_I0_Members> { public From_NS_S0_I0_Members(ITestOutputHelper console) : base(console) {} }

Expand Down
6 changes: 3 additions & 3 deletions Tests/N0/S0/S0.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName></AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit 274041c

Please sign in to comment.