From 4cd03dcae4cdba00320f7dd2038c20d9ae8f6ea1 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 28 Aug 2017 16:38:55 -0700
Subject: [PATCH] Use shorter output paths to avoid max path issues on Windows

For example, "out/2" instead of "artifacts/stage2"

(cherry picked from commit dcb3a7ade75c360d9a1673e0c22cfe046ad50e34)
---
 .gitignore                                                 | 1 +
 build/InitRepo.props                                       | 2 +-
 build/OutputDirectories.props                              | 2 +-
 build/Prepare.targets                                      | 2 +-
 .../RepoDirectoriesProvider.cs                             | 7 +++++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7bed92752..a5216b7f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ dlldata.c
 # DNX
 project.lock.json
 artifacts/
+out/
 
 *_i.c
 *_p.c
diff --git a/build/InitRepo.props b/build/InitRepo.props
index 3a17534a9..ff909b2c9 100644
--- a/build/InitRepo.props
+++ b/build/InitRepo.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <GeneratedPropsDir>$(RepoRoot)/artifacts/obj</GeneratedPropsDir>
+    <GeneratedPropsDir>$(RepoRoot)/out/obj</GeneratedPropsDir>
     <GitCommitInfoProps>$(GeneratedPropsDir)/GitCommitInfo.props</GitCommitInfoProps>
     <HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps>
     <BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps>
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index f175698a8..1a84824c3 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -6,7 +6,7 @@
       <!-- BaseOutputDirectory is the root output path for this stage and RID
            BaseOutputPath is the project-specific output folder that each project builds into.
            This is not confusing at all. -->
-      <BaseOutputDirectory>$(RepoRoot)/artifacts/stage$(CliBuildStage)/$(Rid)</BaseOutputDirectory>
+      <BaseOutputDirectory>$(RepoRoot)/out/$(CliBuildStage)/$(Rid)</BaseOutputDirectory>
       <BaseOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/bin/$(MSBuildProjectName)'))</BaseOutputPath>
 
       <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/obj/$(MSBuildProjectName)'))</BaseIntermediateOutputPath>
diff --git a/build/Prepare.targets b/build/Prepare.targets
index 67ae12cab..8858e03b3 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -100,7 +100,7 @@
 
   <Target Name="IsolateArtifactsFromDirectoryBuildFiles">
     <Copy SourceFiles="$(RepoRoot)TestAssets\Directory.Build.props"
-          DestinationFolder ="$(RepoRoot)artifacts"
+          DestinationFolder ="$(RepoRoot)out"
           SkipUnchangedFiles="true" />
   </Target>
 
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
index 8f5fe78ff..6c061de37 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
@@ -58,7 +58,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
             {
                 if (string.IsNullOrEmpty(s_buildRid))
                 {
-                    var buildInfoPath = Path.Combine(RepoRoot, "artifacts", "obj", "BuildInfo.props");
+                    var buildInfoPath = Path.Combine(RepoRoot, "out", "obj", "BuildInfo.props");
                     var root = XDocument.Load(buildInfoPath).Root;
                     var ns = root.Name.Namespace;
 
@@ -94,7 +94,10 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
             string corehostDummyPackages = null,
             string pjDotnet = null)
         {
-            _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", "stage2", BuildRid);
+            _artifacts = artifacts ?? Path.Combine(RepoRoot,
+                                                   "out",
+                                                   "2",     //  Stage - ideally this would come from the "previous stage"
+                                                   BuildRid);
             _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish");
             _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
             _pjDotnet = pjDotnet ?? GetPjDotnetPath();