Merge pull request #266 from msgpack/fix/#227

Add ValueTuple support

Author: yfakariya

CHANGES.txt

@@ -728,3 +728,9 @@ Relase 1.0.0-beta2 (T.B.D.)
 
   CHANGES
   * Xamarin builds are now integrated to .NET Standard 2.0.
+
+  NEW FEATURES
+  * ValueTuple support. #277
+
+  IMPROVEMENTS
+  * System.Tuple<T> detection now ignores their declaring assemblies.

MsgPack.Common.props

@@ -43,15 +43,23 @@
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <DebugType>pdbonly</DebugType>
     <DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net35'">
+    <DebugType>pdbonly</DebugType>
     <DefineConstants>$(DefineConstants);FEATURE_POINTER_CONVERSION</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DebugType>pdbonly</DebugType>
     <DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+    <DebugType>pdbonly</DebugType>
+    <DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net47'">
+    <DebugType>pdbonly</DebugType>
     <DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
@@ -79,4 +87,7 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
     <DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
 </Project>

appveyor-debug.yml

@@ -13,8 +13,6 @@ environment:
 install:
 - cmd: >-
     cd .\build
-
-    UpdateAndroidSdk.cmd
 - ps: >-
     ./SetBuildEnv.ps1
 

appveyor-release.yml

@@ -18,8 +18,6 @@ environment:
 install:
 - cmd: >-
     cd .\build
-
-    UpdateAndroidSdk.cmd
 - ps: >-
     ./SetBuildEnv.ps1
 

build/Build.ps1

@@ -34,23 +34,8 @@ else
 		Write-Error "Failed to locate MSBuild.exe which can build .NET Core and .NET 3.5. VS2017 is required."
 		exit 1
 	}
-	
-	# Ensure Android SDK for API level 10 is installed.
-	# Thanks to https://github.com/googlesamples/android-ndk/pull/80
-
-	[string]$env:ANDROID_HOME = "$env:localappdata/Android/android-sdk/"
-
-	if ( !( Test-Path "$env:ANDROID_HOME/tools/android.bat" ) )
-	{
-		Write-Error "Android SDK is required."
-		exit 1
-	}
 
 	./SetBuildEnv.ps1
-	if ( $env:SKIP_ANDROID_SDK_UPDATE -ne "True" )
-	{
-		./UpdateAndroidSdk.cmd
-	}
 }
 
 [string]$buildConfig = 'Release'
@@ -73,6 +58,8 @@ if( $Rebuild )
 $buildOptions += "/p:Configuration=${buildConfig}"
 $restoreOptions = "/v:minimal"
 
+Write-Host "Clean up directories..."
+
 # Unity
 if ( !( Test-Path "./MsgPack-CLI" ) )
 {
@@ -103,41 +90,63 @@ if ( !( Test-Path "./MsgPack-CLI/mpu" ) )
 }
 
 # build
+
+Write-Host "Restore $sln packages..."
+
 & $msbuild /t:restore $sln $restoreOptions
 if ( $LastExitCode -ne 0 )
 {
 	Write-Error "Failed to restore $sln"
 	exit $LastExitCode
 }
 
+Write-Host "Build $sln..."
+
 & $msbuild $sln $buildOptions
 if ( $LastExitCode -ne 0 )
 {
 	Write-Error "Failed to build $sln"
 	exit $LastExitCode
 }
 
+Write-Host "Restore $slnCompat packages..."
+
 & $msbuild /t:restore $slnCompat $restoreOptions
 if ( $LastExitCode -ne 0 )
 {
 	Write-Error "Failed to restore $slnCompat"
 	exit $LastExitCode
 }
 
+Write-Host "Build $slnCompat..."
+
 & $msbuild $slnCompat $buildOptions
 if ( $LastExitCode -ne 0 )
 {
 	Write-Error "Failed to build $slnCompat"
 	exit $LastExitCode
 }
 
-& $msbuild /t:restore $slnWindows $restoreOptions
+Write-Host "Restore $slnWindows packages..."
+
+if ( $env:APPVEYOR -eq "True" )
+{
+	# Use nuget for legacy environments.
+	nuget restore $slnWindows -Verbosity quiet
+}
+else
+{
+	& $msbuild /t:restore $slnWindows $restoreOptions
+}
+
 if ( $LastExitCode -ne 0 )
 {
 	Write-Error "Failed to restore $slnWindows"
 	exit $LastExitCode
 }
 
+Write-Host "Build $slnWindows..."
+
 & $msbuild $slnWindows $buildOptions
 if ( $LastExitCode -ne 0 )
 {
@@ -147,6 +156,8 @@ if ( $LastExitCode -ne 0 )
 
 if ( $buildConfig -eq 'Release' )
 {
+	Write-Host "Build NuGet packages..."
+
 	& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /v:minimal /p:Configuration=$buildConfig /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion
 
 	Move-Item ../bin/*.nupkg ../dist/

src/MsgPack.Uwp/project.json

@@ -50,9 +50,15 @@
     "../MsgPack/Serialization/Tracer.cs"
   ],
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "System.Collections.NonGeneric": "4.0.1",
-    "System.Collections.Specialized": "4.0.1"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.3",
+    "System.Collections.NonGeneric": "4.3.0",
+    "System.Collections.Specialized": "4.3.0",
+    "System.Diagnostics.Contracts": "4.3.0",
+    "System.Net.NameResolution": "4.3.0",
+    "System.Net.Primitives": "4.3.0",
+    "System.Runtime.WindowsRuntime" : "4.3.0",
+    "System.Threading.Overlapped": "4.3.0",
+    "Microsoft.Win32.Primitives": "4.3.0"
   },
   "frameworks": {
     "uap10.0": {}