From 416fe6abfea6a359c58f587dc09bfc7ac2319c1b Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 14 Mar 2018 16:15:08 -0700
Subject: [PATCH] Add Alpine Linux download links to the README and remove
 conditionals to exclude building alpine (#960)

---
 README.md                      | 3 +++
 build/SharedFx.props           | 2 +-
 build/docker/alpine.Dockerfile | 1 -
 build/repo.props               | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 24a41d7554..c9a3f295c6 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ Microsoft.AspNetCore              | [![][metapackage-myget-badge]][metapackage-m
 [osx-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-osx-x64.tar.gz
 [debian-x64-deb]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.deb
 [redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.rpm
+[alpine.3.6-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-alpine.3.6-x64.tar.gz
 
 [badge-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-win-x64-version-badge.svg
 [win-x64-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.zip
@@ -68,6 +69,7 @@ Microsoft.AspNetCore              | [![][metapackage-myget-badge]][metapackage-m
 [osx-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-osx-x64.tar.gz
 [debian-x64-deb-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-x64.deb
 [redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-x64.rpm
+[alpine.3.6-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-alpine.3.6-x64.tar.gz
 
 Platform              | Latest (dev branch) <br> ![][badge-master]                      | release/2.1 <br> ![][badge-rel-21]
 :---------------------|:----------------------------------------------------------------|:-------------------------------------------------------------------------
@@ -77,6 +79,7 @@ macOS (x64)           | [Archive (tar.gz)][osx-x64-tar]
 Linux (x64)           | [Archive (tar.gz)][linux-x64-tar]                                | [Archive (tar.gz)][linux-x64-tar-rel-21]
 Debian/Ubuntu (x64)   | [Installer (deb)][debian-x64-deb]                                | [Installer (deb)][debian-x64-deb-rel-21]
 RedHat/Fedora (x64)   | [Installer (rpm)][redhat-x64-rpm]                                | [Installer (rpm)][redhat-x64-rpm-rel-21]
+Alpine Linux 3.6 (x64)| [Archive (tar.gz)][alpine.3.6-x64-tar]                           | [Archive (tar.gz)][alpine.3.6-x64-tar-rel-21]
 
 ## Building from source
 
diff --git a/build/SharedFx.props b/build/SharedFx.props
index 1bc2247515..8d5bc77c3d 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -57,7 +57,7 @@
   <ItemGroup>
     <WindowsSharedFxRIDs Include="win-x64;win-x86"/>
     <NonWindowsSharedFxRIDs Include="osx-x64;linux-x64" />
-    <NonWindowsSharedFxRIDs Include="alpine.3.6-x64" Condition="'$(IsAlpineSupported)' == 'true'" />
+    <NonWindowsSharedFxRIDs Include="alpine.3.6-x64" />
     <AllSharedFxRIDs Include="@(WindowsSharedFxRIDs);@(NonWindowsSharedFxRIDs)"/>
   </ItemGroup>
 </Project>
diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index 66a49420e8..e6a28c5f6d 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -21,7 +21,6 @@ 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
-ENV IsAlpineSupported=true
 
 COPY global.json /tmp/global.json
 RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \
diff --git a/build/repo.props b/build/repo.props
index 9377e7b874..462857fb19 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -22,7 +22,7 @@
     <IntermediateInstaller Include="win-x64" FileExt=".wixlib" />
     <IntermediateInstaller Include="osx-x64" FileExt=".tar.gz" />
     <IntermediateInstaller Include="linux-x64" FileExt=".tar.gz" />
-    <IntermediateInstaller Include="alpine.3.6-x64" FileExt=".tar.gz" Condition="'$(IsAlpineSupported)' == 'true'" />
+    <IntermediateInstaller Include="alpine.3.6-x64" FileExt=".tar.gz" />
 
     <NativeInstaller Include="win-x86" FileExt=".exe" />
     <NativeInstaller Include="win-x86" FileExt=".zip" />
@@ -30,7 +30,7 @@
     <NativeInstaller Include="win-x64" FileExt=".zip" />
     <NativeInstaller Include="osx-x64" FileExt=".tar.gz" />
     <NativeInstaller Include="linux-x64" FileExt=".tar.gz" />
-    <NativeInstaller Include="alpine.3.6-x64" FileExt=".tar.gz" Condition="'$(IsAlpineSupported)' == 'true'" />
+    <NativeInstaller Include="alpine.3.6-x64" FileExt=".tar.gz" />
     <NativeInstaller Include="x64" FileExt=".deb" />
     <NativeInstaller Include="x64" FileExt=".rpm" />
     <NativeInstaller Include="rh.rhel.7-x64" FileExt=".rpm" />