From ab31be20ed5fdc49080bb65454be0436b271f5a4 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Thu, 19 Mar 2015 11:52:29 -0700 Subject: [PATCH] Fix tests to work on CoreClr (this does not fix the Xml tests failures) --- test/WebSites/CorsMiddlewareWebSite/project.json | 2 +- test/WebSites/CorsWebSite/project.json | 2 +- .../FilesWebSite/Controllers/EmbeddedFilesController.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/WebSites/CorsMiddlewareWebSite/project.json b/test/WebSites/CorsMiddlewareWebSite/project.json index be26999ef7..245391b250 100644 --- a/test/WebSites/CorsMiddlewareWebSite/project.json +++ b/test/WebSites/CorsMiddlewareWebSite/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "dnx451": { }, - "dnx50": { } + "dnxcore50": { } }, "webroot": "wwwroot" } \ No newline at end of file diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index be26999ef7..245391b250 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "dnx451": { }, - "dnx50": { } + "dnxcore50": { } }, "webroot": "wwwroot" } \ No newline at end of file diff --git a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs index e7628f2898..1b1f639440 100644 --- a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs +++ b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs @@ -1,7 +1,7 @@ // 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. -using System; +using System.Reflection; using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Mvc; @@ -13,7 +13,7 @@ namespace FilesWebSite { return new FilePathResult("/Greetings.txt", "text/plain") { - FileProvider = new EmbeddedFileProvider(GetType().Assembly, "EmbeddedResources"), + FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "EmbeddedResources"), FileDownloadName = "downloadName.txt" }; }