Merge pull request #268 from msgpack/work/stabilize

Stabilize build

Author: yfakariya

CHANGES.txt

@@ -724,7 +724,7 @@ Release 1.0.0-beta1 2017-10-01
   * Fix UAP build drop does not exists in nupkg. #186
   * Fix new unpacker cannot unpack reserved ext types.
 
-Relase 1.0.0-beta2 (T.B.D.)
+Relase 1.0.0-beta2 2017-10-29
 
   CHANGES
   * Xamarin builds are now integrated to .NET Standard 2.0.
@@ -734,3 +734,5 @@ Relase 1.0.0-beta2 (T.B.D.)
 
   IMPROVEMENTS
   * System.Tuple<T> detection now ignores their declaring assemblies.
+  * Improve exception message in AOT error of Unity.
+  * .NET Standard 1.1/1.3 projects now do not depend on System.Linq.Expressions package.

MsgPack.Common.props

@@ -39,7 +39,10 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(OutputPath)' == '' and '$(TargetFramework)' == ''">
+    <DocumentationFile>$(AssemblyName).XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(OutputPath)' != '' or '$(TargetFramework)' != ''">
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">

src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj

@@ -227,12 +227,6 @@
     <Compile Include="..\MsgPack\ReflectionAbstractions.cs">
       <Link>ReflectionAbstractions.cs</Link>
     </Compile>
-    <Compile Include="..\MsgPack\Serialization\FromExpression.cs">
-      <Link>Serialization\FromExpression.cs</Link>
-    </Compile>
-    <Compile Include="..\MsgPack\Serialization\FromExpression.ToMethod.cs">
-      <Link>Serialization\FromExpression.ToMethod.cs</Link>
-    </Compile>
     <Compile Include="..\MsgPack\Serialization\Metadata\_MessagePackSerializer.cs">
       <Link>Serialization\Metadata\_MessagePackSerializer.cs</Link>
     </Compile>

src/MsgPack.Unity.Full/CorLibOnlyHelper.cs

@@ -1,4 +1,4 @@
-#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //

src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
   <Import Project="..\..\MsgPack.Common.props" />
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_MPCONTRACT;UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT</DefineConstants>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release'">

src/MsgPack.Unity/MsgPack.Unity.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
   <Import Project="..\..\MsgPack.Common.props" />
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);UNITY_IPHONE;AOT</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_MPCONTRACT;UNITY_IPHONE;AOT</DefineConstants>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release'">

src/MsgPack/BigEndianBinary.cs

@@ -1,4 +1,4 @@
-#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -23,11 +23,11 @@
 #endif
 
 using System;
-#if CORE_CLR || UNITY || NETSTANDARD1_1
+#if FEATURE_MPCONTRACT
 using Contract = MsgPack.MPContract;
 #else
 using System.Diagnostics.Contracts;
-#endif // CORE_CLR || UNITY || NETSTANDARD1_1
+#endif // FEATURE_MPCONTRACT
 
 namespace MsgPack
 {

src/MsgPack/CollectionOperation.cs

@@ -1,4 +1,4 @@
-#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -24,11 +24,11 @@
 
 using System;
 using System.Collections.Generic;
-#if CORE_CLR || UNITY || NETSTANDARD1_1
+#if FEATURE_MPCONTRACT
 using Contract = MsgPack.MPContract;
 #else
 using System.Diagnostics.Contracts;
-#endif // CORE_CLR || UNITY || NETSTANDARD1_1
+#endif // FEATURE_MPCONTRACT
 using System.Linq;
 
 namespace MsgPack

src/MsgPack/EncodingExtensions.cs

@@ -1,4 +1,4 @@
-#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -22,10 +22,10 @@
 #define UNITY
 #endif
 
-#if CORE_CLR || UNITY || NETSTANDARD1_1
+#if MPCONTRACT
 using Contract = MsgPack.MPContract;
 #else
-#endif // CORE_CLR || UNITY || NETSTANDARD1_1
+#endif // MPCONTRACT
 using System.Text;
 #if FEATURE_TAP
 #endif // FEATURE_TAP

src/MsgPack/Float32Bits.cs

@@ -1,4 +1,4 @@
-#region -- License Terms --
+#region -- License Terms --
 //
 // MessagePack for CLI
 //
@@ -23,11 +23,11 @@
 #endif
 
 using System;
-#if CORE_CLR || UNITY || NETSTANDARD1_1
+#if FEATURE_MPCONTRACT
 using Contract = MsgPack.MPContract;
 #else
 using System.Diagnostics.Contracts;
-#endif // CORE_CLR || UNITY || NETSTANDARD1_1
+#endif // FEATURE_MPCONTRACT
 using System.Runtime.InteropServices;
 
 namespace MsgPack