Merge pull request #74 from progaudi/migrate/netcoreapp2.0

aensidhe · web-flow · commit cabc70aa3396 · 2017-08-29T20:05:32.000+03:00
Migrate/netcoreapp2.0
diff --git a/.dockerignore b/.dockerignore
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ Debug
 Release
 .idea
 bin
-obj
+obj
+/.vs
diff --git a/.travis.yml b/.travis.yml
@@ -3,21 +3,17 @@ matrix:
     - os: linux # Ubuntu 14.04
       dist: trusty
       sudo: required
-    - os: linux # Ubuntu 14.04
-      dist: trusty
-      env: BUILD_DOCKER=true
     - os: osx # OSX 10.12
       osx_image: xcode8.2
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_DOCKER" != true ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./scripts/mac-prereqs.sh ; fi
 
 install:
-  - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/dotnet-install.sh ; fi
-  - if [[ "$BUILD_DOCKER" != true ]]; then PATH=$PATH:$HOME/.dotnet && export PATH ; fi
+  - ./scripts/dotnet-install.sh
+  - PATH=$PATH:$HOME/.dotnet && export PATH
 
 script:
-  - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/build-netcore.sh ; fi
-  - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/test-netcore.sh ; fi
-  - if [[ "$BUILD_DOCKER" == true  ]]; then docker build . ; fi
+  - ./scripts/build-netcore.sh
+  - ./scripts/test-netcore.sh
diff --git a/Dockerfile b/Dockerfile
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "1.0.3"
+    "version": "2.0.0"
   }
 }
diff --git a/msgpack.sln b/msgpack.sln
@@ -1,17 +1,18 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{024302AB-8703-44C5-A563-05F893163AF0}"
 	ProjectSection(SolutionItems) = preProject
 		.travis.yml = .travis.yml
+		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msgpack.light", "src\msgpack.light\msgpack.light.csproj", "{04D4E761-F756-43D8-B31C-79B1B0671243}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msgpack.light", "src\msgpack.light\msgpack.light.csproj", "{04D4E761-F756-43D8-B31C-79B1B0671243}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msgpack.light.tests", "tests\msgpack.light.tests\msgpack.light.tests.csproj", "{4DD9051D-548F-4E11-86EA-746F443CEA67}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msgpack.light.tests", "tests\msgpack.light.tests\msgpack.light.tests.csproj", "{4DD9051D-548F-4E11-86EA-746F443CEA67}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msgpack.light.benchmark", "src\msgpack.light.benchmark\msgpack.light.benchmark.csproj", "{62C5CC43-A029-4529-BBCA-6D8CC69E6B11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msgpack.light.benchmark", "src\msgpack.light.benchmark\msgpack.light.benchmark.csproj", "{62C5CC43-A029-4529-BBCA-6D8CC69E6B11}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,4 +36,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E31E76EC-C676-45F6-BFBD-448D4436C3C3}
+	EndGlobalSection
 EndGlobal
diff --git a/scripts/build-netcore.sh b/scripts/build-netcore.sh
@@ -8,7 +8,9 @@ cd ..
 
 dotnet restore
 dotnet build -c Release -f netstandard1.1 src/msgpack.light/msgpack.light.csproj
+dotnet build -c Release -f netstandard2.0 src/msgpack.light/msgpack.light.csproj
 dotnet build -c Release -f netcoreapp1.0 tests/msgpack.light.tests/msgpack.light.tests.csproj
 dotnet build -c Release -f netcoreapp1.1 tests/msgpack.light.tests/msgpack.light.tests.csproj
+dotnet build -c Release -f netcoreapp2.0 tests/msgpack.light.tests/msgpack.light.tests.csproj
 
 popd
diff --git a/scripts/dotnet-install.sh b/scripts/dotnet-install.sh
@@ -4,5 +4,5 @@ set -ev
 
 curl -o ./dotnet-install.sh -fL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh
 chmod +x ./dotnet-install.sh
-version=$(jq -r .sdk.version global.json)
-./dotnet-install.sh --version $version
+./dotnet-install.sh --version 1.0.4
+./dotnet-install.sh --version 2.0.0
diff --git a/scripts/test-netcore.sh b/scripts/test-netcore.sh
@@ -8,5 +8,6 @@ cd ..
 
 dotnet test -c Release -f netcoreapp1.0 --no-build tests/msgpack.light.tests/msgpack.light.tests.csproj -- -parallel assemblies
 dotnet test -c Release -f netcoreapp1.1 --no-build tests/msgpack.light.tests/msgpack.light.tests.csproj -- -parallel assemblies
+dotnet test -c Release -f netcoreapp2.0 --no-build tests/msgpack.light.tests/msgpack.light.tests.csproj -- -parallel assemblies
 
 popd
