Skip to content

Commit dd133d1

Browse files
committed
Migrate Xamarin projects.
1 parent f59cdd1 commit dd133d1

11 files changed

Lines changed: 151 additions & 1715 deletions

File tree

MsgPack.Xamarin.sln

Lines changed: 132 additions & 66 deletions
Large diffs are not rendered by default.

Sync.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,26 +72,6 @@
7272
<Exclude File="*.ttinclude" />
7373
</Project>
7474

75-
<!-- TOOD: should be project.json -->
76-
<Project Name="MsgPack.Xamarin.iOS" Base="MsgPack.Uwp">
77-
<Preserve Path="Properties\AssemblyInfo.cs" />
78-
<Preserve Path="UnsafeNativeMethods.cs" />
79-
<Exclude Path="Serialization\DefaultSerializers\FileTimeMessagePackSerializerProvider.cs" />
80-
<Exclude Path="Serialization\DefaultSerializers\NativeFileTimeMessagePackSerializer.cs" />
81-
<Exclude Path="Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs" />
82-
<Exclude Path="Serialization\DefaultSerializers\SimdTypeSerializers.cs" />
83-
<Exclude Path="Serialization\ReflectionExtensions.ConstructorDelegate.cs" />
84-
<Exclude File="*.snk" />
85-
<Exclude Path="BufferedStream.cs" />
86-
<Exclude Path="NetStandardCompatibility.cs" />
87-
<Exclude Path="project.json" />
88-
</Project>
89-
90-
<!-- TOOD: should be project.json -->
91-
<Project Name="MsgPack.Xamarin.Android" Base="MsgPack.Xamarin.iOS">
92-
<Preserve Path="Properties\AssemblyInfo.cs" />
93-
</Project>
94-
9575
<Project Name="MsgPack.Unity.Full" Base="MsgPack.Xamarin.iOS">
9676
<Preserve Path="Properties\AssemblyInfo.cs" />
9777
<Preserve Path="Serialization\AotHelper*.tt" />

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

Lines changed: 0 additions & 771 deletions
This file was deleted.

src/MsgPack.Xamarin.Android/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/MsgPack.Xamarin.Android/Resources/Resource.designer.cs

Whitespace-only changes.

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

Lines changed: 0 additions & 768 deletions
This file was deleted.

src/MsgPack.Xamarin.iOS/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/MsgPack/MsgPack.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
4343
<DocumentationFile>$(OutputPath)\MsgPack.XML</DocumentationFile>
44+
<SignAssembly>false</SignAssembly>
4445
</PropertyGroup>
4546
<PropertyGroup Condition="'$(TargetFramework)' != 'MonoAndroid10' and '$(TargetFramework)' != 'Xamarin.iOS10'">
4647
<DocumentationFile>$(OutputPath)\$(TargetFramework)\MsgPack.XML</DocumentationFile>

src/MsgPack/Properties/AssemblyInfo.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
[assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
5858
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
5959
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.BclExtensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
60-
#endif
60+
#if XAMARIN
61+
#if __ANDROID__
62+
[assembly:InternalsVisibleTo( "MsgPack.UnitTest.Xamarin.Android" )]
63+
#endif // __ANDROID__
64+
#if __IOS__
65+
[assembly:InternalsVisibleTo( "MsgPackUnitTestXamariniOS" )]
66+
#endif // __IOS__
67+
#endif // XAMARIN
68+
#endif // DEBUG || PERFORMANCE_TEST
6169

6270

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@
5454
<AndroidResource Include="Resources\drawable\Icon.png" />
5555
</ItemGroup>
5656
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
57-
<ItemGroup>
58-
<ProjectReference Include="..\..\src\MsgPack.Xamarin.Android\MsgPack.Xamarin.Android.csproj">
59-
<Project>{A6210C9C-1614-46C5-97B2-6A37032AF143}</Project>
60-
<Name>MsgPack.Xamarin.Android</Name>
61-
</ProjectReference>
62-
</ItemGroup>
6357
<ItemGroup>
6458
<None Include="..\..\src\MsgPack.snk">
6559
<Link>MsgPack.snk</Link>
@@ -1851,4 +1845,10 @@
18511845
<Link>gen\_ReadMe.txt</Link>
18521846
</Content>
18531847
</ItemGroup>
1848+
<ItemGroup>
1849+
<ProjectReference Include="..\..\src\MsgPack\MsgPack.csproj">
1850+
<Project>{5bcec32e-990e-4de5-945f-bd27326a7418}</Project>
1851+
<Name>MsgPack</Name>
1852+
</ProjectReference>
1853+
</ItemGroup>
18541854
</Project>

0 commit comments

Comments
 (0)