From 97b7553e31261dc87d82109566ae9afc66d0c7de Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 1 Sep 2017 14:04:52 -0700
Subject: [PATCH] Rename output folder from out to bin

---
 .gitignore                                                  | 2 +-
 build/InitRepo.props                                        | 2 +-
 build/OutputDirectories.props                               | 2 +-
 build/Prepare.targets                                       | 2 +-
 .../RepoDirectoriesProvider.cs                              | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index a5216b7f74..a9597138ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,7 +96,7 @@ dlldata.c
 # DNX
 project.lock.json
 artifacts/
-out/
+bin/
 
 *_i.c
 *_p.c
diff --git a/build/InitRepo.props b/build/InitRepo.props
index ff909b2c94..f917b88c2a 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)/out/obj</GeneratedPropsDir>
+    <GeneratedPropsDir>$(RepoRoot)/bin/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 24781a4769..74c002c6bc 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)/out/$(CliBuildStage)/$(Rid)</BaseOutputDirectory>
+      <BaseOutputDirectory>$(RepoRoot)/bin/$(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 8858e03b3f..3b373ecfc3 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)out"
+          DestinationFolder ="$(RepoRoot)bin"
           SkipUnchangedFiles="true" />
   </Target>
 
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
index afacb335c3..056b1c197e 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
@@ -63,7 +63,7 @@ public static string BuildRid
             {
                 if (string.IsNullOrEmpty(s_buildRid))
                 {
-                    var buildInfoPath = Path.Combine(RepoRoot, "out", "obj", "BuildInfo.props");
+                    var buildInfoPath = Path.Combine(RepoRoot, "bin", "obj", "BuildInfo.props");
                     var root = XDocument.Load(buildInfoPath).Root;
                     var ns = root.Name.Namespace;
 
@@ -102,7 +102,7 @@ public RepoDirectoriesProvider(
             int previousStage = 2;
 
             _artifacts = artifacts ?? Path.Combine(RepoRoot,
-                                                   "out",
+                                                   "bin",
                                                    previousStage.ToString(),
                                                    BuildRid);
             _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish");
@@ -121,7 +121,7 @@ public RepoDirectoriesProvider(
             }
 
             _testWorkingFolder = Path.Combine(RepoRoot,
-                                              "out",
+                                              "bin",
                                               (previousStage + 1).ToString(),
                                               BuildRid,
                                               "test");