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

Merge pull request #1947 from dotnet/piotrpMSFT/disableDeb

Browse source 
Disable deb creation & publishing
This commit is contained in:
Piotr Puszkiewicz 2016-03-18 03:06:59 -07:00
commit 999549e6d4
3 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/dotnet-cli-build/InstallerTargets.cs
View file

@ -14,16 +14,17 @@ namespace Microsoft.DotNet.Cli.Build
{
[Target(nameof(MsiTargets.GenerateMsis),
nameof(MsiTargets.GenerateBundle),
nameof(PkgTargets.GeneratePkgs),
nameof(InstallerTargets.GenerateDebs))]
nameof(PkgTargets.GeneratePkgs))]//,
//nameof(InstallerTargets.GenerateDebs))]
public static BuildTargetResult GenerateInstaller(BuildTargetContext c)
{
return c.Success();
}
[Target(nameof(InstallerTargets.GenerateSdkDeb),
nameof(InstallerTargets.GenerateSharedFrameworkDeb),
nameof(InstallerTargets.GenerateSharedHostDeb))]
[Target(
nameof(InstallerTargets.GenerateSdkDeb),
nameof(InstallerTargets.GenerateSharedFrameworkDeb),
nameof(InstallerTargets.GenerateSharedHostDeb))]
[BuildPlatforms(BuildPlatform.Ubuntu)]
public static BuildTargetResult GenerateDebs(BuildTargetContext c)
{

15
scripts/dotnet-cli-build/PublishTargets.cs
View file

@ -44,12 +44,13 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success();
}
[Target(nameof(PublishTargets.PublishVersionBadge),
nameof(PublishTargets.PublishSdkInstallerFile),
nameof(PublishTargets.PublishDebFileToDebianRepo),
nameof(PublishTargets.PublishCombinedFrameworkSDKHostFile),
nameof(PublishTargets.PublishCombinedFrameworkHostFile),
nameof(PublishTargets.PublishLatestVersionTextFile))]
[Target(
nameof(PublishTargets.PublishVersionBadge),
nameof(PublishTargets.PublishSdkInstallerFile),
//nameof(PublishTargets.PublishDebFileToDebianRepo),
nameof(PublishTargets.PublishCombinedFrameworkSDKHostFile),
nameof(PublishTargets.PublishCombinedFrameworkHostFile),
nameof(PublishTargets.PublishLatestVersionTextFile))]
public static BuildTargetResult PublishArtifacts(BuildTargetContext c)
{
return c.Success();
@ -68,7 +69,7 @@ namespace Microsoft.DotNet.Cli.Build
}
[Target]
[BuildPlatforms(BuildPlatform.Windows, BuildPlatform.OSX, BuildPlatform.Ubuntu)]
[BuildPlatforms(BuildPlatform.Windows, BuildPlatform.OSX)]//, BuildPlatform.Ubuntu)]
public static BuildTargetResult PublishSdkInstallerFile(BuildTargetContext c)
{
var installerFile = c.BuildContext.Get<string>("CombinedFrameworkSDKHostInstallerFile");

18
scripts/obtain/install.sh
View file

@ -99,6 +99,16 @@ make_link() {
ln -s $src $dest
}
make_bootstrap_link() {
local src=$INSTALLDIR/cli/bin/dotnet
local dest=$INSTALLDIR/cli/dotnet
say "Linking $dest -> $src"
if [ -e $dest ]; then
rm $dest
fi
ln -s $src $dest
}
install_dotnet()
{
if ! machine_has "curl"; then
@ -130,6 +140,10 @@ install_dotnet()
local installLocation="$INSTALLDIR"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/$VERSION"
local dotnet_filename="dotnet-dev-$os-x64.$fileVersion.tar.gz"
if [ "$os" = "ubuntu" ]; then
dotnet_filename="dotnet-$os-x64.$fileVersion.tar.gz"
fi
if [ "$RELINK" = "0" ]; then
if [ "$FORCE" = "0" ]; then
@ -178,6 +192,10 @@ install_dotnet()
[ $? != 0 ] && say_err "Failed to clean current dotnet install" && return 1
mv "$installLocation/cli_new" "$installLocation/cli"
if [ "$os" = "ubuntu" ]; then
make_bootstrap_link
fi
elif [ ! -e "$installLocation/cli" ]; then
say_err "${red}cannot relink dotnet, it is not installed in $PREFIX!"
return 1