Merge branch 'rel/1.0.0' into dev, bump version to 1.1.0-*

samples/HelloWorld/project.json

@@ -3,7 +3,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.Net.Http.Server": "0.2.0-*"
+    "Microsoft.Net.Http.Server": "1.1.0-*"
   },
   "commands": {
     "sample": "HelloWorld"

samples/HotAddSample/project.json

@@ -1,7 +1,6 @@
 {
-  "version": "1.1.0-*",
   "dependencies": {
-    "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*",
+    "Microsoft.AspNetCore.Server.WebListener": "1.1.0-*",
     "Microsoft.Extensions.Logging.Console": "1.1.0-*"
   },
   "buildOptions": {

samples/SelfHostServer/project.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.AspNetCore.Server.WebListener": "0.2.0-*",
+    "Microsoft.AspNetCore.Server.WebListener": "1.1.0-*",
     "Microsoft.Extensions.Logging.Console": "1.1.0-*"
   },
   "buildOptions": {

src/Microsoft.AspNetCore.Server.WebListener/project.json

@@ -1,10 +1,16 @@
 {
-  "version": "0.2.0-*",
+  "version": "1.1.0-*",
-  "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.1.0-*",
     "Microsoft.Net.Http.Headers": "1.1.0-*",
-    "Microsoft.Net.Http.Server": "0.2.0-*",
+    "Microsoft.Net.Http.Server": "1.1.0-*",
     "Microsoft.Extensions.TaskCache.Sources": {
       "version": "1.1.0-*",
       "type": "build"

src/Microsoft.Net.Http.Server/project.json

@@ -1,6 +1,12 @@
 {
-  "version": "0.2.0-*",
+  "version": "1.1.0-*",
-  "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.1.0-*",
     "Microsoft.Extensions.Primitives": "1.1.0-*"

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.1.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "xunit": "2.2.0-*"
   },

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.1.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "xunit": "2.2.0-*"
   },

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": "0.2.0-*",
+    "Microsoft.Net.Http.Server": "1.1.0-*",
     "xunit": "2.2.0-*"
   },
   "frameworks": {