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

Merge pull request #3491 from eerhardt/FixVersionRepoUpdater

Browse source 
Fix the VersionRepoUpdater to handle symbols.nupkg files correctly.
This commit is contained in:
Eric Erhardt 2016-06-10 10:01:17 -05:00 committed by GitHub
commit 3550b04f2e
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build_projects/shared-build-targets-utils/VersionRepoUpdater.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class VersionRepoUpdater
{
private static Regex s_nugetFileRegex = new Regex("^(.*?)\\.(([0-9]+\\.)?[0-9]+\\.[0-9]+(-([A-z0-9-]+))?)\\.nupkg$");
private static Regex s_nugetFileRegex = new Regex("^(?<id>.*?)\\.(?<version>([0-9]+\\.)?[0-9]+\\.[0-9]+(-(?<prerelease>[A-z0-9-]+))?)(?<symbols>\\.symbols)?\\.nupkg$");
private string _gitHubAuthToken;
private string _gitHubUser;
@ -68,12 +68,16 @@ namespace Microsoft.DotNet.Cli.Build
{
Match match = s_nugetFileRegex.Match(Path.GetFileName(filePath));
packages.Add(new NuGetPackageInfo()
// only look for non-symbols packages
if (string.IsNullOrEmpty(match.Groups["symbols"].Value))
{
Id = match.Groups[1].Value,
Version = match.Groups[2].Value,
Prerelease = match.Groups[5].Value,
});
packages.Add(new NuGetPackageInfo()
{
Id = match.Groups["id"].Value,
Version = match.Groups["version"].Value,
Prerelease = match.Groups["prerelease"].Value,
});
}
}
return packages;