huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Alpine Linux download links to the README and remove conditionals to exclude building alpine (#960)

This commit is contained in:
Nate McMaster 2018-03-14 16:15:08 -07:00 committed by GitHub
parent c21090da28
commit 416fe6abfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -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 [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 [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 [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 [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 [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 [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 [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 [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] 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] 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] 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] 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 ## Building from source

2
build/SharedFx.props
View File

@ -57,7 +57,7 @@
<ItemGroup> <ItemGroup>
<WindowsSharedFxRIDs Include="win-x64;win-x86"/> <WindowsSharedFxRIDs Include="win-x64;win-x86"/>
<NonWindowsSharedFxRIDs Include="osx-x64;linux-x64" /> <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)"/> <AllSharedFxRIDs Include="@(WindowsSharedFxRIDs);@(NonWindowsSharedFxRIDs)"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
build/docker/alpine.Dockerfile
View File

@ -21,7 +21,6 @@ ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
# Workarounds https://github.com/dotnet/cli/issues/8738 # Workarounds https://github.com/dotnet/cli/issues/8738
ENV DOTNET_INSTALL_SKIP_PREREQS=1 ENV DOTNET_INSTALL_SKIP_PREREQS=1
ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1 ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1
ENV IsAlpineSupported=true
COPY global.json /tmp/global.json COPY global.json /tmp/global.json
RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \ RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \

4
build/repo.props
View File

@ -22,7 +22,7 @@
<IntermediateInstaller Include="win-x64" FileExt=".wixlib" /> <IntermediateInstaller Include="win-x64" FileExt=".wixlib" />
<IntermediateInstaller Include="osx-x64" FileExt=".tar.gz" /> <IntermediateInstaller Include="osx-x64" FileExt=".tar.gz" />
<IntermediateInstaller Include="linux-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=".exe" />
<NativeInstaller Include="win-x86" FileExt=".zip" /> <NativeInstaller Include="win-x86" FileExt=".zip" />
@ -30,7 +30,7 @@
<NativeInstaller Include="win-x64" FileExt=".zip" /> <NativeInstaller Include="win-x64" FileExt=".zip" />
<NativeInstaller Include="osx-x64" FileExt=".tar.gz" /> <NativeInstaller Include="osx-x64" FileExt=".tar.gz" />
<NativeInstaller Include="linux-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=".deb" />
<NativeInstaller Include="x64" FileExt=".rpm" /> <NativeInstaller Include="x64" FileExt=".rpm" />
<NativeInstaller Include="rh.rhel.7-x64" FileExt=".rpm" /> <NativeInstaller Include="rh.rhel.7-x64" FileExt=".rpm" />