Skip to content

Commit 22828a6

Browse files
authored
Merge pull request #255 from msgpack/wip/netstandard2
2 parents 8e14d41 + c160d4b commit 22828a6

File tree

554 files changed

+4247
-8633
lines changed

Some content is hidden

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

554 files changed

+4247
-8633
lines changed

.nuget/NuGet.exe

1010 KB
Binary file not shown.

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,3 +701,5 @@ Release 0.9.0 2017-8-26
701701
* Fix enum serialization throws NullReferenceException in Unity. Issue #215.
702702
* Fix MessagePackSerializer.Capability does not work correctly in Unity.
703703
* Fix polymorphic serializer error in Unity.
704+
705+
Release 1.0.0-beta1 T.B.D.

Directory.Build.props

716 Bytes
Binary file not shown.

MsgPack.Common.props

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<AppDesignerFolder>Properties</AppDesignerFolder>
5+
<RootNamespace>MsgPack</RootNamespace>
6+
<DefineConstants>TRACE</DefineConstants>
7+
<ErrorReport>prompt</ErrorReport>
8+
<WarningLevel>4</WarningLevel>
9+
<PlatformTarget>AnyCPU</PlatformTarget>
10+
<Prefer32Bit>false</Prefer32Bit>
11+
<AssemblyOriginatorKeyFile>$(SolutionDir)\src\MsgPack.snk</AssemblyOriginatorKeyFile>
12+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
13+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
14+
<SignAssembly>true</SignAssembly>
15+
<DebugType>portable</DebugType>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>$(DefineConstants);DEBUG;SKIP_LARGE_TEST</DefineConstants>
22+
</PropertyGroup>
23+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
24+
<Optimize>true</Optimize>
25+
<OutputPath>bin\Release\</OutputPath>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)' == 'Instrument'">
28+
<OutputPath>bin\Instrument\</OutputPath>
29+
<Optimize>true</Optimize>
30+
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
31+
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
32+
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU'">
34+
<OutputPath>bin\CodeAnalysis\</OutputPath>
35+
<Optimize>true</Optimize>
36+
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
37+
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
40+
<SignAssembly>false</SignAssembly>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
46+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(TargetFramework)' == 'net35'">
49+
<DefineConstants>$(DefineConstants);FEATURE_POINTER_CONVERSION</DefineConstants>
50+
</PropertyGroup>
51+
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
52+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION</DefineConstants>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
55+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
56+
</PropertyGroup>
57+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
58+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netcoreapp1.0'">
61+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY</DefineConstants>
62+
</PropertyGroup>
63+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'">
64+
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
67+
<DefineConstants>$(DefineConstants);__MOBILE__;AOT;XAMARIN;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10'">
70+
<DefineConstants>$(DefineConstants);__ANDROID__</DefineConstants>
71+
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
72+
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
75+
<DefineConstants>$(DefineConstants);__IOS__</DefineConstants>
76+
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
77+
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
80+
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT</DefineConstants>
81+
</PropertyGroup>
82+
</Project>

0 commit comments

Comments
 (0)