From 15c0e16a91024f7b7eb4d4ba86a06dcf980a7e4d Mon Sep 17 00:00:00 2001
From: Victor Hurdugaci <victor.hurdugaci@microsoft.com>
Date: Wed, 29 Jul 2015 03:38:40 -0700
Subject: [PATCH] React to DNX changes

---
 src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs       | 4 ++--
 src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs     | 2 +-
 src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs     | 2 +-
 src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs     | 2 +-
 .../Views/RuntimeInfoPageModel.cs                             | 2 +-
 src/Microsoft.AspNet.Diagnostics/project.json                 | 2 +-
 src/PageGenerator/Program.cs                                  | 2 +-
 .../ErrorPageMiddlewareTest.cs                                | 2 +-
 .../RuntimeInfoMiddlewareTest.cs                              | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
index 7aeb42a55e..04524f70ac 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
@@ -13,10 +13,10 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Views;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Logging;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs b/src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs
index 21abfe9cca..c7fbe5cd77 100644
--- a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs
@@ -3,8 +3,8 @@
 
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Http;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Builder
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs
index 310756c982..168a943a76 100644
--- a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs
@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Views;
 using Microsoft.AspNet.Http;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs
index fd7149b6aa..01c71f3ab9 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs
@@ -31,7 +31,7 @@ using Microsoft.AspNet.Diagnostics.Views
 #line hidden
     ;
 #line 6 "RuntimeInfoPage.cshtml"
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPageModel.cs b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPageModel.cs
index a4ab32caaa..90030251bd 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPageModel.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPageModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Diagnostics.Views
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/project.json b/src/Microsoft.AspNet.Diagnostics/project.json
index 298d5fad22..d1c0a5596d 100644
--- a/src/Microsoft.AspNet.Diagnostics/project.json
+++ b/src/Microsoft.AspNet.Diagnostics/project.json
@@ -16,7 +16,7 @@
             "version": "1.0.0-*"
         },
         "Microsoft.Framework.OptionsModel": "1.0.0-*",
-        "Microsoft.Framework.Runtime.Compilation.Abstractions": "1.0.0-*",
+        "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*",
         "Microsoft.Framework.WebEncoders.Core": "1.0.0-*"
     },
     "frameworks": {
diff --git a/src/PageGenerator/Program.cs b/src/PageGenerator/Program.cs
index cd3ecefb13..1e0c3359c5 100644
--- a/src/PageGenerator/Program.cs
+++ b/src/PageGenerator/Program.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace PageGenerator
 {
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ErrorPageMiddlewareTest.cs
index 62d9af1ef2..e845ce1841 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/ErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/ErrorPageMiddlewareTest.cs
@@ -13,7 +13,7 @@ using Microsoft.AspNet.Diagnostics.Views;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.Framework.Caching;
 using Microsoft.Framework.Logging;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Xunit;
 
 namespace Microsoft.AspNet.Diagnostics
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
index 29ffa19ec8..503ffbd2f6 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.WebEncoders;
 #if DNX451
 using Moq;