Slight improvement to log of list of SAA's

clowd · Mar 19, 2022 · 8f6eaf8 · 8f6eaf8
1 parent 2824808
commit 8f6eaf8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/SquirrelCli/Program.cs b/src/SquirrelCli/Program.cs
@@ -252,9 +252,6 @@ static void Releasify(ReleasifyOptions options)
                     // parse the PE header of every squirrel aware app
                     var peparsed = awareExes.ToDictionary(path => path, path => new PeNet.PeFile(path));
 
-                    // check dependencies of squirrel aware binaries for potential issues
-                    peparsed.ForEach(kvp => DotnetUtil.CheckDotnetReferences(kvp.Key, kvp.Value, requiredFrameworks));
-
                     // record architecture of squirrel aware binaries so setup can fast fail if unsupported
                     RuntimeCpu parseMachine(PeNet.Header.Pe.MachineType machine)
                     {
@@ -270,17 +267,20 @@ RuntimeCpu parseMachine(PeNet.Header.Pe.MachineType machine)
                     if (awareExes.Count > 0) {
                         Log.Info($"There are {awareExes.Count} SquirrelAwareApp's. Binaries will be executed during install/update/uninstall hooks.");
                         foreach (var pe in peArch) {
-                            Log.Info($"SquirrelAwareApp '{pe.Name}' (arch: {pe.Architecture})");
+                            Log.Info($"  Detected SquirrelAwareApp '{pe.Name}' (arch: {pe.Architecture})");
                         }
                     } else {
                         Log.Warn("There are no SquirrelAwareApp's. No hooks will be executed during install/update/uninstall. " +
                             "Shortcuts will be created for every binary in package.");
                     }
 
                     var pkgarch = SquirrelRuntimeInfo.SelectPackageArchitecture(peArch.Select(f => f.Architecture));
-                    Log.Write($"Package Architecture (detected from SquirrelAwareApp's): {pkgarch}",
+                    Log.Write($"Program: Package Architecture (detected from SquirrelAwareApp's): {pkgarch}",
                         pkgarch == RuntimeCpu.Unknown ? LogLevel.Warn : LogLevel.Info);
 
+                    // check dependencies of squirrel aware binaries for potential issues
+                    peparsed.ForEach(kvp => DotnetUtil.CheckDotnetReferences(kvp.Key, kvp.Value, requiredFrameworks));
+
                     // store the runtime dependencies and the package architecture in nuspec (read by installer)
                     ZipPackage.SetSquirrelMetadata(nuspecPath, pkgarch, requiredFrameworks.Select(r => r.Id));