diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index 95d254ef9..aa4728ca9 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -1,4 +1,6 @@  + + 1.0.0-rc netcoreapp1.0 @@ -18,7 +20,7 @@ 1.0.4 - 1.0.1-beta-000933 + $(DependencyModelVersion) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 04ab437ac..df8667514 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -11,5 +11,6 @@ 1.0.0-beta1-20170202-111 1.0.0-beta1-20170206-112 1.1.1 + 1.0.2 diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj index 23da68d2b..86a43971d 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -20,7 +20,7 @@ 4.1.0 - 1.0.1-beta-000933 + $(PlatformAbstractionsVersion) diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 5f351ac28..745b80f41 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -52,7 +52,7 @@ $(CLI_MSBuild_Version) - 1.0.1-beta-000933 + $(PlatformAbstractionsVersion) \ No newline at end of file diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj index e714a0b50..6840e9a38 100644 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -38,7 +38,7 @@ 7.2.1 - 1.0.1-beta-000933 + $(PlatformAbstractionsVersion) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 95539171e..8db274b82 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -12,7 +12,7 @@ - 1.0.1-beta-000933 + $(DependencyModelVersion) $(PlatformAbstractionsVersion) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateTFMRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateTFMRule.cs index 188cc286a..6152b479a 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateTFMRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateTFMRule.cs @@ -50,15 +50,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules propertyGroup, mergeExisting: true); } - - _transformApplicator.Execute( - RuntimeIdentifiersTransform.Transform(migrationRuleInputs.ProjectContexts), - propertyGroup, - mergeExisting: true); - _transformApplicator.Execute( - RuntimeIdentifierTransform.Transform(migrationRuleInputs.ProjectContexts), - propertyGroup, - mergeExisting: true); } private void CleanExistingProperties(ProjectRootElement csproj) @@ -127,36 +118,5 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules "TargetFramework", framework => framework.GetShortFolderName(), framework => true); - - private AddPropertyTransform> RuntimeIdentifiersTransform => - new AddPropertyTransform>( - "RuntimeIdentifiers", - projectContexts => RuntimeIdentifiers, - projectContexts => !projectContexts.HasRuntimes() && - !projectContexts.HasLibraryOutput() && - projectContexts.HasBothCoreAndFullFrameworkTFMs()); - - private AddPropertyTransform> RuntimeIdentifierTransform => - new AddPropertyTransform>( - "RuntimeIdentifier", - projectContexts => "win7-x86", - projectContexts => !projectContexts.HasRuntimes() && - !projectContexts.HasLibraryOutput() && - projectContexts.HasFullFrameworkTFM()) - .WithMSBuildCondition(projectContexts => - { - string msBuildCondition = null; - if (projectContexts.HasBothCoreAndFullFrameworkTFMs()) - { - msBuildCondition = string.Join( - " OR ", - projectContexts.Where(p => p.IsFullFramework()).Select( - p => $"'$(TargetFramework)' == '{p.TargetFramework.GetShortFolderName()}'")); - - msBuildCondition = $" {msBuildCondition} "; - } - - return msBuildCondition; - }); } } diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs index 683621ffa..0149eabc7 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs @@ -69,7 +69,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Fact] - public void MigratingCoreAndDesktopTFMsAddsAllRuntimeIdentifiersIfTheProjectDoesNothaveAnyAlready() + public void MigratingCoreAndDesktopTFMsDoesNoAddRuntimeIdentifiersOrRuntimeIdentifierWhenTheProjectDoesNothaveAnyAlready() { var testDirectory = Temp.CreateDirectory().Path; var testPJ = new ProjectJsonBuilder(TestAssetsManager) @@ -88,35 +88,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests new MigrateTFMRule().Apply(migrationSettings, migrationInputs); - mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(1); - mockProj.Properties.First(p => p.Name == "RuntimeIdentifiers") - .Value.Should().Be("win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64"); - } - - [Fact] - public void MigratingCoreAndDesktopTFMsAddsRuntimeIdentifierWithWin7x86ConditionOnAllFullFrameworksWhenNoRuntimesExistAlready() - { - var testDirectory = Temp.CreateDirectory().Path; - var testPJ = new ProjectJsonBuilder(TestAssetsManager) - .FromTestAssetBase("PJAppWithMultipleFrameworks") - .SaveToDisk(testDirectory); - - var projectContexts = ProjectContext.CreateContextForEachFramework(testDirectory); - var mockProj = ProjectRootElement.Create(); - - var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); - var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), - mockProj.AddPropertyGroup()); - - new MigrateTFMRule().Apply(migrationSettings, migrationInputs); - - mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(1); - var runtimeIdentifier = mockProj.Properties.First(p => p.Name == "RuntimeIdentifier"); - runtimeIdentifier.Value.Should().Be("win7-x86"); - runtimeIdentifier.Condition.Should().Be(" '$(TargetFramework)' == 'net20' OR '$(TargetFramework)' == 'net35' OR '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net461' "); + mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(0); + mockProj.Properties.Count(p => p.Name == "RuntimeIdentifier").Should().Be(0); } [Fact] @@ -144,7 +117,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Fact] - public void MigratingProjectWithFullFrameworkTFMsOnlyAddsARuntimeIdentifierWin7x86WhenNoRuntimesExistAlready() + public void MigratingProjectWithFullFrameworkTFMsDoesNotAddRuntimeIdentifiersOrRuntimeIdentiferWhenNoRuntimesExistAlready() { var testDirectory = Temp.CreateDirectory().Path; var testPJ = new ProjectJsonBuilder(TestAssetsManager) @@ -165,8 +138,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests new MigrateTFMRule().Apply(migrationSettings, migrationInputs); mockProj.Properties.Count(p => p.Name == "RuntimeIdentifiers").Should().Be(0); - mockProj.Properties.Where(p => p.Name == "RuntimeIdentifier").Should().HaveCount(1); - mockProj.Properties.Single(p => p.Name == "RuntimeIdentifier").Value.Should().Be("win7-x86"); + mockProj.Properties.Where(p => p.Name == "RuntimeIdentifier").Should().HaveCount(0); } [Fact]