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

Fixing rebase problems.

Browse source
This commit is contained in:
Livar Cunha 2016-10-31 13:22:37 -07:00
parent be2ab211f1
commit 167aaad655
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,13 +91,15 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
{
case ProjectType.Web:
_transformApplicator.Execute(
PackageDependencyInfoTransform.Transform(
SdkPackageDependencyTransform.Transform(
new PackageDependencyInfo
{
Name = PackageConstants.WebSdkPackageName,
Version = migrationSettings.SdkPackageVersion,
PrivateAssets = "All"
}), noFrameworkPackageReferenceItemGroup, mergeExisting: false);
}),
noFrameworkPackageReferenceItemGroup,
mergeExisting: false);
break;
default:
break;
@ -149,7 +151,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
_transformApplicator.Execute(
ToolTransform().Transform(ToPackageDependencyInfo(
tool,
ConstantPackageNames.AspProjectToolsPackages)),
PackageConstants.AspProjectToolsPackages)),
itemGroup,
mergeExisting: true);
}
@ -206,7 +208,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
_transformApplicator.Execute(
transform.Transform(ToPackageDependencyInfo(
packageDependency,
ConstantPackageNames.AspProjectDependencyToolsPackages)),
PackageConstants.AspProjectDependencyToolsPackages)),
itemGroup,
mergeExisting: true);
}