From 84b038498a24d061472722fe3498e06df4419514 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 8 Mar 2017 10:15:11 -0800 Subject: [PATCH] Use an exact match from the first repository that finds a package. --- build/repo.targets | 2 +- tools/PinVersions/PinVersionUtility.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/repo.targets b/build/repo.targets index 0b2f71f87d..b1c1b42336 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -5,7 +5,7 @@ <_BuildGraphFile>$(BuildDir)BuildGraph.proj <_CloneRepositoryRoot>$(RepositoryRoot).r\ <_DependencyBuildDirectory>$(RepositoryRoot).deps\build\ - <_DependencyPackagesDirectory>$(_DependencyBuildDirectory)> + <_DependencyPackagesDirectory>$(_DependencyBuildDirectory) <_RepositoryListFileName>Repositories.props <_DependencyRepositoryList>$(_DependencyBuildDirectory)$(_RepositoryListFileName) <_RestoreGraphSpecsDirectory>$(RepositoryRoot)obj\package-specs\ diff --git a/tools/PinVersions/PinVersionUtility.cs b/tools/PinVersions/PinVersionUtility.cs index cd15598247..84e0a284a8 100644 --- a/tools/PinVersions/PinVersionUtility.cs +++ b/tools/PinVersions/PinVersionUtility.cs @@ -64,6 +64,7 @@ namespace PinVersions .Concat(specProject.TargetFrameworks.SelectMany(tfm => tfm.Dependencies.Select(dependency => new { Dependency = dependency, tfm.FrameworkName }))) .Where(d => d.Dependency.LibraryRange.TypeConstraintAllows(LibraryDependencyTarget.Package)); + Console.WriteLine($"Pinning package versions for {specProject.FilePath}."); var packageReferencesItemGroup = new XElement("ItemGroup"); foreach (var dependency in allDependencies) { @@ -80,6 +81,7 @@ namespace PinVersions continue; } + Console.WriteLine($"Pinning reference {reference.Name}({reference.LibraryRange.VersionRange} to {exactVersion}."); var metadata = new List { new XAttribute("Update", reference.Name), @@ -125,7 +127,7 @@ namespace PinVersions switch (matchingVersions.Count) { case 0: - return null; + continue; case 1: return matchingVersions[0]; default: