Merge pull request #255 from microsoftgraph/fix/logging-configuration

Fix/logging configuration

Author: calebkiage

.azure-pipelines/powershell/BuildTools.psm1

@@ -19,7 +19,7 @@ function Get-ZipName {
         [string]
         $RuntimeIdentifier = "unknown"
     )
-    $version = Get-Version $BranchOrTagName 
+    $version = Get-Version $BranchOrTagName
     return "$FileNameTemplate" -f "$RuntimeIdentifier","$version"
 }
 
@@ -137,11 +137,15 @@ function Compress-SignedFiles {
         return
     }
 
-    if ($ReportDir -and (Test-Path -Path "$ReportDir/*.md")) {
+    if ($ReportDir -and (Test-Path -Path "$SourceDir/*.md")) {
+        if (-Not (Test-Path -Path $ReportDir)) {
+            New-Item $ReportDir -ItemType Directory
+        }
+
         Write-Information "Moving signing report to $ReportDir"
-        Move-Item -Path "$SourceDir/*.md" -Destination $ReportDir
+        Move-Item -Path "$SourceDir/*.md" -Destination $ReportDir/
     }
-    
+
     $parentDir = Split-Path -Path $SourceDir -Parent -Resolve
     $backupDir = Join-Path -Path $parentDir -ChildPath backup
 

.azure-pipelines/release-cli.yaml

@@ -95,7 +95,7 @@ stages:
             parameters:
               vstsFeedName: ${{variables.internalFeed}}
 
-          - pwsh: dotnet publish --no-restore --runtime $(rid) --self-contained true --configuration $(buildConfiguration) --output $(outputDir)
+          - pwsh: dotnet publish ./src/msgraph-cli.csproj --no-restore --runtime $(rid) --self-contained true --configuration $(buildConfiguration) --output $(outputDir)
             workingDirectory: $(Build.SourcesDirectory)
             displayName: DotNet publish
 

.azure-pipelines/templates/prepare-unsigned-executable-darwin.yaml

@@ -52,11 +52,12 @@ steps:
       security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(graph-cli-apple-developer-certificate-password)" -T /usr/bin/codesign
       security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
       codesign -s $(CERTIFICATE_NAME) --deep --force --options runtime --entitlements .azure-pipelines/darwin/entitlements.plist $(EXECUTABLE_PATH)/$(EXECUTABLE_NAME)
+      chmod u+x $(EXECUTABLE_PATH)/$(EXECUTABLE_NAME)
     displayName: Set Hardened Entitlements
     condition: and(succeeded(), startsWith(variables['TARGET_RUNTIME'], 'osx'))
-  
+
   - script: |
       set -e
       pushd $(EXECUTABLE_PATH) && zip -r -X $(EXECUTABLE_PATH)/$(ZIP_NAME) * && rm $(EXECUTABLE_NAME) && popd
     displayName: Archive build for submission
-    condition: and(succeeded(), startsWith(variables['TARGET_RUNTIME'], 'osx'))
+    condition: and(succeeded(), startsWith(variables['TARGET_RUNTIME'], 'osx'))

src/Program.cs

@@ -66,9 +66,9 @@ static async Task<int> Main(string[] args)
 
             builder.AddMiddleware(async (ic, next) =>
             {
-                var op = ic.GetHost().Services.GetService<IOptions<ExtraOptions>>();
+                var op = ic.GetHost().Services.GetService<IOptions<ExtraOptions>>()?.Value;
                 // Show Azure Identity logs if the --debug option is set
-                using AzureEventSourceListener? listener = AzureEventSourceListener.CreateConsoleLogger(op?.Value?.DebugEnabled == true ? EventLevel.LogAlways : EventLevel.Warning);
+                using AzureEventSourceListener? listener = op?.DebugEnabled == true ? AzureEventSourceListener.CreateConsoleLogger(EventLevel.LogAlways) : null;
                 await next(ic);
             });
             builder.AddMiddleware(async (ic, next) =>
@@ -201,8 +201,9 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
             {
                 logBuilder.SetMinimumLevel(LogLevel.Warning);
                 // If a config is unavailable, troubleshoot using (ctx.Configuration as IConfigurationRoot)?.GetDebugView();
-                var options = ctx.GetInvocationContext().BindingContext.GetService<IOptions<ExtraOptions>>()?.Value;
-                if (options?.DebugEnabled == true)
+                // At this point, the host isn't ready. Get the config option directly.
+                var debugEnabled = ctx.Configuration.GetValue<bool>("Debug");
+                if (debugEnabled == true)
                 {
                     logBuilder.AddFilter("Microsoft.Graph.Cli", LogLevel.Debug);
                 }