Make AppendRuntimeIdentifierToPath=true the default

Author: nguerrera

src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.RuntimeIdentifierInference.targets

@@ -100,9 +100,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Choose>
 
   <PropertyGroup>
-    <!-- AppendRuntimeIdentifierToOutputPath defaults to false since it is a breaking change to change the output path -->
-    <!-- Projects that build for multiple RIDs can set this to true to get a RID folder in their output path -->
-    <AppendRuntimeIdentifierToOutputPath Condition="'$(AppendRuntimeIdentifierToOutputPath)' == ''">false</AppendRuntimeIdentifierToOutputPath>
+    <!-- Projects can opt out of having the RID appended to the output path by setting this to false. -->
+    <AppendRuntimeIdentifierToOutputPath Condition="'$(AppendRuntimeIdentifierToOutputPath)' == ''">true</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
   <!--

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExe.cs

@@ -328,7 +328,7 @@ public void It_generates_binding_redirects_if_needed()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory("net452");
+            var outputDirectory = buildCommand.GetOutputDirectory("net452", runtimeIdentifier: "win7-x86");
 
             outputDirectory.Should().HaveFiles(new[] {
                 "DesktopNeedsBindingRedirects.exe",

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs

@@ -32,8 +32,6 @@ public void It_builds_a_runnable_output()
                     var ns = project.Root.Name.Namespace;
                     var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
                     propertyGroup.Add(new XElement(ns + "RuntimeIdentifier", runtimeIdentifier));
-
-                    propertyGroup.Add(new XElement(ns + "AppendRuntimeIdentifierToOutputPath", "true"));
                 })
                 .Restore();
 

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAppsWithFrameworkRefs.cs

@@ -56,11 +56,11 @@ public void It_builds_with_disable_implicit_frameworkRefs()
 
         void VerifyProjectsBuild(TestAsset testAsset, params string[] buildArgs)
         {
-            VerifyBuild(testAsset, "StopwatchLib", "net45", buildArgs,
+            VerifyBuild(testAsset, "StopwatchLib", "net45", "", buildArgs,
                 "StopwatchLib.dll",
                 "StopwatchLib.pdb");
 
-            VerifyBuild(testAsset, "EntityFrameworkApp", "net451", buildArgs,
+            VerifyBuild(testAsset, "EntityFrameworkApp", "net451", "win7-x86", buildArgs,
                 "EntityFrameworkApp.exe",
                 "EntityFrameworkApp.pdb",
                 "EntityFrameworkApp.runtimeconfig.dev.json",
@@ -69,7 +69,7 @@ void VerifyProjectsBuild(TestAsset testAsset, params string[] buildArgs)
             // Try running EntityFrameworkApp.exe
             var appProjectDirectory = Path.Combine(testAsset.TestRoot, "EntityFrameworkApp");
             var buildCommand = new BuildCommand(Stage0MSBuild, appProjectDirectory);
-            var outputDirectory = buildCommand.GetOutputDirectory("net451");
+            var outputDirectory = buildCommand.GetOutputDirectory("net451", runtimeIdentifier: "win7-x86");
 
             Command.Create(Path.Combine(outputDirectory.FullName, "EntityFrameworkApp.exe"), Enumerable.Empty<string>())
                 .CaptureStdOut()
@@ -80,14 +80,14 @@ void VerifyProjectsBuild(TestAsset testAsset, params string[] buildArgs)
                 .HaveStdOutContaining("Required Test Provider");
         }
 
-        private void VerifyBuild(TestAsset testAsset, string project, string targetFramework, 
+        private void VerifyBuild(TestAsset testAsset, string project, string targetFramework, string runtimeIdentifier,
             string [] buildArgs,
             params string [] expectedFiles)
         {
             var appProjectDirectory = Path.Combine(testAsset.TestRoot, project);
 
             var buildCommand = new BuildCommand(Stage0MSBuild, appProjectDirectory);
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework);
+            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier);
 
             buildCommand
                 .Execute(buildArgs)
@@ -106,30 +106,30 @@ public void The_clean_target_removes_all_files_from_the_output_folder()
             }
 
             var testAsset = _testAssetsManager
-                .CopyTestAsset("AppsWithFrameworkReferences")
+                .CopyTestAsset("AppsWithFrameworkReferences", "CleanTargetRemovesAll")
                 .WithSource();
 
             testAsset.Restore("EntityFrameworkApp");
             testAsset.Restore("StopwatchLib");
 
-            VerifyClean(testAsset, "StopwatchLib", "net45",
+            VerifyClean(testAsset, "StopwatchLib", "net45", "",
                 "StopwatchLib.dll",
                 "StopwatchLib.pdb");
 
-            VerifyClean(testAsset, "EntityFrameworkApp", "net451",
+            VerifyClean(testAsset, "EntityFrameworkApp", "net451", "win7-x86",
                 "EntityFrameworkApp.exe",
                 "EntityFrameworkApp.pdb",
                 "EntityFrameworkApp.runtimeconfig.dev.json",
                 "EntityFrameworkApp.runtimeconfig.json");
         }
 
-        private void VerifyClean(TestAsset testAsset, string project, string targetFramework,
+        private void VerifyClean(TestAsset testAsset, string project, string targetFramework, string runtimeIdentifier,
             params string[] expectedFiles)
         {
             var appProjectDirectory = Path.Combine(testAsset.TestRoot, project);
 
             var buildCommand = new BuildCommand(Stage0MSBuild, appProjectDirectory);
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework);
+            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier);
 
             buildCommand
                 .Execute()