Enable official portable musl build (dotnet/corefx#34352)

* Enable portable builds in linux-musl.groovy

* Enable official portable musl build

* Add back Windowws_NT condition

Commit migrated from https://github.com/dotnet/corefx/commit/1072799465f41315f2d041e09db17e0390445739

diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml
index 69a8673..2bfe37e 100644 (file)
--- a/eng/pipelines/libraries/linux.yml
+++ b/eng/pipelines/libraries/linux.yml
@@ -43,7 +43,7 @@ jobs:
               _helixQueues: $(alpineQueues)
               _dockerContainer: alpine_36_container
               _buildScriptPrefix: ''
-              _buildExtraArguments: /p:RuntimeOS=linux-musl /p:PortableBuild=false
+              _buildExtraArguments: /p:RuntimeOS=linux-musl
 
       pool:
         name: Hosted Ubuntu 1604
@@ -78,7 +78,7 @@ jobs:
               _framework: netcoreapp
               _dockerContainer: alpine_36_container
               _buildScriptPrefix: ''
-              _buildExtraArguments: /p:RuntimeOS=linux-musl /p:PortableBuild=false
+              _buildExtraArguments: /p:RuntimeOS=linux-musl
 
           arm_Release:
             _BuildConfig: Release

diff --git a/src/libraries/buildpipeline/linux-musl.groovy b/src/libraries/buildpipeline/linux-musl.groovy
index 16e1fe2..8467457 100644 (file)
--- a/src/libraries/buildpipeline/linux-musl.groovy
+++ b/src/libraries/buildpipeline/linux-musl.groovy
@@ -13,14 +13,14 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-2017111
     def commonprops = "--ci /p:ArchGroup=${params.AGroup} /p:ConfigurationGroup=${params.CGroup}"
 
     stage ('Build Product') {
-        sh "./build.sh ${commonprops} /p:RuntimeOs=linux-musl /p:PortableBuild=false"
+        sh "./build.sh ${commonprops} /p:RuntimeOs=linux-musl"
     }
     stage ('Build Tests') {
         def additionalArgs = ''
         if (params.TestOuter) {
             additionalArgs = ' /p:OuterLoop=true'
         }
-        sh "./build.sh -test ${commonprops} /p:SkipTests=true /p:ArchiveTests=true /p:EnableDumpling=false /p:PortableBuild=false${additionalArgs}"
+        sh "./build.sh -test ${commonprops} /p:SkipTests=true /p:ArchiveTests=true /p:EnableDumpling=false${additionalArgs}"
     }
 
     // TODO: Add submission for Helix testing once we have queue for Alpine Linux working