diff --git a/build.proj b/build.proj
index a29fa1f6..f1230376 100644
--- a/build.proj
+++ b/build.proj
@@ -6,7 +6,7 @@
true
-
+
true
diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json
index 640e36a0..07db339c 100644
--- a/buildpipeline/pipeline.json
+++ b/buildpipeline/pipeline.json
@@ -31,22 +31,37 @@
}
},
{
- "Name": "Core-Setup-Linux-Arm-BT",
- "Parameters": {
- "PB_DistroRid": "ubuntu.14.04-arm",
- "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239",
- "PB_TargetArchitecture": "arm",
+ "Name": "Core-Setup-Linux-Arm-BT",
+ "Parameters": {
+ "PB_DistroRid": "rhel.6-x64",
+ "PB_DockerTag": "centos-6-c8c9b08-20174310104313",
+ "PB_TargetArchitecture": "x64",
+ "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -DistroRid=rhel.6-x64 -PortableBuild=false -strip-symbols",
+ "PB_PortableBuild": "false"
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "RedHat6",
+ "Type": "build/product/",
+ "Platform": "x64"
+ }
+ },
+ {
+ "Name": "Core-Setup-Linux-Arm-BT",
+ "Parameters": {
+ "PB_DistroRid": "ubuntu.14.04-arm",
+ "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239",
+ "PB_TargetArchitecture": "arm",
"PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DistroRid=linux-arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
"PB_CrossBuildArgs": "-e ROOTFS_DIR ",
- "PB_PortableBuild": "true"
- },
- "ReportingParameters": {
- "SubType": "PortableBuild",
- "OperatingSystem": "Ubuntu 14.04",
- "Type": "build/product/",
- "Platform": "arm"
- }
- },
+ "PB_PortableBuild": "true"
+ },
+ "ReportingParameters": {
+ "SubType": "PortableBuild",
+ "OperatingSystem": "Ubuntu 14.04",
+ "Type": "build/product/",
+ "Platform": "arm"
+ }
+ },
{
"Name": "Core-Setup-OSX-BT",
"Parameters": {
diff --git a/dir.targets b/dir.targets
index 8f1afd55..986f75b1 100644
--- a/dir.targets
+++ b/dir.targets
@@ -20,7 +20,7 @@
netstandard1.3
net451
-
+
diff --git a/init-tools.sh b/init-tools.sh
index ddb8b75e..7a2dec21 100755
--- a/init-tools.sh
+++ b/init-tools.sh
@@ -33,6 +33,14 @@ OSName=$(uname -s)
Linux)
__DOTNET_PKG=dotnet-dev-linux-x64
OS=Linux
+
+ if [ -e /etc/redhat-release ]; then
+ redhatRelease=$(