Merge pull request bdovaz#202 from redwyre/master

Add Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAnalysis.Common

Author: bdovaz

registry.json

@@ -18,7 +18,7 @@
   "AsyncKeyedLock": {
     "listed": true,
     "version": "1.0.0"
-  },  
+  },
   "AutoMapper": {
     "listed": true,
     "version": "7.0.1"
@@ -468,11 +468,30 @@
     "listed": true,
     "version": "1.0.0"
   },
+  "Microsoft.CodeAnalysis.Analyzers": {
+    "listed": true,
+    "version": "3.0.0",
+    "analyzer": true
+  },
   "Microsoft.CodeAnalysis.BannedApiAnalyzers": {
     "listed": true,
     "version": "2.9.0",
     "analyzer": true
   },
+  "Microsoft.CodeAnalysis.Common": {
+    "listed": true,
+    "version": "3.0.0",
+    "defineConstraints": [
+      "UNITY_EDITOR"
+    ]
+  },
+  "Microsoft.CodeAnalysis.CSharp": {
+    "listed": true,
+    "version": "3.0.0",
+    "defineConstraints": [
+      "UNITY_EDITOR"
+    ]
+  },
   "Microsoft.CodeAnalysis.NetAnalyzers": {
     "listed": true,
     "version": "5.0.3",

src/UnityNuGet/RegistryCache.cs

@@ -564,14 +564,14 @@ RegistryEntry packageEntry
 
                     var collectedItems = new Dictionary<FrameworkSpecificGroup, HashSet<RegistryTargetFramework>>();
 
-                    foreach (var closestVersion in closestVersions)
+                    foreach (var (item, targetFramework) in closestVersions)
                     {
-                        if (!collectedItems.TryGetValue(closestVersion.Item1, out var frameworksPerGroup))
+                        if (!collectedItems.TryGetValue(item, out var frameworksPerGroup))
                         {
                             frameworksPerGroup = new HashSet<RegistryTargetFramework>();
-                            collectedItems.Add(closestVersion.Item1, frameworksPerGroup);
+                            collectedItems.Add(item, frameworksPerGroup);
                         }
-                        frameworksPerGroup.Add(closestVersion.Item2);
+                        frameworksPerGroup.Add(targetFramework);
                     }
 
                     if (!packageEntry.Analyzer && collectedItems.Count == 0)
@@ -662,14 +662,17 @@ RegistryEntry packageEntry
                         }
                     }
 
-                    foreach (var groupToFrameworks in collectedItems)
+                    foreach (var (item, frameworks) in collectedItems)
                     {
-                        var item = groupToFrameworks.Key;
-                        var frameworks = groupToFrameworks.Value;
-
                         var folderPrefix = hasMultiNetStandard ? $"{frameworks.First().Name}/" : "";
                         foreach (var file in item.Items)
                         {
+                            // reject resource dlls since Unity can't use them and we're not handling paths
+                            if (file.EndsWith(".resources.dll", StringComparison.OrdinalIgnoreCase))
+                            {
+                                continue;
+                            }
+
                             var fileInUnityPackage = $"{folderPrefix}{Path.GetFileName(file)}";
                             string? meta;