Merge branch 'release' into dev

src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs

@@ -233,7 +233,7 @@ namespace Microsoft.AspNetCore.Hosting.Startup
         private static string GenerateFooterEncoded(IRuntimeEnvironment environment)
         {
             var runtimeType = HtmlEncodeAndReplaceLineBreaks(environment.RuntimeType);
-#if NETSTANDARDAPP1_5 || NETSTANDARD1_3
+#if NETCOREAPP1_0 || NETSTANDARD1_3
             var systemRuntimeAssembly = typeof(System.ComponentModel.DefaultValueAttribute).GetTypeInfo().Assembly;
             var assemblyVersion = new AssemblyName(systemRuntimeAssembly.FullName).Version.ToString();
             var clrVersion = HtmlEncodeAndReplaceLineBreaks(assemblyVersion);

test/Microsoft.AspNetCore.Hosting.Tests/project.json

@@ -7,6 +7,7 @@
     "testroot/**/*"
   ],
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Hosting": "1.0.0-*",
     "Microsoft.AspNetCore.Owin": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",

test/Microsoft.AspNetCore.TestHost.Tests/project.json

@@ -4,6 +4,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*",