Skip to content

Commit 4ba0751

Browse files
authored
Merge pull request #57 from kumaS-nu/develop
Add empty check
2 parents 0702fd8 + 5cbf731 commit 4ba0751

3 files changed

Lines changed: 22 additions & 6 deletions

File tree

NuGetImporterForUnity/Packages/NuGet Importer/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [3.3.1] - 2023-05-24
4+
5+
- Fix occasional UI bugs
6+
37
## [3.3.0] - 2023-05-22
48

59
- Auto-generate Assembly Definition files for analyzers

NuGetImporterForUnity/Packages/NuGet Importer/Editor/DataClasses/StandardLibraries.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@ public static IList<string> PackageIds
3434
private static void GetDefaultUnityAssembly()
3535
{
3636
var projectPath = Path.GetDirectoryName(Application.dataPath).Replace("\\", "/");
37-
Assembly playerAssembly = CompilationPipeline.GetAssemblies(AssembliesType.Player).First();
38-
var standardRef = playerAssembly.compiledAssemblyReferences
37+
Assembly playerAssembly = CompilationPipeline.GetAssemblies(AssembliesType.Player).FirstOrDefault();
38+
if (playerAssembly != default)
39+
{
40+
var standardRef = playerAssembly.compiledAssemblyReferences
3941
.Select(p => p.Replace("\\", "/"))
4042
.Where(p => !p.StartsWith(projectPath)).Select(p => Path.GetFileNameWithoutExtension(p))
4143
.ToList();
42-
packageIds = standardRef.AsReadOnly();
44+
packageIds = standardRef.AsReadOnly();
45+
}
4346
profile = PlayerSettings.GetApiCompatibilityLevel(EditorUserBuildSettings.selectedBuildTargetGroup);
4447
}
4548
}

NuGetImporterForUnity/Packages/NuGet Importer/Editor/NuGetImporterWindow.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,13 @@ internal void UpdateSelected(Catalog data)
285285
{
286286
isAddedSummary = true;
287287
}
288-
summary = new PackageSummary(data, PackageManager.Installed.package.First(package => package.id == data.items[0].items[0].catalogEntry.id).version);
289-
deteal = data;
288+
var package = PackageManager.Installed.package.Where(package => package.id == data.items[0].items[0].catalogEntry.id);
289+
if (package != null && package.Any())
290+
{
291+
summary = new PackageSummary(data, package.First().version);
292+
deteal = data;
293+
}
294+
290295
Repaint();
291296
}
292297

@@ -391,7 +396,11 @@ internal async Task UpdateInstalledList()
391396
foreach (KeyValuePair<string, Catalog> catalog in PackageManager.installedCatalog)
392397
{
393398
catalogs.Add(catalog.Value);
394-
tasks.Add(catalog.Value.GetIcon(PackageManager.installed.package.First(package => package.id == catalog.Value.items[0].items[0].catalogEntry.id).version));
399+
var package = PackageManager.Installed.package.Where(package => package.id == catalog.Value.items[0].items[0].catalogEntry.id);
400+
if (package != null && package.Any())
401+
{
402+
tasks.Add(catalog.Value.GetIcon(package.First().version));
403+
}
395404
}
396405
}
397406
}

0 commit comments

Comments
 (0)