From 4e8c543489fd237b1138167458c562b4692c3380 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 22 Oct 2015 19:48:55 -0700 Subject: [PATCH] Rename Microsoft.Runtime.Abstractions to Microsoft.Extensions.PlatformAbstractions --- .../Infrastructure/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/CompilationOptionsProviderExtension.cs | 2 +- .../Compilation/PrecompiledViewsCompilerCacheProvider.cs | 2 +- .../Compilation/RazorCompilationService.cs | 2 +- .../Compilation/RoslynCompilationService.cs | 2 +- .../Internal/RazorFileInfoCollectionGenerator.cs | 2 +- .../Precompilation/RazorFileInfoCollection.cs | 2 +- src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs | 2 +- .../Infrastructure/DefaultAssemblyProviderTests.cs | 3 +-- .../FilteredDefaultAssemblyProviderFixtureOfT.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs | 3 +-- .../PrecompilationTest.cs | 2 +- .../TestApplicationEnvironment.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs | 2 +- .../HtmlLocalizerOfTTest.cs | 2 +- .../ViewLocalizerTest.cs | 2 +- .../Compilation/CompilationResultTest.cs | 2 +- .../Compilation/ExpressionRewriterTest.cs | 3 +-- .../Compilation/PrecompiledViewsCompilerCacheProviderTest.cs | 2 +- .../Compilation/RoslynCompilationServiceTest.cs | 1 + .../Internal/RazorFileInfoCollectionGeneratorTest.cs | 4 ++-- .../Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs | 2 +- .../ScriptTagHelperTest.cs | 2 +- test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs | 2 +- .../RazorViewEngineOptionsSetupTest.cs | 2 +- .../FilesWebSite/Controllers/DownloadFilesController.cs | 2 +- test/WebSites/FilesWebSite/SendFileMiddleware.cs | 2 +- 30 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs index 36b37ea5a6..788fb0a949 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reflection; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.Mvc.Infrastructure { diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index bab35530b4..4c5542ba43 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -13,7 +13,7 @@ "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", "Microsoft.AspNet.Mvc.Abstractions": "6.0.0-*", - "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" diff --git a/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs b/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs index 25daf09cee..af662d85a2 100644 --- a/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs +++ b/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs @@ -7,7 +7,7 @@ using System.Globalization; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Localization; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; 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 809681a177..6e22ac74e7 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json @@ -20,12 +20,12 @@ "frameworks": { "net451": { "dependencies": { - "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*" } }, "dotnet5.4": { "dependencies": { - "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "System.Collections.Concurrent": "4.0.11-beta-*", "System.ComponentModel.TypeConverter": "4.0.1-beta-*", "System.Reflection.Extensions": "4.0.1-beta-*", diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs index 4ac5d08bba..75595d50cc 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Dnx.Compilation; using Microsoft.Dnx.Compilation.CSharp; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.Mvc.Razor.Compilation { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/PrecompiledViewsCompilerCacheProvider.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/PrecompiledViewsCompilerCacheProvider.cs index ceeb9a027c..9e28b57fbc 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/PrecompiledViewsCompilerCacheProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/PrecompiledViewsCompilerCacheProvider.cs @@ -8,7 +8,7 @@ using System.Reflection; using System.Threading; using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Mvc.Razor.Precompilation; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.OptionsModel; 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 58dd95ed0a..5ae033cc51 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Razor; using Microsoft.AspNet.Razor.CodeGenerators; using Microsoft.Dnx.Compilation; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.OptionsModel; 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 2d65fb801e..f6b93b0322 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs @@ -19,7 +19,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Emit; using Microsoft.Dnx.Compilation; using Microsoft.Dnx.Compilation.CSharp; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.OptionsModel; namespace Microsoft.AspNet.Mvc.Razor.Compilation diff --git a/src/Microsoft.AspNet.Mvc.Razor/Internal/RazorFileInfoCollectionGenerator.cs b/src/Microsoft.AspNet.Mvc.Razor/Internal/RazorFileInfoCollectionGenerator.cs index a7c42b8dc0..480ad6831e 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Internal/RazorFileInfoCollectionGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Internal/RazorFileInfoCollectionGenerator.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.CompilerServices; using System.Text; using Microsoft.AspNet.Mvc.Razor.Precompilation; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.Mvc.Razor.Internal { diff --git a/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs index 438d1d9afa..24fcceb7f7 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.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; 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 ee6ed6ba02..59ef2e9c89 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.Extensions.OptionsModel; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.Mvc { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs index 386d5c0f13..a52ef250c1 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http; -using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Infrastructure; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs index 1665792a83..737b2aaa7d 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc.Infrastructure; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNet.Mvc.FunctionalTests diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs index ce6d8f147e..c5ef0fbf6e 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs @@ -12,8 +12,7 @@ using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.TestHost; using Microsoft.AspNet.Testing; -using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Infrastructure; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs index f05b428fa4..74b541ff85 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc.Razor.Precompilation; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; using PrecompilationWebSite; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestApplicationEnvironment.cs index ce5d2bbce0..4b83042c8d 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.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.Mvc.FunctionalTests { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs index 7fc584ca22..6541dd3541 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.TestHost; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; 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 1fc86e229d..fe2d996019 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.Extensions.Localization; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.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 f044a40983..0e449f2b93 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.Extensions.Localization; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.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 6c0c801f1c..536559e4f6 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs @@ -13,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/ExpressionRewriterTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs index 686038fff2..473f77675d 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs @@ -9,8 +9,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.Dnx.Compilation; using Microsoft.Dnx.Compilation.CSharp; -using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Infrastructure; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/PrecompiledViewsCompilerCacheProviderTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/PrecompiledViewsCompilerCacheProviderTest.cs index 6acc48a60a..572eefd324 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/PrecompiledViewsCompilerCacheProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/PrecompiledViewsCompilerCacheProviderTest.cs @@ -4,7 +4,7 @@ using System; using System.Reflection; using Microsoft.AspNet.Mvc.Razor.Precompilation; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; 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 70fbbe1288..ca4e8a7f04 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs @@ -10,6 +10,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Text; using Microsoft.Dnx.Compilation; using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.OptionsModel; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Internal/RazorFileInfoCollectionGeneratorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Internal/RazorFileInfoCollectionGeneratorTest.cs index 1730d74efb..2251d77258 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Internal/RazorFileInfoCollectionGeneratorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Internal/RazorFileInfoCollectionGeneratorTest.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Internal private static System.Reflection.Assembly _loadedAssembly; public override System.Reflection.Assembly LoadAssembly( - Microsoft.Dnx.Runtime.IAssemblyLoadContext loadContext) + Microsoft.Extensions.PlatformAbstractions.IAssemblyLoadContext loadContext) { if (_loadedAssembly == null) { @@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Internal private static System.Reflection.Assembly _loadedAssembly; public override System.Reflection.Assembly LoadAssembly( - Microsoft.Dnx.Runtime.IAssemblyLoadContext loadContext) + Microsoft.Extensions.PlatformAbstractions.IAssemblyLoadContext loadContext) { if (_loadedAssembly == null) { diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs index 4a33d5afd2..5a9b71258c 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs @@ -18,7 +18,7 @@ using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Routing; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs index a2cff697ff..7c6ed65073 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs @@ -18,7 +18,7 @@ using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.TagHelpers; using Microsoft.AspNet.Routing; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs index 0fd9c71072..6ea9011c9d 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs @@ -11,7 +11,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Razor; using Microsoft.Dnx.Compilation; -using Microsoft.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.OptionsModel; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs index ababd261a1..7bdbb4a1ac 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.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; using Moq; using Xunit; diff --git a/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs b/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs index 7733fdca21..5bf1a194c0 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.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace FilesWebSite { diff --git a/test/WebSites/FilesWebSite/SendFileMiddleware.cs b/test/WebSites/FilesWebSite/SendFileMiddleware.cs index 7831bf02b1..637a1f0aae 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.Dnx.Runtime; +using Microsoft.Extensions.PlatformAbstractions; namespace FilesWebSite {