mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2812 from dotnet/pakrym/is-package-based

Browse source 
Remove IsPackageBased() workaround
This commit is contained in:
Pavel Krymets 2016-05-02 11:16:43 -07:00
commit 18f9018eb9
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs
View file

@ -417,7 +417,7 @@ namespace Microsoft.DotNet.ProjectModel
if (package != null && if (package != null &&
package.Resolved && package.Resolved &&
package.HasCompileTimePlaceholder && package.HasCompileTimePlaceholder &&
!TargetFramework.IsPackageBased()) !TargetFramework.IsPackageBased)
{ {
var newKey = new LibraryKey(library.Identity.Name, LibraryType.ReferenceAssembly); var newKey = new LibraryKey(library.Identity.Name, LibraryType.ReferenceAssembly);
var dependency = new LibraryRange(library.Identity.Name, LibraryType.ReferenceAssembly); var dependency = new LibraryRange(library.Identity.Name, LibraryType.ReferenceAssembly);

2
src/Microsoft.DotNet.ProjectModel/Resolution/MSBuildDependencyProvider.cs
View file

@ -83,7 +83,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
LibraryDependencyType.Default)); LibraryDependencyType.Default));
} }
if (!targetFramework.IsPackageBased()) if (!targetFramework.IsPackageBased)
{ {
// Only add framework assemblies for non-package based frameworks. // Only add framework assemblies for non-package based frameworks.
foreach (var frameworkAssembly in targetLibrary.FrameworkAssemblies) foreach (var frameworkAssembly in targetLibrary.FrameworkAssemblies)

2
src/Microsoft.DotNet.ProjectModel/Resolution/PackageDependencyProvider.cs
View file

@ -138,7 +138,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
LibraryDependencyType.Default)); LibraryDependencyType.Default));
} }
if (!targetFramework.IsPackageBased()) if (!targetFramework.IsPackageBased)
{ {
// Only add framework assemblies for non-package based frameworks. // Only add framework assemblies for non-package based frameworks.
foreach (var frameworkAssembly in targetLibrary.FrameworkAssemblies) foreach (var frameworkAssembly in targetLibrary.FrameworkAssemblies)

7
src/Microsoft.DotNet.ProjectModel/Utilities/FrameworksExtensions.cs
View file

@ -56,12 +56,5 @@ namespace NuGet.Frameworks
} }
return name + "-" + frameworkName.Profile; return name + "-" + frameworkName.Profile;
} }
internal static bool IsPackageBased(this NuGetFramework self)
{
return self.IsPackageBased ||
(self.Framework == FrameworkConstants.FrameworkIdentifiers.NetCore &&
self.Version >= new Version(5, 0, 0, 0));
}
} }
} }