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

Fix tests to work on CoreClr (this does not fix the Xml tests failures)

This commit is contained in:
Kiran Challa 2015-03-19 11:52:29 -07:00
parent 4b5dd199ca
commit ab31be20ed
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/WebSites/CorsMiddlewareWebSite/project.json
View File

@ -16,7 +16,7 @@
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": { },
"dnx50": { } "dnxcore50": { }
}, },
"webroot": "wwwroot" "webroot": "wwwroot"
} }

2
test/WebSites/CorsWebSite/project.json
View File

@ -16,7 +16,7 @@
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": { },
"dnx50": { } "dnxcore50": { }
}, },
"webroot": "wwwroot" "webroot": "wwwroot"
} }

4
test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System.Reflection;
using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.FileProviders;
using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc;
@ -13,7 +13,7 @@ namespace FilesWebSite
{ {
return new FilePathResult("/Greetings.txt", "text/plain") return new FilePathResult("/Greetings.txt", "text/plain")
{ {
FileProvider = new EmbeddedFileProvider(GetType().Assembly, "EmbeddedResources"), FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "EmbeddedResources"),
FileDownloadName = "downloadName.txt" FileDownloadName = "downloadName.txt"
}; };
} }