phase one of refactoring for #2226

aspnet · Jul 31, 2015 · 20c1f12 · 20c1f12
1 parent 0094312
commit 20c1f12
Show file tree

Hide file tree

Showing 45 changed files with 165 additions and 172 deletions.
diff --git a/DNX.sln b/DNX.sln
@@ -91,8 +91,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FileSystem", "FileSystem",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0661BDE0-6471-49A4-B902-F826D92EB96D}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.Compilation.Caching", "src\Microsoft.Dnx.Compilation.Caching\Microsoft.Dnx.Compilation.Caching.xproj", "{7004FC14-677B-491F-A98B-E44C61733B46}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.Compilation.DesignTime", "src\Microsoft.Dnx.Compilation.DesignTime\Microsoft.Dnx.Compilation.DesignTime.xproj", "{19D39312-A4A4-449D-B53F-653F951A11F8}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.Host.Tests", "test\Microsoft.Dnx.Host.Tests\Microsoft.Dnx.Host.Tests.xproj", "{6F59A0B7-745D-4ADA-A913-6A1AD1AB49C2}"
@@ -111,6 +109,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnx.tests", "test\dnx.tests
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.Compilation.CSharp.Abstractions", "src\Microsoft.Dnx.Compilation.CSharp.Abstractions\Microsoft.Dnx.Compilation.CSharp.Abstractions.xproj", "{EF257BFD-5517-48F5-B16D-407DF86F5A6D}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.Compilation", "src\Microsoft.Dnx.Compilation\Microsoft.Dnx.Compilation.xproj", "{587F95E0-0E56-4C37-8530-6B1485BE01AE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -785,30 +785,6 @@ Global
 		{970449A2-3BBB-4E87-8513-C41F109B1A3E}.Release|x64.Build.0 = Release|Any CPU
 		{970449A2-3BBB-4E87-8513-C41F109B1A3E}.Release|x86.ActiveCfg = Release|Any CPU
 		{970449A2-3BBB-4E87-8513-C41F109B1A3E}.Release|x86.Build.0 = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|Win32.Build.0 = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|x64.Build.0 = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Debug|x86.Build.0 = Debug|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|ARM.Build.0 = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|Win32.ActiveCfg = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|Win32.Build.0 = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|x64.ActiveCfg = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|x64.Build.0 = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|x86.ActiveCfg = Release|Any CPU
-		{7004FC14-677B-491F-A98B-E44C61733B46}.Release|x86.Build.0 = Release|Any CPU
 		{19D39312-A4A4-449D-B53F-653F951A11F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19D39312-A4A4-449D-B53F-653F951A11F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19D39312-A4A4-449D-B53F-653F951A11F8}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1015,6 +991,30 @@ Global
 		{EF257BFD-5517-48F5-B16D-407DF86F5A6D}.Release|x64.Build.0 = Release|Any CPU
 		{EF257BFD-5517-48F5-B16D-407DF86F5A6D}.Release|x86.ActiveCfg = Release|Any CPU
 		{EF257BFD-5517-48F5-B16D-407DF86F5A6D}.Release|x86.Build.0 = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|ARM.Build.0 = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|Win32.Build.0 = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|ARM.Build.0 = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|Win32.ActiveCfg = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|Win32.Build.0 = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|x64.Build.0 = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1055,7 +1055,6 @@ Global
 		{970449A2-3BBB-4E87-8513-C41F109B1A3E} = {0661BDE0-6471-49A4-B902-F826D92EB96D}
 		{A95304E0-DA56-45EE-B5DA-BB6B46D83D88} = {D825D676-CEB4-4D32-8049-A6383AD1929B}
 		{0661BDE0-6471-49A4-B902-F826D92EB96D} = {A95304E0-DA56-45EE-B5DA-BB6B46D83D88}
-		{7004FC14-677B-491F-A98B-E44C61733B46} = {AF391791-F4B7-41AC-8F08-9485DAC543C5}
 		{19D39312-A4A4-449D-B53F-653F951A11F8} = {AF391791-F4B7-41AC-8F08-9485DAC543C5}
 		{6F59A0B7-745D-4ADA-A913-6A1AD1AB49C2} = {C43EE429-DE10-4906-BB09-54E6A080948A}
 		{893A7304-50DB-4053-B864-E10BA3FFAC53} = {13ED5001-B871-4BC3-8499-29607F596C7C}
@@ -1065,5 +1064,6 @@ Global
 		{2AF210A9-5BDC-45E8-95DD-07B5A2616493} = {C43EE429-DE10-4906-BB09-54E6A080948A}
 		{9387033F-B955-4794-A6FD-DAD700CBB6A5} = {C43EE429-DE10-4906-BB09-54E6A080948A}
 		{EF257BFD-5517-48F5-B16D-407DF86F5A6D} = {AF391791-F4B7-41AC-8F08-9485DAC543C5}
+		{587F95E0-0E56-4C37-8530-6B1485BE01AE} = {AF391791-F4B7-41AC-8F08-9485DAC543C5}
 	EndGlobalSection
 EndGlobal
diff --git a/makefile.shade b/makefile.shade
@@ -70,8 +70,8 @@ var MANAGED_PROJECTS = '${FindAllProjects(
     BOOTSTRAPPER_HOST_NAME,
     BOOTSTRAPPER_CORECLR_MANAGED_NAME,
     "Microsoft.Dnx.ApplicationHost",
+    "Microsoft.Dnx.Compilation",
     "Microsoft.Dnx.Compilation.Abstractions",
-    "Microsoft.Dnx.Compilation.Caching",
     "Microsoft.Dnx.Compilation.CSharp",
     "Microsoft.Dnx.Compilation.CSharp.Abstractions",
     "Microsoft.Dnx.Compilation.CSharp.Common",

diff --git a/....Compilation.Abstractions/CacheContext.cs → ...tion.Abstractions/Caching/CacheContext.cs b/....Compilation.Abstractions/CacheContext.cs → ...tion.Abstractions/Caching/CacheContext.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public class CacheContext
     {

diff --git a/...mpilation.Abstractions/CacheExtensions.cs → ...n.Abstractions/Caching/CacheExtensions.cs b/...mpilation.Abstractions/CacheExtensions.cs → ...n.Abstractions/Caching/CacheExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public static class CacheExtensions
     {

diff --git a/...ft.Dnx.Compilation.Abstractions/ICache.cs → ...ompilation.Abstractions/Caching/ICache.cs b/...ft.Dnx.Compilation.Abstractions/ICache.cs → ...ompilation.Abstractions/Caching/ICache.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public interface ICache
     {

diff --git a/...ion.Abstractions/ICacheContextAccessor.cs → ...ractions/Caching/ICacheContextAccessor.cs b/...ion.Abstractions/ICacheContextAccessor.cs → ...ractions/Caching/ICacheContextAccessor.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public interface ICacheContextAccessor
     {

diff --git a/...pilation.Abstractions/ICacheDependency.cs → ....Abstractions/Caching/ICacheDependency.cs b/...pilation.Abstractions/ICacheDependency.cs → ....Abstractions/Caching/ICacheDependency.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public interface ICacheDependency
     {

diff --git a/...ractions/INamedCacheDependencyProvider.cs → .../Caching/INamedCacheDependencyProvider.cs b/...ractions/INamedCacheDependencyProvider.cs → .../Caching/INamedCacheDependencyProvider.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public interface INamedCacheDependencyProvider
     {

diff --git a/src/Microsoft.Dnx.Compilation.Abstractions/ILibraryExporter.cs b/src/Microsoft.Dnx.Compilation.Abstractions/ILibraryExporter.cs
@@ -1,9 +1,7 @@
 // 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;
-
-namespace Microsoft.Dnx.Runtime
+namespace Microsoft.Dnx.Compilation
 {
     /// <summary>
     /// Provides access to the complete graph of dependencies for the application.

diff --git a/src/Microsoft.Dnx.Compilation.CSharp/RoslynCompiler.cs b/src/Microsoft.Dnx.Compilation.CSharp/RoslynCompiler.cs
@@ -13,10 +13,9 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.Dnx.Compilation.Caching;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Dnx.Runtime.Caching;
 using Microsoft.Dnx.Runtime.Common.DependencyInjection;
-using Microsoft.Dnx.Compilation;
 using Microsoft.Dnx.Runtime.Infrastructure;
 
 namespace Microsoft.Dnx.Compilation.CSharp

diff --git a/src/Microsoft.Dnx.Compilation.CSharp/RoslynProjectCompiler.cs b/src/Microsoft.Dnx.Compilation.CSharp/RoslynProjectCompiler.cs
@@ -1,10 +1,8 @@
-using Microsoft.CodeAnalysis;
 using System;
 using System.Collections.Generic;
-using Microsoft.Dnx.Runtime.Caching;
-using Microsoft.Dnx.Compilation;
-using Microsoft.Dnx.Runtime.Infrastructure;
+using Microsoft.Dnx.Compilation.Caching;
 using Microsoft.Dnx.Runtime;
+using Microsoft.Dnx.Runtime.Infrastructure;
 
 namespace Microsoft.Dnx.Compilation.CSharp
 {

diff --git a/src/Microsoft.Dnx.Compilation.CSharp/project.json b/src/Microsoft.Dnx.Compilation.CSharp/project.json
@@ -3,7 +3,7 @@
     "description": "ASP.NET 5 Roslyn compiler implementation.",
     "compilationOptions": { "define": [ "TRACE" ], "allowUnsafe": true, "warningsAsErrors": true },
     "dependencies": {
-        "Microsoft.Dnx.Compilation.Caching": "1.0.0-*",
+        "Microsoft.Dnx.Compilation": "1.0.0-*",
         "Microsoft.Dnx.Compilation.CSharp.Common": { "version": "1.0.0-*", "type": "build" },
         "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*",
         "Microsoft.Dnx.Runtime.Sources": { "version": "1.0.0-*", "type": "build" }

diff --git a/...icrosoft.Dnx.Compilation.Caching/Cache.cs → ...icrosoft.Dnx.Compilation/Caching/Cache.cs b/...icrosoft.Dnx.Compilation.Caching/Cache.cs → ...icrosoft.Dnx.Compilation/Caching/Cache.cs
@@ -2,9 +2,8 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Dnx.Compilation;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public class Cache : ICache
     {

diff --git a/...mpilation.Caching/CacheContextAccessor.cs → ...mpilation/Caching/CacheContextAccessor.cs b/...mpilation.Caching/CacheContextAccessor.cs → ...mpilation/Caching/CacheContextAccessor.cs
@@ -1,7 +1,6 @@
 using System;
-using Microsoft.Dnx.Compilation;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public class CacheContextAccessor : ICacheContextAccessor
     {

diff --git a/...n.Caching/FileWriteTimeCacheDependency.cs → ...n/Caching/FileWriteTimeCacheDependency.cs b/...n.Caching/FileWriteTimeCacheDependency.cs → ...n/Caching/FileWriteTimeCacheDependency.cs
@@ -1,8 +1,7 @@
 using System;
 using System.IO;
-using Microsoft.Dnx.Compilation;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public class FileWriteTimeCacheDependency : ICacheDependency
     {

diff --git a/...mpilation.Caching/NamedCacheDependency.cs → ...mpilation/Caching/NamedCacheDependency.cs b/...mpilation.Caching/NamedCacheDependency.cs → ...mpilation/Caching/NamedCacheDependency.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public class NamedCacheDependency : ICacheDependency
     {

diff --git a/...n.Caching/NamedCacheDependencyProvider.cs → ...n/Caching/NamedCacheDependencyProvider.cs b/...n.Caching/NamedCacheDependencyProvider.cs → ...n/Caching/NamedCacheDependencyProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 
-namespace Microsoft.Dnx.Runtime.Caching
+namespace Microsoft.Dnx.Compilation.Caching
 {
     public class NamedCacheDependencyProvider : INamedCacheDependencyProvider
     {

diff --git a/...g/Microsoft.Dnx.Compilation.Caching.xproj → ...mpilation/Microsoft.Dnx.Compilation.xproj b/...g/Microsoft.Dnx.Compilation.Caching.xproj → ...mpilation/Microsoft.Dnx.Compilation.xproj
@@ -6,10 +6,12 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>7004fc14-677b-491f-a98b-e44c61733b46</ProjectGuid>
+    <ProjectGuid>587f95e0-0e56-4c37-8530-6b1485be01ae</ProjectGuid>
+    <RootNamespace>Microsoft.Dnx.Compilation</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
+
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/...soft.Dnx.Compilation.Caching/project.json → src/Microsoft.Dnx.Compilation/project.json b/...soft.Dnx.Compilation.Caching/project.json → src/Microsoft.Dnx.Compilation/project.json
diff --git a/src/Microsoft.Dnx.DesignTimeHost/ApplicationContext.cs b/src/Microsoft.Dnx.DesignTimeHost/ApplicationContext.cs
@@ -5,19 +5,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Versioning;
 using System.Threading;
+using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Compilation.Caching;
+using Microsoft.Dnx.Compilation.CSharp;
+using Microsoft.Dnx.Compilation.DesignTime;
 using Microsoft.Dnx.DesignTimeHost.Models;
 using Microsoft.Dnx.DesignTimeHost.Models.IncomingMessages;
 using Microsoft.Dnx.DesignTimeHost.Models.OutgoingMessages;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Dnx.Runtime.Caching;
 using Microsoft.Dnx.Runtime.Common.Impl;
-using Microsoft.Dnx.Compilation;
-using Microsoft.Dnx.Compilation.DesignTime;
 using Microsoft.Dnx.Runtime.Infrastructure;
-using Microsoft.Dnx.Compilation.CSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NuGet;

diff --git a/src/Microsoft.Dnx.DesignTimeHost/ConnectionContext.cs b/src/Microsoft.Dnx.DesignTimeHost/ConnectionContext.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Microsoft.Dnx.Compilation.Caching;
 using Microsoft.Dnx.DesignTimeHost.Models;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Dnx.Runtime.Caching;
 
 namespace Microsoft.Dnx.DesignTimeHost
 {

diff --git a/src/Microsoft.Dnx.DesignTimeHost/DesignTimeAssemblyLoadContextFactory.cs b/src/Microsoft.Dnx.DesignTimeHost/DesignTimeAssemblyLoadContextFactory.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.Dnx.Compilation.Caching;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Dnx.Runtime.Caching;
 using Microsoft.Dnx.Runtime.Infrastructure;
 using Microsoft.Dnx.Runtime.Loader;
 

diff --git a/src/Microsoft.Dnx.DesignTimeHost/Program.cs b/src/Microsoft.Dnx.DesignTimeHost/Program.cs
@@ -8,9 +8,9 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
+using Microsoft.Dnx.Compilation.Caching;
 using Microsoft.Dnx.DesignTimeHost.Models;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Dnx.Runtime.Caching;
 using Microsoft.Dnx.Runtime.Common.DependencyInjection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

diff --git a/src/Microsoft.Dnx.Runtime.Abstractions/ILibraryManager.cs b/src/Microsoft.Dnx.Runtime.Abstractions/ILibraryManager.cs
@@ -12,7 +12,7 @@ public interface ILibraryManager
     {
         IEnumerable<Library> GetReferencingLibraries(string name);
 
-        Library GetLibraryInformation(string name);
+        Library GetLibrary(string name);
 
         IEnumerable<Library> GetLibraries();
     }

diff --git a/src/Microsoft.Dnx.Runtime.Abstractions/Library.cs b/src/Microsoft.Dnx.Runtime.Abstractions/Library.cs
@@ -10,8 +10,28 @@ namespace Microsoft.Dnx.Runtime
     /// <summary>
     /// Exposes information about a library which can be an assembly, project, or a package.
     /// </summary>
-    public sealed class Library
+    public class Library
     {
+        public Library(string name)
+            : this(name, string.Empty, string.Empty, string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>())
+        {
+        }
+
+        public Library(string name, IEnumerable<string> dependencies)
+            : this(name, string.Empty, string.Empty, string.Empty, dependencies, Enumerable.Empty<AssemblyName>())
+        {
+        }
+
+        public Library(string name, string version, string path, string type, IEnumerable<string> dependencies, IEnumerable<AssemblyName> assemblies)
+        {
+            Name = name;
+            Version = version;
+            Path = path;
+            Type = type;
+            Dependencies = dependencies;
+            Assemblies = assemblies;
+        }
+
         /// <summary>
         /// Gets the name of the library.
         /// </summary>
@@ -41,25 +61,5 @@ public sealed class Library
         /// Gets a list of assembly names from the library that can be loaded. Packages can contain multiple assemblies.
         /// </summary>
         public IEnumerable<AssemblyName> Assemblies { get; }
-
-        public Library(string name)
-            : this(name, string.Empty, string.Empty, string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>())
-        {
-        }
-
-        public Library(string name, IEnumerable<string> dependencies)
-            : this(name, string.Empty, string.Empty, string.Empty, dependencies, Enumerable.Empty<AssemblyName>())
-        {
-        }
-
-        public Library(string name, string version, string path, string type, IEnumerable<string> dependencies, IEnumerable<AssemblyName> assemblies)
-        {
-            Name = name;
-            Version = version;
-            Path = path;
-            Type = type;
-            Dependencies = dependencies;
-            Assemblies = assemblies;
-        }
     }
 }
diff --git a/src/Microsoft.Dnx.Runtime/ApplicationHostContext.cs b/src/Microsoft.Dnx.Runtime/ApplicationHostContext.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
-using Microsoft.Dnx.Runtime.Caching;
-using Microsoft.Dnx.Runtime.Common.DependencyInjection;
 using Microsoft.Dnx.Compilation;
+using Microsoft.Dnx.Compilation.Caching;
+using Microsoft.Dnx.Runtime.Common.DependencyInjection;
 using Microsoft.Dnx.Runtime.DependencyManagement;
 using Microsoft.Dnx.Runtime.FileSystem;
 using Microsoft.Dnx.Runtime.Infrastructure;
@@ -112,10 +112,8 @@ public ApplicationHostContext(IServiceProvider hostServices,
             });
 
             // TODO(anurse): #2226 - Split LibraryManager implementation
-            var libraryManager = new LibraryManager(targetFramework, configuration, DependencyWalker,
-                LibraryExportProvider, cache);
-            LibraryManager = libraryManager;
-            LibraryExporter = libraryManager;
+            LibraryManager = new LibraryManager(DependencyWalker);
+            LibraryExporter = new LibraryExporter(targetFramework, configuration, LibraryManager, LibraryExportProvider, cache);
 
             AssemblyLoadContextFactory = loadContextFactory ?? new RuntimeLoadContextFactory(ServiceProvider);
             namedCacheDependencyProvider = namedCacheDependencyProvider ?? NamedCacheDependencyProvider.Empty;

diff --git a/...oviders/CompositeLibraryExportProvider.cs → ...ilation/CompositeLibraryExportProvider.cs b/...oviders/CompositeLibraryExportProvider.cs → ...ilation/CompositeLibraryExportProvider.cs