Merge pull request #3632 from AdmiringWorm/merge-release-1.4.3-changes

(maint) Back-merge changes from support branch to develop

Author: gep13

docs/legal/CREDITS.md

@@ -6,7 +6,7 @@
   - [Contributors](#contributors)
 - [Third Party Licenses - Development](#third-party-licenses---development)
 - [Third Party Licenses - Runtime](#third-party-licenses---runtime)
-  - [7-Zip @ 24.08](#7-zip--2408)
+  - [7-Zip @ 24.09](#7-zip--2409)
   - [AlphaFS @ 2.1.3](#alphafs--213)
   - [Checksum @ 0.3.1](#checksum--031)
   - [log4net @ 2.0.12](#log4net--2012)
@@ -73,7 +73,7 @@ We would like to credit other super sweet tools/frameworks that aid in the devel
 Chocolatey CLI (choco) uses a number of 3rd-party components.
 Their details are below.
 
-### 7-Zip @ 24.08
+### 7-Zip @ 24.09
 
 Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives.
 [License terms](http://www.7-zip.org/license.txt):

src/chocolatey.console/Program.cs

@@ -150,7 +150,7 @@ private static void Main(string[] args)
                 {
                     Log4NetAppenderConfiguration.EnableTraceLoggingIf(config.Trace, traceAppenderName);
                 }
-                else
+                else if (config.Trace)
                 {
                     var logger = ChocolateyLoggers.Normal;
 

src/chocolatey.resources/tools/7z.dll

@@ -87,4 +87,4 @@
 
 
   --
-  Igor Pavlov
+  Igor Pavlov

src/chocolatey.resources/tools/7z.exe

@@ -449,14 +449,17 @@ private T EnsureOriginalConfiguration<T>(IList<string> args, Func<ChocolateyConf
                 Log4NetAppenderConfiguration.EnableDebugLoggingIf(configuration.Debug, verboseAppenderName, traceAppenderName);
                 Log4NetAppenderConfiguration.EnableVerboseLoggingIf(configuration.Verbose, configuration.Debug, verboseAppenderName);
 
-                var logger = ChocolateyLoggers.Normal;
-
-                if (!configuration.RegularOutput)
+                if (!configuration.Information.IsProcessElevated && configuration.Trace)
                 {
-                    logger = ChocolateyLoggers.LogFileOnly;
-                }
+                    var logger = ChocolateyLoggers.Normal;
+
+                    if (!configuration.RegularOutput)
+                    {
+                        logger = ChocolateyLoggers.LogFileOnly;
+                    }
 
-                "chocolatey".Log().Warn(logger, "Usage of the --trace option is only allowed when running from an elevated session.");
+                    "chocolatey".Log().Warn(logger, "Usage of the --trace option is only allowed when running from an elevated session.");
+                }
             }
             finally
             {

src/chocolatey.resources/tools/7zip.license.txt

@@ -3,7 +3,7 @@
 Describe 'Ensuring correct version of <Name> is installed' -Tag BundledApplications -ForEach @(
     @{ Name = 'shimgen' ; Version = '2.0.0' ; IsSigned = $true }
     @{ Name = 'checksum' ; Version = '0.3.1' ; IsSigned = $true }
-    @{ Name = '7z' ; Version = '24.08' ; IsSigned = $false }
+    @{ Name = '7z' ; Version = '24.09' ; IsSigned = $false }
 ) {
     Context '<Name> is correctly installed' {
         BeforeAll {