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

Addressing code review comments.

Browse source
This commit is contained in:
Livar Cunha 2017-01-04 12:25:48 -08:00
parent 47eafb9ef4
commit a4dcff9ea8
5 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.DotNet.ProjectJsonMigration/MigrationRuleInputs.cs
View file

@ -28,6 +28,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration
}
}
public bool IsMultiTFM => ProjectContexts.Count() > 1;
public MigrationRuleInputs(
IEnumerable<ProjectContext> projectContexts,
ProjectRootElement outputMSBuildProject,

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

@ -63,7 +63,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
MigrateImports(
migrationRuleInputs.CommonPropertyGroup,
targetFramework,
migrationRuleInputs.ProjectContexts.Count() > 1);
migrationRuleInputs.IsMultiTFM);
MigrateDependencies(
project,

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

@ -32,7 +32,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
csproj,
scriptSet.Value,
scriptSet.Key,
migrationRuleInputs.ProjectContexts.Count() > 1);
migrationRuleInputs.IsMultiTFM);
}
}

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

@ -34,20 +34,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
CleanExistingProperties(csproj);
CleanExistingPackageReferences(csproj);
if(migrationRuleInputs.ProjectContexts.Count() == 1)
{
_transformApplicator.Execute(
FrameworkTransform.Transform(
migrationRuleInputs.ProjectContexts.Single().TargetFramework),
propertyGroup,
mergeExisting: true);
_transformApplicator.Execute(
FrameworkRuntimeIdentifiersTransform.Transform(
migrationRuleInputs.ProjectContexts.Single()),
propertyGroup,
mergeExisting: true);
}
else
if(migrationRuleInputs.IsMultiTFM)
{
_transformApplicator.Execute(
FrameworksTransform.Transform(
@ -65,6 +52,19 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
propertyGroup,
mergeExisting: true);
}
else
{
_transformApplicator.Execute(
FrameworkTransform.Transform(
migrationRuleInputs.ProjectContexts.Single().TargetFramework),
propertyGroup,
mergeExisting: true);
_transformApplicator.Execute(
FrameworkRuntimeIdentifiersTransform.Transform(
migrationRuleInputs.ProjectContexts.Single()),
propertyGroup,
mergeExisting: true);
}
}
private void CleanExistingProperties(ProjectRootElement csproj)

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

@ -201,7 +201,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
}
[Fact]
public void ItDoesNotConditionToPackageTargetFallBackWhenMigratingASingleTFM()
public void ItDoesNotAddConditionToPackageTargetFallBackWhenMigratingASingleTFM()
{
var importPropertyName = "PackageTargetFallback";