Skip to content

Commit 436a178

Browse files
yfakariyayfakariya
authored
Merge pull request #262 from msgpack/fix/netstandard2-aot
Integrate Xamarin build to .NET Standard 2.0 build
2 parents e28e8aa + 2ce14da commit 436a178

File tree

68 files changed

+911
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+911
-673
lines changed

‎CHANGES.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,3 +723,8 @@ Release 1.0.0-beta1 2017-10-01
723723
* Fix ByteArrayPacker throws IndexOutOfBoundException when the buffer remaining bytes is equal to packed scalar size. #252
724724
* Fix UAP build drop does not exists in nupkg. #186
725725
* Fix new unpacker cannot unpack reserved ext types.
726+
727+
Relase 1.0.0-beta2 (T.B.D.)
728+
729+
CHANGES
730+
* Xamarin builds are now integrated to .NET Standard 2.0.

‎MsgPack.Xamarin.sln‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
4+
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{60EC42E9-D79B-4ADF-8F80-4DCD580061FD}"
77
ProjectSection(SolutionItems) = preProject
@@ -172,30 +172,30 @@ Global
172172
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
173173
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
174174
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C}.Release|Mixed Platforms.ActiveCfg = Release|iPhone
175-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Any CPU.ActiveCfg = PerformanceTest|Any CPU
176-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Any CPU.Build.0 = PerformanceTest|Any CPU
177-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhone.ActiveCfg = PerformanceTest|Any CPU
178-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhone.Build.0 = PerformanceTest|Any CPU
179-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhoneSimulator.ActiveCfg = PerformanceTest|Any CPU
180-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhoneSimulator.Build.0 = PerformanceTest|Any CPU
181-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Mixed Platforms.ActiveCfg = PerformanceTest|Any CPU
182-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Mixed Platforms.Build.0 = PerformanceTest|Any CPU
183-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Any CPU.ActiveCfg = PerformanceTest|Any CPU
184-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Any CPU.Build.0 = PerformanceTest|Any CPU
185-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhone.ActiveCfg = PerformanceTest|Any CPU
186-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhone.Build.0 = PerformanceTest|Any CPU
187-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhoneSimulator.ActiveCfg = PerformanceTest|Any CPU
188-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhoneSimulator.Build.0 = PerformanceTest|Any CPU
189-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Mixed Platforms.ActiveCfg = PerformanceTest|Any CPU
190-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Mixed Platforms.Build.0 = PerformanceTest|Any CPU
191-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
192-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
193-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhone.ActiveCfg = CodeAnalysis|Any CPU
194-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhone.Build.0 = CodeAnalysis|Any CPU
195-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhoneSimulator.ActiveCfg = CodeAnalysis|Any CPU
196-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhoneSimulator.Build.0 = CodeAnalysis|Any CPU
197-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.ActiveCfg = CodeAnalysis|Any CPU
198-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU
175+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
176+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
177+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
178+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
179+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
180+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
181+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
182+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
183+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
184+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Any CPU.Build.0 = Release|Any CPU
185+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhone.ActiveCfg = Release|Any CPU
186+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhone.Build.0 = Release|Any CPU
187+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
188+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
189+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
190+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
191+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
192+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
193+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhone.ActiveCfg = Release|Any CPU
194+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhone.Build.0 = Release|Any CPU
195+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhoneSimulator.ActiveCfg = Release|Any CPU
196+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|iPhoneSimulator.Build.0 = Release|Any CPU
197+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU
198+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.Build.0 = Release|Any CPU
199199
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
200200
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|Any CPU.Build.0 = Debug|Any CPU
201201
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -204,22 +204,22 @@ Global
204204
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
205205
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
206206
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
207-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.ActiveCfg = Instrument|Any CPU
208-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.Build.0 = Instrument|Any CPU
209-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhone.ActiveCfg = Instrument|Any CPU
210-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhone.Build.0 = Instrument|Any CPU
211-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhoneSimulator.ActiveCfg = Instrument|Any CPU
212-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhoneSimulator.Build.0 = Instrument|Any CPU
213-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.ActiveCfg = Instrument|Any CPU
214-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.Build.0 = Instrument|Any CPU
215-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.ActiveCfg = PerformanceTest|Any CPU
216-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.Build.0 = PerformanceTest|Any CPU
217-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhone.ActiveCfg = PerformanceTest|Any CPU
218-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhone.Build.0 = PerformanceTest|Any CPU
219-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhoneSimulator.ActiveCfg = PerformanceTest|Any CPU
220-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhoneSimulator.Build.0 = PerformanceTest|Any CPU
221-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.ActiveCfg = PerformanceTest|Any CPU
222-
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.Build.0 = PerformanceTest|Any CPU
207+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.ActiveCfg = Release|Any CPU
208+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.Build.0 = Release|Any CPU
209+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhone.ActiveCfg = Release|Any CPU
210+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhone.Build.0 = Release|Any CPU
211+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhoneSimulator.ActiveCfg = Release|Any CPU
212+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|iPhoneSimulator.Build.0 = Release|Any CPU
213+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU
214+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU
215+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU
216+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU
217+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhone.ActiveCfg = Release|Any CPU
218+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhone.Build.0 = Release|Any CPU
219+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhoneSimulator.ActiveCfg = Release|Any CPU
220+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|iPhoneSimulator.Build.0 = Release|Any CPU
221+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU
222+
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU
223223
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|Any CPU.ActiveCfg = Release|Any CPU
224224
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|Any CPU.Build.0 = Release|Any CPU
225225
{5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|iPhone.ActiveCfg = Release|Any CPU
@@ -237,6 +237,9 @@ Global
237237
{2B75A9C8-F891-4F78-9E27-8B6FE972DE6C} = {87A17015-9338-431E-B338-57BDA03984C1}
238238
{5BCEC32E-990E-4DE5-945F-BD27326A7418} = {1BD5D488-707E-4030-8AE8-80D93D04963F}
239239
EndGlobalSection
240+
GlobalSection(ExtensibilityGlobals) = postSolution
241+
SolutionGuid = {D6D6995F-870D-4920-9CA2-42FE54F45E5E}
242+
EndGlobalSection
240243
GlobalSection(MonoDevelopProperties) = preSolution
241244
StartupItem = src\MsgPack.Xamarin.Android\MsgPack.Xamarin.Android.csproj
242245
Policies = $0

‎build/Version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0-beta1
1+
1.0.0-beta2

‎src/MsgPack/MessagePackObject.Utilities.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ private static void ToStringBinary( StringBuilder buffer, bool isJson, MessagePa
922922
}
923923

924924
// Lifting support.
925-
#if ( NETSTANDARD1_1 || NETSTANDARD1_3 ) && !XAMARIN
925+
#if ( NETSTANDARD1_1 || NETSTANDARD1_3 )
926926
switch ( NetStandardCompatibility.GetTypeCode( type ) )
927927
#else
928928
switch ( Type.GetTypeCode( type ) )

‎src/MsgPack/MessagePackObjectDictionary.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ private static MessagePackObject ValidateObjectArgument( object obj, string para
481481
return new MessagePackObject( asMessagePackString );
482482
}
483483

484-
#if ( NETSTANDARD1_1 || NETSTANDARD1_3 ) && !XAMARIN
484+
#if ( NETSTANDARD1_1 || NETSTANDARD1_3 )
485485
switch ( NetStandardCompatibility.GetTypeCode( value.GetType() ) )
486486
#else
487487
switch ( Type.GetTypeCode( value.GetType() ) )

‎src/MsgPack/MsgPack.csproj‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,23 @@
44
<ProjectGuid>{5BCEC32E-990E-4DE5-945F-BD27326A7418}</ProjectGuid>
55
<OutputType>Library</OutputType>
66
<AssemblyName>MsgPack</AssemblyName>
7-
<TargetFrameworks>net46;net35;net45;netstandard1.1;netstandard1.3;netstandard2.0;MonoAndroid10;Xamarin.iOS10</TargetFrameworks>
7+
<TargetFrameworks>net46;net35;net45;netstandard1.1;netstandard1.3;netstandard2.0;</TargetFrameworks>
88
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
99
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
1010
<NuspecFile>$(SolutionDir)/msgpack.nuspec</NuspecFile>
1111
</PropertyGroup>
1212
<Import Project="..\..\MsgPack.Common.props" />
13-
<PropertyGroup Condition="'$(Configuration)' == 'Release' and ('$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10')">
14-
<OutputPath>..\..\bin\$(TargetFramework)\</OutputPath>
15-
</PropertyGroup>
16-
<PropertyGroup Condition="'$(Configuration)' == 'Release' and '$(TargetFramework)' != 'MonoAndroid10' and '$(TargetFramework)' != 'Xamarin.iOS10'">
13+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
1714
<OutputPath>..\..\bin\</OutputPath>
1815
</PropertyGroup>
19-
<PropertyGroup Condition="'$(Configuration)' != 'Release' and ('$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10')">
20-
<OutputPath>bin\$(Configuration)\$(TargetFramework)\</OutputPath>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="'$(Configuration)' != 'Release' and '$(TargetFramework)' != 'MonoAndroid10' and '$(TargetFramework)' != 'Xamarin.iOS10'">
16+
<PropertyGroup Condition="'$(Configuration)' != 'Release'">
2317
<OutputPath>bin\$(Configuration)\</OutputPath>
2418
</PropertyGroup>
25-
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10'">
26-
<!-- Workaround for VS 15.3 -->
27-
<NuGetTargetMoniker>MonoAndroid,Version=1.0</NuGetTargetMoniker>
28-
</PropertyGroup>
2919
<ItemGroup Condition="'$(TargetFramework)' != 'uap10.0' and '$(TargetFramework)' != 'netstandard1.1' and '$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'netstandard2.0'">
3020
<Reference Include="System" />
3121
<Reference Include="System.Core" />
3222
<Reference Include="System.Numerics" Condition="'$(TargetFramework)' != 'net35'" />
3323
</ItemGroup>
34-
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10'">
35-
<Reference Include="Mono.Android" />
36-
</ItemGroup>
37-
<ItemGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
38-
<Reference Include="Xamarin.iOS" />
39-
</ItemGroup>
4024
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3'">
4125
<PackageReference Include="System.Collections" Version="4.0.11" />
4226
<PackageReference Include="System.Collections.Concurrent" Version="4.0.12" />
@@ -446,7 +430,7 @@
446430
<Compile Remove="Serialization\DefaultSerializers\SimdTypeSerializers.cs" />
447431
<Compile Remove="Serialization\DefaultSerializers\System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs" />
448432
</ItemGroup>
449-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
433+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'uap10.0'">
450434
<Compile Remove="Serialization\CodeDomSerializers\*.*" />
451435
<Compile Remove="Serialization\CodeGenerationSink.cs" />
452436
<Compile Remove="Serialization\DependentAssemblyManager.cs" />
@@ -469,7 +453,7 @@
469453
<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0'">
470454
<Compile Remove="UnsafeNativeMethods.cs" />
471455
</ItemGroup>
472-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
456+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'uap10.0'">
473457
<Compile Remove="Serialization\AbstractSerializers\**\*.*" />
474458
<Compile Remove="Serialization\DefaultSerializers\System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs" />
475459
<Compile Remove="Serialization\EmittingSerializers\**\*.*" />
@@ -500,14 +484,7 @@
500484
<Compile Remove="Serialization\EmittingSerializers\AssemblyBuilderCodeGenerationContext.cs" />
501485
<Compile Remove="Serialization\DefaultSerializers\System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs" />
502486
</ItemGroup>
503-
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
504-
<Compile Remove="Serialization\DefaultSerializers\FileTimeMessagePackSerializerProvider.cs" />
505-
<Compile Remove="Serialization\DefaultSerializers\NativeFileTimeMessagePackSerializer.cs" />
506-
<Compile Remove="Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs" />
507-
<Compile Remove="Serialization\DefaultSerializers\TimestampFileTimeMessagePackSerializer.cs" />
508-
<Compile Remove="Serialization\ReflectionExtensions.ConstructorDelegate.cs" />
509-
</ItemGroup>
510-
<ItemGroup Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
487+
<ItemGroup Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'uap10.0'">
511488
<Compile Include="AsyncReadResult.cs" />
512489
<Compile Include="AsyncReadResult`1.cs" />
513490
<Compile Include="TaskAugument.cs" />
@@ -520,10 +497,4 @@
520497
<!-- For VS, use $(MSBuildExtensionsPath) -->
521498
<VSMSBuildExtensionsPath>$(MSBuildExtensionsPath)</VSMSBuildExtensionsPath>
522499
</PropertyGroup>
523-
<PropertyGroup Condition="'$(XamarinMSBuildExtensionsPath)' == ''">
524-
<XamarinMSBuildExtensionsPath>$(VSMSBuildExtensionsPath)</XamarinMSBuildExtensionsPath>
525-
</PropertyGroup>
526-
<Import Project="$(VSMSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" Condition="'$(TargetFramework)' == 'uap10.0'" />
527-
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" Condition="'$(TargetFramework)' == 'MonoAndroid10' and $(SkipXamarin) != 'true'" />
528-
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" Condition="'$(TargetFramework)' == 'Xamarin.iOS10' and $(SkipXamarin) != 'true'" />
529500
</Project>

‎src/MsgPack/Properties/AssemblyInfo.cs‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -34,15 +34,8 @@
3434
".NET Standard 1.1"
3535
#elif NETSTANDARD1_3
3636
".NET Standard 1.3"
37-
#elif XAMARIN
38-
"Xamarin for " +
39-
#if __ANDROID__
40-
"Android"
41-
#elif __IOS__
42-
"iOS"
43-
#else
44-
#error Unexpected Xamarin!
45-
#endif // XAMARIN
37+
#elif NETSTANDARD2_0
38+
".NET Standard 2.0"
4639
#else
4740
".NET Framework 4.6"
4841
#endif // NET4_5..
@@ -65,12 +58,8 @@
6558
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
6659
#endif // NET35
6760
[assembly: InternalsVisibleTo( "MsgPack.UnitTest.BclExtensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
68-
#if XAMARIN
69-
#if __ANDROID__
70-
[assembly:InternalsVisibleTo( "MsgPack.UnitTest.Xamarin.Android" )]
71-
#endif // __ANDROID__
72-
#if __IOS__
73-
[assembly:InternalsVisibleTo( "MsgPackUnitTestXamariniOS" )]
74-
#endif // __IOS__
75-
#endif // XAMARIN
61+
#if NETSTANDARD1_3 || NETSTANDARD2_0
62+
[assembly:InternalsVisibleTo( "MsgPack.UnitTest.Xamarin.Android, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
63+
[assembly:InternalsVisibleTo( "MsgPackUnitTestXamariniOS, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
64+
#endif // NETSTANDARD1_3 || NETSTANDARD2_0
7665
#endif // DEBUG || PERFORMANCE_TEST

0 commit comments

Comments
 (0)