From 925b15ca2efcd7216531f0917eb87e138d49f24a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 11 Nov 2019 11:26:39 +0100
Subject: [PATCH] Cherry-picking of the conslidated changes

---
 Directory.Build.props | 6 +++---
 build.sh              | 1 -
 eng/Build.props       | 5 +++++
 eng/Subsets.props     | 8 ++------
 eng/build.sh          | 9 +++++----
 installer.sh          | 1 -
 libraries.sh          | 1 -
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 32117a114f1e0..1c4eb0f3a1aad 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,13 +30,13 @@
     <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
 
     <DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir>
-    <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>    
+    <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'installer', 'manpages'))</ManPagesDir>    
   </PropertyGroup>
 
   <!-- Packaging properties -->
   <PropertyGroup>
     <!--
-      This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used 
+      This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used
       to find source code for debugging. It is also used to name the build output manifest for orchestrated builds.
     -->
     <GitHubRepositoryName>runtime</GitHubRepositoryName>
@@ -45,4 +45,4 @@
     <LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build.sh b/build.sh
index 6b17f24e48f19..ae097a31d855e 100755
--- a/build.sh
+++ b/build.sh
@@ -14,4 +14,3 @@ done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 "$scriptroot/eng/build.sh" $@
-exit $?
diff --git a/eng/Build.props b/eng/Build.props
index 6b1e54044bb78..3215bb6feb4a4 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -14,6 +14,11 @@
       signing that isn't (can't be?) supported by Arcade's single pass, such as MSIs and bundles:
       https://github.com/dotnet/arcade/issues/388
   -->
+
+  <PropertyGroup>
+    <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
+  </PropertyGroup>
+
   <Import Project="$(MSBuildThisFileDirectory)Subsets.props" />
 
   <Target Name="CheckSpecifiedSubsetValidity"
diff --git a/eng/Subsets.props b/eng/Subsets.props
index ce00016777ef9..3be58a2bef85b 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -47,12 +47,8 @@
       artifacts to the test layout, then running the test subset.
   -->
 
-  <PropertyGroup>
-    <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
-  </PropertyGroup>
-
   <!-- Import only when imported by Arcade's Build.proj as we import Directory.Build.props ourselves. -->
-  <Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(MSBuildProjectFile)' == 'Build.proj'" />
+  <Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true'" />
 
   <PropertyGroup>
     <DefaultSubsetCategories>libraries-installer</DefaultSubsetCategories>
@@ -69,7 +65,7 @@
 
   <ItemGroup>
     <!-- Global -->
-    <SubsetName Include="RegenerateReadmeTable" Category="" OnDemand="true" Description="Regenerates the table of asset links in the README.md file." />    
+    <SubsetName Include="RegenerateReadmeTable" Category="" OnDemand="true" Description="Regenerates the table of asset links in the README.md file." />
 
     <!-- Libraries -->
     <SubsetName Include="All" Category="Libraries" Description="The .NET libraries comprising the shared framework." />
diff --git a/eng/build.sh b/eng/build.sh
index bbe413c3dd4a3..870df04869823 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -52,6 +52,10 @@ build=false
 buildtests=false
 subsetCategory=''
 
+# Check if an action is passed in
+declare -a actions=("r" "restore" "b" "build" "rebuild" "t" "test" "buildtests")
+actInt=($(comm -12 <(printf '%s\n' "${actions[@]/#/-}" | sort) <(printf '%s\n' "${@/#--/-}" | sort)))
+
 while [[ $# > 0 ]]; do
   opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
   case "$opt" in
@@ -127,14 +131,11 @@ if [[ "$buildtests" == true ]]; then
   fi
 fi
 
-# Check if an action is passed in
-declare -a actions=("r" "restore" "b" "build" "rebuild" "t" "test" "buildtests")
-actInt=($(comm -12 <(printf '%s\n' "${actions[@]/#/-}" | sort) <(printf '%s\n' "${@/#--/-}" | sort)))
 if [ ${#actInt[@]} -eq 0 ] || [ "$subsetCategory" != "libraries" ]; then
     arguments="-restore -build $arguments"
+    echo "${#actInt[@]}"
 fi
 
 arguments="$arguments $extraargs"
 
 "$scriptroot/common/build.sh" $arguments
-exit $?
diff --git a/installer.sh b/installer.sh
index 0c2ae0edcd2bc..3809d7d3ec351 100755
--- a/installer.sh
+++ b/installer.sh
@@ -14,4 +14,3 @@ done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 "$scriptroot/build.sh" --subsetCategory installer $@
-exit $?
diff --git a/libraries.sh b/libraries.sh
index 880a1092b7cc2..4e1d47718416f 100755
--- a/libraries.sh
+++ b/libraries.sh
@@ -14,4 +14,3 @@ done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 "$scriptroot/build.sh" --subsetCategory libraries $@
-exit $?