(chore) Upgrade packages (#103)

Directory.Build.props

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
 
   <!-- Dogfooding - add the latest ReferenceTrimmer package to this repo's build.
@@ -30,6 +30,12 @@
 
     <!-- Embed symbols in the assembly for easier debugging -->
     <DebugType>embedded</DebugType>
+
+    <!--
+      This all runs in the context of other processes, so we don't have control of the dependencies.
+      Furthermore, we intentionally target lower versions for best compatibility.
+    -->
+    <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <!-- Packaging -->

ReferenceTrimmer.sln

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.rsp = Directory.Build.rsp
+		global.json = global.json
 		LICENSE = LICENSE
 		NuGet.Config = NuGet.Config
 		README.md = README.md

global.json

@@ -0,0 +1,6 @@
+{
+  "msbuild-sdks": {
+    "Microsoft.Build.NoTargets": "3.7.56",
+    "MSTest.Sdk": "3.6.0"
+  }
+}

src/Loggers/MSVC/ForwardingLogger.cs

@@ -229,13 +229,14 @@ private static string EscapeJsonChars(string str)
 
     private void OnMessageRaised(object sender, BuildMessageEventArgs e)
     {
-        if (string.IsNullOrEmpty(e.ProjectFile))
+        string? projectFilePath = e.ProjectFile;
+        string? message = e.Message;
+
+        if (string.IsNullOrEmpty(projectFilePath) || message is null)
         {
             return;
         }
 
-        string projectFilePath = e.ProjectFile;
-
         if (!_projects.TryGetValue(projectFilePath, out ProjectStateLibs? projState))
         {
             return;
@@ -246,14 +247,14 @@ private void OnMessageRaised(object sender, BuildMessageEventArgs e)
         switch (projState.ProjectState)
         {
             case State.LinkStarted:
-                if (e.Message.IndexOf("Unused libraries:", StringComparison.OrdinalIgnoreCase) != -1)
+                if (message!.IndexOf("Unused libraries:", StringComparison.OrdinalIgnoreCase) != -1)
                 {
                     projState.ProjectState = State.UnusedLibsStarted;
                 }
                 break;
 
             case State.UnusedLibsStarted:
-                string lib = e.Message.Trim();
+                string lib = message!.Trim();
                 if (lib.Length > 0)
                 {
                     try

src/Loggers/ReferenceTrimmer.Loggers.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.1" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.6.3" />
   </ItemGroup>
 
   <ItemGroup>

src/Package/ReferenceTrimmer.Package.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
+<Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

src/Tasks/CollectDeclaredReferencesTask.cs

@@ -202,8 +202,12 @@ private Dictionary<string, PackageInfo> GetPackageInfos()
         var lockFile = LockFileUtilities.GetLockFile(ProjectAssetsFile, NullLogger.Instance);
         var packageFolders = lockFile.PackageFolders.Select(item => item.Path).ToList();
 
-        var nugetFramework = NuGetFramework.ParseComponents(TargetFrameworkMoniker, TargetPlatformMoniker);
-        LockFileTarget? nugetTarget = lockFile.GetTarget(nugetFramework, RuntimeIdentifier);
+        LockFileTarget? nugetTarget = null;
+        if (!string.IsNullOrEmpty(TargetFrameworkMoniker))
+        {
+            var nugetFramework = NuGetFramework.ParseComponents(TargetFrameworkMoniker!, TargetPlatformMoniker);
+            nugetTarget = lockFile.GetTarget(nugetFramework, RuntimeIdentifier);
+        }
 
         List<LockFileTargetLibrary> nugetLibraries;
         if (nugetTarget?.Libraries is not null)
@@ -222,7 +226,12 @@ private Dictionary<string, PackageInfo> GetPackageInfos()
         var nugetDependents = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
         foreach (LockFileTargetLibrary nugetLibrary in nugetLibraries)
         {
-            var packageId = nugetLibrary.Name;
+            string? packageId = nugetLibrary.Name;
+            if (packageId is null)
+            {
+                continue;
+            }
+
             foreach (var dependency in nugetLibrary.Dependencies)
             {
                 if (!nugetDependents.TryGetValue(dependency.Id, out var parents))
@@ -238,6 +247,11 @@ private Dictionary<string, PackageInfo> GetPackageInfos()
         // Get the transitive closure of assemblies included by each package
         foreach (LockFileTargetLibrary nugetLibrary in nugetLibraries)
         {
+            if (nugetLibrary.Name is null)
+            {
+                continue;
+            }
+
             string nugetLibraryRelativePath = lockFile.GetLibrary(nugetLibrary.Name, nugetLibrary.Version).Path;
             string nugetLibraryAbsolutePath = packageFolders
                 .Select(packageFolder => Path.Combine(packageFolder, nugetLibraryRelativePath))

src/Tasks/ReferenceTrimmer.Tasks.csproj

@@ -3,8 +3,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.1" />
-    <PackageReference Include="NuGet.ProjectModel" Version="6.3.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.6.3" />
+    <PackageReference Include="NuGet.ProjectModel" Version="6.11.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Shared\*.cs" />