Skip to content

Commit 09fb4aa

Browse files
committed
Add unit tests for ValueTuple
This commit changes CodeDOM test .NET version because Roslyn in .NET 4.6 does not build the code which uses ValueTuple.
1 parent 3097871 commit 09fb4aa

16 files changed

+1844
-162
lines changed

MsgPack.Common.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
<DebugType>pdbonly</DebugType>
5959
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
6060
</PropertyGroup>
61+
<PropertyGroup Condition="'$(TargetFramework)' == 'net47'">
62+
<DebugType>pdbonly</DebugType>
63+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
64+
</PropertyGroup>
6165
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
6266
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
6367
</PropertyGroup>
@@ -83,7 +87,7 @@
8387
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
8488
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT</DefineConstants>
8589
</PropertyGroup>
86-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
90+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
8791
<DebugType>full</DebugType>
8892
</PropertyGroup>
8993
</Project>

test/MsgPack.UnitTest.CodeDom/MsgPack.UnitTest.CodeDom.csproj

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectGuid>{23F8ABB1-F41A-4150-B5D5-9A7AA60E05D2}</ProjectGuid>
55
<OutputType>Library</OutputType>
66
<AssemblyName>MsgPack.UnitTest.CodeDom</AssemblyName>
7-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
7+
<TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
88
</PropertyGroup>
99
<Import Project="..\..\MsgPack.Common.props" />
1010
<PropertyGroup>
@@ -18,17 +18,19 @@
1818
<PackageReference Include="NUnit" Version="3.8.1" />
1919
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.4.0" />
2222
<!-- To avoid PDB Reader error -->
2323
<PackageReference Include="Mono.Cecil" Version="0.10.0-beta6" />
2424
</ItemGroup>
2525
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
2626
<PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" />
2727
</ItemGroup>
28-
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
2929
<Reference Include="System" />
3030
<Reference Include="System.Core" />
3131
<Reference Include="System.Runtime.Serialization" />
32+
<Reference Include="Microsoft.CSharp" />
33+
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
3234
</ItemGroup>
3335
<ItemGroup>
3436
<Compile Update="Serialization\ArrayCodeDomBasedEnumSerializationTest.cs">
@@ -59,7 +61,40 @@
5961
</ItemGroup>
6062
<ItemGroup>
6163
<ProjectReference Include="..\..\src\MsgPack\MsgPack.csproj" />
62-
<ProjectReference Include="..\MsgPack.UnitTest\MsgPack.UnitTest.csproj" />
64+
</ItemGroup>
65+
<ItemGroup>
66+
<Compile Include="..\MsgPack.UnitTest\Image.cs" />
67+
<Compile Include="..\MsgPack.UnitTest\StreamExtensions.cs" />
68+
<Compile Include="..\MsgPack.UnitTest\Serialization\AddOnlyCollection`1.cs" Link="Serialization\AddOnlyCollection`1.cs" />
69+
<Compile Include="..\MsgPack.UnitTest\Serialization\AppendableReadOnlyCollections.cs" Link="Serialization\AppendableReadOnlyCollections.cs" />
70+
<Compile Include="..\MsgPack.UnitTest\Serialization\ArraySegmentEqualityComparer`1.cs" Link="Serialization\ArraySegmentEqualityComparer`1.cs" />
71+
<Compile Include="..\MsgPack.UnitTest\Serialization\AutoMessagePackSerializerTest.Types.cs" Link="Serialization\AutoMessagePackSerializerTest.Types.cs" />
72+
<Compile Include="..\MsgPack.UnitTest\Serialization\BaseCollections.cs" Link="Serialization\BaseCollections.cs" />
73+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexType.cs" Link="Serialization\ComplexType.cs" />
74+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithDataContract.cs" Link="Serialization\ComplexTypeWithDataContract.cs" />
75+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithDataContractWithOrder.cs" Link="Serialization\ComplexTypeWithDataContractWithOrder.cs" />
76+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithNonSerialized.cs" Link="Serialization\ComplexTypeWithNonSerialized.cs" />
77+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithOneBaseOrder.cs" Link="Serialization\ComplexTypeWithOneBaseOrder.cs" />
78+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithoutAnyAttribute.cs" Link="Serialization\ComplexTypeWithoutAnyAttribute.cs" />
79+
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithTwoMember.cs" Link="Serialization\ComplexTypeWithTwoMember.cs" />
80+
<Compile Include="..\MsgPack.UnitTest\Serialization\DataContractAndNonSerializedMixedTarget.cs" Link="Serialization\DataContractAndNonSerializedMixedTarget.cs" />
81+
<Compile Include="..\MsgPack.UnitTest\Serialization\DataMemberAttributeNamedPropertyTestTarget.cs" Link="Serialization\DataMemberAttributeNamedPropertyTestTarget.cs" />
82+
<Compile Include="..\MsgPack.UnitTest\Serialization\EnumSerializationTest.EnumDefinitions.cs" Link="Serialization\EnumSerializationTest.EnumDefinitions.cs" />
83+
<Compile Include="..\MsgPack.UnitTest\Serialization\IVerifiable.cs" Link="Serialization\IVerifiable.cs" />
84+
<Compile Include="..\MsgPack.UnitTest\Serialization\IVerifiable`1.cs" Link="Serialization\IVerifiable`1.cs" />
85+
<Compile Include="..\MsgPack.UnitTest\Serialization\NilImplicationTestTarget.cs" Link="Serialization\NilImplicationTestTarget.cs" />
86+
<Compile Include="..\MsgPack.UnitTest\Serialization\RoslynCodeGeneration.cs" Link="Serialization\RoslynCodeGeneration.cs" />
87+
<Compile Include="..\MsgPack.UnitTest\Serialization\SerializationTargets.cs" Link="Serialization\SerializationTargets.cs" />
88+
<Compile Include="..\MsgPack.UnitTest\Serialization\SimpleCollection`1.cs" Link="Serialization\SimpleCollection`1.cs" />
89+
<Compile Include="..\MsgPack.UnitTest\Serialization\StringKeyedCollection.cs" Link="Serialization\StringKeyedCollection.cs" />
90+
<Compile Include="..\MsgPack.UnitTest\Serialization\TempFileDependentAssemblyManager.cs" Link="Serialization\TempFileDependentAssemblyManager.cs" />
91+
<Compile Include="..\MsgPack.UnitTest\Serialization\TestValueType.cs" Link="Serialization\TestValueType.cs" />
92+
<Compile Include="..\MsgPack.UnitTest\Serialization\TypeWithDuplicatedMessagePackMemberAttributeMember.cs" Link="Serialization\TypeWithDuplicatedMessagePackMemberAttributeMember.cs" />
93+
<Compile Include="..\MsgPack.UnitTest\Serialization\TypeWithInvalidMessagePackMemberAttributeMember.cs" Link="Serialization\TypeWithInvalidMessagePackMemberAttributeMember.cs" />
94+
<Compile Include="..\MsgPack.UnitTest\Serialization\TypeWithMissingMessagePackMemberAttributeMember.cs" Link="Serialization\TypeWithMissingMessagePackMemberAttributeMember.cs" />
95+
</ItemGroup>
96+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
97+
<Compile Include="..\MsgPack.NUnitPortable\TimeoutAttribute.cs" />
6398
</ItemGroup>
6499
<ItemGroup>
65100
<None Include="..\..\src\MsgPack.snk">

0 commit comments

Comments
 (0)