From 4c7d1df5b34ac09566d96862bc2c8be829a4f5db Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Thu, 3 May 2018 15:50:19 -0700 Subject: [PATCH] Revert "Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0." This reverts commit 370243ab81c43fe0e3e2a57c1d101b45724ea75e. --- .../GivenDotnetPublishPublishesProjects.cs | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2cc11eb51..9b325256f 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -4,9 +4,7 @@ using System; using System.IO; using System.Diagnostics; -using System.Linq; using System.Runtime.InteropServices; -using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.PlatformAbstractions; @@ -105,19 +103,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance() .WithSourceFiles() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - - // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. - // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the - // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we - // need a manual roll-forward. - propertyGroup.Add( - new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); - }); + .WithRestoreFiles(); var testProjectDirectory = testInstance.Root; @@ -184,19 +170,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance($"PublishesSelfContained{selfContained}") .WithSourceFiles() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - - // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. - // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the - // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we - // need a manual roll-forward. - propertyGroup.Add( - new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); - }); + .WithRestoreFiles(); var testProjectDirectory = testInstance.Root;