diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
index 54065c0aab25..e60215750f3e 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
@@ -179,7 +179,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OfficialBuildId=$(OfficialBuildId)",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OutputRID=$(PB_OutputRID) /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -199,7 +199,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishPackages -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg /p:PublishFlatContainer=$(PublishFlat) /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -219,7 +219,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishSymbols -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -239,7 +239,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -distroRid=$(Rid) -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./publish-packages.sh -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -BuildType=$(PB_BuildType) -BuildArch=$(Platform) -Container=$(PB_ContainerName) -PublishTestNativeBins -- /p:RelativePath=$(PB_BlobNamePrefix)$(PB_BuildType)/TestNativeBins/$(Rid)-$(Architecture) /p:OverwriteOnPublish=true",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -497,6 +497,9 @@
},
"VsoRepositoryName": {
"value": "DotNet-CoreCLR-Trusted"
+ },
+ "PB_OutputRID": {
+ "value": ""
}
},
"demands": [
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index 49e3763d9777..cf1df6d0b7ef 100644
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -41,7 +41,7 @@
"Architecture": "x64",
"PB_BuildType": null
}
- },
+ },
{
"Name": "DotNet-CoreClr-Trusted-Linux",
"Parameters": {
@@ -55,7 +55,22 @@
"Architecture": "x64",
"PB_BuildType": null
}
- },
+ },
+ {
+ "Name": "DotNet-CoreClr-Trusted-Linux",
+ "Parameters": {
+ "DockerTag": "alpine-3.6-3148f11-20171119021156",
+ "Rid": "linux-musl",
+ "PB_OutputRID": "linux-musl-x64",
+ "PB_AdditionalBuildArgs": "-portablebuild=false"
+ },
+ "ReportingParameters": {
+ "OperatingSystem": "Linux-musl",
+ "Type": "build/product/",
+ "Architecture": "x64",
+ "PB_BuildType": null
+ }
+ },
{
"Name": "DotNet-CoreClr-Trusted-Mac",
"Parameters": {
diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props
index 224c6bf1bebc..253adeb3f427 100644
--- a/src/.nuget/dir.props
+++ b/src/.nuget/dir.props
@@ -5,7 +5,7 @@
AnyCPU
-
+
true
@@ -26,8 +26,8 @@
Windows_NT;OSX;Android;Linux
;$(SupportedPackageOSGroups);
-
<_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))
@@ -46,7 +46,7 @@
<_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false
-
@@ -65,6 +65,12 @@
+
+
+
+ $(OutputRID)
+
+
@@ -127,6 +133,7 @@
+
@@ -155,7 +162,7 @@
-