mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Use the portable linux-x64 runtime when building on Linux.

Browse source
This commit is contained in:
Eric Erhardt 2017-03-24 15:07:54 -05:00
parent dff66c1acb
commit a97b572e49
4 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/BuildDefaults.props
View file

@ -7,5 +7,6 @@
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' ">false</IncludeAdditionalSharedFrameworks> <IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' ">false</IncludeAdditionalSharedFrameworks>
<IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive> <IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>
<SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers> <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
<UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' ">true</UsePortableLinuxSharedFramework>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

3
build/BuildInfo.targets
View file

@ -5,12 +5,14 @@
<GetCurrentRuntimeInformation> <GetCurrentRuntimeInformation>
<Output TaskParameter="Rid" PropertyName="HostRid" /> <Output TaskParameter="Rid" PropertyName="HostRid" />
<Output TaskParameter="OSName" PropertyName="HostOSName" /> <Output TaskParameter="OSName" PropertyName="HostOSName" />
<Output TaskParameter="OSPlatform" PropertyName="HostOSPlatform" />
</GetCurrentRuntimeInformation> </GetCurrentRuntimeInformation>
<PropertyGroup> <PropertyGroup>
<Rid Condition=" '$(Rid)' == '' ">$(HostRid)</Rid> <Rid Condition=" '$(Rid)' == '' ">$(HostRid)</Rid>
<Architecture Condition=" '$(Architecture)' == '' ">x64</Architecture> <Architecture Condition=" '$(Architecture)' == '' ">x64</Architecture>
<OSName Condition=" '$(OSName)' == '' ">$(HostOSName)</OSName> <OSName Condition=" '$(OSName)' == '' ">$(HostOSName)</OSName>
<OSPlatform Condition=" '$(OSPlatform)' == '' ">$(HostOSPlatform)</OSPlatform>
<BuildInfoPropsContent> <BuildInfoPropsContent>
&lt;Project ToolsVersion=&quot;15.0&quot;&gt; &lt;Project ToolsVersion=&quot;15.0&quot;&gt;
@ -18,6 +20,7 @@
&lt;Rid&gt;$(Rid)&lt;/Rid&gt; &lt;Rid&gt;$(Rid)&lt;/Rid&gt;
&lt;Architecture&gt;$(Architecture)&lt;/Architecture&gt; &lt;Architecture&gt;$(Architecture)&lt;/Architecture&gt;
&lt;OSName&gt;$(OSName)&lt;/OSName&gt; &lt;OSName&gt;$(OSName)&lt;/OSName&gt;
&lt;OSPlatform&gt;$(OSPlatform)&lt;/OSPlatform&gt;
&lt;/PropertyGroup&gt; &lt;/PropertyGroup&gt;
&lt;/Project&gt; &lt;/Project&gt;
</BuildInfoPropsContent> </BuildInfoPropsContent>

6
build/BundledRuntimes.props
View file

@ -10,7 +10,11 @@
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName> <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile> <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
<CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName> <!-- 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. -->
<SharedFrameworkRid>$(ProductMonikerRid)</SharedFrameworkRid>
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
<CombinedFrameworkHostCompressedFileName>dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
</PropertyGroup> </PropertyGroup>
<!-- Additional Shared Framework to be installed --> <!-- Additional Shared Framework to be installed -->

4
build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs
View file

@ -16,10 +16,14 @@ namespace Microsoft.DotNet.Cli.Build
[Output] [Output]
public string OSName { get; set; } public string OSName { get; set; }
[Output]
public string OSPlatform { get; set; }
public override bool Execute() public override bool Execute()
{ {
Rid = RuntimeEnvironment.GetRuntimeIdentifier(); Rid = RuntimeEnvironment.GetRuntimeIdentifier();
OSName = GetOSShortName(); OSName = GetOSShortName();
OSPlatform = RuntimeEnvironment.OperatingSystemPlatform.ToString().ToLower();
return true; return true;
} }