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

Support Ubuntu16.10 installer

Browse source 
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
This commit is contained in:
Eric Erhardt 2017-02-18 09:34:50 -08:00
parent 3458aa38ba
commit 996d458e30
4 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/Microsoft.DotNet.Cli.Monikers.props
View file

@ -2,13 +2,13 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<SdkBrandName>.NET Core SDK 1.0.1 ($(Architecture)) Installer</SdkBrandName> <SdkBrandName>.NET Core SDK 1.0.1 ($(Architecture)) Installer</SdkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</AdditionalSharedFrameworkBrandName> <AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</AdditionalSharedFrameworkBrandName>
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</AdditionalSharedHostBrandName> <AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</AdditionalHostFxrBrandName> <AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
<SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName> <SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
</PropertyGroup> </PropertyGroup>

21
build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
View file

@ -75,8 +75,10 @@
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)" /> Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
</Target> </Target>
@ -90,9 +92,12 @@
Outputs="$(DebianTestResultsXmlFile)" > Outputs="$(DebianTestResultsXmlFile)" >
<!-- Install Dependencies and SDK Packages --> <!-- Install Dependencies and SDK Packages -->
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)" /> <Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)"
<Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)" /> Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)" /> <Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" /> <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
@ -113,8 +118,10 @@
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)" /> Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
</Target> </Target>

9
build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
View file

@ -93,8 +93,13 @@
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%"> <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
<ReplacementString>$(SharedFxDebianPackageName)</ReplacementString> <ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
</DebianConfigTokenValues> </DebianConfigTokenValues>
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%"> <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
<ReplacementString>$(AdditionalSharedFxDebianPackageName)</ReplacementString> Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'">
<ReplacementString>"$(AdditionalSharedFxDebianPackageName)" : {}</ReplacementString>
</DebianConfigTokenValues>
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
Condition="'$(IncludeAdditionalSharedFrameworks)' != 'true'">
<ReplacementString></ReplacementString>
</DebianConfigTokenValues> </DebianConfigTokenValues>
<DebianConfigTokenValues Include="%SDK_NUGET_VERSION%"> <DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
<ReplacementString>$(SdkVersion)</ReplacementString> <ReplacementString>$(SdkVersion)</ReplacementString>

2
packaging/deb/dotnet-debian_config.json
View file

@ -30,6 +30,6 @@
"debian_dependencies":{ "debian_dependencies":{
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}, "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {},
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%" : {} %SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%
} }
} }