diff --git a/samples/HelloWorld/project.json b/samples/HelloWorld/project.json index e020b2f42..0f484970e 100644 --- a/samples/HelloWorld/project.json +++ b/samples/HelloWorld/project.json @@ -11,14 +11,14 @@ }, "frameworks": { "net45": { - "dependencies": { - "System.Collections": "", - "System.IO": "", - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Threading.Tasks": "", - "System.Text.Encoding": "" + "frameworkAssemblies": { + "System.Collections": "4.0.0.0", + "System.IO": "4.0.0.0", + "System.Runtime": "4.0.0.0", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0", + "System.Threading.Tasks": "4.0.0.0", + "System.Text.Encoding": "4.0.0.0" } }, "k10": { @@ -32,14 +32,14 @@ } }, "aspnet50": { - "dependencies": { - "System.Collections": "", - "System.IO": "", - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Threading.Tasks": "", - "System.Text.Encoding": "" + "frameworkAssemblies": { + "System.Collections": "4.0.0.0", + "System.IO": "4.0.0.0", + "System.Runtime": "4.0.0.0", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0", + "System.Threading.Tasks": "4.0.0.0", + "System.Text.Encoding": "4.0.0.0" } }, "aspnetcore50": { diff --git a/src/Microsoft.Framework.DesignTimeHost/project.json b/src/Microsoft.Framework.DesignTimeHost/project.json index 1a66396eb..54355c2a5 100644 --- a/src/Microsoft.Framework.DesignTimeHost/project.json +++ b/src/Microsoft.Framework.DesignTimeHost/project.json @@ -11,8 +11,8 @@ "compilationOptions" : { "define" : ["TRACE"], "warningsAsErrors": true }, "frameworks" : { "net45" : { - "dependencies" : { - "System.Net" : "" + "frameworkAssemblies" : { + "System.Net" : "4.0.0.0" } }, "aspnetcore50" : { diff --git a/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs b/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs index 284fc5286..b82055b70 100644 --- a/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs +++ b/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs @@ -170,14 +170,12 @@ private async Task RestoreForProject(string projectJsonPath, string rootDi new ProjectReferenceDependencyProvider( new ProjectResolver( projectDirectory, - rootDirectory), - new EmptyFrameworkResolver()))); + rootDirectory)))); localProviders.Add( new LocalWalkProvider( new NuGetDependencyResolver( - packagesDirectory, - new EmptyFrameworkResolver()))); + packagesDirectory))); var effectiveSources = PackageSourceUtils.GetEffectivePackageSources(SourceProvider, Sources, FallbackSources); @@ -285,8 +283,7 @@ private async Task RestoreFromGlobalJson(string rootDirectory, string pack localProviders.Add( new LocalWalkProvider( new NuGetDependencyResolver( - packagesDirectory, - new EmptyFrameworkResolver()))); + packagesDirectory))); var effectiveSources = PackageSourceUtils.GetEffectivePackageSources(SourceProvider, Sources, FallbackSources); diff --git a/src/Microsoft.Framework.PackageManager/project.json b/src/Microsoft.Framework.PackageManager/project.json index 27a47802f..ac08e40e9 100644 --- a/src/Microsoft.Framework.PackageManager/project.json +++ b/src/Microsoft.Framework.PackageManager/project.json @@ -12,16 +12,16 @@ "frameworks": { "net45": { - "dependencies": { - "System.Collections": "", - "System.IO": "", - "System.IO.Compression": "", - "System.Net.Http": "", - "System.Runtime": "", - "System.Runtime.Serialization": "", - "System.Security": "", - "System.Xml": "", - "System.Xml.Linq": "" + "frameworkAssemblies": { + "System.Collections": "4.0.0.0", + "System.IO": "4.0.0.0", + "System.IO.Compression": "4.0.0.0", + "System.Net.Http": "4.0.0.0", + "System.Runtime": "4.0.0.0", + "System.Runtime.Serialization": "4.0.0.0", + "System.Security": "4.0.0.0", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0" } }, "aspnetcore50": { diff --git a/src/Microsoft.Framework.Project/project.json b/src/Microsoft.Framework.Project/project.json index 8fa5cf33b..b4113b63f 100644 --- a/src/Microsoft.Framework.Project/project.json +++ b/src/Microsoft.Framework.Project/project.json @@ -9,13 +9,13 @@ }, "frameworks" : { "net45" : { - "dependencies": { - "System.Collections" : "", - "System.IO" : "", - "System.IO.Compression" : "", - "System.Runtime" : "", - "System.Xml": "", - "System.Xml.Linq": "" + "frameworkAssemblies": { + "System.Collections" : "4.0.0.0", + "System.IO" : "4.0.0.0", + "System.IO.Compression" : "4.0.0.0", + "System.Runtime" : "4.0.0.0", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0" } }, "aspnetcore50" : { diff --git a/src/Microsoft.Framework.Runtime.Roslyn/project.json b/src/Microsoft.Framework.Runtime.Roslyn/project.json index 7071c6d28..411f6795c 100644 --- a/src/Microsoft.Framework.Runtime.Roslyn/project.json +++ b/src/Microsoft.Framework.Runtime.Roslyn/project.json @@ -9,14 +9,14 @@ }, "frameworks" : { "net45" : { - "dependencies": { - "System.Collections" : "", - "System.IO": "", - "System.Runtime" : "", - "System.Xml": "", - "System.Xml.Linq": "", - "System.Threading.Tasks": "", - "System.Text.Encoding": "" + "frameworkAssemblies": { + "System.Collections" : "4.0.0.0", + "System.IO": "4.0.0.0", + "System.Runtime" : "4.0.0.0", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0", + "System.Threading.Tasks": "4.0.0.0", + "System.Text.Encoding": "4.0.0.0" } }, "aspnetcore50" : { diff --git a/src/Microsoft.Framework.Runtime/ApplicationHostContext.cs b/src/Microsoft.Framework.Runtime/ApplicationHostContext.cs index 068502e2b..e4eade253 100644 --- a/src/Microsoft.Framework.Runtime/ApplicationHostContext.cs +++ b/src/Microsoft.Framework.Runtime/ApplicationHostContext.cs @@ -29,9 +29,9 @@ public ApplicationHostContext(IServiceProvider serviceProvider, PackagesDirectory = packagesDirectory ?? NuGetDependencyResolver.ResolveRepositoryPath(RootDirectory); var referenceAssemblyDependencyResolver = new ReferenceAssemblyDependencyResolver(FrameworkReferenceResolver); - NuGetDependencyProvider = new NuGetDependencyResolver(PackagesDirectory, FrameworkReferenceResolver, RootDirectory); + NuGetDependencyProvider = new NuGetDependencyResolver(PackagesDirectory, RootDirectory); var gacDependencyResolver = new GacDependencyResolver(); - ProjectDepencyProvider = new ProjectReferenceDependencyProvider(ProjectResolver, FrameworkReferenceResolver); + ProjectDepencyProvider = new ProjectReferenceDependencyProvider(ProjectResolver); UnresolvedDependencyProvider = new UnresolvedDependencyProvider(); DependencyWalker = new DependencyWalker(new IDependencyProvider[] { diff --git a/src/Microsoft.Framework.Runtime/DependencyManagement/NuGetDependencyResolver.cs b/src/Microsoft.Framework.Runtime/DependencyManagement/NuGetDependencyResolver.cs index dde5f4df4..33031743c 100644 --- a/src/Microsoft.Framework.Runtime/DependencyManagement/NuGetDependencyResolver.cs +++ b/src/Microsoft.Framework.Runtime/DependencyManagement/NuGetDependencyResolver.cs @@ -22,16 +22,14 @@ public class NuGetDependencyResolver : IDependencyProvider, ILibraryExportProvid // All the information required by this package private readonly Dictionary _packageDescriptions = new Dictionary(StringComparer.OrdinalIgnoreCase); - private readonly IFrameworkReferenceResolver _frameworkReferenceResolver; - private readonly GlobalSettings _globalSettings; - public NuGetDependencyResolver(string packagesPath, IFrameworkReferenceResolver frameworkReferenceResolver, string rootDir = null) + public NuGetDependencyResolver(string packagesPath, string rootDir = null) { // Runtime already ensures case-sensitivity, so we don't need package ids in accurate casing here _repository = new PackageRepository(packagesPath, checkPackageIdCase: false); - _frameworkReferenceResolver = frameworkReferenceResolver; Dependencies = Enumerable.Empty(); + if (!string.IsNullOrEmpty(rootDir)) { GlobalSettings.TryGetGlobalSettings(rootDir, out _globalSettings); @@ -281,11 +279,6 @@ private void PopulateMetadataReferences(PackageDescription description, Framewor paths[assembly.Name] = new MetadataFileReference(assembly.Name, assembly.Path); } } - - foreach (var assembly in GetFrameworkAssemblies(description, targetFramework)) - { - paths[assembly.Name] = new MetadataFileReference(assembly.Name, assembly.Path); - } } @@ -300,31 +293,6 @@ private IEnumerable GetSharedSources(PackageDescription description, Fra return Directory.EnumerateFiles(directory, "*.*", SearchOption.AllDirectories); } - private List GetFrameworkAssemblies(PackageDescription description, FrameworkName targetFramework) - { - var results = new List(); - var package = description.Package; - - IEnumerable frameworkAssemblies; - if (VersionUtility.TryGetCompatibleItems(targetFramework, package.FrameworkAssemblies, out frameworkAssemblies)) - { - foreach (var reference in frameworkAssemblies) - { - string path; - if (_frameworkReferenceResolver.TryGetAssembly(reference.AssemblyName, targetFramework, out path)) - { - results.Add(new AssemblyDescription - { - Name = reference.AssemblyName, - Path = path - }); - } - } - } - - return results; - } - private static List GetPackageAssemblies(PackageDescription description, FrameworkName targetFramework) { var package = description.Package; diff --git a/src/Microsoft.Framework.Runtime/DependencyManagement/ProjectReferenceDependencyProvider.cs b/src/Microsoft.Framework.Runtime/DependencyManagement/ProjectReferenceDependencyProvider.cs index ea50e5a4d..617adf55e 100644 --- a/src/Microsoft.Framework.Runtime/DependencyManagement/ProjectReferenceDependencyProvider.cs +++ b/src/Microsoft.Framework.Runtime/DependencyManagement/ProjectReferenceDependencyProvider.cs @@ -13,12 +13,10 @@ namespace Microsoft.Framework.Runtime public class ProjectReferenceDependencyProvider : IDependencyProvider { private readonly IProjectResolver _projectResolver; - private readonly IFrameworkReferenceResolver _frameworkReferenceResolver; - public ProjectReferenceDependencyProvider(IProjectResolver projectResolver, IFrameworkReferenceResolver frameworkReferenceResolver) + public ProjectReferenceDependencyProvider(IProjectResolver projectResolver) { _projectResolver = projectResolver; - _frameworkReferenceResolver = frameworkReferenceResolver; Dependencies = Enumerable.Empty(); } @@ -71,25 +69,6 @@ public LibraryDescription GetDescription(Library library, FrameworkName targetFr var dependencies = project.Dependencies.Concat(targetFrameworkDependencies).ToList(); - // TODO: Remove this code once there's a new build of the KRE - // We need to keep this for bootstrapping to continue working - foreach (var d in dependencies) - { - if (d.Library.IsGacOrFrameworkReference) - { - continue; - } - - string path; - d.Library.IsGacOrFrameworkReference = _frameworkReferenceResolver.TryGetAssembly(d.Name, targetFramework, out path); - - // We need to fix up the version here since - if (d.Library.IsGacOrFrameworkReference) - { - d.Library.Version = VersionUtility.GetAssemblyVersion(path); - } - } - return new LibraryDescription { Identity = new Library diff --git a/src/Microsoft.Framework.Runtime/project.json b/src/Microsoft.Framework.Runtime/project.json index 98f44a27b..96b14e928 100644 --- a/src/Microsoft.Framework.Runtime/project.json +++ b/src/Microsoft.Framework.Runtime/project.json @@ -9,14 +9,14 @@ }, "frameworks": { "net45": { - "dependencies": { - "System.Collections": "", - "System.IO": "", - "System.IO.Compression": "", - "System.IO.Compression.FileSystem": "", - "System.Runtime": "", - "System.Xml": "", - "System.Xml.Linq": "" + "frameworkAssemblies": { + "System.Collections": "4.0.0.0", + "System.IO": "4.0.0.0", + "System.IO.Compression": "4.0.0.0", + "System.IO.Compression.FileSystem": "4.0.0.0", + "System.Runtime": "4.0.0.0", + "System.Xml": "4.0.0.0", + "System.Xml.Linq": "4.0.0.0" } }, "aspnetcore50": { diff --git a/src/klr.host/project.json b/src/klr.host/project.json index e5ca59c7c..fa3ce3a58 100644 --- a/src/klr.host/project.json +++ b/src/klr.host/project.json @@ -7,8 +7,8 @@ }, "frameworks": { "net45": { - "dependencies": { - "System.Runtime": "" + "frameworkAssemblies": { + "System.Runtime": "4.0.0.0" } }, "aspnetcore50": { diff --git a/test/Microsoft.Framework.CommandLineUtils.Tests/project.json b/test/Microsoft.Framework.CommandLineUtils.Tests/project.json index 6df336d46..4af743f57 100644 --- a/test/Microsoft.Framework.CommandLineUtils.Tests/project.json +++ b/test/Microsoft.Framework.CommandLineUtils.Tests/project.json @@ -1,15 +1,11 @@ { "dependencies": { - "Microsoft.Framework.CommandLineUtils": "", + "Microsoft.Framework.CommandLineUtils": "", "Xunit.KRunner": "1.0.0-*" }, - "frameworks" : { - "aspnet50" : { - "dependencies": { - "System.Runtime": "" - } - } + "frameworks": { + "aspnet50": { } }, "commands": { diff --git a/test/Microsoft.Framework.Runtime.Roslyn.Tests/project.json b/test/Microsoft.Framework.Runtime.Roslyn.Tests/project.json index efe4b05d1..978e54453 100644 --- a/test/Microsoft.Framework.Runtime.Roslyn.Tests/project.json +++ b/test/Microsoft.Framework.Runtime.Roslyn.Tests/project.json @@ -1,19 +1,12 @@ { "dependencies": { - "K.Roslyn" : "1.0.0-*", + "K.Roslyn": "1.0.0-*", "Microsoft.Framework.Runtime.Interfaces": "", "Microsoft.Framework.Runtime.Roslyn": "", "Xunit.KRunner": "1.0.0-*" }, "frameworks": { - "aspnet50": { - "dependencies": { - "System.Collections" : "", - "System.Runtime" : "", - "System.Xml": "", - "System.Xml.Linq": "" - } - } + "aspnet50": { } }, "commands": { "test": "Xunit.KRunner" diff --git a/test/Microsoft.Framework.Runtime.Tests/project.json b/test/Microsoft.Framework.Runtime.Tests/project.json index bc9dd4afc..be4cc1d1a 100644 --- a/test/Microsoft.Framework.Runtime.Tests/project.json +++ b/test/Microsoft.Framework.Runtime.Tests/project.json @@ -2,15 +2,11 @@ "dependencies": { "Microsoft.Framework.Runtime": "", "Microsoft.Framework.Runtime.Interfaces": "", - "Shouldly" : "1.1.1.1", + "Shouldly": "1.1.1.1", "Xunit.KRunner": "1.0.0-*" }, "frameworks": { - "aspnet50": { - "dependencies": { - "System.Runtime" : "" - } - } + "aspnet50": { } }, "commands": { "test": "Xunit.KRunner"