diff --git a/README.md b/README.md index 7294a25..dbbc23e 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Analyzing Thuuud... │ ┌──────────────────┬──────────┬───────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├──────────────────┼──────────┼───────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 12.0.3 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.3 │ Updated from 13.0.1 in Foo │ │ │ │ Autofac │ 4.9.3 │ Downgraded from 4.9.4 in Foo │ │ │ └──────────────────┴──────────┴───────────────────────────────┘ │ │ │ @@ -61,7 +61,7 @@ Analyzing Thuuud... │ ┌─────────────────┬──────────────┬────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├─────────────────┼──────────────┼────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 13.0.1 in Foo │ │ │ └─────────────────┴──────────────┴────────────────────────────┘ │ ╰─────────────────────────────────────────────────────────────────╯ ``` diff --git a/global.json b/global.json index d38d25e..0029b26 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "projects": [ "src" ], "sdk": { - "version": "8.0.100", + "version": "10.0.100", "rollForward": "latestFeature" } } diff --git a/src/Snitch.Tests.Fixtures/Foo/Foo.csproj b/src/Snitch.Tests.Fixtures/Foo/Foo.csproj index 9f44f8c..743b424 100644 --- a/src/Snitch.Tests.Fixtures/Foo/Foo.csproj +++ b/src/Snitch.Tests.Fixtures/Foo/Foo.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Snitch.Tests.Fixtures/Zap/Zap.csproj b/src/Snitch.Tests.Fixtures/Zap/Zap.csproj index dfe7711..0e44cc5 100644 --- a/src/Snitch.Tests.Fixtures/Zap/Zap.csproj +++ b/src/Snitch.Tests.Fixtures/Zap/Zap.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Snitch.Tests/Expectations/Slnx.Default.verified.txt b/src/Snitch.Tests/Expectations/Slnx.Default.verified.txt index 55c85aa..0733d7a 100644 --- a/src/Snitch.Tests/Expectations/Slnx.Default.verified.txt +++ b/src/Snitch.Tests/Expectations/Slnx.Default.verified.txt @@ -36,7 +36,7 @@ Analyzing Thuuud... │ ┌──────────────────┬──────────┬───────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├──────────────────┼──────────┼───────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 12.0.3 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.3 │ Updated from 13.0.1 in Foo │ │ │ │ Autofac │ 4.9.3 │ Downgraded from 4.9.4 in Foo │ │ │ └──────────────────┴──────────┴───────────────────────────────┘ │ │ │ @@ -44,6 +44,6 @@ Analyzing Thuuud... │ ┌─────────────────┬──────────────┬────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├─────────────────┼──────────────┼────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 13.0.1 in Foo │ │ │ └─────────────────┴──────────────┴────────────────────────────┘ │ ╰─────────────────────────────────────────────────────────────────╯ \ No newline at end of file diff --git a/src/Snitch.Tests/Expectations/Solution.Default.verified.txt b/src/Snitch.Tests/Expectations/Solution.Default.verified.txt index 6a7f9b6..3b8da24 100644 --- a/src/Snitch.Tests/Expectations/Solution.Default.verified.txt +++ b/src/Snitch.Tests/Expectations/Solution.Default.verified.txt @@ -36,7 +36,7 @@ Analyzing Thuuud... │ ┌──────────────────┬──────────┬───────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├──────────────────┼──────────┼───────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 12.0.3 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.3 │ Updated from 13.0.1 in Foo │ │ │ │ Autofac │ 4.9.3 │ Downgraded from 4.9.4 in Foo │ │ │ └──────────────────┴──────────┴───────────────────────────────┘ │ │ │ @@ -44,6 +44,6 @@ Analyzing Thuuud... │ ┌─────────────────┬──────────────┬────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├─────────────────┼──────────────┼────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 13.0.1 in Foo │ │ │ └─────────────────┴──────────────┴────────────────────────────┘ │ ╰─────────────────────────────────────────────────────────────────╯ \ No newline at end of file diff --git a/src/Snitch.Tests/Expectations/Thuuud.netstandard2.NoPreRelease.verified.txt b/src/Snitch.Tests/Expectations/Thuuud.netstandard2.NoPreRelease.verified.txt index d1238a5..5279c3c 100644 --- a/src/Snitch.Tests/Expectations/Thuuud.netstandard2.NoPreRelease.verified.txt +++ b/src/Snitch.Tests/Expectations/Thuuud.netstandard2.NoPreRelease.verified.txt @@ -8,7 +8,7 @@ Analyzing Thuuud... │ ┌─────────────────┬──────────────┬────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├─────────────────┼──────────────┼────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 13.0.1 in Foo │ │ │ └─────────────────┴──────────────┴────────────────────────────┘ │ │ │ │ Projects with pre-release package references: │ diff --git a/src/Snitch.Tests/Expectations/Thuuud.netstandard2.Strict.NoPreRelease.verified.txt b/src/Snitch.Tests/Expectations/Thuuud.netstandard2.Strict.NoPreRelease.verified.txt index d1238a5..5279c3c 100644 --- a/src/Snitch.Tests/Expectations/Thuuud.netstandard2.Strict.NoPreRelease.verified.txt +++ b/src/Snitch.Tests/Expectations/Thuuud.netstandard2.Strict.NoPreRelease.verified.txt @@ -8,7 +8,7 @@ Analyzing Thuuud... │ ┌─────────────────┬──────────────┬────────────────────────────┐ │ │ │ Package │ Version │ Reason │ │ │ ├─────────────────┼──────────────┼────────────────────────────┤ │ -│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 12.0.1 in Foo │ │ +│ │ Newtonsoft.Json │ 13.0.2-beta2 │ Updated from 13.0.1 in Foo │ │ │ └─────────────────┴──────────────┴────────────────────────────┘ │ │ │ │ Projects with pre-release package references: │ diff --git a/src/Snitch.Tests/Snitch.Tests.csproj b/src/Snitch.Tests/Snitch.Tests.csproj index 81f7aa4..442d93a 100644 --- a/src/Snitch.Tests/Snitch.Tests.csproj +++ b/src/Snitch.Tests/Snitch.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false diff --git a/src/Snitch/Analysis/ProjectBuilder.cs b/src/Snitch/Analysis/ProjectBuilder.cs index f9038a2..afdd3ac 100644 --- a/src/Snitch/Analysis/ProjectBuilder.cs +++ b/src/Snitch/Analysis/ProjectBuilder.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using Buildalyzer; +using Buildalyzer.IO; using NuGet.Frameworks; using NuGet.ProjectModel; using Snitch.Analysis.Utilities; @@ -234,7 +235,8 @@ private static Dictionary GetRestoredVersions(string? lockFilePa _console.MarkupLine(status); - var projectAnalyzer = manager.GetProject(project.Path); + var projectAnalyzer = manager.GetProject(IOPath.Parse(project.Path)) + ?? throw new InvalidOperationException($"Could not load the project '{project.Path}'."); var results = (IEnumerable)projectAnalyzer.Build(); project.IsMultiTargeting = results diff --git a/src/Snitch/Snitch.csproj b/src/Snitch/Snitch.csproj index 0f73d1b..b26fadc 100644 --- a/src/Snitch/Snitch.csproj +++ b/src/Snitch/Snitch.csproj @@ -3,7 +3,7 @@ Exe 10.0 - net8.0 + net10.0 1701;1702;SA0001 enable true @@ -23,11 +23,14 @@ - - - - + + + + + + + diff --git a/src/Snitch/Utilities/Extensions/AnalyzerResultExtensions.cs b/src/Snitch/Utilities/Extensions/AnalyzerResultExtensions.cs index 959d5d1..c034a8c 100644 --- a/src/Snitch/Utilities/Extensions/AnalyzerResultExtensions.cs +++ b/src/Snitch/Utilities/Extensions/AnalyzerResultExtensions.cs @@ -30,7 +30,7 @@ private static string GetNearestFrameworkMoniker(this NuGetFramework framework, var mappings = new Dictionary( candidates.ToDictionary( - x => NuGetFramework.Parse(x, provider), y => y, new NuGetFrameworkFullComparer())); + x => NuGetFramework.Parse(x, provider), y => y, NuGetFrameworkFullComparer.Instance)); var nearest = reducer.GetNearest(framework, mappings.Keys); if (nearest == null)