diff --git a/build.cake b/build.cake index 1d52a46..e08389e 100644 --- a/build.cake +++ b/build.cake @@ -22,7 +22,7 @@ var csProjectFiles = GetFiles("./src/**/*.csproj"); var nuget = Directory(".nuget"); var output = Directory("build"); var outputBinaries = output + Directory("binaries"); -var outputBinariesNet451 = outputBinaries + Directory("net451"); +var outputBinariesNet45 = outputBinaries + Directory("net45"); var outputBinariesNetstandard = outputBinaries + Directory("netstandard1.3"); var outputPackages = output + Directory("packages"); var outputNuGet = output + Directory("nuget"); @@ -36,7 +36,7 @@ Task("Clean") // Clean artifact directories. CleanDirectories(new DirectoryPath[] { output, outputBinaries, outputPackages, outputNuGet, - outputBinariesNet451, outputBinariesNetstandard + outputBinariesNet45, outputBinariesNetstandard }); if(!skipClean) { @@ -169,7 +169,7 @@ Task("Benchmark") { StartProcess(nuget.ToString() + "/nuget.exe", "install NBench.Runner -OutputDirectory tools -ExcludeVersion -Version 0.3.4"); - var libraries = GetFiles("./test/**/bin/" + configuration + "/net451/*.Performance.dll"); + var libraries = GetFiles("./test/**/bin/" + configuration + "/net45/*.Performance.dll"); CreateDirectory(outputPerfResults); foreach (var lib in libraries) diff --git a/src/DotNetty.Buffers/DotNetty.Buffers.csproj b/src/DotNetty.Buffers/DotNetty.Buffers.csproj index ece8e44..970f520 100644 --- a/src/DotNetty.Buffers/DotNetty.Buffers.csproj +++ b/src/DotNetty.Buffers/DotNetty.Buffers.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true Buffer management in DotNetty Copyright © Microsoft Corporation @@ -28,7 +28,7 @@ - + diff --git a/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj b/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj index 6668105..9bd1540 100644 --- a/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj +++ b/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Codecs.Mqtt MQTT codec for DotNetty @@ -32,7 +32,7 @@ - + diff --git a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj index 47f3876..664fa65 100644 --- a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj +++ b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Codecs.Protobuf Protobuf Proto3 codec for DotNetty @@ -35,7 +35,7 @@ - + diff --git a/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj b/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj index 9e91fc6..c286e6f 100644 --- a/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj +++ b/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj @@ -1,7 +1,7 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Codecs.ProtocolBuffers ProtocolBuffers Proto2 codec for DotNetty @@ -38,7 +38,7 @@ - + diff --git a/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj b/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj index aebb8a9..c4adeea 100644 --- a/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj +++ b/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Codecs.Redis Redis codec for DotNetty @@ -32,7 +32,7 @@ - + diff --git a/src/DotNetty.Codecs/DotNetty.Codecs.csproj b/src/DotNetty.Codecs/DotNetty.Codecs.csproj index c216355..a4a88f1 100644 --- a/src/DotNetty.Codecs/DotNetty.Codecs.csproj +++ b/src/DotNetty.Codecs/DotNetty.Codecs.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Codecs General purpose codecs for DotNetty @@ -33,7 +33,7 @@ - + diff --git a/src/DotNetty.Common/DotNetty.Common.csproj b/src/DotNetty.Common/DotNetty.Common.csproj index 560a5eb..8a62757 100644 --- a/src/DotNetty.Common/DotNetty.Common.csproj +++ b/src/DotNetty.Common/DotNetty.Common.csproj @@ -1,7 +1,7 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Common DotNetty common routines @@ -31,7 +31,7 @@ - + diff --git a/src/DotNetty.Handlers/DotNetty.Handlers.csproj b/src/DotNetty.Handlers/DotNetty.Handlers.csproj index 5c19b18..de41447 100644 --- a/src/DotNetty.Handlers/DotNetty.Handlers.csproj +++ b/src/DotNetty.Handlers/DotNetty.Handlers.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Handlers Application handlers for DotNetty @@ -33,7 +33,7 @@ - + diff --git a/src/DotNetty.Transport/DotNetty.Transport.csproj b/src/DotNetty.Transport/DotNetty.Transport.csproj index ce9a997..a0998b5 100644 --- a/src/DotNetty.Transport/DotNetty.Transport.csproj +++ b/src/DotNetty.Transport/DotNetty.Transport.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net451 + netstandard1.3;net45 true DotNetty.Transport Transport model in DotNetty @@ -35,7 +35,7 @@ - + diff --git a/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj b/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj index 603a7a4..5efdfc8 100644 --- a/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj +++ b/test/DotNetty.Buffers.Tests/DotNetty.Buffers.Tests.csproj @@ -1,21 +1,21 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + 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 8bfe729..2f6942b 100644 --- a/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj +++ b/test/DotNetty.Codecs.Mqtt.Tests/DotNetty.Codecs.Mqtt.Tests.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - + 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 75b1d06..07ecb8e 100644 --- a/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj +++ b/test/DotNetty.Codecs.Protobuf.Tests/DotNetty.Codecs.Protobuf.Tests.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - + 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 41910af..2e6aab9 100644 --- a/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj +++ b/test/DotNetty.Codecs.ProtocolBuffers.Tests/DotNetty.Codecs.ProtocolBuffers.Tests.csproj @@ -1,11 +1,11 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false $(PackageTargetFallback);portable-net45+win8 - + win-x64 @@ -13,11 +13,11 @@ - - - + + + - + 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 e4b1065..3a40bd6 100644 --- a/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj +++ b/test/DotNetty.Codecs.Redis.Tests/DotNetty.Codecs.Redis.Tests.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj b/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj index b15cc64..96c36e8 100644 --- a/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj +++ b/test/DotNetty.Codecs.Tests/DotNetty.Codecs.Tests.csproj @@ -1,22 +1,27 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 - + - - - + + + + + + + + diff --git a/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj b/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj index 609eb9b..20c3fa9 100644 --- a/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj +++ b/test/DotNetty.Common.Tests/DotNetty.Common.Tests.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj b/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj index d6b313f..f3b2d3f 100644 --- a/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj +++ b/test/DotNetty.Handlers.Tests/DotNetty.Handlers.Tests.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/test/DotNetty.Microbench/DotNetty.Microbench.csproj b/test/DotNetty.Microbench/DotNetty.Microbench.csproj index 46022a2..598f253 100644 --- a/test/DotNetty.Microbench/DotNetty.Microbench.csproj +++ b/test/DotNetty.Microbench/DotNetty.Microbench.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - + diff --git a/test/DotNetty.Microbench/Utilities/CodeTimer.cs b/test/DotNetty.Microbench/Utilities/CodeTimer.cs index 15d4293..4a3a54b 100644 --- a/test/DotNetty.Microbench/Utilities/CodeTimer.cs +++ b/test/DotNetty.Microbench/Utilities/CodeTimer.cs @@ -39,7 +39,7 @@ namespace DotNetty.Microbench.Utilities // Get the time before returning so that any code above doesn't // impact the time. this.startTime = Stopwatch.GetTimestamp(); -#if NET451 +#if NET45 var handle = Process.GetCurrentProcess().Handle; #else var handle = Process.GetCurrentProcess().SafeHandle.DangerousGetHandle(); @@ -121,7 +121,7 @@ namespace DotNetty.Microbench.Utilities public void Dispose() { -#if NET451 +#if NET45 var handle = Process.GetCurrentProcess().Handle; #else var handle = Process.GetCurrentProcess().SafeHandle.DangerousGetHandle(); diff --git a/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj b/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj index 14de66c..5fb197a 100644 --- a/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj +++ b/test/DotNetty.Tests.Common/DotNetty.Tests.Common.csproj @@ -2,23 +2,23 @@ true false - netcoreapp1.1;net451 + netcoreapp1.1;net45 ../../DotNetty.snk true - + win-x64 - - - + + + - + diff --git a/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj b/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj index a59aac2..1f7f7f6 100644 --- a/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj +++ b/test/DotNetty.Tests.End2End/DotNetty.Tests.End2End.csproj @@ -1,20 +1,21 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 - - - + + + + - + @@ -28,4 +29,5 @@ + \ No newline at end of file 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 adbad97..fe988a3 100644 --- a/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj +++ b/test/DotNetty.Transport.Tests.Performance/DotNetty.Transport.Tests.Performance.csproj @@ -1,7 +1,7 @@  true - net451 + net45 false diff --git a/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj b/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj index 4a895e1..35f90c8 100644 --- a/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj +++ b/test/DotNetty.Transport.Tests/DotNetty.Transport.Tests.csproj @@ -1,12 +1,12 @@  true - netcoreapp1.1;net451 + netcoreapp1.1;net45 false ../../DotNetty.snk true - + win-x64 @@ -14,11 +14,11 @@ - - - + + + - +