1.0.4 patch train updates (#312)

JunTaoLuo · web-flow · commit dfd6d8f054b2 · 2017-02-13T14:22:18.000-08:00
* 1.0.4 patch train updates

* Update to Microsoft.NETCore.App 1.0.4 and pin cli to 1.0.0-preview2-003154

* Update NuGet.config
diff --git a/NuGet.config b/NuGet.config
@@ -3,7 +3,7 @@
   <packageSources>
     <clear />
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
-    <add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnetcore-rel-1-0-3/api/v3/index.json" />
+    <add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnet-1-0-4-patch/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "projects": ["src", "test"],
     "sdk": {
-      "version": "1.0.0-preview2-1-003177"
+       "version": "1.0.0-preview2-003154"
     }
 }
diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json
@@ -13,7 +13,7 @@
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.3",
+          "version": "1.0.4",
           "type": "platform"
         }
       }
diff --git 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.2",
-    "Microsoft.Extensions.Logging.Console": "1.0.1"
+    "Microsoft.Extensions.Logging.Console": "1.0.2"
   },
   "buildOptions": {
     "emitEntryPoint": true
@@ -15,7 +15,7 @@
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.3",
+          "version": "1.0.4",
           "type": "platform"
         }
       }
diff --git a/samples/SelfHostServer/project.json b/samples/SelfHostServer/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.AspNetCore.Server.WebListener": "1.0.2",
-    "Microsoft.Extensions.Logging.Console": "1.0.1"
+    "Microsoft.Extensions.Logging.Console": "1.0.2"
   },
   "buildOptions": {
     "emitEntryPoint": true
@@ -14,7 +14,7 @@
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.3",
+          "version": "1.0.4",
           "type": "platform"
         }
       }
diff --git a/src/Microsoft.AspNetCore.Server.WebListener/project.json b/src/Microsoft.AspNetCore.Server.WebListener/project.json
@@ -8,8 +8,8 @@
     ]
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Hosting": "1.0.1",
-    "Microsoft.Net.Http.Headers": "1.0.1",
+    "Microsoft.AspNetCore.Hosting": "1.0.2",
+    "Microsoft.Net.Http.Headers": "1.0.2",
     "Microsoft.Net.Http.Server": "1.0.2"
   },
   "buildOptions": {
diff --git a/src/Microsoft.Net.Http.Server/project.json b/src/Microsoft.Net.Http.Server/project.json
@@ -8,7 +8,7 @@
     ]
   },
   "dependencies": {
-    "Microsoft.Extensions.Logging.Abstractions": "1.0.1",
+    "Microsoft.Extensions.Logging.Abstractions": "1.0.2",
     "Microsoft.Extensions.Primitives": "1.0.1"
   },
   "buildOptions": {
diff --git a/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Server.WebListener.FunctionalTests/project.json
@@ -14,7 +14,7 @@
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.3",
+          "version": "1.0.4",
           "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
@@ -10,7 +10,7 @@
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.3",
+          "version": "1.0.4",
           "type": "platform"
         },
         "System.Net.Http": "4.1.1",
diff --git a/test/Microsoft.Net.Http.Server.Tests/project.json b/test/Microsoft.Net.Http.Server.Tests/project.json
@@ -9,7 +9,7 @@
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.3",
+          "version": "1.0.4",
           "type": "platform"
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"projects": ["src", "test"],`
`3`	`3`	`"sdk": {`
`4`		`- "version": "1.0.0-preview2-1-003177"`
	`4`	`+ "version": "1.0.0-preview2-003154"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"netcoreapp1.0": {`
`14`	`14`	`"dependencies": {`
`15`	`15`	`"Microsoft.NETCore.App": {`
`16`		`- "version": "1.0.3",`
	`16`	`+ "version": "1.0.4",`
`17`	`17`	`"type": "platform"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"Microsoft.AspNetCore.Server.WebListener": "1.0.2",`
`4`		`- "Microsoft.Extensions.Logging.Console": "1.0.1"`
	`4`	`+ "Microsoft.Extensions.Logging.Console": "1.0.2"`
`5`	`5`	`},`
`6`	`6`	`"buildOptions": {`
`7`	`7`	`"emitEntryPoint": true`
`@@ -14,7 +14,7 @@`
`14`	`14`	`"netcoreapp1.0": {`
`15`	`15`	`"dependencies": {`
`16`	`16`	`"Microsoft.NETCore.App": {`
`17`		`- "version": "1.0.3",`
	`17`	`+ "version": "1.0.4",`
`18`	`18`	`"type": "platform"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`]`
`9`	`9`	`},`
`10`	`10`	`"dependencies": {`
`11`		`- "Microsoft.Extensions.Logging.Abstractions": "1.0.1",`
	`11`	`+ "Microsoft.Extensions.Logging.Abstractions": "1.0.2",`
`12`	`12`	`"Microsoft.Extensions.Primitives": "1.0.1"`
`13`	`13`	`},`
`14`	`14`	`"buildOptions": {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"netcoreapp1.0": {`
`10`	`10`	`"dependencies": {`
`11`	`11`	`"Microsoft.NETCore.App": {`
`12`		`- "version": "1.0.3",`
	`12`	`+ "version": "1.0.4",`
`13`	`13`	`"type": "platform"`
`14`	`14`	`}`
`15`	`15`	`},`