From 2ea227e388a73cd854479047f640159fdec21d68 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 26 Sep 2016 15:34:10 -0700 Subject: [PATCH] Fixing a build break on windows. --- src/Microsoft.DotNet.Compiler.Common/project.json | 3 +++ .../ProjectDependencyFinder.cs | 1 - .../Resolution/UnresolvedDependencyProvider.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index ce94b9421..2573ee69b 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -30,6 +30,9 @@ }, "System.Threading.Tasks": { "type": "build" + }, + "System.Text.Encoding": { + "type": "build" } } }, diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs index 6f1522b56..4be944cae 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectDependencyFinder.cs @@ -60,7 +60,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration if (!possibleProjectDependencies.TryGetValue(projectExportName, out projectDependency)) { - Console.WriteLine($"Don't have it: {projectExportName} {projectExport.Library.Identity.Type}"); if (projectExport.Library.Identity.Type.Equals(LibraryType.Project) && !preResolvedProjects.Contains(projectExportName)) { diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs index 227c7b8e7..599d96cd9 100644 --- a/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs +++ b/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution new LibraryIdentity( libraryDependency.Name, libraryDependency.LibraryRange.VersionRange?.MinVersion, - libraryDependency.LibraryRange.TypeConstraint == LibraryDependencyTarget.Project ? LibraryType.Project : LibraryType.Unresolved), + GetLibraryTypeFromLibraryDependencyTarget(libraryDependency.LibraryRange.TypeConstraint)), hash: null, path: null, dependencies: Enumerable.Empty(),