Return additional information about properties and evaluted dependenc…

…y versions

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Cli.Test/EntryPointTests.Discover.cs

@@ -91,9 +91,9 @@ await RunAsync(path =>
                         Dependencies = [
                             new("Newtonsoft.Json", "7.0.1", DependencyType.PackageConfig)
                         ],
-                        Properties = new Dictionary<string, string>()
+                        Properties = new Dictionary<string, Property>()
                         {
-                            ["TargetFrameworkVersion"] = "v4.5",
+                            ["TargetFrameworkVersion"] = new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
                         }.ToImmutableDictionary()
                     }
                 ]
@@ -153,9 +153,9 @@ await RunAsync(path =>
                         Dependencies = [
                             new("Newtonsoft.Json", "7.0.1", DependencyType.PackageConfig)
                         ],
-                        Properties = new Dictionary<string, string>()
+                        Properties = new Dictionary<string, Property>()
                         {
-                            ["TargetFrameworkVersion"] = "v4.5",
+                            ["TargetFrameworkVersion"] = new("TargetFrameworkVersion", "v4.5", "path/to/my.csproj"),
                         }.ToImmutableDictionary()
                     }
                 ]

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTestBase.cs

@@ -82,7 +82,11 @@ void ValidateDependencies(ImmutableArray<Dependency> expectedDependencies, Immut
             foreach (var expectedDependency in expectedDependencies)
             {
                 var actualDependency = actualDependencies.Single(d => d.Name == expectedDependency.Name);
-                Assert.Equal(expectedDependency, actualDependency);
+                Assert.Equal(expectedDependency.Name, actualDependency.Name);
+                Assert.Equal(expectedDependency.Version, actualDependency.Version);
+                Assert.Equal(expectedDependency.Type, actualDependency.Type);
+                Assert.Equal(expectedDependency.IsDirect, actualDependency.IsDirect);
+                Assert.Equal(expectedDependency.IsTransitive, actualDependency.IsTransitive);
             }
         }
     }

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs

@@ -46,10 +46,10 @@ await TestDiscovery(
                         Dependencies = [
                             new("Newtonsoft.Json", "9.0.1", DependencyType.PackageReference, IsDirect: true)
                         ],
-                        Properties = new Dictionary<string, string>()
+                        Properties = new Dictionary<string, Property>()
                         {
-                            ["NewtonsoftJsonPackageVersion"] = "9.0.1",
-                            ["TargetFramework"] = "netstandard2.0",
+                            ["NewtonsoftJsonPackageVersion"] = new("NewtonsoftJsonPackageVersion", "9.0.1", projectPath),
+                            ["TargetFramework"] = new("TargetFramework", "netstandard2.0", projectPath),
                         }.ToImmutableDictionary()
                     }
                 ]
@@ -104,9 +104,9 @@ await TestDiscovery(
                         Dependencies = [
                             new("Newtonsoft.Json", "7.0.1", DependencyType.PackageConfig)
                         ],
-                        Properties = new Dictionary<string, string>()
+                        Properties = new Dictionary<string, Property>()
                         {
-                            ["TargetFrameworkVersion"] = "v4.5",
+                            ["TargetFrameworkVersion"] = new("TargetFrameworkVersion", "v4.5", projectPath),
                         }.ToImmutableDictionary()
                     }
                 ]
@@ -162,11 +162,11 @@ await TestDiscovery(
                         Dependencies = [
                             new("Newtonsoft.Json", "9.0.1", DependencyType.PackageReference, IsDirect: true)
                         ],
-                        Properties = new Dictionary<string, string>()
+                        Properties = new Dictionary<string, Property>()
                         {
-                            ["ManagePackageVersionsCentrally"] = "true",
-                            ["NewtonsoftJsonPackageVersion"] = "9.0.1",
-                            ["TargetFramework"] = "netstandard2.0",
+                            ["ManagePackageVersionsCentrally"] = new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
+                            ["NewtonsoftJsonPackageVersion"] = new("NewtonsoftJsonPackageVersion", "9.0.1", "Directory.Packages.props"),
+                            ["TargetFramework"] = new("TargetFramework", "netstandard2.0", projectPath),
                         }.ToImmutableDictionary()
                     }
                 ],
