huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bring Microsoft.NETCore.Platforms dependency back

This commit is contained in:
Pavel Krymets 2016-04-18 16:58:28 -07:00
parent 6fd469e748
commit e3f4f23b5a
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
View File

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

1
test/Microsoft.AspNetCore.Hosting.Tests/project.json
View File

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

1
test/Microsoft.AspNetCore.TestHost.Tests/project.json
View File

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