Skip to content

Commit 0d4c137

Browse files
committed
Fix Android build.
1 parent be3dc84 commit 0d4c137

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

test/MsgPack.UnitTest.Xamarin.Android/MsgPack.UnitTest.Xamarin.Android.csproj

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<None Include="..\MsgPack.UnitTest\cases_compact.mpac">
8080
<Link>cases_compact.mpac</Link>
8181
</None>
82+
<None Include="Properties\AndroidManifest.xml" />
8283
</ItemGroup>
8384
<ItemGroup>
8485
<Compile Include="..\MsgPack.UnitTest\BigEndianBinaryTest.cs">
@@ -240,9 +241,6 @@
240241
<Compile Include="..\MsgPack.UnitTest\Serialization\ComplexTypeWithTwoMember.cs">
241242
<Link>Serialization\ComplexTypeWithTwoMember.cs</Link>
242243
</Compile>
243-
<Compile Include="..\MsgPack.UnitTest\Serialization\CompositeTest.cs">
244-
<Link>Serialization\CompositeTest.cs</Link>
245-
</Compile>
246244
<Compile Include="..\MsgPack.UnitTest\Serialization\DataContractAndNonSerializedMixedTarget.cs">
247245
<Link>Serialization\DataContractAndNonSerializedMixedTarget.cs</Link>
248246
</Compile>
@@ -957,18 +955,12 @@
957955
<Compile Include="..\MsgPack.UnitTest\Serialization\VersioningTest.cs">
958956
<Link>Serialization\VersioningTest.cs</Link>
959957
</Compile>
960-
<Compile Include="..\MsgPack.UnitTest\Serialization\_SetUpFixture.cs">
961-
<Link>Serialization\_SetUpFixture.cs</Link>
962-
</Compile>
963958
<Compile Include="..\MsgPack.UnitTest\SubtreeUnpackerTest.cs">
964959
<Link>SubtreeUnpackerTest.cs</Link>
965960
</Compile>
966961
<Compile Include="..\MsgPack.UnitTest\TestRandom.cs">
967962
<Link>TestRandom.cs</Link>
968963
</Compile>
969-
<Compile Include="..\MsgPack.UnitTest\TestSuite.cs">
970-
<Link>TestSuite.cs</Link>
971-
</Compile>
972964
<Compile Include="..\MsgPack.UnitTest\UnpackerTest.cs">
973965
<Link>UnpackerTest.cs</Link>
974966
</Compile>
@@ -1041,10 +1033,9 @@
10411033
<Compile Include="..\MsgPack.UnitTest\UnpackingTest.Scalar.cs">
10421034
<Link>UnpackingTest.Scalar.cs</Link>
10431035
</Compile>
1044-
<Compile Include="..\MsgPack.UnitTest\_SetUpFixture.cs">
1045-
<Link>_SetUpFixture.cs</Link>
1046-
</Compile>
10471036
<Compile Include="Properties\AssemblyInfo.cs" />
1037+
<Compile Include="MainActivity.cs" />
1038+
<Compile Include="Resources\Resource.designer.cs" />
10481039
</ItemGroup>
10491040
<ItemGroup>
10501041
<BundleResource Include="..\MsgPack.UnitTest\cases.json">

test/MsgPack.UnitTest/Serialization/SerializationTargetTest.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
using System.Linq;
2424
using System.Runtime.Serialization;
2525

26-
using MsgPack.Serialization.AbstractSerializers;
2726
#if !MSTEST
2827
using NUnit.Framework;
2928
#else
@@ -77,9 +76,9 @@ public void TestAnnotated()
7776
TestCore<AnnotatedClass>(
7877
PublicProperty, NonPublicProperty, PublicField, NonPublicField,
7978
#if !NETFX_CORE && !WINDOWS_PHONE
80-
NonSerializedPublicField, NonSerializedNonPublicField,
79+
NonSerializedPublicField, NonSerializedNonPublicField,
8180
#endif
82-
CollectionReadOnlyProperty );
81+
CollectionReadOnlyProperty );
8382
}
8483

8584
[Test]
@@ -89,9 +88,9 @@ public void TestDataMember()
8988
TestCore<DataMamberClass>(
9089
PublicProperty, NonPublicProperty, PublicField, NonPublicField,
9190
#if !NETFX_CORE && !WINDOWS_PHONE
92-
NonSerializedPublicField, NonSerializedNonPublicField,
91+
NonSerializedPublicField, NonSerializedNonPublicField,
9392
#endif
94-
CollectionReadOnlyProperty );
93+
CollectionReadOnlyProperty );
9594
}
9695

9796
[Test]

0 commit comments

Comments
 (0)