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

Merge pull request #2805 from dotnet/piotrpMSFT/AzurePublisher

Browse source 
Piotrp msft/azure publisher
This commit is contained in:
Piotr Puszkiewicz 2016-05-02 01:04:50 -07:00
commit ac5432bff2
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,13 +69,16 @@ namespace Microsoft.DotNet.Cli.Build
// at the same time and someone already took care of publishing and we have no work to do. // at the same time and someone already took care of publishing and we have no work to do.
if (AzurePublisherTool.IsLatestSpecifiedVersion(targetVersionFile)) if (AzurePublisherTool.IsLatestSpecifiedVersion(targetVersionFile))
{ {
AzurePublisherTool.ReleaseLeaseOnBlob(targetContainer, leaseId); AzurePublisherTool.ReleaseLeaseOnBlob(semaphoreBlob, leaseId);
return c.Success(); return c.Success();
} }
else else
{ {
// This is an old drop of latest so remove all old files to ensure a clean state // This is an old drop of latest so remove all old files to ensure a clean state
AzurePublisherTool.ListBlobs($"{targetContainer}").ToList().ForEach(f => AzurePublisherTool.TryDeleteBlob(f)); AzurePublisherTool.ListBlobs($"{targetContainer}")
.Select(s => s.Replace("/dotnet/", ""))
.ToList()
.ForEach(f => AzurePublisherTool.TryDeleteBlob(f));
// Drop the version file signaling such for any race-condition builds (see above comment). // Drop the version file signaling such for any race-condition builds (see above comment).
AzurePublisherTool.DropLatestSpecifiedVersion(targetVersionFile); AzurePublisherTool.DropLatestSpecifiedVersion(targetVersionFile);

4
scripts/obtain/dotnet-install.sh vendored
View file

@ -245,7 +245,7 @@ is_dotnet_package_installed() {
local install_root=$1 local install_root=$1
local relative_path_to_package=$2 local relative_path_to_package=$2
local specific_version=$3 local specific_version=${3//[$'\t\r\n']}
local dotnet_package_path=$(combine_paths $(combine_paths $install_root $relative_path_to_package) $specific_version) local dotnet_package_path=$(combine_paths $(combine_paths $install_root $relative_path_to_package) $specific_version)
say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path" say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path"
@ -343,7 +343,7 @@ construct_download_link() {
local azure_feed=$1 local azure_feed=$1
local azure_channel=$2 local azure_channel=$2
local normalized_architecture=$3 local normalized_architecture=$3
local specific_version=$4 local specific_version=${4//[$'\t\r\n']}
local osname=$(get_current_os_name) local osname=$(get_current_os_name)