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

Merge pull request #4540 from livarcocc/issue4492/migrateWeb

Browse source 
Issue4492/migrate web
This commit is contained in:
Livar 2016-10-31 12:26:26 -07:00 • committed by GitHub
commit 5a621b53e2
8 changed files with 184 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageNames.cs → src/Microsoft.DotNet.ProjectJsonMigration/PackageConstants.cs
View file

@ -3,8 +3,9 @@
namespace Microsoft.DotNet.ProjectJsonMigration
{
internal class ConstantPackageNames
internal class PackageConstants
{
public const string CSdkPackageName = "Microsoft.NET.Sdk";
public const string SdkPackageName = "Microsoft.NET.Sdk";
public const string WebSdkPackageName = "Microsoft.NET.Sdk.Web";
}
}

67
src/Microsoft.DotNet.ProjectJsonMigration/ProjectExtensions.cs Normal file
View file

@ -0,0 +1,67 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license info
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Microsoft.DotNet.Internal.ProjectModel;
namespace Microsoft.DotNet.ProjectJsonMigration
{
internal static class ProjectExtensions
{
public static ProjectType GetProjectType(this Project project)
{
var projectType = ProjectType.Console;
if (project.IsWebProject())
{
projectType = ProjectType.Web;
}
return projectType;
}
private static bool IsWebProject(this Project project)
{
if(project.IsTestProject)
{
return false;
}
var isExecutable = project.GetCompilerOptions(null, "Debug").EmitEntryPoint.GetValueOrDefault();
if (isExecutable
&& project.HasAnyPackageContainingName(".AspNetCore."))
{
return true;
}
return false;
}
private static bool HasAnyPackageContainingName(this Project project, string nameSegment)
{
var containsPackageName = HasAnyPackageContainingName(
new ReadOnlyCollection<ProjectLibraryDependency>(project.Dependencies),
nameSegment);
foreach (var tf in project.GetTargetFrameworks())
{
if(containsPackageName)
{
break;
}
containsPackageName = HasAnyPackageContainingName(tf.Dependencies, nameSegment);
}
return containsPackageName;
}
private static bool HasAnyPackageContainingName(
IReadOnlyList<ProjectLibraryDependency> dependencies,
string nameSegment)
{
return dependencies.Any(x => x.Name.IndexOf(nameSegment, StringComparison.OrdinalIgnoreCase) > -1);
}
}
}

8
src/Microsoft.DotNet.ProjectJsonMigration/ProjectType.cs Normal file
View file

@ -0,0 +1,8 @@
namespace Microsoft.DotNet.ProjectJsonMigration
{
internal enum ProjectType
{
Console,
Web
}
}

113
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs
View file

