From 107a1c87b10aab1ca83244542b5b4c114572539b Mon Sep 17 00:00:00 2001 From: Johnny Z Date: Fri, 17 Mar 2017 22:30:53 +1000 Subject: [PATCH] Follow up .NET tooling to upgraded packages to latest stable version 1. Microsoft.Extensions.Configuration from 1.1.0 to 1.1.1 2. Microsoft.Extensions.Logging from 1.1.0 to 1.1.1 3. Google.Protobuf from 3.1.0 to 3.2.0 4. Microsoft.NET.Test.Sdk from 15.0.0 preview to 15.0.0 5. XUnit to 2.2.0 release 6. Moq from alpha to 4.7.1 7. NBench from 0.3.4 to 1.0.0 --- DotNetty.sln | 2 +- build.cake | 4 ++-- build.ps1 | 4 ++-- examples/Examples.Common/Examples.Common.csproj | 8 ++++---- .../DotNetty.Codecs.Protobuf.csproj | 2 +- src/DotNetty.Common/DotNetty.Common.csproj | 2 +- .../DotNetty.Buffers.Tests.csproj | 14 +++++++------- .../DotNetty.Codecs.Mqtt.Tests.csproj | 16 ++++++++-------- .../DotNetty.Codecs.Protobuf.Tests.csproj | 16 ++++++++-------- .../DotNetty.Codecs.ProtocolBuffers.Tests.csproj | 16 ++++++++-------- .../DotNetty.Codecs.Redis.Tests.csproj | 16 ++++++++-------- .../DotNetty.Codecs.Tests.csproj | 16 ++++++++-------- .../DotNetty.Common.Tests.csproj | 16 ++++++++-------- .../DotNetty.Handlers.Tests.csproj | 16 ++++++++-------- .../DotNetty.Microbench.csproj | 16 ++++++++-------- .../DotNetty.Tests.Common.csproj | 14 +++++++------- .../DotNetty.Tests.End2End.csproj | 14 +++++++------- .../DotNetty.Transport.Tests.Performance.csproj | 4 ++-- .../DotNetty.Transport.Tests.csproj | 16 ++++++++-------- 19 files changed, 106 insertions(+), 106 deletions(-) diff --git a/DotNetty.sln b/DotNetty.sln index 1db307592..e54a26986 100644 --- a/DotNetty.sln +++ b/DotNetty.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +VisualStudioVersion = 15.0.26228.9 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F5B1CA65-5852-41C6-9D6F-184A3889237B}" ProjectSection(SolutionItems) = preProject diff --git a/build.cake b/build.cake index 4871a99b2..94fc3836c 100644 --- a/build.cake +++ b/build.cake @@ -167,9 +167,9 @@ Task("Benchmark") .IsDependentOn("Compile") .Does(() => { - StartProcess(nuget.ToString() + "/nuget.exe", "install NBench.Runner -OutputDirectory tools -ExcludeVersion -Version 0.3.4"); + StartProcess(nuget.ToString() + "/nuget.exe", "install NBench.Runner -OutputDirectory tools -ExcludeVersion -Version 1.0.0"); - var libraries = GetFiles("./test/**/bin/" + configuration + "/net45/*.Performance.dll"); + var libraries = GetFiles("./test/**/bin/" + configuration + "/net452/*.Performance.dll"); CreateDirectory(outputPerfResults); foreach (var lib in libraries) diff --git a/build.ps1 b/build.ps1 index a1c0c6bfe..7bc2068b5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,6 @@ $CakeVersion = "0.17.0" -$DotNetVersion = "1.0.0-rc4-004771"; -$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1"; +$DotNetVersion = "1.0.1"; +$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.ps1"; # Make sure tools folder exists $PSScriptRoot = $pwd diff --git a/examples/Examples.Common/Examples.Common.csproj b/examples/Examples.Common/Examples.Common.csproj index 513eaade7..6c6288b95 100644 --- a/examples/Examples.Common/Examples.Common.csproj +++ b/examples/Examples.Common/Examples.Common.csproj @@ -5,10 +5,10 @@ false - - - - + + + + diff --git a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj index 664fa65a7..3c446d8b9 100644 --- a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj +++ b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/DotNetty.Common/DotNetty.Common.csproj b/src/DotNetty.Common/DotNetty.Common.csproj index 8a62757b4..4a8729ad2 100644 --- a/src/DotNetty.Common/DotNetty.Common.csproj +++ b/src/DotNetty.Common/DotNetty.Common.csproj @@ -25,7 +25,7 @@ 1.6.1 - + diff --git a/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj b/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj index 5efdfc8fd..ea9d63fa4 100644 --- a/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj +++ b/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj @@ -10,15 +10,15 @@ win-x64 - - - - + + + + - - - + + + diff --git a/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj b/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj index 2f6942b9a..c9a273583 100644 --- a/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj +++ b/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj b/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj index 07ecb8ec5..72fcbb834 100644 --- a/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj +++ b/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj b/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj index 2e6aab99c..73fbcefa2 100644 --- a/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj +++ b/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj @@ -9,18 +9,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj b/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj index 3a40bd607..cfaa82eb7 100644 --- a/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj +++ b/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj b/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj index 96c36e8ed..a01c18b59 100644 --- a/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj +++ b/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj b/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj index 20c3fa9f5..b88048213 100644 --- a/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj +++ b/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj b/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj index f3b2d3f88..e6d48ba89 100644 --- a/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj +++ b/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Microbench/DotNetty.Microbench.csproj b/test/DotNetty.Microbench/DotNetty.Microbench.csproj index 598f253fe..4ba73fcc1 100644 --- a/test/DotNetty.Microbench/DotNetty.Microbench.csproj +++ b/test/DotNetty.Microbench/DotNetty.Microbench.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + + diff --git a/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj b/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj index 5fb197aa2..68bbc48b7 100644 --- a/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj +++ b/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj @@ -13,15 +13,15 @@ win-x64 - - - - + + + + - - - + + + diff --git a/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj b/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj index 1f7f7f63d..4ecd1d852 100644 --- a/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj +++ b/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj @@ -10,15 +10,15 @@ win-x64 - - - - + + + + - - - + + + diff --git a/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj b/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj index fe988a304..70f87228a 100644 --- a/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj +++ b/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj @@ -1,11 +1,11 @@  true - net45 + net452 false - + diff --git a/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj b/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj index 35f90c8d0..53906df21 100644 --- a/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj +++ b/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj @@ -10,18 +10,18 @@ win-x64 - + - - - - + + + + - - - + + +