fix MapsterMapper#319 cannot load library with multiple runtime assem…

…blies

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
  "mapster.tool": {
- "version": "8.0.5",
+ "version": "8.0.13",
  "commands": [
  "dotnet-mapster"
  ]

src/Mapster.Tool/AssemblyResolver.cs

@@ -51,22 +51,27 @@ public void Dispose()
  if (name.Name == "System.Text.Json")
  return typeof(JsonIgnoreAttribute).Assembly;
 
- var library = _dependencyContext.RuntimeLibraries
- .FirstOrDefault(it => string.Equals(it.Name, name.Name, StringComparison.OrdinalIgnoreCase));
+ var (library, assetPath) = (from lib in _dependencyContext.RuntimeLibraries
+ from grp in lib.RuntimeAssemblyGroups
+ where grp.Runtime == string.Empty
+ from path in grp.AssetPaths
+ where string.Equals(GetAssemblyName(path), name.Name, StringComparison.OrdinalIgnoreCase)
+ select (lib, path)).FirstOrDefault();
+
  if (library == null)
  {
  Console.WriteLine("Cannot find library: " + name.Name);
  return null;
  }
-  
+
  try
  {
  var wrapped = new CompilationLibrary(
  library.Type,
  library.Name,
  library.Version,
  library.Hash,
- library.RuntimeAssemblyGroups.SelectMany(g => g.AssetPaths),
+ new[] {assetPath},
  library.Dependencies,
  library.Serviceable);
 
@@ -88,5 +93,22 @@ public void Dispose()
  return null;
  }
  }
+
+ private const string NativeImageSufix = ".ni";
+ private static string GetAssemblyName(string assetPath)
+ {
+ var name = Path.GetFileNameWithoutExtension(assetPath);
+ if (name == null)
+ {
+ throw new ArgumentException($"Provided path has empty file name '{assetPath}'", nameof(assetPath));
+ }
+
+ if (name.EndsWith(NativeImageSufix))
+ {
+ name = name.Substring(0, name.Length - NativeImageSufix.Length);
+ }
+
+ return name;
+ }
  }
 }

src/Mapster.Tool/Mapster.Tool.csproj

@@ -15,7 +15,7 @@
  <SignAssembly>true</SignAssembly>
  <AssemblyOriginatorKeyFile>Mapster.Tool.snk</AssemblyOriginatorKeyFile>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <Version>8.0.5</Version>
+ <Version>8.0.13</Version>
  <PackageLicenseExpression>MIT</PackageLicenseExpression>
  <Copyright>Copyright (c) 2020 Chaowlert Chaisrichalermpol</Copyright>
  <PackageIcon>icon.png</PackageIcon>