Skip to content

Commit affa0d6

Browse files
committed
Fix Xamarin project settings.
1 parent a3323b7 commit affa0d6

6 files changed

Lines changed: 23 additions & 27 deletions

File tree

src/MsgPack.Xamarin.Android/MsgPack.Xamarin.Android.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
<Compile Include="..\MsgPack\DictionaryDebuggerProxy`2.cs">
7171
<Link>DictionaryDebuggerProxy`2.cs</Link>
7272
</Compile>
73-
<Compile Include="..\MsgPack\EnumerableStream.cs">
74-
<Link>EnumerableStream.cs</Link>
75-
</Compile>
7673
<Compile Include="..\MsgPack\Float32Bits.cs">
7774
<Link>Float32Bits.cs</Link>
7875
</Compile>
@@ -385,9 +382,6 @@
385382
<Compile Include="..\MsgPack\Serialization\ReflectionSerializers\ReflectionCollectionSerializer.cs">
386383
<Link>Serialization\ReflectionSerializers\ReflectionCollectionSerializer.cs</Link>
387384
</Compile>
388-
<Compile Include="..\MsgPack\Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer.cs">
389-
<Link>Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer.cs</Link>
390-
</Compile>
391385
<Compile Include="..\MsgPack\Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer`1.cs">
392386
<Link>Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer`1.cs</Link>
393387
</Compile>

src/MsgPack.Xamarin.iOS/MsgPack.Xamarin.iOS.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<Folder Include="Serialization\ReflectionSerializers\ReflectionSerializers\" />
5252
</ItemGroup>
5353
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
54+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
5455
<ItemGroup>
5556
<Compile Include="..\MsgPack\BigEndianBinary.cs">
5657
<Link>BigEndianBinary.cs</Link>
@@ -67,9 +68,6 @@
6768
<Compile Include="..\MsgPack\DictionaryDebuggerProxy`2.cs">
6869
<Link>DictionaryDebuggerProxy`2.cs</Link>
6970
</Compile>
70-
<Compile Include="..\MsgPack\EnumerableStream.cs">
71-
<Link>EnumerableStream.cs</Link>
72-
</Compile>
7371
<Compile Include="..\MsgPack\Float32Bits.cs">
7472
<Link>Float32Bits.cs</Link>
7573
</Compile>
@@ -479,9 +477,6 @@
479477
<Compile Include="..\MsgPack\Serialization\ReflectionSerializers\ReflectionCollectionSerializer.cs">
480478
<Link>Serialization\ReflectionSerializers\ReflectionCollectionSerializer.cs</Link>
481479
</Compile>
482-
<Compile Include="..\MsgPack\Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer.cs">
483-
<Link>Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer.cs</Link>
484-
</Compile>
485480
<Compile Include="..\MsgPack\Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer`1.cs">
486481
<Link>Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer`1.cs</Link>
487482
</Compile>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<WarningLevel>4</WarningLevel>
3232
<AndroidLinkMode>None</AndroidLinkMode>
3333
<ConsolePause>false</ConsolePause>
34+
<JavaMaximumHeapSize>256M</JavaMaximumHeapSize>
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3637
<DebugType>full</DebugType>
@@ -49,10 +50,10 @@
4950
<Reference Include="Xamarin.Android.NUnitLite" />
5051
<Reference Include="System.Numerics" />
5152
<Reference Include="System.Runtime.Serialization" />
53+
<Reference Include="Microsoft.CSharp" />
5254
</ItemGroup>
5355
<ItemGroup>
5456
<Compile Include="MainActivity.cs" />
55-
<Compile Include="Resources\Resource.designer.cs" />
5657
<Compile Include="Properties\AssemblyInfo.cs" />
5758
<Compile Include="..\MsgPack.UnitTest\Serialization\GeneratedSerializers\ArrayBased\MsgPack_Serialization_HasEnumerableSerializer.cs">
5859
<Link>Serialization\GeneratedSerializers\ArrayBased\MsgPack_Serialization_HasEnumerableSerializer.cs</Link>
@@ -81,6 +82,7 @@
8182
<Compile Include="..\MsgPack.UnitTest\Serialization\GeneratedSerializers\MapBased\MsgPack_Serialization_PlainClassSerializer.cs">
8283
<Link>Serialization\GeneratedSerializers\MapBased\MsgPack_Serialization_PlainClassSerializer.cs</Link>
8384
</Compile>
85+
<Compile Include="Resources\Resource.designer.cs" />
8486
</ItemGroup>
8587
<ItemGroup>
8688
<None Include="Resources\AboutResources.txt" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="MsgPack.UnitTest.Xamarin.Android">
3-
<uses-sdk />
3+
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
44
<application android:label="MsgPack.UnitTest.Xamarin.Android">
55
</application>
66
</manifest>

test/MsgPack.UnitTest.Xamarin.Android/Resources/Resource.designer.cs

Lines changed: 17 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/MsgPack.UnitTest.Xamarin.iOS/MsgPack.UnitTest.Xamarin.iOS.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,7 @@
10701070
</Compile>
10711071
</ItemGroup>
10721072
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
1073+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
10731074
<ItemGroup>
10741075
<ProjectReference Include="..\..\src\MsgPack.Xamarin.iOS\MsgPack.Xamarin.iOS.csproj">
10751076
<Project>{346B55F0-94FA-4B90-9C11-06031043B685}</Project>

0 commit comments

Comments
 (0)