diff --git a/src/msgpack.light.benchmark/BeerDeserializeBenchmark.cs b/src/msgpack.light.benchmark/BeerDeserializeBenchmark.cs
@@ -3,6 +3,8 @@
 
 using BenchmarkDotNet.Attributes;
 
+using MessagePack;
+
 using ProGaudi.MsgPack.Light.Benchmark.Data;
 
 namespace ProGaudi.MsgPack.Light.Benchmark
@@ -61,6 +63,19 @@ public void MPCli_Array()
             var beer = Serializers.MsgPack.GetSerializer<Beer>().UnpackSingleObject(_msgPackArray);
         }
 
+        [Benchmark]
+        public void MPSharp_Stream()
+        {
+            _msgPack.Seek(0, SeekOrigin.Begin);
+            var beer = MessagePackSerializer.Deserialize<Beer>(_msgPack);
+        }
+
+        [Benchmark]
+        public void MPSharp_Array()
+        {
+            var beer = MessagePackSerializer.Deserialize<Beer>(_msgPackArray);
+        }
+
         [Benchmark]
         public void MPLight_Stream()
         {
@@ -112,18 +127,5 @@ public void MPLightH_Array_AutoMap()
         {
             var beer = MsgPackSerializer.Deserialize<Beer>(_msgPackArray, Serializers.MsgPackLightMapAutoGeneration);
         }
-
-        [Benchmark]
-        public void MPLightH_Stream_AutoArray()
-        {
-            _msgPack.Seek(0, SeekOrigin.Begin);
-            var beer = MsgPackSerializer.Deserialize<Beer>(_msgPack, Serializers.MsgPackLightArrayAutoGeneration);
-        }
-
-        [Benchmark]
-        public void MPLightH_Array_AutoArray()
-        {
-            var beer = MsgPackSerializer.Deserialize<Beer>(_msgPackArray, Serializers.MsgPackLightArrayAutoGeneration);
-        }
     }
 }
diff --git a/src/msgpack.light.benchmark/BeerListDeserializeBenchmark.cs b/src/msgpack.light.benchmark/BeerListDeserializeBenchmark.cs
@@ -119,18 +119,5 @@ public void MPLightH_Array_AutoMap()
         {
             var beer = MsgPackSerializer.Deserialize<Beer[]>(_msgPackArray, Serializers.MsgPackLightMapAutoGeneration);
         }
-
-        [Benchmark]
-        public void MPLightH_Stream_AutoArray()
-        {
-            _msgPack.Seek(0, SeekOrigin.Begin);
-            var beer = MsgPackSerializer.Deserialize<Beer[]>(_msgPack, Serializers.MsgPackLightArrayAutoGeneration);
-        }
-
-        [Benchmark]
-        public void MPLightH_Array_AutoArray()
-        {
-            var beer = MsgPackSerializer.Deserialize<Beer[]>(_msgPackArray, Serializers.MsgPackLightArrayAutoGeneration);
-        }
     }
 }
diff --git a/src/msgpack.light.benchmark/BeerListSerializeBenchmark.cs b/src/msgpack.light.benchmark/BeerListSerializeBenchmark.cs
@@ -100,18 +100,5 @@ public void MPLightH_Array_AutoMap()
         {
             var bytes = MsgPackSerializer.Serialize(BenchmarkData.Belgium, Serializers.MsgPackLightMapAutoGeneration);
         }
-
-        [Benchmark]
-        public void MPLightH_Stream_AutoArray()
-        {
-            var memoryStream = new MemoryStream();
-            MsgPackSerializer.Serialize(BenchmarkData.Belgium, memoryStream, Serializers.MsgPackLightArrayAutoGeneration);
-        }
-
-        [Benchmark]
-        public void MPLightH_Array_AutoArray()
-        {
-            var bytes = MsgPackSerializer.Serialize(BenchmarkData.Belgium, Serializers.MsgPackLightArrayAutoGeneration);
-        }
     }
 }
diff --git a/src/msgpack.light.benchmark/BeerSerializeBenchmark.cs b/src/msgpack.light.benchmark/BeerSerializeBenchmark.cs
@@ -4,6 +4,8 @@
 
 using BenchmarkDotNet.Attributes;
 
+using MessagePack;
+
 using ProGaudi.MsgPack.Light.Benchmark.Data;
 
 namespace ProGaudi.MsgPack.Light.Benchmark
@@ -52,6 +54,25 @@ internal void MsgPackSerialize(MemoryStream memoryStream)
             Serializers.MsgPack.GetSerializer<Beer>().Pack(memoryStream, _testBeer);
         }
 