@@ -284,11 +284,11 @@ await TestDiscovery(
                         Dependencies = [
                             new("Newtonsoft.Json", "9.0.1", DependencyType.PackageReference, IsDirect: true)
                         ],
-                        Properties = new Dictionary<string, string>()
+                        Properties = new Dictionary<string, Property>()
                         {
-                            ["ManagePackageVersionsCentrally"] = "true",
-                            ["NewtonsoftJsonPackageVersion"] = "9.0.1",
-                            ["TargetFramework"] = "netstandard2.0",
+                            ["ManagePackageVersionsCentrally"] = new("ManagePackageVersionsCentrally", "true", "Directory.Packages.props"),
+                            ["NewtonsoftJsonPackageVersion"] = new("NewtonsoftJsonPackageVersion", "9.0.1", "Directory.Packages.props"),
+                            ["TargetFramework"] = new("TargetFramework", "netstandard2.0", "src/project.csproj"),
                         }.ToImmutableDictionary()
                     }
                 ],

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/ExpectedDiscoveryResults.cs

@@ -19,7 +19,7 @@ public record ExpectedWorkspaceDiscoveryResult : IDiscoveryResult
 public record ExpectedSdkProjectDiscoveryResult : IDiscoveryResultWithDependencies
 {
     public required string FilePath { get; init; }
-    public required ImmutableDictionary<string, string> Properties { get; init; }
+    public required ImmutableDictionary<string, Property> Properties { get; init; }
     public ImmutableArray<string> TargetFrameworks { get; init; }
     public ImmutableArray<string> ReferencedProjectPaths { get; init; }
     public ImmutableArray<Dependency> Dependencies { get; init; }

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Files/PackagesConfigBuildFileTests.cs

@@ -38,7 +38,7 @@ public void PackagesConfig_GetDependencies_ReturnsDependencies()
         var expectedDependencies = new List<Dependency>
         {
             new("Microsoft.CodeDom.Providers.DotNetCompilerPlatform", "1.0.0", DependencyType.PackageConfig),
-            new("Microsoft.Net.Compilers", "1.0.0", DependencyType.PackageConfig, true),
+            new("Microsoft.Net.Compilers", "1.0.0", DependencyType.PackageConfig, IsDevDependency: true),
             new("Newtonsoft.Json", "8.0.3", DependencyType.PackageConfig)
         };
 

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs

@@ -4,6 +4,8 @@
 
 namespace NuGetUpdater.Core.Test.Utilities;
 
+using TestFile = (string Path, string Content);
+
 public class MSBuildHelperTests
 {
     public MSBuildHelperTests()
@@ -25,15 +27,15 @@ public void GetRootedValue_FindsValue()
                 </ItemGroup>
             </Project>
             """;
-        var propertyInfo = new Dictionary<string, string>
+        var propertyInfo = new Dictionary<string, Property>
         {
-            { "PackageVersion1", "1.1.1" },
+            { "PackageVersion1", new("PackageVersion1", "1.1.1", "Packages.props") },
         };
 
         // Act
-        var (resultType, evaluatedValue, _) = MSBuildHelper.GetEvaluatedValue(projectContents, propertyInfo);
+        var (resultType, _, evaluatedValue, _, _, _) = MSBuildHelper.GetEvaluatedValue(projectContents, propertyInfo);
 
-        Assert.Equal(MSBuildHelper.EvaluationResultType.Success, resultType);
+        Assert.Equal(EvaluationResultType.Success, resultType);
 
         // Assert
         Assert.Equal("""
@@ -62,19 +64,19 @@ public async Task GetRootedValue_DoesNotRecurseAsync()
                 </ItemGroup>
             </Project>
             """;
-        var propertyInfo = new Dictionary<string, string>
+        var propertyInfo = new Dictionary<string, Property>
         {
-            { "PackageVersion1", "$(PackageVersion2)" },
-            { "PackageVersion2", "$(PackageVersion1)" }
+            { "PackageVersion1", new("PackageVersion1", "$(PackageVersion2)", "Packages.props") },
+            { "PackageVersion2", new("PackageVersion2", "$(PackageVersion1)", "Packages.props") }
         };
         // This is needed to make the timeout work. Without that we could get caugth in an infinite loop.
         await Task.Delay(1);
 
         // Act
-        var (resultType, _, errorMessage) = MSBuildHelper.GetEvaluatedValue(projectContents, propertyInfo);
+        var (resultType, _, _, _, _, errorMessage) = MSBuildHelper.GetEvaluatedValue(projectContents, propertyInfo);
 
         // Assert
-        Assert.Equal(MSBuildHelper.EvaluationResultType.CircularReference, resultType);
+        Assert.Equal(EvaluationResultType.CircularReference, resultType);
         Assert.Equal("Property 'PackageVersion1' has a circular reference.", errorMessage);
     }
 
@@ -127,7 +129,7 @@ public void TfmsCanBeDeterminedFromProjectContents(string projectContents, strin
 
     [Theory]
     [MemberData(nameof(GetTopLevelPackageDependencyInfosTestData))]
-    public async Task TopLevelPackageDependenciesCanBeDetermined((string Path, string Content)[] buildFileContents, Dependency[] expectedTopLevelDependencies)
+    public async Task TopLevelPackageDependenciesCanBeDetermined(TestFile[] buildFileContents, Dependency[] expectedTopLevelDependencies)
     {
         using var testDirectory = new TemporaryDirectory();
         var buildFiles = new List<ProjectBuildFile>();
@@ -510,7 +512,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    EvaluationResult: new(EvaluationResultType.Success, "12.0.1", "12.0.1", null, null, null))
             }
         ];
 
@@ -533,7 +539,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    EvaluationResult: new(EvaluationResultType.Success, "12.0.1", "12.0.1", null, null, null))
             }
         ];
 
@@ -557,7 +567,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    new(EvaluationResultType.Success, "$(NewtonsoftJsonVersion)", "12.0.1", "NewtonsoftJsonVersion", "NewtonsoftJsonVersion", null))
             }
         ];
 
@@ -583,7 +597,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    new(EvaluationResultType.Success, "$(NewtonsoftJsonVersion)", "12.0.1", "NewtonsoftJsonVersion", "NewtonsoftJsonVersion", null))
             }
         ];
 
@@ -609,7 +627,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    new(EvaluationResultType.Success, "$(NewtonsoftJsonVersion)", "12.0.1", "NewtonsoftJsonVersion", "NewtonsoftJsonVersion", null))
             }
         };
 
@@ -635,7 +657,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    new(EvaluationResultType.Success, "$(NewtonsoftJsonVersion)", "12.0.1", "NewtonsoftJsonVersion", "NewtonsoftJsonVersion", null))
             }
         ];
 
@@ -661,7 +687,11 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Newtonsoft.Json", "12.0.1", DependencyType.Unknown)
+                new(
+                    "Newtonsoft.Json",
+                    "12.0.1",
+                    DependencyType.Unknown,
+                    new(EvaluationResultType.Success, "$(NewtonsoftJsonVersion)", "12.0.1", "NewtonsoftJsonVersion", "NewtonsoftJsonVersion", null))
             }
         };
 
@@ -693,8 +723,17 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Azure.Identity", "1.6.0", DependencyType.Unknown),
-                new("Microsoft.Data.SqlClient", "5.1.4", DependencyType.Unknown, IsUpdate: true)
+                new(
+                    "Azure.Identity",
+                    "1.6.0",
+                    DependencyType.Unknown,
+                    EvaluationResult: new(EvaluationResultType.Success, "1.6.0", "1.6.0", null, null, null)),
+                new(
+                    "Microsoft.Data.SqlClient",
+                    "5.1.4",
+                    DependencyType.Unknown,
+                    EvaluationResult: new(EvaluationResultType.Success, "5.1.4", "5.1.4", null, null, null),
+                    IsUpdate: true),
             }
         ];
 
@@ -726,8 +765,17 @@ public static IEnumerable<object[]> GetTopLevelPackageDependencyInfosTestData()
             // expected dependencies
             new Dependency[]
             {
-                new("Azure.Identity", "1.6.0", DependencyType.Unknown),
-                new("Microsoft.Data.SqlClient", "5.1.4", DependencyType.Unknown, IsUpdate: true)
+                new(
+                    "Azure.Identity",
+                    "1.6.0",
+                    DependencyType.Unknown,
+                    EvaluationResult: new(EvaluationResultType.Success, "1.6.0", "1.6.0", null, null, null)),
+                new(
+                    "Microsoft.Data.SqlClient",
+                    "5.1.4",
+                    DependencyType.Unknown,
+                    EvaluationResult: new(EvaluationResultType.Success, "5.1.4", "5.1.4", null, null, null),
+                    IsUpdate: true),
             }
         ];
     }

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Dependency.cs

@@ -4,6 +4,7 @@ public sealed record Dependency(
     string Name,
     string? Version,
     DependencyType Type,
+    EvaluationResult? EvaluationResult = null,
     bool IsDevDependency = false,
     bool IsDirect = false,
     bool IsTransitive = false,

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DirectoryPackagesPropsDiscovery.cs

@@ -6,7 +6,7 @@ internal static class DirectoryPackagesPropsDiscovery
 {
     public static DirectoryPackagesPropsDiscoveryResult? Discover(string repoRootPath, string workspacePath, ImmutableArray<ProjectDiscoveryResult> projectResults, Logger logger)
     {
-        var projectResult = projectResults.FirstOrDefault(p => p.Properties.TryGetValue("ManagePackageVersionsCentrally", out var value) && string.Equals(value, "true", StringComparison.OrdinalIgnoreCase));
+        var projectResult = projectResults.FirstOrDefault(p => p.Properties.TryGetValue("ManagePackageVersionsCentrally", out var property) && string.Equals(property.Value, "true", StringComparison.OrdinalIgnoreCase));
         if (projectResult is null)
         {
             return null;
@@ -29,7 +29,7 @@ internal static class DirectoryPackagesPropsDiscovery
 
         logger.Log($"  Discovered [{directoryPackagesPropsFile.FilePath}] file.");
 
-        var isTransitivePinningEnabled = projectResult.Properties.TryGetValue("EnableTransitivePinning", out var value) && string.Equals(value, "true", StringComparison.OrdinalIgnoreCase);
+        var isTransitivePinningEnabled = projectResult.Properties.TryGetValue("EnableTransitivePinning", out var property) && string.Equals(property.Value, "true", StringComparison.OrdinalIgnoreCase);
         return new()
         {
             FilePath = directoryPackagesPropsFile.FilePath,

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/ProjectDiscoveryResult.cs

@@ -5,7 +5,7 @@ namespace NuGetUpdater.Core.Discover;
 public record ProjectDiscoveryResult : IDiscoveryResultWithDependencies
 {
     public required string FilePath { get; init; }
-    public required ImmutableDictionary<string, string> Properties { get; init; }
+    public required ImmutableDictionary<string, Property> Properties { get; init; }
     public ImmutableArray<string> TargetFrameworks { get; init; } = [];
     public ImmutableArray<string> ReferencedProjectPaths { get; init; } = [];
     public required ImmutableArray<Dependency> Dependencies { get; init; }

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/SdkProjectDiscovery.cs

@@ -57,7 +57,7 @@ public static async Task<ImmutableArray<ProjectDiscoveryResult>> DiscoverAsync(s
                 results.Add(new()
                 {
                     FilePath = buildFile.RepoRelativePath,
-                    Properties = ImmutableDictionary<string, string>.Empty,
+                    Properties = ImmutableDictionary<string, Property>.Empty,
                     Dependencies = directDependencies,
                 });
             }

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/EvaluationResult.cs

@@ -0,0 +1,9 @@
+namespace NuGetUpdater.Core;
+
+public record EvaluationResult(
+    EvaluationResultType ResultType,
+    string OriginalValue,
+    string EvaluatedValue,
+    string? FirstPropertyName,
+    string? LastPropertyName,
+    string? ErrorMessage);

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/EvaluationResultType.cs

@@ -0,0 +1,9 @@
+namespace NuGetUpdater.Core;
+
+public enum EvaluationResultType
+{
+    Success,
+    PropertyIgnored,
+    CircularReference,
+    PropertyNotFound,
+}

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Files/PackagesConfigBuildFile.cs

@@ -28,5 +28,5 @@ public IEnumerable<Dependency> GetDependencies() => Packages
             p.GetAttributeValue("id", StringComparison.OrdinalIgnoreCase),
             p.GetAttributeValue("version", StringComparison.OrdinalIgnoreCase),
             DependencyType.PackageConfig,
-            (p.GetAttribute("developmentDependency", StringComparison.OrdinalIgnoreCase)?.Value ?? "false").Equals(true.ToString(), StringComparison.OrdinalIgnoreCase)));
+            IsDevDependency: (p.GetAttribute("developmentDependency", StringComparison.OrdinalIgnoreCase)?.Value ?? "false").Equals(true.ToString(), StringComparison.OrdinalIgnoreCase)));
 }

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Property.cs

@@ -0,0 +1,6 @@
+namespace NuGetUpdater.Core;
+
+public sealed record Property(
+    string Name,
+    string Value,
+    string SourceFilePath);