React to DNX renames

samples/MvcSample.Web/Startup.cs

@@ -15,8 +15,8 @@ using Microsoft.Framework.Configuration;
 using Microsoft.Framework.DependencyInjection;
 #if DNX451
 using Microsoft.Framework.DependencyInjection.Autofac;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Infrastructure;
+using Microsoft.Dnx.Runtime;
+using Microsoft.Dnx.Runtime.Infrastructure;
 #endif
 using MvcSample.Web.Filters;
 using MvcSample.Web.Services;

src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/project.json

@@ -21,7 +21,7 @@
         "Microsoft.Framework.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Framework.SecurityHelper.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Framework.Runtime.Compilation.Abstractions": "1.0.0-*",
+        "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*",
         "Newtonsoft.Json": "6.0.6"
     },
     "frameworks": {

src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Localization;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Mvc.Localization
 {

src/Microsoft.AspNet.Mvc.Razor.Host/project.json

@@ -19,12 +19,12 @@
     "net45": { },
     "dnx451": {
       "dependencies": {
-        "Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
+        "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*"
       }
     },
     "dnxcore50": {
       "dependencies": {
-        "Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
+        "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
         "System.Collections.Concurrent": "4.0.10-beta-*",
         "System.ComponentModel.TypeConverter": "4.0.0-beta-*",
         "System.Reflection.Extensions": "4.0.0-beta-*",

src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Dnx.Compilation;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime.Compilation;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs

@@ -1,10 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Compilation.CSharp;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
-using Microsoft.Framework.Runtime.Roslyn;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs

@@ -5,8 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
+using Microsoft.Dnx.Runtime;
+using Microsoft.Dnx.Compilation;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs

@@ -10,7 +10,7 @@ using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs

@@ -8,10 +8,10 @@ using System.Linq;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Razor;
 using Microsoft.AspNet.Razor.CodeGenerators;
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs

@@ -16,9 +16,9 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Emit;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
-using Microsoft.Framework.Runtime.Roslyn;
+using Microsoft.Dnx.Runtime;
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Compilation.CSharp;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs

@@ -5,8 +5,8 @@ using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.Dnx.Compilation.CSharp;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime.Roslyn;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {

src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs

@@ -8,9 +8,9 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
+using Microsoft.Dnx.Compilation.CSharp;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Roslyn;
 
 namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {

src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {

src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs

@@ -5,9 +5,9 @@ using System.Globalization;
 using System.Text;
 using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
+using Microsoft.Dnx.Compilation.CSharp;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Roslyn;
 
 namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {

src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs

@@ -14,10 +14,10 @@ using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Dnx.Compilation.CSharp;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.Internal;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Roslyn;
 
 namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {

src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs

@@ -4,7 +4,7 @@
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Razor/project.json

@@ -15,8 +15,8 @@
     "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" },
     "Microsoft.Framework.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
     "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
-    "Microsoft.Framework.Runtime.Roslyn.Common": "1.0.0-*",
-    "Microsoft.Framework.Runtime.Roslyn.Abstractions": "1.0.0-*"
+    "Microsoft.Dnx.Compilation.Csharp.Common": "1.0.0-*",
+    "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": {

src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs

@@ -4,11 +4,11 @@
 using System;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc.Razor.Precompilation;
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Compilation.CSharp;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
-using Microsoft.Framework.Runtime.Roslyn;
 
 namespace Microsoft.AspNet.Mvc
 {

test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs

@@ -3,12 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.Runtime;
+using Microsoft.AspNet.Http;
+using Microsoft.Dnx.Runtime;
+using Microsoft.Dnx.Runtime.Infrastructure;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
-using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Runtime.Infrastructure;
 
 namespace Microsoft.AspNet.Mvc.Core
 {

test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using ControllerDiscoveryConventionsWebSite;
 using Microsoft.AspNet.Builder;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests

test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs

@@ -11,7 +11,7 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using PrecompilationWebSite;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.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.Runtime.Versioning;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {

test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs

@@ -8,8 +8,8 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Infrastructure;
+using Microsoft.Dnx.Runtime;
+using Microsoft.Dnx.Runtime.Infrastructure;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {

test/Microsoft.AspNet.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Localization;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.WebEncoders.Testing;
 using Moq;
 using Xunit;

test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Localization;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.WebEncoders.Testing;
 using Moq;
 using Xunit;

test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs

@@ -2,9 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
-using Moq;
+using Microsoft.Dnx.Compilation;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.Razor.Compilation
@@ -15,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
         public void EnsureSuccessful_ThrowsIfCompilationFailed()
         {
             // Arrange
-            var compilationFailure = new CompilationFailure("test", Enumerable.Empty<Framework.Runtime.DiagnosticMessage>());
+            var compilationFailure = new CompilationFailure("test", Enumerable.Empty<Dnx.Runtime.DiagnosticMessage>());
             var failures = new[] { compilationFailure };
             var result = CompilationResult.Failed(failures);
 

test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs

@@ -12,7 +12,7 @@ using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.AspNet.Testing.xunit;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs

@@ -8,9 +8,9 @@ using System.Runtime.Versioning;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.Runtime;
-using Microsoft.Framework.Runtime.Compilation;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Razor.Test/project.json

@@ -15,7 +15,7 @@
         "Microsoft.AspNet.Testing": "1.0.0-*",
         "Microsoft.Framework.DependencyInjection": "1.0.0-*",
         "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*",
-        "Microsoft.Framework.Runtime": "1.0.0-*",
+        "Microsoft.Dnx.Runtime": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
     "commands": {

test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs

@@ -19,7 +19,7 @@ using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Framework.Caching;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.Logging;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.WebEncoders.Testing;
 using Moq;
 using Xunit;

test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs

@@ -19,7 +19,7 @@ using Microsoft.AspNet.Testing.xunit;
 using Microsoft.Framework.Caching;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.Logging;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.WebEncoders;
 using Microsoft.Framework.WebEncoders.Testing;
 using Moq;

test/Microsoft.AspNet.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs

@@ -9,7 +9,6 @@ using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.AspNet.Testing;
 using Microsoft.Framework.WebEncoders.Testing;
-using Microsoft.Internal.Web.Utils;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.TagHelpers

test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc.Razor;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 using Moq;
 using Xunit;
 

test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using System.Text;
 using Microsoft.AspNet.Mvc;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace FilesWebSite
 {

test/WebSites/FilesWebSite/SendFileMiddleware.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace FilesWebSite
 {

test/WebSites/LocalizationWebSite/TestStringLocalizerFactory.cs

@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Resources;
 using Microsoft.Framework.Localization;
 using Microsoft.Framework.Localization.Internal;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace LocalizationWebSite
 {

test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.Framework.OptionsModel;
-using Microsoft.Framework.Runtime;
+using Microsoft.Dnx.Runtime;
 
 namespace RazorCompilerCacheWebSite
 {