From a787a01a739a3b907ae7b587be254ccdccbcd1b5 Mon Sep 17 00:00:00 2001 From: Chris R Date: Tue, 6 Sep 2016 12:36:23 -0700 Subject: [PATCH 1/8] Downgrade to 1.0 dependencies --- samples/HotAddSample/project.json | 2 +- samples/SelfHostServer/project.json | 2 +- .../project.json | 4 +- src/Microsoft.Net.Http.Server/NullLogger.cs | 51 +++++++++++++++++++ .../WebListenerSettings.cs | 1 - src/Microsoft.Net.Http.Server/project.json | 4 +- .../project.json | 2 +- .../project.json | 2 +- 8 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 src/Microsoft.Net.Http.Server/NullLogger.cs diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index d6538aa090..923b80c29c 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -2,7 +2,7 @@ "version": "1.1.0-*", "dependencies": { "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "buildOptions": { "emitEntryPoint": true diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index f621b8021a..5687132a8e 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "buildOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index 56cfd2f176..43e21fe3de 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -2,8 +2,8 @@ "version": "0.2.0-*", "description": "ASP.NET 5 self-host web server.", "dependencies": { - "Microsoft.AspNetCore.Hosting": "1.1.0-*", - "Microsoft.Net.Http.Headers": "1.1.0-*", + "Microsoft.AspNetCore.Hosting": "1.0.0", + "Microsoft.Net.Http.Headers": "1.0.0", "Microsoft.Net.Http.Server": "0.2.0-*" }, "buildOptions": { diff --git a/src/Microsoft.Net.Http.Server/NullLogger.cs b/src/Microsoft.Net.Http.Server/NullLogger.cs new file mode 100644 index 0000000000..8e82046da2 --- /dev/null +++ b/src/Microsoft.Net.Http.Server/NullLogger.cs @@ -0,0 +1,51 @@ +// Copyright (c) Microsoft Open Technologies, Inc. +// All Rights Reserved +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR +// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING +// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF +// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR +// NON-INFRINGEMENT. +// See the Apache 2 License for the specific language governing +// permissions and limitations under the License. + +using System; +using Microsoft.Extensions.Logging; + +namespace Microsoft.Net.Http.Server +{ + internal class NullLogger : ILogger + { + public static readonly NullLogger Instance = new NullLogger(); + + public IDisposable BeginScope(TState state) + { + return NullDisposable.Instance; + } + + public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) + { + } + + public bool IsEnabled(LogLevel logLevel) + { + return false; + } + + private class NullDisposable : IDisposable + { + public static readonly NullDisposable Instance = new NullDisposable(); + + public void Dispose() + { + // intentionally does nothing + } + } + } +} diff --git a/src/Microsoft.Net.Http.Server/WebListenerSettings.cs b/src/Microsoft.Net.Http.Server/WebListenerSettings.cs index ce2bd122df..a952137227 100644 --- a/src/Microsoft.Net.Http.Server/WebListenerSettings.cs +++ b/src/Microsoft.Net.Http.Server/WebListenerSettings.cs @@ -17,7 +17,6 @@ using System; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; namespace Microsoft.Net.Http.Server { diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index c7083374f7..91402ad7d9 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -2,8 +2,8 @@ "version": "0.2.0-*", "description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", - "Microsoft.Extensions.Primitives": "1.1.0-*" + "Microsoft.Extensions.Logging.Abstractions": "1.0.0", + "Microsoft.Extensions.Primitives": "1.0.0" }, "buildOptions": { "allowUnsafe": true, diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index d25973f484..0da4448638 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -7,7 +7,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*", - "Microsoft.AspNetCore.Testing": "1.1.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.2.0-*" }, "frameworks": { diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 399d8dc19d..9a0a5948de 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.Net.Http.Server": "0.2.0-*", - "Microsoft.AspNetCore.Testing": "1.1.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.2.0-*" }, "frameworks": { From a526454321d6bdcc5a3ef454c72f6cd76e417813 Mon Sep 17 00:00:00 2001 From: Chris R Date: Wed, 7 Sep 2016 09:55:21 -0700 Subject: [PATCH 2/8] Raise version from 0.2.0-pre to 1.0.0-rc1 --- samples/HelloWorld/project.json | 2 +- samples/HotAddSample/project.json | 2 +- samples/SelfHostServer/project.json | 2 +- src/Microsoft.AspNetCore.Server.WebListener/project.json | 4 ++-- src/Microsoft.Net.Http.Server/project.json | 2 +- .../project.json | 2 +- test/Microsoft.Net.Http.Server.FunctionalTests/project.json | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index b63c18564c..3c539e30a1 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Net.Http.Server": "0.2.0-*" + "Microsoft.Net.Http.Server": "1.0.0-rc1-*" }, "commands": { "sample": "HelloWorld" diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index 923b80c29c..1f960ccef4 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -1,7 +1,7 @@ { "version": "1.1.0-*", "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "buildOptions": { diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 5687132a8e..52c5854dbc 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "buildOptions": { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index 43e21fe3de..dc0d01e50e 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -1,10 +1,10 @@ { - "version": "0.2.0-*", + "version": "1.0.0-rc1-*", "description": "ASP.NET 5 self-host web server.", "dependencies": { "Microsoft.AspNetCore.Hosting": "1.0.0", "Microsoft.Net.Http.Headers": "1.0.0", - "Microsoft.Net.Http.Server": "0.2.0-*" + "Microsoft.Net.Http.Server": "1.0.0-rc1-*" }, "buildOptions": { "allowUnsafe": true, diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index 91402ad7d9..57d8bbe8b7 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -1,5 +1,5 @@ { - "version": "0.2.0-*", + "version": "1.0.0-rc1-*", "description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "1.0.0", diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index 0da4448638..ae72d0619a 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -6,7 +6,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.2.0-*" }, diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 9a0a5948de..91f6c36ca0 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -2,7 +2,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Net.Http.Server": "0.2.0-*", + "Microsoft.Net.Http.Server": "1.0.0-rc1-*", "Microsoft.AspNetCore.Testing": "1.0.0-*", "xunit": "2.2.0-*" }, From b94519b821f1daec1f9e15cb339e0b8524a44bac Mon Sep 17 00:00:00 2001 From: Chris R Date: Wed, 7 Sep 2016 10:24:38 -0700 Subject: [PATCH 3/8] Pin versions --- samples/HotAddSample/project.json | 2 +- samples/SelfHostServer/project.json | 2 +- .../project.json | 2 +- src/Microsoft.Net.Http.Server/project.json | 32 +++++++++---------- .../project.json | 2 +- .../project.json | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index 1f960ccef4..7a8871d4f6 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -2,7 +2,7 @@ "version": "1.1.0-*", "dependencies": { "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0" }, "buildOptions": { "emitEntryPoint": true diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 52c5854dbc..8a48d6ac6d 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*" + "Microsoft.Extensions.Logging.Console": "1.0.0" }, "buildOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index dc0d01e50e..234a44efd2 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -19,7 +19,7 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.Security.Claims": "4.0.1-*" + "System.Security.Claims": "4.0.1" } } } diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index 57d8bbe8b7..fe3340ff30 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -28,22 +28,22 @@ "type": "build", "version": "1.1.0-*" }, - "Microsoft.Win32.Primitives": "4.0.1-*", - "System.Diagnostics.Contracts": "4.0.1-*", - "System.Diagnostics.Debug": "4.0.11-*", - "System.Diagnostics.Tools": "4.0.1-*", - "System.IO": "4.1.0-*", - "System.IO.FileSystem": "4.0.1-*", - "System.Net.Primitives": "4.0.11-*", - "System.Net.WebSockets": "4.0.0-*", - "System.Runtime.Extensions": "4.1.0-*", - "System.Runtime.InteropServices": "4.1.0-*", - "System.Security.Claims": "4.0.1-*", - "System.Security.Cryptography.X509Certificates": "4.1.0-*", - "System.Security.Principal.Windows": "4.0.0-*", - "System.Text.Encoding.Extensions": "4.0.11-*", - "System.Threading": "4.0.11-*", - "System.Threading.Overlapped": "4.0.1-*", + "Microsoft.Win32.Primitives": "4.0.1", + "System.Diagnostics.Contracts": "4.0.1", + "System.Diagnostics.Debug": "4.0.11", + "System.Diagnostics.Tools": "4.0.1", + "System.IO": "4.1.0", + "System.IO.FileSystem": "4.0.1", + "System.Net.Primitives": "4.0.11", + "System.Net.WebSockets": "4.0.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Security.Claims": "4.0.1", + "System.Security.Cryptography.X509Certificates": "4.1.0", + "System.Security.Principal.Windows": "4.0.0", + "System.Text.Encoding.Extensions": "4.0.11", + "System.Threading": "4.0.11", + "System.Threading.Overlapped": "4.0.1", "System.Threading.Timer": "4.0.1" } } diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index ae72d0619a..14c0131feb 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -7,7 +7,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", - "Microsoft.AspNetCore.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0", "xunit": "2.2.0-*" }, "frameworks": { diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 91f6c36ca0..179757aaf4 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.Net.Http.Server": "1.0.0-rc1-*", - "Microsoft.AspNetCore.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Testing": "1.0.0", "xunit": "2.2.0-*" }, "frameworks": { From e984b89e0a3acd5a2ebc7001ca85b90f14a51b50 Mon Sep 17 00:00:00 2001 From: Chris R Date: Wed, 7 Sep 2016 10:24:56 -0700 Subject: [PATCH 4/8] Switch to master myget feed --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 826a1f9035..9fca4584cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,7 @@  - + \ No newline at end of file From dc8806f07e0d67e6a47ac3cb59aa1c37b27d4a37 Mon Sep 17 00:00:00 2001 From: Chris R Date: Wed, 7 Sep 2016 11:24:39 -0700 Subject: [PATCH 5/8] Downgrade and pin Microsoft.Extensions.RuntimeEnvironment.Sources --- src/Microsoft.Net.Http.Server/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index fe3340ff30..c23246d6d6 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -26,7 +26,7 @@ "dependencies": { "Microsoft.Extensions.RuntimeEnvironment.Sources": { "type": "build", - "version": "1.1.0-*" + "version": "1.0.0" }, "Microsoft.Win32.Primitives": "4.0.1", "System.Diagnostics.Contracts": "4.0.1", From bc7eb631d93a5bdf3202187b03cb30117678e69a Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 8 Sep 2016 14:06:13 -0700 Subject: [PATCH 6/8] Pin to 1.0.0-rc1-final --- samples/HelloWorld/project.json | 4 ++-- samples/HotAddSample/project.json | 4 ++-- samples/SelfHostServer/project.json | 4 ++-- src/Microsoft.AspNetCore.Server.WebListener/project.json | 4 ++-- src/Microsoft.Net.Http.Server/project.json | 2 +- .../project.json | 4 ++-- test/Microsoft.Net.Http.Server.FunctionalTests/project.json | 4 ++-- test/Microsoft.Net.Http.Server.Tests/project.json | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index 3c539e30a1..e8d088ba9e 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Net.Http.Server": "1.0.0-rc1-*" + "Microsoft.Net.Http.Server": "1.0.0-rc1-final" }, "commands": { "sample": "HelloWorld" @@ -13,7 +13,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.0.0", "type": "platform" } } diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index 7a8871d4f6..f7d3cb30d2 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -1,7 +1,7 @@ { "version": "1.1.0-*", "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Console": "1.0.0" }, "buildOptions": { @@ -15,7 +15,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.0.0", "type": "platform" } } diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 8a48d6ac6d..61a41dccf5 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Console": "1.0.0" }, "buildOptions": { @@ -14,7 +14,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.0.0", "type": "platform" } } diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index 234a44efd2..27eed10c6b 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -1,10 +1,10 @@ { - "version": "1.0.0-rc1-*", + "version": "1.0.0-rc1-final", "description": "ASP.NET 5 self-host web server.", "dependencies": { "Microsoft.AspNetCore.Hosting": "1.0.0", "Microsoft.Net.Http.Headers": "1.0.0", - "Microsoft.Net.Http.Server": "1.0.0-rc1-*" + "Microsoft.Net.Http.Server": "1.0.0-rc1-final" }, "buildOptions": { "allowUnsafe": true, diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index c23246d6d6..314afcfa67 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc1-*", + "version": "1.0.0-rc1-final", "description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "1.0.0", diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index 14c0131feb..88bf098bd4 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -6,7 +6,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-final", "Microsoft.AspNetCore.Testing": "1.0.0", "xunit": "2.2.0-*" }, @@ -14,7 +14,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.0.0", "type": "platform" }, "System.Net.Http.WinHttpHandler": "4.0.0-*", diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index 179757aaf4..bf605d7360 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -2,7 +2,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Net.Http.Server": "1.0.0-rc1-*", + "Microsoft.Net.Http.Server": "1.0.0-rc1-final", "Microsoft.AspNetCore.Testing": "1.0.0", "xunit": "2.2.0-*" }, @@ -10,7 +10,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.0.0", "type": "platform" }, "System.Net.Http": "4.1.0-*", diff --git a/test/Microsoft.Net.Http.Server.Tests/project.json b/test/Microsoft.Net.Http.Server.Tests/project.json index f4d93ce1af..81687ac3a3 100644 --- a/test/Microsoft.Net.Http.Server.Tests/project.json +++ b/test/Microsoft.Net.Http.Server.Tests/project.json @@ -2,14 +2,14 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Net.Http.Server": "0.2.0-*", + "Microsoft.Net.Http.Server": "1.0.0-rc1-final", "xunit": "2.2.0-*" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-*", + "version": "1.0.0", "type": "platform" } } From 99a98af51e425dcccc8ce4f5c0549bbb9f6f25bc Mon Sep 17 00:00:00 2001 From: Chris R Date: Fri, 9 Sep 2016 13:53:15 -0700 Subject: [PATCH 7/8] #229 Update package descriptions and tags --- src/Microsoft.AspNetCore.Server.WebListener/project.json | 8 +++++++- src/Microsoft.Net.Http.Server/project.json | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index 27eed10c6b..3641825f52 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -1,6 +1,12 @@ { "version": "1.0.0-rc1-final", - "description": "ASP.NET 5 self-host web server.", + "description": "ASP.NET Core HTTP server for Windows.", + "packOptions": { + "tags": [ + "aspnetcore", + "weblistener" + ] + }, "dependencies": { "Microsoft.AspNetCore.Hosting": "1.0.0", "Microsoft.Net.Http.Headers": "1.0.0", diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index 314afcfa67..c194e0a135 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -1,6 +1,12 @@ { "version": "1.0.0-rc1-final", - "description": "Implementation of WebListener, a successor to HttpListener. It is used in the WebListener server package.", + "description": ".NET HTTP server that uses the Windows HTTP Server API.", + "packOptions": { + "tags": [ + "netcore", + "weblistener" + ] + }, "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "1.0.0", "Microsoft.Extensions.Primitives": "1.0.0" From ba4965155268435cc773282256ac428bd75a9ced Mon Sep 17 00:00:00 2001 From: Chris R Date: Fri, 9 Sep 2016 15:43:04 -0700 Subject: [PATCH 8/8] Increment version to 1.0.0-rc1-final --- samples/HelloWorld/project.json | 2 +- samples/HotAddSample/project.json | 2 +- samples/SelfHostServer/project.json | 2 +- src/Microsoft.AspNetCore.Server.WebListener/project.json | 4 ++-- src/Microsoft.Net.Http.Server/project.json | 2 +- .../project.json | 2 +- test/Microsoft.Net.Http.Server.FunctionalTests/project.json | 2 +- test/Microsoft.Net.Http.Server.Tests/project.json | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index e8d088ba9e..0188f94723 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.Net.Http.Server": "1.0.0-rc1-final" + "Microsoft.Net.Http.Server": "1.0.0-rc2-final" }, "commands": { "sample": "HelloWorld" diff --git a/samples/HotAddSample/project.json b/samples/HotAddSample/project.json index f7d3cb30d2..1371305e91 100644 --- a/samples/HotAddSample/project.json +++ b/samples/HotAddSample/project.json @@ -1,7 +1,7 @@ { "version": "1.1.0-*", "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-final", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc2-final", "Microsoft.Extensions.Logging.Console": "1.0.0" }, "buildOptions": { diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json index 61a41dccf5..f33119839b 100644 --- a/samples/SelfHostServer/project.json +++ b/samples/SelfHostServer/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-final", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc2-final", "Microsoft.Extensions.Logging.Console": "1.0.0" }, "buildOptions": { diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json index 3641825f52..bdfe64508c 100644 --- a/src/Microsoft.AspNetCore.Server.WebListener/project.json +++ b/src/Microsoft.AspNetCore.Server.WebListener/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc1-final", + "version": "1.0.0-rc2-final", "description": "ASP.NET Core HTTP server for Windows.", "packOptions": { "tags": [ @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.AspNetCore.Hosting": "1.0.0", "Microsoft.Net.Http.Headers": "1.0.0", - "Microsoft.Net.Http.Server": "1.0.0-rc1-final" + "Microsoft.Net.Http.Server": "1.0.0-rc2-final" }, "buildOptions": { "allowUnsafe": true, diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json index c194e0a135..b0b467ba09 100644 --- a/src/Microsoft.Net.Http.Server/project.json +++ b/src/Microsoft.Net.Http.Server/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc1-final", + "version": "1.0.0-rc2-final", "description": ".NET HTTP server that uses the Windows HTTP Server API.", "packOptions": { "tags": [ diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json index 88bf098bd4..17449f517c 100644 --- a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json @@ -6,7 +6,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc1-final", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-rc2-final", "Microsoft.AspNetCore.Testing": "1.0.0", "xunit": "2.2.0-*" }, diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json index bf605d7360..f69d545db9 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/project.json +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/project.json @@ -2,7 +2,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Net.Http.Server": "1.0.0-rc1-final", + "Microsoft.Net.Http.Server": "1.0.0-rc2-final", "Microsoft.AspNetCore.Testing": "1.0.0", "xunit": "2.2.0-*" }, diff --git a/test/Microsoft.Net.Http.Server.Tests/project.json b/test/Microsoft.Net.Http.Server.Tests/project.json index 81687ac3a3..bfdd758b97 100644 --- a/test/Microsoft.Net.Http.Server.Tests/project.json +++ b/test/Microsoft.Net.Http.Server.Tests/project.json @@ -2,7 +2,7 @@ "testRunner": "xunit", "dependencies": { "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Net.Http.Server": "1.0.0-rc1-final", + "Microsoft.Net.Http.Server": "1.0.0-rc2-final", "xunit": "2.2.0-*" }, "frameworks": {