diff --git a/DNX.sln b/DNX.sln index fcad11066..e9ec91c7b 100644 --- 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 index e64d3ea21..8b85314d5 100644 --- 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/src/Microsoft.Dnx.Compilation.Abstractions/CacheContext.cs b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/CacheContext.cs similarity index 88% rename from src/Microsoft.Dnx.Compilation.Abstractions/CacheContext.cs rename to src/Microsoft.Dnx.Compilation.Abstractions/Caching/CacheContext.cs index c014aea6c..aa23ca097 100644 --- a/src/Microsoft.Dnx.Compilation.Abstractions/CacheContext.cs +++ b/src/Microsoft.Dnx.Compilation.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/src/Microsoft.Dnx.Compilation.Abstractions/CacheExtensions.cs b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/CacheExtensions.cs similarity index 91% rename from src/Microsoft.Dnx.Compilation.Abstractions/CacheExtensions.cs rename to src/Microsoft.Dnx.Compilation.Abstractions/Caching/CacheExtensions.cs index 4c2a5db58..56712deb7 100644 --- a/src/Microsoft.Dnx.Compilation.Abstractions/CacheExtensions.cs +++ b/src/Microsoft.Dnx.Compilation.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/src/Microsoft.Dnx.Compilation.Abstractions/ICache.cs b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICache.cs similarity index 82% rename from src/Microsoft.Dnx.Compilation.Abstractions/ICache.cs rename to src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICache.cs index e95c4d2d2..d06382eec 100644 --- a/src/Microsoft.Dnx.Compilation.Abstractions/ICache.cs +++ b/src/Microsoft.Dnx.Compilation.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/src/Microsoft.Dnx.Compilation.Abstractions/ICacheContextAccessor.cs b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICacheContextAccessor.cs similarity index 68% rename from src/Microsoft.Dnx.Compilation.Abstractions/ICacheContextAccessor.cs rename to src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICacheContextAccessor.cs index ba7fec2ec..8eec6e8bf 100644 --- a/src/Microsoft.Dnx.Compilation.Abstractions/ICacheContextAccessor.cs +++ b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICacheContextAccessor.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Dnx.Runtime.Caching +namespace Microsoft.Dnx.Compilation.Caching { public interface ICacheContextAccessor { diff --git a/src/Microsoft.Dnx.Compilation.Abstractions/ICacheDependency.cs b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICacheDependency.cs similarity index 64% rename from src/Microsoft.Dnx.Compilation.Abstractions/ICacheDependency.cs rename to src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICacheDependency.cs index c8b926c85..e7cd90e06 100644 --- a/src/Microsoft.Dnx.Compilation.Abstractions/ICacheDependency.cs +++ b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/ICacheDependency.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Dnx.Runtime.Caching +namespace Microsoft.Dnx.Compilation.Caching { public interface ICacheDependency { diff --git a/src/Microsoft.Dnx.Compilation.Abstractions/INamedCacheDependencyProvider.cs b/src/Microsoft.Dnx.Compilation.Abstractions/Caching/INamedCacheDependencyProvider.cs similarity index 77% rename from src/Microsoft.Dnx.Compilation.Abstractions/INamedCacheDependencyProvider.cs rename to src/Microsoft.Dnx.Compilation.Abstractions/Caching/INamedCacheDependencyProvider.cs index 7ee822e92..8008bb49a 100644 --- a/src/Microsoft.Dnx.Compilation.Abstractions/INamedCacheDependencyProvider.cs +++ b/src/Microsoft.Dnx.Compilation.Abstractions/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 index 6960e54bf..3ac25dd1c 100644 --- 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 { /// /// 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 index 16fc91741..6d0549102 100644 --- 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 index a9ed19bf5..a445c9239 100644 --- 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 index b3cb7a0f7..71a894656 100644 --- 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/src/Microsoft.Dnx.Compilation.Caching/Cache.cs b/src/Microsoft.Dnx.Compilation/Caching/Cache.cs similarity index 98% rename from src/Microsoft.Dnx.Compilation.Caching/Cache.cs rename to src/Microsoft.Dnx.Compilation/Caching/Cache.cs index 3eb879dd7..af4b9073c 100644 --- a/src/Microsoft.Dnx.Compilation.Caching/Cache.cs +++ b/src/Microsoft.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/src/Microsoft.Dnx.Compilation.Caching/CacheContextAccessor.cs b/src/Microsoft.Dnx.Compilation/Caching/CacheContextAccessor.cs similarity index 86% rename from src/Microsoft.Dnx.Compilation.Caching/CacheContextAccessor.cs rename to src/Microsoft.Dnx.Compilation/Caching/CacheContextAccessor.cs index 628e46853..37839a822 100644 --- a/src/Microsoft.Dnx.Compilation.Caching/CacheContextAccessor.cs +++ b/src/Microsoft.Dnx.Compilation/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/src/Microsoft.Dnx.Compilation.Caching/FileWriteTimeCacheDependency.cs b/src/Microsoft.Dnx.Compilation/Caching/FileWriteTimeCacheDependency.cs similarity index 92% rename from src/Microsoft.Dnx.Compilation.Caching/FileWriteTimeCacheDependency.cs rename to src/Microsoft.Dnx.Compilation/Caching/FileWriteTimeCacheDependency.cs index ade5c4ead..6b5fbe960 100644 --- a/src/Microsoft.Dnx.Compilation.Caching/FileWriteTimeCacheDependency.cs +++ b/src/Microsoft.Dnx.Compilation/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/src/Microsoft.Dnx.Compilation.Caching/NamedCacheDependency.cs b/src/Microsoft.Dnx.Compilation/Caching/NamedCacheDependency.cs similarity index 90% rename from src/Microsoft.Dnx.Compilation.Caching/NamedCacheDependency.cs rename to src/Microsoft.Dnx.Compilation/Caching/NamedCacheDependency.cs index 32289f18d..cc3c35cc6 100644 --- a/src/Microsoft.Dnx.Compilation.Caching/NamedCacheDependency.cs +++ b/src/Microsoft.Dnx.Compilation/Caching/NamedCacheDependency.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Dnx.Runtime.Caching +namespace Microsoft.Dnx.Compilation.Caching { public class NamedCacheDependency : ICacheDependency { diff --git a/src/Microsoft.Dnx.Compilation.Caching/NamedCacheDependencyProvider.cs b/src/Microsoft.Dnx.Compilation/Caching/NamedCacheDependencyProvider.cs similarity index 97% rename from src/Microsoft.Dnx.Compilation.Caching/NamedCacheDependencyProvider.cs rename to src/Microsoft.Dnx.Compilation/Caching/NamedCacheDependencyProvider.cs index 0a465df81..456c75451 100644 --- a/src/Microsoft.Dnx.Compilation.Caching/NamedCacheDependencyProvider.cs +++ b/src/Microsoft.Dnx.Compilation/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/src/Microsoft.Dnx.Compilation.Caching/Microsoft.Dnx.Compilation.Caching.xproj b/src/Microsoft.Dnx.Compilation/Microsoft.Dnx.Compilation.xproj similarity index 89% rename from src/Microsoft.Dnx.Compilation.Caching/Microsoft.Dnx.Compilation.Caching.xproj rename to src/Microsoft.Dnx.Compilation/Microsoft.Dnx.Compilation.xproj index f15a5f403..310cfa755 100644 --- a/src/Microsoft.Dnx.Compilation.Caching/Microsoft.Dnx.Compilation.Caching.xproj +++ b/src/Microsoft.Dnx.Compilation/Microsoft.Dnx.Compilation.xproj @@ -6,10 +6,12 @@ - 7004fc14-677b-491f-a98b-e44c61733b46 + 587f95e0-0e56-4c37-8530-6b1485be01ae + Microsoft.Dnx.Compilation ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ + 2.0 diff --git a/src/Microsoft.Dnx.Compilation.Caching/project.json b/src/Microsoft.Dnx.Compilation/project.json similarity index 100% rename from src/Microsoft.Dnx.Compilation.Caching/project.json rename to src/Microsoft.Dnx.Compilation/project.json diff --git a/src/Microsoft.Dnx.DesignTimeHost/ApplicationContext.cs b/src/Microsoft.Dnx.DesignTimeHost/ApplicationContext.cs index bb3b1e9b6..ae5bcb4ba 100644 --- 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 index dcaab226b..c0f5277f3 100644 --- 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 index e5d03538c..9072b69a8 100644 --- 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 index 8bf52ab59..0c40d3d26 100644 --- 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 index aae937d93..1fbfbe71c 100644 --- a/src/Microsoft.Dnx.Runtime.Abstractions/ILibraryManager.cs +++ b/src/Microsoft.Dnx.Runtime.Abstractions/ILibraryManager.cs @@ -12,7 +12,7 @@ public interface ILibraryManager { IEnumerable GetReferencingLibraries(string name); - Library GetLibraryInformation(string name); + Library GetLibrary(string name); IEnumerable GetLibraries(); } diff --git a/src/Microsoft.Dnx.Runtime.Abstractions/Library.cs b/src/Microsoft.Dnx.Runtime.Abstractions/Library.cs index 47f66a3df..dbfde63a8 100644 --- a/src/Microsoft.Dnx.Runtime.Abstractions/Library.cs +++ b/src/Microsoft.Dnx.Runtime.Abstractions/Library.cs @@ -10,8 +10,28 @@ namespace Microsoft.Dnx.Runtime /// /// Exposes information about a library which can be an assembly, project, or a package. /// - public sealed class Library + public class Library { + public Library(string name) + : this(name, string.Empty, string.Empty, string.Empty, Enumerable.Empty(), Enumerable.Empty()) + { + } + + public Library(string name, IEnumerable dependencies) + : this(name, string.Empty, string.Empty, string.Empty, dependencies, Enumerable.Empty()) + { + } + + public Library(string name, string version, string path, string type, IEnumerable dependencies, IEnumerable assemblies) + { + Name = name; + Version = version; + Path = path; + Type = type; + Dependencies = dependencies; + Assemblies = assemblies; + } + /// /// Gets the name of the library. /// @@ -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. /// public IEnumerable Assemblies { get; } - - public Library(string name) - : this(name, string.Empty, string.Empty, string.Empty, Enumerable.Empty(), Enumerable.Empty()) - { - } - - public Library(string name, IEnumerable dependencies) - : this(name, string.Empty, string.Empty, string.Empty, dependencies, Enumerable.Empty()) - { - } - - public Library(string name, string version, string path, string type, IEnumerable dependencies, IEnumerable 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 index c47658456..1dfe2572b 100644 --- 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/src/Microsoft.Dnx.Runtime/ExportProviders/CompositeLibraryExportProvider.cs b/src/Microsoft.Dnx.Runtime/Compilation/CompositeLibraryExportProvider.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/CompositeLibraryExportProvider.cs rename to src/Microsoft.Dnx.Runtime/Compilation/CompositeLibraryExportProvider.cs diff --git a/src/Microsoft.Dnx.Runtime/Compilation/LibraryExporter.cs b/src/Microsoft.Dnx.Runtime/Compilation/LibraryExporter.cs new file mode 100644 index 000000000..5969d89e3 --- /dev/null +++ b/src/Microsoft.Dnx.Runtime/Compilation/LibraryExporter.cs @@ -0,0 +1,62 @@ +using System; +using System.Runtime.Versioning; +using Microsoft.Dnx.Compilation; +using Microsoft.Dnx.Compilation.Caching; + +namespace Microsoft.Dnx.Runtime +{ + public class LibraryExporter : ILibraryExporter + { + private readonly ILibraryManager _libraryManager; + private readonly FrameworkName _targetFramework; + private readonly string _configuration; + private readonly ILibraryExportProvider _libraryExportProvider; + private readonly ICache _cache; + + public LibraryExporter(FrameworkName targetFramework, + string configuration, + ILibraryManager libraryManager, + ILibraryExportProvider libraryExportProvider, + ICache cache) + { + _targetFramework = targetFramework; + _configuration = configuration; + _libraryExportProvider = libraryExportProvider; + _libraryManager = libraryManager; + _cache = cache; + } + + public LibraryExport GetLibraryExport(string name) + { + return GetLibraryExport(name, aspect: null); + } + + public LibraryExport GetAllExports(string name) + { + return GetAllExports(name, aspect: null); + } + + public LibraryExport GetLibraryExport(string name, string aspect) + { + return _libraryExportProvider.GetLibraryExport(new CompilationTarget(name, _targetFramework, _configuration, aspect)); + } + + public LibraryExport GetAllExports(string name, string aspect) + { + var key = Tuple.Create( + nameof(LibraryExporter), + nameof(GetAllExports), + name, + _targetFramework, + _configuration, + aspect); + + return _cache.Get(key, ctx => + ProjectExportProviderHelper.GetExportsRecursive( + _libraryManager, + _libraryExportProvider, + new CompilationTarget(name, _targetFramework, _configuration, aspect), + dependenciesOnly: false)); + } + } +} diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/ProjectExportProviderHelper.cs b/src/Microsoft.Dnx.Runtime/Compilation/ProjectExportProviderHelper.cs similarity index 97% rename from src/Microsoft.Dnx.Runtime/ExportProviders/ProjectExportProviderHelper.cs rename to src/Microsoft.Dnx.Runtime/Compilation/ProjectExportProviderHelper.cs index 12a5fd766..355e4acea 100644 --- a/src/Microsoft.Dnx.Runtime/ExportProviders/ProjectExportProviderHelper.cs +++ b/src/Microsoft.Dnx.Runtime/Compilation/ProjectExportProviderHelper.cs @@ -46,7 +46,7 @@ public static LibraryExport GetExportsRecursive( var rootNode = new Node { - Library = manager.GetLibraryInformation(target.Name) + Library = manager.GetLibrary(target.Name) }; queue.Enqueue(rootNode); @@ -86,7 +86,7 @@ public static LibraryExport GetExportsRecursive( { var childNode = new Node { - Library = manager.GetLibraryInformation(dependency), + Library = manager.GetLibrary(dependency), Parent = node }; diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/ProjectLibraryExportProvider.cs b/src/Microsoft.Dnx.Runtime/Compilation/ProjectLibraryExportProvider.cs similarity index 99% rename from src/Microsoft.Dnx.Runtime/ExportProviders/ProjectLibraryExportProvider.cs rename to src/Microsoft.Dnx.Runtime/Compilation/ProjectLibraryExportProvider.cs index fa359bb7d..e7d5b4c9f 100644 --- a/src/Microsoft.Dnx.Runtime/ExportProviders/ProjectLibraryExportProvider.cs +++ b/src/Microsoft.Dnx.Runtime/Compilation/ProjectLibraryExportProvider.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.IO; -using Microsoft.Dnx.Runtime.Caching; using Microsoft.Dnx.Compilation; +using Microsoft.Dnx.Compilation.Caching; using Microsoft.Dnx.Runtime.Infrastructure; namespace Microsoft.Dnx.Runtime diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/Resources/CompositeResourceProvider.cs b/src/Microsoft.Dnx.Runtime/Compilation/Resources/CompositeResourceProvider.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/Resources/CompositeResourceProvider.cs rename to src/Microsoft.Dnx.Runtime/Compilation/Resources/CompositeResourceProvider.cs diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/Resources/CreateCSharpManifestResourceName.cs b/src/Microsoft.Dnx.Runtime/Compilation/Resources/CreateCSharpManifestResourceName.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/Resources/CreateCSharpManifestResourceName.cs rename to src/Microsoft.Dnx.Runtime/Compilation/Resources/CreateCSharpManifestResourceName.cs diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/Resources/EmbeddedResourceProvider.cs b/src/Microsoft.Dnx.Runtime/Compilation/Resources/EmbeddedResourceProvider.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/Resources/EmbeddedResourceProvider.cs rename to src/Microsoft.Dnx.Runtime/Compilation/Resources/EmbeddedResourceProvider.cs diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/Resources/IResourceProvider.cs b/src/Microsoft.Dnx.Runtime/Compilation/Resources/IResourceProvider.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/Resources/IResourceProvider.cs rename to src/Microsoft.Dnx.Runtime/Compilation/Resources/IResourceProvider.cs diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/Resources/ResourcePathUtility.cs b/src/Microsoft.Dnx.Runtime/Compilation/Resources/ResourcePathUtility.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/Resources/ResourcePathUtility.cs rename to src/Microsoft.Dnx.Runtime/Compilation/Resources/ResourcePathUtility.cs diff --git a/src/Microsoft.Dnx.Runtime/ExportProviders/Resources/ResxResourceProvider.cs b/src/Microsoft.Dnx.Runtime/Compilation/Resources/ResxResourceProvider.cs similarity index 100% rename from src/Microsoft.Dnx.Runtime/ExportProviders/Resources/ResxResourceProvider.cs rename to src/Microsoft.Dnx.Runtime/Compilation/Resources/ResxResourceProvider.cs diff --git a/src/Microsoft.Dnx.Runtime/DefaultHost.cs b/src/Microsoft.Dnx.Runtime/DefaultHost.cs index 8e51e5534..d08567432 100644 --- a/src/Microsoft.Dnx.Runtime/DefaultHost.cs +++ b/src/Microsoft.Dnx.Runtime/DefaultHost.cs @@ -8,9 +8,9 @@ using System.Linq; using System.Reflection; 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.FileSystem; using Microsoft.Dnx.Runtime.Infrastructure; using Microsoft.Dnx.Runtime.Loader; diff --git a/src/Microsoft.Dnx.Runtime/DependencyManagement/LibraryManager.cs b/src/Microsoft.Dnx.Runtime/DependencyManagement/LibraryManager.cs index e35d4ccb9..f5b2fe8db 100644 --- a/src/Microsoft.Dnx.Runtime/DependencyManagement/LibraryManager.cs +++ b/src/Microsoft.Dnx.Runtime/DependencyManagement/LibraryManager.cs @@ -4,48 +4,25 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.Versioning; -using Microsoft.Dnx.Runtime.Caching; -using Microsoft.Dnx.Compilation; namespace Microsoft.Dnx.Runtime { - public class LibraryManager : ILibraryManager, ILibraryExporter + public class LibraryManager : ILibraryManager { - private readonly FrameworkName _targetFramework; - private readonly string _configuration; - private readonly ILibraryExportProvider _libraryExportProvider; - private readonly ICache _cache; private readonly Func> _libraryInfoThunk; private readonly object _initializeLock = new object(); private Dictionary> _inverse; private Dictionary _graph; private bool _initialized; - public LibraryManager(FrameworkName targetFramework, - string configuration, - DependencyWalker dependencyWalker, - ILibraryExportProvider libraryExportProvider, - ICache cache) - : this(targetFramework, - configuration, - GetLibraryInfoThunk(dependencyWalker), - libraryExportProvider, - cache) + public LibraryManager(DependencyWalker dependencyWalker) + : this(GetLibraryInfoThunk(dependencyWalker)) { } - public LibraryManager(FrameworkName targetFramework, - string configuration, - Func> libraryInfoThunk, - ILibraryExportProvider libraryExportProvider, - ICache cache) + public LibraryManager(Func> libraryInfoThunk) { - _targetFramework = targetFramework; - _configuration = configuration; _libraryInfoThunk = libraryInfoThunk; - _libraryExportProvider = libraryExportProvider; - _cache = cache; } private Dictionary LibraryLookup @@ -66,16 +43,6 @@ private Dictionary> InverseGraph } } - public LibraryExport GetLibraryExport(string name) - { - return GetLibraryExport(name, aspect: null); - } - - public LibraryExport GetAllExports(string name) - { - return GetAllExports(name, aspect: null); - } - public IEnumerable GetReferencingLibraries(string name) { IEnumerable libraries; @@ -87,7 +54,7 @@ public IEnumerable GetReferencingLibraries(string name) return Enumerable.Empty(); } - public Library GetLibraryInformation(string name) + public Library GetLibrary(string name) { Library information; if (LibraryLookup.TryGetValue(name, out information)) @@ -104,29 +71,6 @@ public IEnumerable GetLibraries() return _graph.Values; } - public LibraryExport GetLibraryExport(string name, string aspect) - { - return _libraryExportProvider.GetLibraryExport(new CompilationTarget(name, _targetFramework, _configuration, aspect)); - } - - public LibraryExport GetAllExports(string name, string aspect) - { - var key = Tuple.Create( - nameof(LibraryManager), - nameof(GetAllExports), - name, - _targetFramework, - _configuration, - aspect); - - return _cache.Get(key, ctx => - ProjectExportProviderHelper.GetExportsRecursive( - this, - _libraryExportProvider, - new CompilationTarget(name, _targetFramework, _configuration, aspect), - dependenciesOnly: false)); - } - private void EnsureInitialized() { lock (_initializeLock) diff --git a/src/Microsoft.Dnx.Runtime/project.json b/src/Microsoft.Dnx.Runtime/project.json index 1222ce005..d6ff603c7 100644 --- a/src/Microsoft.Dnx.Runtime/project.json +++ b/src/Microsoft.Dnx.Runtime/project.json @@ -14,7 +14,7 @@ ], "dependencies": { "Microsoft.Dnx.Compilation.CSharp.Abstractions": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.Dnx.Compilation.Caching": "1.0.0-*", + "Microsoft.Dnx.Compilation": "1.0.0-*", "Microsoft.Dnx.Compilation.Abstractions": "1.0.0-*", "Microsoft.Dnx.Loader": "1.0.0-*", "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", diff --git a/src/Microsoft.Dnx.Tooling/Building/BuildContext.cs b/src/Microsoft.Dnx.Tooling/Building/BuildContext.cs index 5688fa256..a460486a4 100644 --- a/src/Microsoft.Dnx.Tooling/Building/BuildContext.cs +++ b/src/Microsoft.Dnx.Tooling/Building/BuildContext.cs @@ -3,9 +3,9 @@ using System.IO; using System.Linq; using System.Runtime.Versioning; -using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Caching; using Microsoft.Dnx.Compilation; +using Microsoft.Dnx.Compilation.Caching; +using Microsoft.Dnx.Runtime; using Microsoft.Dnx.Runtime.Infrastructure; using Microsoft.Dnx.Runtime.Loader; using NuGet; diff --git a/src/Microsoft.Dnx.Tooling/Building/BuildManager.cs b/src/Microsoft.Dnx.Tooling/Building/BuildManager.cs index 9469b6b72..a7b4d08fb 100644 --- a/src/Microsoft.Dnx.Tooling/Building/BuildManager.cs +++ b/src/Microsoft.Dnx.Tooling/Building/BuildManager.cs @@ -6,12 +6,12 @@ using System.Diagnostics; using System.IO; using System.Linq; -using Microsoft.Framework.FileSystemGlobbing; -using Microsoft.Framework.FileSystemGlobbing.Abstractions; +using Microsoft.Dnx.Compilation.Caching; +using Microsoft.Dnx.Runtime; using Microsoft.Dnx.Tooling.SourceControl; using Microsoft.Dnx.Tooling.Utils; -using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Caching; +using Microsoft.Framework.FileSystemGlobbing; +using Microsoft.Framework.FileSystemGlobbing.Abstractions; using NuGet; namespace Microsoft.Dnx.Tooling diff --git a/src/Microsoft.Dnx.Tooling/List/DependencyListOperation.cs b/src/Microsoft.Dnx.Tooling/List/DependencyListOperation.cs index 8852ae58e..74711c24b 100644 --- a/src/Microsoft.Dnx.Tooling/List/DependencyListOperation.cs +++ b/src/Microsoft.Dnx.Tooling/List/DependencyListOperation.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Runtime.Versioning; -using Microsoft.Dnx.Tooling.Algorithms; +using Microsoft.Dnx.Compilation.Caching; using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Caching; +using Microsoft.Dnx.Tooling.Algorithms; using NuGet; namespace Microsoft.Dnx.Tooling.List diff --git a/src/Microsoft.Dnx.Tooling/Publish/DependencyContext.cs b/src/Microsoft.Dnx.Tooling/Publish/DependencyContext.cs index 19d9df098..a51328dc6 100644 --- a/src/Microsoft.Dnx.Tooling/Publish/DependencyContext.cs +++ b/src/Microsoft.Dnx.Tooling/Publish/DependencyContext.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Versioning; +using Microsoft.Dnx.Compilation.Caching; using Microsoft.Dnx.Runtime; -using Microsoft.Dnx.Runtime.Caching; using Microsoft.Dnx.Runtime.Common.Impl; using NuGet; diff --git a/src/Microsoft.Dnx.Tooling/project.json b/src/Microsoft.Dnx.Tooling/project.json index 2e303ed2a..d480740b8 100644 --- a/src/Microsoft.Dnx.Tooling/project.json +++ b/src/Microsoft.Dnx.Tooling/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "compilationOptions": { "warningsAsErrors": true }, "dependencies": { + "Microsoft.Dnx.Compilation": "1.0.0-*", "Microsoft.Dnx.Project": "1.0.0-*", "Microsoft.Dnx.Runtime": "1.0.0-*", "Microsoft.Dnx.Runtime.CommandParsing.Sources": { "version": "1.0.0-*", "type": "build" }, diff --git a/test/Microsoft.Dnx.Runtime.Tests/LibraryManagerFacts.cs b/test/Microsoft.Dnx.Runtime.Tests/LibraryManagerFacts.cs index de4fcaedc..3c3f1aaac 100644 --- a/test/Microsoft.Dnx.Runtime.Tests/LibraryManagerFacts.cs +++ b/test/Microsoft.Dnx.Runtime.Tests/LibraryManagerFacts.cs @@ -5,8 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.Versioning; -using Microsoft.Dnx.Runtime.Caching; -using Microsoft.Dnx.Compilation; +using Microsoft.Dnx.Compilation.Caching; using Xunit; namespace Microsoft.Dnx.Runtime.Tests @@ -58,11 +57,7 @@ private static LibraryManager CreateManager(IEnumerable libraryInfo = n new Library("Config", Enumerable.Empty()), new Library("MyApp", new[] { "DI", "Hosting", "Mvc", "HttpAbstractions" }) }; - return new LibraryManager(frameworkName, - "Debug", - () => libraryInfo, - new CompositeLibraryExportProvider(Enumerable.Empty()), - new EmptyCache()); + return new LibraryManager(() => libraryInfo); } private class EmptyCache : ICache