+        [Benchmark]
+        public void MPSharp_Stream()
+        {
+            var stream = new MemoryStream();
+            MessagePackSerializer.Serialize(stream, _testBeer);
+        }
+
+        [Benchmark]
+        public void MPSharp_Array()
+        {
+            MessagePackSerializer.Serialize(_testBeer);
+        }
+
+        [Benchmark]
+        public void MPSharp_Array_Unsafe()
+        {
+            MessagePackSerializer.SerializeUnsafe(_testBeer);
+        }
+
         [Benchmark]
         public void MPCli_Array()
         {
diff --git a/src/msgpack.light.benchmark/BenchmarkConfig.cs b/src/msgpack.light.benchmark/BenchmarkConfig.cs
@@ -1,20 +1,38 @@
+using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Environments;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Exporters.Csv;
 using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Order;
+using BenchmarkDotNet.Reports;
+using BenchmarkDotNet.Toolchains.CsProj;
 
 namespace ProGaudi.MsgPack.Light.Benchmark
 {
     internal class BenchmarkConfig : ManualConfig
     {
         public BenchmarkConfig()
         {
-            Add(MarkdownExporter.GitHub);
-            Add(CsvMeasurementsExporter.Default);
+            Add(StatisticColumn.P95);
+
             Add(MemoryDiagnoser.Default);
 
-            Add(Job.Clr, Job.Core);
+            // https://github.com/dotnet/BenchmarkDotNet/issues/500
+            //Add(Job.ShortRun.With(Jit.LegacyJit).With(Platform.X86).With(Runtime.Clr));
+            //Add(Job.ShortRun.With(Jit.LegacyJit).With(Platform.X64).With(Runtime.Clr));
+
+            //Add(Job.ShortRun.With(Jit.RyuJit).With(Platform.X64).With(Runtime.Clr));
+
+            // RyuJit for .NET Core 1.1
+            Add(Job.Default.With(Jit.RyuJit).With(Platform.X64).With(Runtime.Core).With(CsProjCoreToolchain.NetCoreApp11).WithId("netcore1.1"));
+
+            // RyuJit for .NET Core 2.0
+            Add(Job.Default.With(Jit.RyuJit).With(Platform.X64).With(Runtime.Core).With(CsProjCoreToolchain.NetCoreApp20).WithId("netcore2.0"));
+
+            Add(MarkdownExporter.GitHub);
+            Add(CsvMeasurementsExporter.Default);
         }
     }
 }
diff --git a/src/msgpack.light.benchmark/Data/Beer.cs b/src/msgpack.light.benchmark/Data/Beer.cs
@@ -1,7 +1,10 @@
 ﻿using System.Collections.Generic;
 
+using MessagePack;
+
 namespace ProGaudi.MsgPack.Light.Benchmark.Data
 {
+    [MessagePackObject(true)]
     public class Beer
     {
         [MsgPackMapElement(nameof(Brand))]
diff --git a/src/msgpack.light.benchmark/msgpack.light.benchmark.csproj b/src/msgpack.light.benchmark/msgpack.light.benchmark.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>msgpack.light.benchmark Console Application</Description>
     <Authors>aensidhe</Authors>
-    <TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>msgpack.light.benchmark</AssemblyName>
     <RootNamespace>ProGaudi.MsgPack.Light.Benchmark</RootNamespace>
     <OutputType>Exe</OutputType>
@@ -19,9 +19,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.3" />
-    <PackageReference Include="MsgPack.Cli" Version="0.8.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.9" />
+    <PackageReference Include="MessagePack" Version="1.6.0.1" />
+    <PackageReference Include="MsgPack.Cli" Version="0.9.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/msgpack.light/msgpack.light.csproj b/src/msgpack.light/msgpack.light.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <Description>Lightweight msgpack serialization library</Description>
-    <TargetFrameworks>net45;net46;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net45;net46;netstandard1.1;netstandard2.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyTitle>msgpack.light</AssemblyTitle>
     <RootNamespace>ProGaudi.MsgPack.Light</RootNamespace>
@@ -19,10 +19,10 @@
     <Company>progaudi</Company>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 </Project>
diff --git a/tests/msgpack.light.tests/msgpack.light.tests.csproj b/tests/msgpack.light.tests/msgpack.light.tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Tests for MsgPack.Light library</Description>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net46;netcoreapp1.0;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
     <AssemblyName>msgpack.light.tests</AssemblyName>
     <RootNamespace>ProGaudi.MsgPack.Light.Tests</RootNamespace>
@@ -15,16 +15,15 @@
     <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>true</GenerateAssemblyCopyrightAttribute>
     <ProjectGuid>{4DD9051D-548F-4E11-86EA-746F443CEA67}</ProjectGuid>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.7.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Moq" Version="4.7.99" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Shouldly" Version="2.8.2" />
+    <PackageReference Include="Shouldly" Version="2.8.3" />
     <ProjectReference Include="..\..\src\msgpack.light\msgpack.light.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>

-Original file line number
+Diff line change
 Release
 .idea
 bin
 -obj
 +obj
 +/.vs
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "1.0.3"`
	`3`	`+ "version": "2.0.0"`
`4`	`4`	`}`
`5`	`5`	`}`