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

Fixing where the CoreHost packages are published to the correct version folder.

Browse source 
Also fixing 'PullNupkgFilesFromBlob' target to no longer include the hack looking for the CoreHost packages under a "preview" version folder.

Fix #3012
This commit is contained in:
Eric Erhardt 2016-05-13 14:43:08 -05:00
parent 01b7bb439a
commit 572d68de7e
2 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
foreach (var file in Directory.GetFiles(Dirs.CorehostLocalPackages, "*.nupkg")) foreach (var file in Directory.GetFiles(Dirs.CorehostLocalPackages, "*.nupkg"))
{ {
var hostBlob = $"{Channel}/Binaries/{CliNuGetVersion}/{Path.GetFileName(file)}"; var hostBlob = $"{Channel}/Binaries/{SharedFrameworkNugetVersion}/{Path.GetFileName(file)}";
AzurePublisherTool.PublishFile(hostBlob, file); AzurePublisherTool.PublishFile(hostBlob, file);
Console.WriteLine($"Publishing package {hostBlob} to Azure."); Console.WriteLine($"Publishing package {hostBlob} to Azure.");
} }
@ -458,10 +458,7 @@ namespace Microsoft.DotNet.Cli.Build
List<string> buildVersions = new List<string>(); List<string> buildVersions = new List<string>();
// The corehost packages are published to the CLI version, which is "preview1-xxxxxx" right now. Regex buildVersionRegex = new Regex(@"Binaries/(?<version>\d+\.\d+\.\d+-[^-]+-\d{6})/$");
// But there are -rc2-xxxxxx blobs on Azure, which breaks the sort descending. So only look for
// -p(.*)-xxxxxx for now to ignore those rc2 packages.
Regex buildVersionRegex = new Regex(@"Binaries/(?<version>\d+\.\d+\.\d+-p[^-]+-\d{6})/$");
foreach (string file in AzurePublisherTool.ListBlobs(hostBlob)) foreach (string file in AzurePublisherTool.ListBlobs(hostBlob))
{ {

10
scripts/dotnet-cli-build/Publishing/AzurePublisher.cs
View file

@ -205,15 +205,5 @@ namespace Microsoft.DotNet.Cli.Build
} }
} }
} }
public IEnumerable<string> ListBlobs(string blobVirtualDirectory)
{
CloudBlobDirectory blobDir = _blobContainer.GetDirectoryReference(blobVirtualDirectory);
BlobContinuationToken continuationToken = new BlobContinuationToken();
var blobFiles = blobDir.ListBlobsSegmentedAsync(continuationToken).Result;
return blobFiles.Results.Select(bf => bf.Uri.AbsoluteUri);
}
} }
} }