Merge pull request #15 from dotnet/fix_all_linux_distros

Replacing Compile with ComposeSdk in the build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets

build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets

@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)/LinuxDistrosNativeInstaller.props" />
 
-  <Target Name="BuildAndPublishAllLinuxDistrosNativeInstallers" DependsOnTargets="Prepare;Compile;SetBuildingAndPublishingProps;RunAllSandBoxAndPackage;MultiPublish" />
+  <Target Name="BuildAndPublishAllLinuxDistrosNativeInstallers" DependsOnTargets="Prepare;ComposeSdk;SetBuildingAndPublishingProps;RunAllSandBoxAndPackage;MultiPublish" />
 
 
   <Target Name="RunAllSandBoxAndPackage" >

build/DotnetCoreSdkLKG.props

@@ -5,8 +5,10 @@
 
     <!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
          NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
+    <!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
     <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
-    <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
+    <SharedFrameworkRid Condition=" '$(ProductMonikerRid)' == 'linux-musl-x64' ">$(ProductMonikerRid)</SharedFrameworkRid>
+    <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
 
     <DotNetCoreSdkLKGCompressedFileName>dotnet-sdk-$(DotNetCoreSdkLKGVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</DotNetCoreSdkLKGCompressedFileName>
   </PropertyGroup>

run-build.sh

@@ -161,8 +161,9 @@ if [[ $archlower == 'arm'* ]]; then
     INSTALL_ARCHITECTURE="x64"
 fi
 
+# Workaround while the install script is not updated on the website.
 if [ "$STAGE0_SOURCE_DIR" == "" ]; then
-    (set -x ; curl -sSL "https://dot.net/v1/dotnet-install.sh" | bash /dev/stdin --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
+    (set -x ; curl -sSL "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh" | bash /dev/stdin --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
 else
     echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR"
     cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR"

scripts/docker/alpine.3.6/Dockerfile

@@ -6,6 +6,8 @@
 # Dockerfile that creates a container suitable to build dotnet-cli
 FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156
 
+RUN apk update && apk upgrade && apk add --no-cache curl ncurses
+
 # This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker
 # from issuing a warning
 ARG USER_ID=0

scripts/docker/ubuntu.18.04/Dockerfile

@@ -8,6 +8,8 @@ FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721
 
 RUN apt-get update && \
     apt-get -qqy install \
+        curl \
+        libcurl4 \
         sudo && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*