Lowercase bin dir name to align with corefx and others (dotnet/core-setup#4498)

Commit migrated from https://github.com/dotnet/core-setup/commit/01e0d4240f3b449e0c63326d52de1d4ce7694df5

diff --git a/src/installer/RepoDirectories.props b/src/installer/RepoDirectories.props
index 212e525..0319132 100644 (file)
--- a/src/installer/RepoDirectories.props
+++ b/src/installer/RepoDirectories.props
@@ -6,7 +6,7 @@
     <SourceDir>$(RepoRoot)src/</SourceDir>
 
     <!-- Output directories -->
-    <BinDir Condition="'$(BinDir)'==''">$(RepoRoot)Bin/</BinDir>
+    <BinDir Condition="'$(BinDir)'==''">$(RepoRoot)bin/</BinDir>
     <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(BinDir)</BaseOutputPath>
     <ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(ObjDir)</BaseIntermediateOutputPath>

diff --git a/src/installer/buildpipeline/Core-Setup-Linux-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
index 109ec06..bed36c4 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Linux-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
@@ -188,7 +188,7 @@
         "definitionType": "task"
       },
       "inputs": {
-        "SourceFolder": "$(PB_SourcesDirectory)/Bin/obj/linux-x64.$(BuildConfiguration)/sharedFrameworkPublish",
+        "SourceFolder": "$(PB_SourcesDirectory)/bin/obj/linux-x64.$(BuildConfiguration)/sharedFrameworkPublish",
         "Contents": "**",
         "TargetFolder": "$(Build.StagingDirectory)/sharedFrameworkPublish",
         "CleanTargetFolder": "false",

diff --git a/src/installer/corehost/build.cmd b/src/installer/corehost/build.cmd
index baeb53e..610df02 100644 (file)
--- a/src/installer/corehost/build.cmd
+++ b/src/installer/corehost/build.cmd
@@ -4,7 +4,7 @@ setlocal
 :SetupArgs
 :: Initialize the args that will be passed to cmake
 set __nativeWindowsDir=%~dp0Windows
-set __binDir=%~dp0..\..\Bin
+set __binDir=%~dp0..\..\bin
 set __rootDir=%~dp0..\..
 set __CMakeBinDir=""
 set __IntermediatesDir=""

diff --git a/src/installer/corehost/build.sh b/src/installer/corehost/build.sh
index ff0461f..29d3c2d 100755 (executable)
--- a/src/installer/corehost/build.sh
+++ b/src/installer/corehost/build.sh
@@ -98,7 +98,7 @@ __portableBuildArgs=
 __configuration=Debug
 __linkPortable=0
 __cmake_defines=
-__baseIntermediateOutputPath="$RootRepo/Bin/obj"
+__baseIntermediateOutputPath="$RootRepo/bin/obj"
 __versionSourceFile="$__baseIntermediateOutputPath/version.cpp"
 
 while [ "$1" != "" ]; do

diff --git a/src/installer/netci.groovy b/src/installer/netci.groovy
index 9d61f71..785dcf8 100644 (file)
--- a/src/installer/netci.groovy
+++ b/src/installer/netci.groovy
@@ -112,7 +112,7 @@ platformList.each { platform ->
     Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osForGHTrigger} ${architecture} ${configuration} Build")
     
     ArchivalSettings settings = new ArchivalSettings();
-    def archiveString = ["tar.gz", "zip", "deb", "msi", "pkg", "exe", "nupkg"].collect { "Bin/*/packages/*.${it},Bin/*/corehost/*.${it}" }.join(",")
+    def archiveString = ["tar.gz", "zip", "deb", "msi", "pkg", "exe", "nupkg"].collect { "bin/*/packages/*.${it},bin/*/corehost/*.${it}" }.join(",")
     settings.addFiles(archiveString)
     settings.setArchiveOnSuccess()
     settings.setFailIfNothingArchived()