From 04fb9081c71a370266e203673bfc00e76cbcd65b Mon Sep 17 00:00:00 2001 From: Andreas Maechler Date: Sun, 24 Oct 2021 14:31:11 -0600 Subject: [PATCH 1/5] Add .NET 5 as target framework --- src/Depends.Core/Depends.Core.csproj | 2 +- src/Depends/Depends.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Depends.Core/Depends.Core.csproj b/src/Depends.Core/Depends.Core.csproj index 27b28bc..5db4eb2 100644 --- a/src/Depends.Core/Depends.Core.csproj +++ b/src/Depends.Core/Depends.Core.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1;net5.0 false diff --git a/src/Depends/Depends.csproj b/src/Depends/Depends.csproj index 288093e..df9dfac 100644 --- a/src/Depends/Depends.csproj +++ b/src/Depends/Depends.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1;net5.0 dotnet-depends True Exe From 0d42438eb0e2289cd597d96ab69001c6787d7e2b Mon Sep 17 00:00:00 2001 From: Andreas Maechler Date: Sun, 24 Oct 2021 14:31:37 -0600 Subject: [PATCH 2/5] Update SDK to .NET 5 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 04dc30c..8de6d8c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "3.1.402", + "version": "5.0.402", "rollForward": "latestPatch", "allowPrerelease": false } From 4fad8b0777da016098df8150041ca2e7357d38f9 Mon Sep 17 00:00:00 2001 From: Andreas Maechler Date: Sun, 24 Oct 2021 14:32:05 -0600 Subject: [PATCH 3/5] Remove unused usings --- src/Depends.Core/DependencyAnalyzer.cs | 2 -- src/Depends.Core/Extensions/AnalyzerResultExtensions.cs | 3 --- src/Depends.Core/Extensions/LockFileTargetLibraryExtensions.cs | 2 -- src/Depends.Core/Extensions/LoggerExtensions.cs | 1 - src/Depends.Core/Output/DotFileWriter.cs | 1 - 5 files changed, 9 deletions(-) diff --git a/src/Depends.Core/DependencyAnalyzer.cs b/src/Depends.Core/DependencyAnalyzer.cs index 2b5be3f..b2766e0 100644 --- a/src/Depends.Core/DependencyAnalyzer.cs +++ b/src/Depends.Core/DependencyAnalyzer.cs @@ -12,14 +12,12 @@ using NuGet.Frameworks; using NuGet.Packaging.Core; using NuGet.ProjectModel; -using NuGet.Protocol; using NuGet.Protocol.Core.Types; using NuGet.Versioning; using System.Threading.Tasks; using NuGet.Resolver; using NuGet.Packaging; using Microsoft.Build.Construction; -using Depends.Core.Output; namespace Depends.Core { diff --git a/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs b/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs index bfb92de..df6a47b 100644 --- a/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs +++ b/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; using Buildalyzer; -using Microsoft.Build.Execution; using NuGet.Frameworks; namespace Depends.Core.Extensions diff --git a/src/Depends.Core/Extensions/LockFileTargetLibraryExtensions.cs b/src/Depends.Core/Extensions/LockFileTargetLibraryExtensions.cs index e291616..71ab4c5 100644 --- a/src/Depends.Core/Extensions/LockFileTargetLibraryExtensions.cs +++ b/src/Depends.Core/Extensions/LockFileTargetLibraryExtensions.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Depends.Core.Graph; using NuGet.ProjectModel; diff --git a/src/Depends.Core/Extensions/LoggerExtensions.cs b/src/Depends.Core/Extensions/LoggerExtensions.cs index e1dd8c0..55ceb14 100644 --- a/src/Depends.Core/Extensions/LoggerExtensions.cs +++ b/src/Depends.Core/Extensions/LoggerExtensions.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using NuGet.Common; -using Microsoft.Extensions.Logging; using MEL = Microsoft.Extensions.Logging; using ILogger = NuGet.Common.ILogger; using LogLevel = NuGet.Common.LogLevel; diff --git a/src/Depends.Core/Output/DotFileWriter.cs b/src/Depends.Core/Output/DotFileWriter.cs index dc8fa49..045078b 100644 --- a/src/Depends.Core/Output/DotFileWriter.cs +++ b/src/Depends.Core/Output/DotFileWriter.cs @@ -3,7 +3,6 @@ using System.Collections.Immutable; using System.IO; using System.Linq; -using System.Security.Cryptography.X509Certificates; using Depends.Core.Graph; namespace Depends.Core.Output From 012176c542ed76a356019f8ebe2b3cdc3184301c Mon Sep 17 00:00:00 2001 From: Andreas Maechler Date: Sun, 24 Oct 2021 14:52:11 -0600 Subject: [PATCH 4/5] Update packages --- src/Depends.Core/Depends.Core.csproj | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Depends.Core/Depends.Core.csproj b/src/Depends.Core/Depends.Core.csproj index 5db4eb2..5a2f03b 100644 --- a/src/Depends.Core/Depends.Core.csproj +++ b/src/Depends.Core/Depends.Core.csproj @@ -2,21 +2,17 @@ netcoreapp2.1;netcoreapp3.1;net5.0 - false + false - - - + + all runtime; build; native; contentfiles; analyzers - - - - - + + From 0e9d491d99f9e2b49512cd2957bc499c3009f8eb Mon Sep 17 00:00:00 2001 From: Andreas Maechler Date: Sun, 24 Oct 2021 14:52:21 -0600 Subject: [PATCH 5/5] Fix warning --- src/Depends.Core/Extensions/AnalyzerResultExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs b/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs index df6a47b..8d168e5 100644 --- a/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs +++ b/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs @@ -22,6 +22,6 @@ internal static class AnalyzerResultExtensions result.GetProperty("RuntimeIdentifier"); public static IEnumerable GetItems(this IAnalyzerResult result, string name) => - result.Items.TryGetValue(name, out var items) ? items : Enumerable.Empty(); + result.Items.TryGetValue(name, out var items) ? (IEnumerable)items : Enumerable.Empty(); } }