Stop forcing runtime version in tests

Author: nguerrera

test/Microsoft.DotNet.ShellShim.Tests/ShellShimRepositoryTests.cs

@@ -474,7 +474,6 @@ private static FilePath MakeHelloWorldExecutableDll(string instanceName = null)
 
             TestAssetInstance testInstance = TestAssets.Get(testAppName)
                 .CreateInstance(instanceName)
-                .UseCurrentRuntimeFrameworkVersion()
                 .WithRestoreFiles()
                 .WithBuildFiles();
 

test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs

@@ -172,23 +172,6 @@ public TestAssetInstance WithProjectChanges(Action<string, XDocument> xmlAction)
             return this;
         }
 
-        public TestAssetInstance UseCurrentRuntimeFrameworkVersion()
-        {
-            return WithProjectChanges(project =>
-            {
-                var ns = project.Root.Name.Namespace;
-
-                var propertyGroup = project.Root.Elements(ns + "PropertyGroup").LastOrDefault();
-                if (propertyGroup == null)
-                {
-                    propertyGroup = new XElement(ns + "PropertyGroup");
-                    project.Root.Add(propertyGroup);
-                }
-
-                propertyGroup.Add(new XElement(ns + "RuntimeFrameworkVersion", CurrentRuntimeFrameworkVersion));
-            });
-        }
-
         private static string RebasePath(string path, string oldBaseDirectory, string newBaseDirectory)
         {
             path = Path.IsPathRooted(path) ? PathUtility.GetRelativePath(PathUtility.EnsureTrailingSlash(oldBaseDirectory), path) : path;

test/dotnet.Tests/PackagedCommandTests.cs

@@ -59,20 +59,15 @@ public static IEnumerable<object[]> LibraryDependencyToolArguments
         }
 
         [Theory]
-        [InlineData("AppWithDirectAndToolDep", true)]
-        [InlineData("AppWithToolDependency", false)]
-        public void TestProjectToolIsAvailableThroughDriver(string appName, bool useCurrentFrameworkRuntimeVersion)
+        [InlineData("AppWithDirectAndToolDep")]
+        [InlineData("AppWithToolDependency")]
+        public void TestProjectToolIsAvailableThroughDriver(string appName)
         {
             var testInstance = TestAssets.Get(appName)
                 .CreateInstance()
                 .WithSourceFiles()
                 .WithNuGetConfig(new RepoDirectoriesProvider().TestPackages);
 
-            if (useCurrentFrameworkRuntimeVersion)
-            {
-                testInstance = testInstance.UseCurrentRuntimeFrameworkVersion();
-            }
-
             // restore again now that the project has changed
             new RestoreCommand()
                 .WithWorkingDirectory(testInstance.Root)
@@ -281,7 +276,6 @@ public void TestProjectDependencyIsNotAvailableThroughDriver()
             var testInstance = TestAssets.Get("AppWithDirectDep")
                 .CreateInstance()
                 .WithSourceFiles()
-                .UseCurrentRuntimeFrameworkVersion()
                 .WithNuGetConfig(new RepoDirectoriesProvider().TestPackages);
 
             // restore again now that the project has changed