diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9fe9d0738..1e34f5af0 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -156,7 +156,7 @@ stages:
_LinuxPortable: '--linux-portable'
_RuntimeIdentifier: '--runtime-id linux-arm'
_BuildArchitecture: 'arm'
- # Never run tests on arm64
+ # Never run tests on arm
_TestArg: ''
Build_Arm64_Debug:
_BuildConfig: Debug
@@ -166,12 +166,32 @@ stages:
_BuildArchitecture: 'arm64'
# Never run tests on arm64
_TestArg: ''
+ Build_Linux_musl_Debug_arm:
+ _BuildConfig: Debug
+ # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it)
+ _DockerParameter: '--docker ubuntu.18.04'
+ _LinuxPortable: ''
+ _RuntimeIdentifier: '--runtime-id linux-musl-arm'
+ _BuildArchitecture: 'arm'
+ _AdditionalBuildParameters: '/p:OSName="linux-musl"'
+ # Never run tests on arm
+ _TestArg: ''
+ Build_Linux_musl_Debug_arm64:
+ _BuildConfig: Debug
+ _DockerParameter: ''
+ _LinuxPortable: ''
+ _RuntimeIdentifier: '--runtime-id linux-musl-arm64'
+ _BuildArchitecture: 'arm64'
+ _AdditionalBuildParameters: '/p:OSName="linux-musl"'
+ # Never run tests on arm64
+ _TestArg: ''
Build_Linux_musl_Debug_x64:
_BuildConfig: Debug
_DockerParameter: '--docker alpine.3.6'
_LinuxPortable: ''
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
_BuildArchitecture: 'x64'
+ _AdditionalBuildParameters: '/p:OSName="linux-musl"'
_TestArg: $(_NonWindowsTestArg)
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Build_Arm_Release:
@@ -180,7 +200,7 @@ stages:
_LinuxPortable: '--linux-portable'
_RuntimeIdentifier: '--runtime-id linux-arm'
_BuildArchitecture: 'arm'
- # Never run tests on arm64
+ # Never run tests on arm
_TestArg: ''
Build_Arm64_Release:
_BuildConfig: Release
@@ -190,12 +210,32 @@ stages:
_BuildArchitecture: 'arm64'
# Never run tests on arm64
_TestArg: ''
+ Build_Linux_musl_Release_arm:
+ _BuildConfig: Release
+ # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it)
+ _DockerParameter: '--docker ubuntu.18.04'
+ _LinuxPortable: ''
+ _RuntimeIdentifier: '--runtime-id linux-musl-arm'
+ _BuildArchitecture: 'arm'
+ _AdditionalBuildParameters: '/p:OSName="linux-musl"'
+ # Never run tests on arm
+ _TestArg: ''
+ Build_Linux_musl_Release_arm64:
+ _BuildConfig: Release
+ _DockerParameter: ''
+ _LinuxPortable: ''
+ _RuntimeIdentifier: '--runtime-id linux-musl-arm64'
+ _BuildArchitecture: 'arm64'
+ _AdditionalBuildParameters: '/p:OSName="linux-musl"'
+ # Never run tests on arm64
+ _TestArg: ''
Build_Linux_musl_Release_x64:
_BuildConfig: Release
_DockerParameter: '--docker alpine.3.6'
_LinuxPortable: ''
_RuntimeIdentifier: '--runtime-id linux-musl-x64'
_BuildArchitecture: 'x64'
+ _AdditionalBuildParameters: '/p:OSName="linux-musl"'
Build_Linux_Portable_Deb_Release_x64:
_BuildConfig: Release
_DockerParameter: '--docker ubuntu.16.04'
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index 91a04a34b..21ddff18a 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -7,11 +7,11 @@
microsoft.netcore.app.runtime.$(SharedFrameworkRid)
<_crossDir Condition="'$(Architecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64'">/x64_arm64
<_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm
- <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm
+ <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' != 'win'">/x64_arm
$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)
x64_arm64
x86_arm
- x64_arm
+ x64_arm
$(SharedFrameworkRid)
$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)
$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion)
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 11bafc1b5..2bcf44794 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -77,6 +77,7 @@
-
+
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 46beb66e7..b317beac2 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -67,7 +67,7 @@
$(CoreSetupRid)
- $(ProductMonikerRid)
+ $(ProductMonikerRid)
linux-$(Architecture)
dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
index 9f53268ab..ce6e3b14c 100644
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@@ -16,7 +16,7 @@
true
true
- true
+ true
true
diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets
index 0378bbb53..4f37eaa0a 100644
--- a/src/redist/targets/SetBuildDefaults.targets
+++ b/src/redist/targets/SetBuildDefaults.targets
@@ -12,11 +12,11 @@
OR $(Rid.StartsWith('ubuntu.18.04')))">true
false
- true
+ true
true