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

Merge pull request #3334 from livarcocc/skip_installer_for_ubuntu_16

Browse source 
We need to prevent downloading deb packages on Ubuntu16.04 since we d…
This commit is contained in:
Livar 2016-06-01 21:39:10 -07:00
commit 48b3b02d3c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build_projects/dotnet-cli-build/PrepareTargets.cs
View file

@ -187,6 +187,11 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.Windows, BuildPlatform.OSX, BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Windows, BuildPlatform.OSX, BuildPlatform.Ubuntu)]
public static BuildTargetResult DownloadHostAndSharedFxInstallers(BuildTargetContext c) public static BuildTargetResult DownloadHostAndSharedFxInstallers(BuildTargetContext c)
{ {
if (CurrentPlatform.IsUbuntu && !CurrentPlatform.IsVersion("14.04"))
{
return c.Success();
}
var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion; var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion;
var hostVersion = CliDependencyVersions.SharedHostVersion; var hostVersion = CliDependencyVersions.SharedHostVersion;
@ -198,7 +203,7 @@ namespace Microsoft.DotNet.Cli.Build
Mkdirp(Path.GetDirectoryName(sharedFrameworkInstallerDownloadFile)); Mkdirp(Path.GetDirectoryName(sharedFrameworkInstallerDownloadFile));
Mkdirp(Path.GetDirectoryName(sharedHostInstallerDownloadFile)); Mkdirp(Path.GetDirectoryName(sharedHostInstallerDownloadFile));
if ( ! File.Exists(sharedFrameworkInstallerDownloadFile)) if ( ! File.Exists(sharedFrameworkInstallerDownloadFile))
{ {
var sharedFrameworkInstallerDestinationFile = c.BuildContext.Get<string>("SharedFrameworkInstallerFile"); var sharedFrameworkInstallerDestinationFile = c.BuildContext.Get<string>("SharedFrameworkInstallerFile");