Load assemblies from PreloadAssemblies (#13799)

dingmeng-xue · web-flow · commit cfa3c8e415b9 · 2020-12-21T22:48:01.000+08:00
diff --git a/tools/Tools.Common/Loaders/CmdletLoader.cs b/tools/Tools.Common/Loaders/CmdletLoader.cs
@@ -40,6 +40,10 @@ public ModuleMetadata GetModuleMetadata(string assemblyPath, List<string> common
                 {
                     var assemblyName = args.Name.Substring(0, args.Name.IndexOf(","));
                     var dll = Directory.GetFiles(commonOutputFolder, "*.dll").FirstOrDefault(f => Path.GetFileNameWithoutExtension(f) == assemblyName);
+                    if (dll == null && Directory.Exists(commonOutputFolder + "\\PreloadAssemblies"))
+                    {
+                        dll = Directory.GetFiles(commonOutputFolder + "\\PreloadAssemblies", "*.dll").FirstOrDefault(f => Path.GetFileNameWithoutExtension(f) == assemblyName);
+                    }
                     if (dll == null)
                     {
                         continue;
@@ -212,7 +216,7 @@ public ModuleMetadata GetModuleMetadata(string assemblyPath)
             }
             catch (Exception ex)
             {
-                throw ex;
+                throw;
             }
 
             ModuleMetadata.Cmdlets = results;

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public ModuleMetadata GetModuleMetadata(string assemblyPath, List<string> common`
`40`	`40`	`{`
`41`	`41`	`var assemblyName = args.Name.Substring(0, args.Name.IndexOf(","));`
`42`	`42`	`var dll = Directory.GetFiles(commonOutputFolder, "*.dll").FirstOrDefault(f => Path.GetFileNameWithoutExtension(f) == assemblyName);`
	`43`	`+ if (dll == null && Directory.Exists(commonOutputFolder + "\\PreloadAssemblies"))`
	`44`	`+ {`
	`45`	`+ dll = Directory.GetFiles(commonOutputFolder + "\\PreloadAssemblies", "*.dll").FirstOrDefault(f => Path.GetFileNameWithoutExtension(f) == assemblyName);`
	`46`	`+ }`
`43`	`47`	`if (dll == null)`
`44`	`48`	`{`
`45`	`49`	`continue;`
`@@ -212,7 +216,7 @@ public ModuleMetadata GetModuleMetadata(string assemblyPath)`
`212`	`216`	`}`
`213`	`217`	`catch (Exception ex)`
`214`	`218`	`{`
`215`		`- throw ex;`
	`219`	`+ throw;`
`216`	`220`	`}`
`217`	`221`
`218`	`222`	`ModuleMetadata.Cmdlets = results;`