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

Port https://github.com/dotnet/core-setup/pull/168 to CLI.

Browse source
This commit is contained in:
Eric Erhardt 2016-06-21 19:18:48 -05:00
parent 4f1d9c4e23
commit 80332c8fc3
2 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,8 @@ namespace Microsoft.DotNet.Cli.Build
private static string Channel { get; set; }
private static string CommitHash { get; set; }
private static string CliNuGetVersion { get; set; }
private static string SharedFrameworkNugetVersion { get; set; }
@ -28,6 +30,7 @@ namespace Microsoft.DotNet.Cli.Build
CliNuGetVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
SharedFrameworkNugetVersion = CliDependencyVersions.SharedFrameworkVersion;
Channel = c.BuildContext.Get<string>("Channel");
CommitHash = c.BuildContext.Get<string>("CommitHash");
return c.Success();
}
@ -49,7 +52,7 @@ namespace Microsoft.DotNet.Cli.Build
if (CheckIfAllBuildsHavePublished())
{
string targetContainer = $"{AzurePublisher.Product.Sdk}/{Channel}/";
string targetVersionFile = $"{targetContainer}{CliNuGetVersion}";
string targetVersionFile = $"{targetContainer}{CommitHash}";
string semaphoreBlob = $"{targetContainer}/publishSemaphore";
AzurePublisherTool.CreateBlobIfNotExists(semaphoreBlob);
string leaseId = AzurePublisherTool.AcquireLeaseOnBlob(semaphoreBlob);
@ -64,7 +67,7 @@ namespace Microsoft.DotNet.Cli.Build
}
else
{
Regex versionFileRegex = new Regex(@"(?<version>\d\.\d\.\d)-(?<release>.*)?");
Regex versionFileRegex = new Regex(@"(?<CommitHash>[\w\d]{40})");
// Delete old version files
AzurePublisherTool.ListBlobs(targetContainer)