From e96b4d7b94112fd087628544e3f9a3f1f3f3b08d Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Wed, 29 Jul 2015 04:49:49 -0700 Subject: [PATCH] React to DNX renames --- samples/MvcSample.Web/Startup.cs | 4 ++-- src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs | 2 +- src/Microsoft.AspNet.Mvc.Core/project.json | 2 +- src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs | 2 +- src/Microsoft.AspNet.Mvc.Razor.Host/project.json | 4 ++-- .../Compilation/CompilationFailedException.cs | 2 +- .../Compilation/CompilationOptionsProviderExtension.cs | 6 +++--- .../Compilation/CompilationResult.cs | 4 ++-- .../Compilation/CompilerCache.cs | 2 +- .../Compilation/RazorCompilationService.cs | 4 ++-- .../Compilation/RoslynCompilationService.cs | 6 +++--- .../Compilation/SyntaxTreeGenerator.cs | 2 +- .../PrecompilationTagHelperDescriptorResolver.cs | 4 ++-- .../Precompilation/RazorFileInfoCollection.cs | 2 +- .../Precompilation/RazorFileInfoCollectionGenerator.cs | 4 ++-- .../Precompilation/RazorPreCompiler.cs | 4 ++-- .../RazorViewEngineOptionsSetup.cs | 2 +- src/Microsoft.AspNet.Mvc.Razor/project.json | 4 ++-- src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs | 6 +++--- .../DefaultAssemblyProviderTests.cs | 8 ++++---- .../ControllerDiscoveryConventionTests.cs | 2 +- .../PrecompilationTest.cs | 2 +- .../TestApplicationEnvironment.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs | 4 ++-- .../HtmlLocalizerOfTTest.cs | 2 +- .../ViewLocalizerTest.cs | 2 +- .../Compilation/CompilationResultTest.cs | 6 ++---- .../Compilation/CompilerCacheTest.cs | 2 +- .../Compilation/RoslynCompilationServiceTest.cs | 4 ++-- test/Microsoft.AspNet.Mvc.Razor.Test/project.json | 2 +- .../LinkTagHelperTest.cs | 2 +- .../ScriptTagHelperTest.cs | 2 +- .../TagHelperOutputExtensionsTest.cs | 1 - .../RazorViewEngineOptionsSetupTest.cs | 2 +- .../FilesWebSite/Controllers/DownloadFilesController.cs | 2 +- test/WebSites/FilesWebSite/SendFileMiddleware.cs | 2 +- .../LocalizationWebSite/TestStringLocalizerFactory.cs | 2 +- .../Services/CustomCompilerCache.cs | 2 +- 38 files changed, 57 insertions(+), 60 deletions(-) diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index d71c36852d..e838073352 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs index 5e2eba774b..c602af17f8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index d2e18b8a92..3afff3b00f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/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": { diff --git a/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs b/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs index 7d94c25dcc..9a5b47cd20 100644 --- a/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json index ec31a9b5d1..e939180cf6 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/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-*", diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs index 902f2d1b91..a730c2027c 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs index 30f1448427..e91e12c2cf 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs index 7e9a65d84e..5b2fd1326e 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs index 8bf42bee63..966b9effca 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs index 3448ffe035..890f0f759d 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs index a9f91b19c0..c2a7d535cf 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs index 31d0236c87..9c87d9a9b9 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs index 008becd334..d794225af7 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs index e01ae3d525..3ff7e92ca8 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs index 0e16362ed0..4386159f38 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs index cb9c5dfef2..0b8e8674e1 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs index c3aed32c0c..729521f658 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index b1c44c2c33..b00fbe7428 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/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": { diff --git a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs index 1bbfff427c..5390e33c9c 100644 --- a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs +++ b/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 { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs index 07aa5fb777..06777f99ae 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs +++ b/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 { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs index a8ddb0eaea..cd77b32b8d 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ControllerDiscoveryConventionTests.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs index 980c2e2665..23ea26a4c1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.cs index fda5f3abc8..0978258777 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.cs +++ b/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 { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs index 8d14946b03..187f826734 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs +++ b/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 { diff --git a/test/Microsoft.AspNet.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs b/test/Microsoft.AspNet.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs index 1277c47c11..931950688d 100644 --- a/test/Microsoft.AspNet.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs b/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs index b2a749a2f8..ef6d4b0f5a 100644 --- a/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs index c16c6b96a6..6c0c801f1c 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs +++ b/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()); + var compilationFailure = new CompilationFailure("test", Enumerable.Empty()); var failures = new[] { compilationFailure }; var result = CompilationResult.Failed(failures); diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs index f4247b1702..c500050d1d 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs index 7e5a9aad99..d6f8d10c83 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json index 4ca7c619bf..58a3deb17a 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json +++ b/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": { diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs index 804313b2e9..763cb4a393 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs index 446d2de471..8520bca842 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs +++ b/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; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs index 08c27dac7e..9788b95e73 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs index 4b9fa2e64f..ababd261a1 100644 --- a/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs +++ b/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; diff --git a/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs b/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs index d6340b14b0..192b495cc7 100644 --- a/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs +++ b/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 { diff --git a/test/WebSites/FilesWebSite/SendFileMiddleware.cs b/test/WebSites/FilesWebSite/SendFileMiddleware.cs index b99724e4d6..8f9c8c7f8e 100644 --- a/test/WebSites/FilesWebSite/SendFileMiddleware.cs +++ b/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 { diff --git a/test/WebSites/LocalizationWebSite/TestStringLocalizerFactory.cs b/test/WebSites/LocalizationWebSite/TestStringLocalizerFactory.cs index 19fb7b9b28..3ece76b6d6 100644 --- a/test/WebSites/LocalizationWebSite/TestStringLocalizerFactory.cs +++ b/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 { diff --git a/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs b/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs index 3634d7bb11..b3a77cfb06 100644 --- a/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs +++ b/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 {