@ -44,10 +44,15 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
PackageDependencyInfoTransform.Transform(
new PackageDependencyInfo
{
Name = ConstantPackageNames.CSdkPackageName,
Name = PackageConstants.SdkPackageName,
Version = migrationSettings.SdkPackageVersion,
PrivateAssets = "All"
}), noFrameworkPackageReferenceItemGroup, mergeExisting: false);
AddProjectTypeSpecificDependencies(
migrationRuleInputs,
migrationSettings,
noFrameworkPackageReferenceItemGroup);
// Migrate Direct Deps first
MigrateDependencies(
@ -76,7 +81,32 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
MigrateTools(project, migrationRuleInputs.OutputMSBuildProject);
}
private void MigrateImports(ProjectPropertyGroupElement commonPropertyGroup, TargetFrameworkInformation targetFramework)
private void AddProjectTypeSpecificDependencies(
MigrationRuleInputs migrationRuleInputs,
MigrationSettings migrationSettings,
ProjectItemGroupElement noFrameworkPackageReferenceItemGroup)
{
var type = migrationRuleInputs.DefaultProjectContext.ProjectFile.GetProjectType();
switch (type)
{
case ProjectType.Web:
_transformApplicator.Execute(
PackageDependencyInfoTransform.Transform(
new PackageDependencyInfo
{
Name = PackageConstants.WebSdkPackageName,
Version = migrationSettings.SdkPackageVersion,
PrivateAssets = "All"
}), noFrameworkPackageReferenceItemGroup, mergeExisting: false);
break;
default:
break;
}
}
private void MigrateImports(
ProjectPropertyGroupElement commonPropertyGroup,
TargetFrameworkInformation targetFramework)
{
var transform = ImportsTransformation.Transform(targetFramework);
@ -168,7 +198,10 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
}
}
_transformApplicator.Execute(transform.Transform(packageDependency), itemGroup, mergeExisting: true);
_transformApplicator.Execute(
transform.Transform(packageDependency),
itemGroup,
mergeExisting: true);
}
}
@ -188,7 +221,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
private void InjectAssemblyReferenceIfNotPresent(string dependencyName,
IList<ProjectLibraryDependency> packageDependencies)
{
if (!packageDependencies.Any(dep => string.Equals(dep.Name, dependencyName, StringComparison.OrdinalIgnoreCase)))
if (!packageDependencies.Any(dep =>
string.Equals(dep.Name, dependencyName, StringComparison.OrdinalIgnoreCase)))
{
packageDependencies.Add(new ProjectLibraryDependency
{
@ -238,12 +272,16 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
return flagString;
}
private IEnumerable<string> GetAllProjectReferenceNames(Project project, NuGetFramework framework, ProjectRootElement xproj)
private IEnumerable<string> GetAllProjectReferenceNames(
Project project,
NuGetFramework framework,
ProjectRootElement xproj)
{
var csprojReferenceItems = _projectDependencyFinder.ResolveXProjProjectDependencies(xproj);
var migratedXProjDependencyPaths = csprojReferenceItems.SelectMany(p => p.Includes());
var migratedXProjDependencyNames = new HashSet<string>(migratedXProjDependencyPaths.Select(p => Path.GetFileNameWithoutExtension(
PathUtility.GetPathWithDirectorySeparator(p))));
var migratedXProjDependencyNames =
new HashSet<string>(migratedXProjDependencyPaths.Select(p =>
Path.GetFileNameWithoutExtension(PathUtility.GetPathWithDirectorySeparator(p))));
var projectDependencies = _projectDependencyFinder.ResolveDirectProjectDependenciesForFramework(
project,
framework,
@ -252,38 +290,43 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
return projectDependencies.Select(p => p.Name).Concat(migratedXProjDependencyNames);
}
private AddItemTransform<ProjectLibraryDependency> FrameworkDependencyTransform => new AddItemTransform<ProjectLibraryDependency>(
"Reference",
dep => dep.Name,
dep => "",
dep => true);
private AddItemTransform<ProjectLibraryDependency> FrameworkDependencyTransform =>
new AddItemTransform<ProjectLibraryDependency>(
"Reference",
dep => dep.Name,
dep => "",
dep => true);
private Func<AddItemTransform<ProjectLibraryDependency>> PackageDependencyTransform => () => new AddItemTransform<ProjectLibraryDependency>(
"PackageReference",
dep => dep.Name,
dep => "",
dep => true)
.WithMetadata("Version", r => r.LibraryRange.VersionRange.OriginalString);
private Func<AddItemTransform<ProjectLibraryDependency>> PackageDependencyTransform =>
() => new AddItemTransform<ProjectLibraryDependency>(
"PackageReference",
dep => dep.Name,
dep => "",
dep => true)
.WithMetadata("Version", r => r.LibraryRange.VersionRange.OriginalString);
private AddItemTransform<PackageDependencyInfo> PackageDependencyInfoTransform => new AddItemTransform<PackageDependencyInfo>(
"PackageReference",
dep => dep.Name,
dep => "",
dep => true)
.WithMetadata("Version", r => r.Version)
.WithMetadata("PrivateAssets", r => r.PrivateAssets, r => !string.IsNullOrEmpty(r.PrivateAssets));
private AddItemTransform<PackageDependencyInfo> PackageDependencyInfoTransform =>
new AddItemTransform<PackageDependencyInfo>(
"PackageReference",
dep => dep.Name,
dep => "",
dep => true)
.WithMetadata("Version", r => r.Version)
.WithMetadata("PrivateAssets", r => r.PrivateAssets, r => !string.IsNullOrEmpty(r.PrivateAssets));
private AddItemTransform<ProjectLibraryDependency> ToolTransform => new AddItemTransform<ProjectLibraryDependency>(
"DotNetCliToolReference",
dep => dep.Name,
dep => "",
dep => true)
.WithMetadata("Version", r => r.LibraryRange.VersionRange.OriginalString);
private AddItemTransform<ProjectLibraryDependency> ToolTransform =>
new AddItemTransform<ProjectLibraryDependency>(
"DotNetCliToolReference",
dep => dep.Name,
dep => "",
dep => true)
.WithMetadata("Version", r => r.LibraryRange.VersionRange.OriginalString);
private AddPropertyTransform<TargetFrameworkInformation> ImportsTransformation => new AddPropertyTransform<TargetFrameworkInformation>(
"PackageTargetFallback",
t => $"$(PackageTargetFallback);{string.Join(";", t.Imports)}",
t => t.Imports.OrEmptyIfNull().Any());
private AddPropertyTransform<TargetFrameworkInformation> ImportsTransformation =>
new AddPropertyTransform<TargetFrameworkInformation>(
"PackageTargetFallback",
t => $"$(PackageTargetFallback);{string.Join(";", t.Imports)}",
t => t.Imports.OrEmptyIfNull().Any());
private class PackageDependencyInfo
{

2
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateTFMRule.cs
View file

@ -72,7 +72,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
{
var packageRefs = outputMSBuildProject
.Items
.Where(i => i.ItemType == "PackageReference" && i.Include != ConstantPackageNames.CSdkPackageName)
.Where(i => i.ItemType == "PackageReference" && i.Include != PackageConstants.SdkPackageName)
.ToList();
foreach (var packageRef in packageRefs)

2
src/dotnet/commands/dotnet-migrate/ProjectRootElementExtensions.cs
View file

@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Tools.Migrate
return projectRootElement
.Items
.Where(i => i.ItemType == "PackageReference")
.First(i => i.Include == ConstantPackageNames.CSdkPackageName)
.First(i => i.Include == PackageConstants.SdkPackageName)
.GetMetadataWithName("version").Value;
}
}

25
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs
View file

@ -49,6 +49,31 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
privateAssetsMetadata.Value.Should().Be("All");
}
[Fact]
public void It_migrates_web_projects_to_have_web_sdk_PrivateAssets()
{
var mockProj = RunPackageDependenciesRuleOnPj(@"
{
""buildOptions"": {
""emitEntryPoint"": true
},
""dependencies"": {
""Microsoft.AspNetCore.Mvc"" : {
""version"": ""1.0.0""
}
},
""frameworks"": {
""netcoreapp1.0"": {}
}
}");
var packageRef = mockProj.Items.FirstOrDefault(i =>
i.Include == "Microsoft.NET.Sdk.Web" && i.ItemType == "PackageReference");
packageRef.Should().NotBeNull();
packageRef.GetMetadataWithName("PrivateAssets").Value.Should().NotBeNull().And.Be("All");
}
[Fact]
public void It_migrates_suppress_parent_array_to_PrivateAssets()
{

1
test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
View file

@ -5,6 +5,7 @@
<clear />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
<add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>