Produce an Alpine Linux version of the ASP.NET Core shared framework (#931)

Required changes: - Update to SQLitePCLRaw 1.1.10-pre20180223200113 - Add alpine.3.6-x64 as a new RID - Add new external dependencies
2018-03-01 10:55:53 -08:00 · 2018-03-01 10:55:53 -08:00 · 0276bb199e
parent 43cb4e9a2a
commit 0276bb199e
5 changed files with 31 additions and 23 deletions
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@ -56,7 +56,7 @@

  <ItemGroup>
    <WindowsSharedFxRIDs Include="win-x64;win-x86"/>
-    <NonWindowsSharedFxRIDs Include="osx-x64;linux-x64"/>
+    <NonWindowsSharedFxRIDs Include="osx-x64;linux-x64;alpine.3.6-x64"/>
    <AllSharedFxRIDs Include="@(WindowsSharedFxRIDs);@(NonWindowsSharedFxRIDs)"/>
  </ItemGroup>
 </Project>
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@ -119,10 +119,6 @@
      <PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
      <PathSeparator Condition="$(SharedFxRID.StartsWith('win'))">%3B</PathSeparator>

-      <!-- Required because SQLitePCLRaw 1.1.8 uses win7-x64/win7-x86 as its RIDs, even though the e_sqlite3.dll file works on all supported win-x64/win-x86 platforms. -->
-      <SharedFxRestoreRid Condition="'$(SharedFxRID)' == 'win-x64'">win7-x64</SharedFxRestoreRid>
-      <SharedFxRestoreRid Condition="'$(SharedFxRID)' == 'win-x86'">win7-x86</SharedFxRestoreRid>
-
      <CommonSharedFxProps>Configuration=$(Configuration);RuntimeIdentifier=$(SharedFxRestoreRid)</CommonSharedFxProps>
      <CommonSharedFxProps>$(CommonSharedFxProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)</CommonSharedFxProps>
      <CommonSharedFxProps>$(CommonSharedFxProps);AspNetUniverseBuildOffline=true</CommonSharedFxProps>
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -17,6 +17,11 @@
    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26224-02</MicrosoftNETCorePlatformsPackageVersion>
    <MicrosoftWin32RegistryPackageVersion>4.5.0-preview2-26224-02</MicrosoftWin32RegistryPackageVersion>
    <NuGetFrameworksPackageVersion>4.7.0-preview1-4958</NuGetFrameworksPackageVersion>
+    <RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26225-03</RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>
+    <RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26225-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>
+    <RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26225-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>
+    <RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26225-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
+    <RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26225-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>
    <RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26225-03</RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>
    <RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26225-03</RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>
    <RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26225-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>
@ -179,9 +184,9 @@
    <RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion>
    <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion>
    <SerilogSinksFilePackageVersion>3.2.0</SerilogSinksFilePackageVersion>
-    <SQLitePCLRawBundleGreenPackageVersion>1.1.8</SQLitePCLRawBundleGreenPackageVersion>
-    <SQLitePCLRawBundleSqlcipherPackageVersion>1.1.8</SQLitePCLRawBundleSqlcipherPackageVersion>
-    <SQLitePCLRawCorePackageVersion>1.1.8</SQLitePCLRawCorePackageVersion>
+    <SQLitePCLRawBundleGreenPackageVersion>1.1.10-pre20180223200113</SQLitePCLRawBundleGreenPackageVersion>
+    <SQLitePCLRawBundleSqlcipherPackageVersion>1.1.10-pre20180223200113</SQLitePCLRawBundleSqlcipherPackageVersion>
+    <SQLitePCLRawCorePackageVersion>1.1.10-pre20180223200113</SQLitePCLRawCorePackageVersion>
    <StackExchangeRedisStrongNamePackageVersion>1.2.4</StackExchangeRedisStrongNamePackageVersion>
    <StreamJsonRpcPackageVersion>1.1.92</StreamJsonRpcPackageVersion>
    <StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion>
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@ -35,21 +35,11 @@
    <ExternalDependency Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(RuntimeWinX86MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.App" Version="$(RuntimeWinX64MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHost" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.App" Version="$(RuntimeOsxX64MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHost" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.alpine.3.6-x64.Microsoft.NETCore.App" Version="$(RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.alpine.3.6-x64.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.alpine.3.6-x64.Microsoft.NETCore.DotNetHost" Version="$(RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.alpine.3.6-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.alpine.3.6-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.App" Version="$(RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHost" Version="$(RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
@ -60,6 +50,21 @@
    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.App" Version="$(RuntimeOsxX64MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHost" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.App" Version="$(RuntimeWinX64MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHost" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(RuntimeWinX86MicrosoftNETCoreAppPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
    <ExternalDependency Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
--- a/build/repo.props
+++ b/build/repo.props
@ -24,6 +24,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" />

    <NativeInstaller Include="win-x86" FileExt=".exe" />
    <NativeInstaller Include="win-x86" FileExt=".zip" />
@ -31,6 +32,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" />
    <NativeInstaller Include="x64" FileExt=".deb" />
    <NativeInstaller Include="x64" FileExt=".rpm" />
    <NativeInstaller Include="rh.rhel.7-x64" FileExt=".rpm" />