From a7811c56562699035f4fac7715428a5426d8c719 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 3 Jul 2018 11:14:40 -0700
Subject: [PATCH] Ensure .NET Core runtimes are install in alpine builds to
 tests can run

---
 build/SharedFx.targets         |  2 +-
 build/docker/alpine.Dockerfile | 11 -----------
 build/repo.props               |  2 +-
 dockerbuild.sh                 |  7 -------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 2c206a87b15e..594e9148407d 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -530,7 +530,7 @@
 
   <Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;ResolveSharedFxFiles;CrossGenAssemblies;CrossGenSymbols;PackSharedFx;TestSharedFx"/>
 
-  <Target Name="TestSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash">
+  <Target Name="TestSharedFx" DependsOnTargets="GeneratePropsFiles;DefineSharedFxPrerequisites;ResolveCommitHash;InstallDotNet">
     <PropertyGroup>
       <UnitTestFxProject>$(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj</UnitTestFxProject>
       <UnitTestFxTestProps>
diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index 4dcc47505c5d..ae9cbab56fba 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -25,14 +25,3 @@ ENV LANG en_US.UTF-8
 
 # Skip package initilization
 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Workarounds https://github.com/dotnet/cli/issues/8738
-ENV DOTNET_INSTALL_SKIP_PREREQS=1
-ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1
-
-COPY global.json /tmp/global.json
-RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \
-    && echo "Installing SDK ${DOTNET_SDK_VERSION}" \
-    && wget -q --tries 10 -O /tmp/dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \
-    && mkdir -p "$HOME/.dotnet" \
-    && tar xzf /tmp/dotnet.tar.gz -C "$HOME/.dotnet"
diff --git a/build/repo.props b/build/repo.props
index eab83a9e3112..f4a27e311585 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -43,7 +43,7 @@
 
   <ItemGroup>
     <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe -->
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" />
 
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"
       Feed="$(DotNetAssetRootUrl)"
diff --git a/dockerbuild.sh b/dockerbuild.sh
index 629984611504..a3f61b7a1742 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -90,13 +90,6 @@ fi
 dockerfile="$DIR/build/docker/$image.Dockerfile"
 tagname="universe-build-$image"
 
-# Workaround for https://github.com/dotnet/cli/issues/8738 and https://github.com/Microsoft/msbuild/issues/3066
-# Run noop target because we need to generate the global.json file so we can install the matching
-# .NET Core SDK inside the Docker container.
-"$DIR/build.sh" /t:Noop
-cp "$DIR/global.json" "$(dirname "$dockerfile")"
-#endworkaround
-
 docker build "$(dirname "$dockerfile")" \
     --build-arg "USER=$(whoami)" \
     --build-arg "USER_ID=$(id -u)" \