Update packages and prepare for v0.5.0

bjorkstromm · Sep 24, 2020 · 17b0e70 · 17b0e70
1 parent 0c39d5d
commit 17b0e70
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "3.0.100",
-    "rollForward": "latestMinor",
+    "version": "3.1.402",
+    "rollForward": "latestPatch",
     "allowPrerelease": false
   }
 }
diff --git a/src/Depends.Core/DependencyAnalyzer.cs b/src/Depends.Core/DependencyAnalyzer.cs
@@ -25,6 +25,11 @@ namespace Depends.Core
 {
     public class DependencyAnalyzer
     {
+        static DependencyAnalyzer()
+        {
+            _ = typeof(NuGet.Common.LogLevel);
+        }
+
         private ILogger _logger;
         private ILoggerFactory _loggerFactory;
 
@@ -169,7 +174,7 @@ public DependencyGraph AnalyzeSolution(string solution, string framework = null)
             {
                 builder = CreateBuilder(project.Value, project.Key, builder, framework);
             }
-            
+
             return builder.Build();
         }
 
@@ -194,7 +199,7 @@ public DependencyGraph Analyze(string projectPath, string framework = null)
             return CreateBuilder(projectAnalyzer, projectPath, null, framework).Build();
         }
 
-        private DependencyGraph.Builder CreateBuilder(ProjectAnalyzer  projectAnalyzer, string projectPath, DependencyGraph.Builder builder = null, string framework = null)
+        private DependencyGraph.Builder CreateBuilder(IProjectAnalyzer  projectAnalyzer, string projectPath, DependencyGraph.Builder builder = null, string framework = null)
         {
             var analyzeResults = string.IsNullOrEmpty(framework) ?
                 projectAnalyzer.Build() : projectAnalyzer.Build(framework);
@@ -227,7 +232,7 @@ private DependencyGraph.Builder CreateBuilder(ProjectAnalyzer  projectAnalyzer,
                     // a new project doesn't have an asset file
                     throw new InvalidOperationException($"{projectAssetsFilePath} not found. Please run 'dotnet restore'");
                 }
-                
+
                 // Old csproj
 
                 var oldStylePackageReferences = analyzerResult.GetItems("Reference").Where(x => x.ItemSpec.Contains("Version"));

diff --git a/src/Depends.Core/Depends.Core.csproj b/src/Depends.Core/Depends.Core.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.4.0</Version>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Version>0.5.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="buildalyzer" Version="2.3.0" />
-    <PackageReference Include="NuGet.ProjectModel" Version="5.3.0" />
+    <PackageReference Include="Buildalyzer" Version="3.0.1" />
+    <PackageReference Include="NuGet.ProjectModel" Version="5.7.0" />
 
     <!-- The below is only to not run into incompatibilites with the NuGet version loaded by MSBuild -->
-    <PackageReference Include="NuGet.Build.Tasks" Version="5.3.0" />
-    <PackageReference Include="NuGet.Resolver" Version="5.3.0" />
+    <PackageReference Include="NuGet.Build.Tasks" Version="5.7.0" />
+    <PackageReference Include="NuGet.Resolver" Version="5.7.0" />
+    <PackageReference Include="NuGet.Common" Version="5.7.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs b/src/Depends.Core/Extensions/AnalyzerResultExtensions.cs
@@ -11,20 +11,20 @@ namespace Depends.Core.Extensions
 {
     internal static class AnalyzerResultExtensions
     {
-        public static NuGetFramework GetTargetFramework(this AnalyzerResult result) =>
+        public static NuGetFramework GetTargetFramework(this IAnalyzerResult result) =>
             NuGetFramework.Parse(result.TargetFramework, DefaultFrameworkNameProvider.Instance);
 
-        public static bool IsNetSdkProject(this AnalyzerResult result) =>
+        public static bool IsNetSdkProject(this IAnalyzerResult result) =>
             string.Equals(bool.TrueString, result.GetProperty("UsingMicrosoftNETSdk"),
                 StringComparison.InvariantCultureIgnoreCase);
 
-        public static string GetProjectAssetsFilePath(this AnalyzerResult result) =>
+        public static string GetProjectAssetsFilePath(this IAnalyzerResult result) =>
             result.GetProperty("ProjectAssetsFile");
 
-        public static string GetRuntimeIdentifier(this AnalyzerResult result) =>
+        public static string GetRuntimeIdentifier(this IAnalyzerResult result) =>
             result.GetProperty("RuntimeIdentifier");
 
-        public static IEnumerable<ProjectItem> GetItems(this AnalyzerResult result, string name) =>
+        public static IEnumerable<ProjectItem> GetItems(this IAnalyzerResult result, string name) =>
             result.Items.TryGetValue(name, out var items) ? items : Enumerable.Empty<ProjectItem>();
     }
 }
diff --git a/src/Depends/Depends.csproj b/src/Depends/Depends.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-  <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ToolCommandName>dotnet-depends</ToolCommandName>
     <PackAsTool>True</PackAsTool>
     <OutputType>Exe</OutputType>
-    <Version>0.4.0</Version>
+    <Version>0.5.0</Version>
     <PackageId>dotnet-depends</PackageId>
     <Title>dotnet-depends</Title>
     <Authors>mholo65</Authors>
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
     <PackageReference Include="Terminal.Gui" Version="0.81.0" />
   </ItemGroup>
 

diff --git a/src/Depends/Program.cs b/src/Depends/Program.cs
@@ -65,7 +65,7 @@ private ValidationResult OnValidate()
             }
 
             var fileAttributes = File.GetAttributes(Project);
-            
+
             // If a directory was passed in, search for a .sln or .proj file
             if (fileAttributes.HasFlag(FileAttributes.Directory))
             {
@@ -76,12 +76,12 @@ private ValidationResult OnValidate()
                     Project = Path.GetFullPath(solutionFiles[0]);
                     return ValidationResult.Success;
                 }
-                
+
                 if (solutionFiles.Length > 1)
                 {
                     return new ValidationResult($"More than one solution file found in working directory.");
                 }
-                
+
                 // We did not find any solutions, so try and find individual projects
                 var projectFiles = Directory.GetFiles(Project, "*.*proj").ToArray();
 
@@ -90,7 +90,7 @@ private ValidationResult OnValidate()
                     Project = Path.GetFullPath(projectFiles[0]);
                     return ValidationResult.Success;
                 }
-                
+
                 if (projectFiles.Length > 1)
                 {
                     return new ValidationResult($"More than one project file found in working directory.");
@@ -110,8 +110,8 @@ private void OnExecute()
             var loggerFactory = LoggerFactory.Create(builder => builder
                 .SetMinimumLevel(Verbosity)
                 .AddConsole());
-            var analyzer = new DependencyAnalyzer(loggerFactory);
 
+            var analyzer = new DependencyAnalyzer(loggerFactory);
             DependencyGraph graph;
             if (!string.IsNullOrEmpty(Package))
             {