Detecting configuration files

tools/SetupFlow/DevHome.SetupFlow/Models/CloneRepoTask.cs

@@ -31,6 +31,7 @@ namespace DevHome.SetupFlow.Models;
 /// </summary>
 public partial class CloneRepoTask : ObservableObject, ISetupTask
 {
+
     private const string _configurationFolderName = ".configurations";
 
     private const string _configurationFileYamlExtension = ".dsc.yaml";
@@ -39,6 +40,8 @@ public partial class CloneRepoTask : ObservableObject, ISetupTask
 
     private readonly IHost _host;
 
+    private readonly ILogger _log = Log.ForContext("SourceContext", nameof(CloneRepoTask));
+
     private readonly Guid _activityId;
 
     /// <summary>

tools/SetupFlow/DevHome.SetupFlow/Models/ConfigureTargetTask.cs

@@ -13,24 +13,24 @@
 using DevHome.Common.Environments.Services;
 using DevHome.Common.Views;
 using DevHome.Contracts.Services;
-using DevHome.Logging;
 using DevHome.SetupFlow.Common.Exceptions;
-using DevHome.SetupFlow.Common.Helpers;
 using DevHome.SetupFlow.Exceptions;
 using DevHome.SetupFlow.Models.WingetConfigure;
 using DevHome.SetupFlow.Services;
-using DevHome.SetupFlow.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.DevHome.SDK;
 using Projection::DevHome.SetupFlow.ElevatedComponent;
+using Serilog;
 using Windows.Foundation;
 using Windows.Storage;
 using SDK = Microsoft.Windows.DevHome.SDK;
 
 namespace DevHome.SetupFlow.Models;
 
 public class ConfigureTargetTask : ISetupTask
 {
+    private readonly ILogger _log = Log.ForContext("SourceContext", nameof(ConfigureTargetTask));
+
     private readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcherQueue;
 
     private readonly ISetupFlowStringResource _stringResource;
@@ -93,8 +93,8 @@
     public SDKApplyConfigurationResult Result { get; private set; }
 
     public IAsyncOperation<ApplyConfigurationResult> ApplyConfigurationAsyncOperation { get; private set; }
-
+    
     public ISummaryInformationViewModel SummaryScreenInformation { get; }
 
     public ConfigureTargetTask(
         ISetupFlowStringResource stringResource,
@@ -114,7 +114,7 @@
 
     public void OnAdaptiveCardSessionStopped(IExtensionAdaptiveCardSession2 cardSession, SDK.ExtensionAdaptiveCardSessionStoppedEventArgs data)
     {
-        Log.Logger?.ReportInfo(Log.Component.ConfigurationTarget, "Extension ending adaptive card session");
+        _log.Information("Extension ending adaptive card session");
 
         // Now that the session has ended, we can remove the adaptive card panel from the UI.
         cardSession.Stopped -= OnAdaptiveCardSessionStopped;
@@ -135,13 +135,13 @@
             }
 
             AddMessage(_stringResource.GetLocalized(StringResourceKey.ConfigureTargetApplyConfigurationActionFailureEnd), MessageSeverityKind.Error);
-            Log.Logger?.ReportError(Log.Component.ConfigurationTarget, "Error no more attempts to correct action");
+            _log.Error("Error no more attempts to correct action");
         }
     }
 
     public void OnActionRequired(IApplyConfigurationOperation operation, SDK.ApplyConfigurationActionRequiredEventArgs actionRequiredEventArgs)
     {
-        Log.Logger?.ReportInfo(Log.Component.ConfigurationTarget, $"adaptive card receieved from extension");
+        _log.Information($"adaptive card receieved from extension");
         var correctiveCard = actionRequiredEventArgs?.CorrectiveActionCardSession;
 
         if (correctiveCard != null)
@@ -162,7 +162,7 @@
         }
         else
         {
-            Log.Logger?.ReportInfo(Log.Component.ConfigurationTarget, "A corrective action was sent from the extension but the adaptive card session was null.");
+            _log.Information("A corrective action was sent from the extension but the adaptive card session was null.");
         }
     }
 
@@ -174,7 +174,7 @@
 
             if (progressData == null)
             {
-                Log.Logger?.ReportError(Log.Component.ConfigurationTarget, "Unable to get progress of the configuration as the progress data was null");
+                _log.Error("Unable to get progress of the configuration as the progress data was null");
                 return;
             }
 
@@ -195,7 +195,7 @@
 
             if (wrapper.IsErrorMessagePresent)
             {
-                Log.Logger?.ReportError(Log.Component.ConfigurationTarget, $"Target experienced an error while applying the configuration: {wrapper.GetErrorMessageForLogging()}");
+                _log.Error($"Target experienced an error while applying the configuration: {wrapper.GetErrorMessageForLogging()}");
                 severity = MessageSeverityKind.Error;
                 stringBuilder.AppendLine(GetSpacingForProgressMessage(startingLineNumber++) + wrapper.GetErrorMessagesForDisplay());
             }
@@ -212,7 +212,7 @@
             }
             else
             {
-                Log.Logger?.ReportInfo(Log.Component.ConfigurationTarget, "Extension sent progress but there was no configuration unit data sent.");
+                _log.Information("Extension sent progress but there was no configuration unit data sent.");
             }
 
             // Example of a message that will be displayed in the UI:
@@ -224,7 +224,7 @@
         }
         catch (Exception ex)
         {
-            Log.Logger?.ReportError(Log.Component.ConfigurationTarget, $"Failed to process configuration progress data on target machine.'{ComputeSystemName}'", ex);
+            _log.Error($"Failed to process configuration progress data on target machine.'{ComputeSystemName}'", ex);
         }
     }
 
@@ -264,7 +264,7 @@
 
             if (resultStatus == ProviderOperationStatus.Failure)
             {
-                Log.Logger?.ReportError(Log.Component.ConfigurationTarget, $"Extension failed to configure config file with exception. Diagnostic text: {result.DiagnosticText}", result.ExtendedError);
+                _log.Error($"Extension failed to configure config file with exception. Diagnostic text: {result.DiagnosticText}", result.ExtendedError);
                 throw new SDKApplyConfigurationSetResultException(applyConfigurationResult.Result.DiagnosticText);
             }
 
@@ -289,7 +289,7 @@
                     ConfigurationResults.Add(new ConfigurationUnitResult(Result.ApplyResult.Result.UnitResults[i]));
                 }
 
-                Log.Logger?.ReportInfo(Log.Component.ConfigurationTarget, "Configuration stopped");
+                _log.Information("Configuration stopped");
             }
             else
             {
@@ -298,7 +298,7 @@
         }
         catch (Exception ex)
         {
-            Log.Logger?.ReportError(Log.Component.ConfigurationTarget, $"Failed to apply configuration on target machine. '{ComputeSystemName}'", ex);
+            _log.Error($"Failed to apply configuration on target machine. '{ComputeSystemName}'", ex);
         }
 
         var tempResultInfo = !string.IsNullOrEmpty(resultInformation) ? resultInformation : string.Empty;
@@ -381,7 +381,7 @@
             }
             catch (Exception e)
             {
-                Log.Logger?.ReportError(Log.Component.ConfigurationTarget, $"Failed to apply configuration on target machine.", e);
+                _log.Error($"Failed to apply configuration on target machine.", e);
                 return TaskFinishedState.Failure;
             }
         }).AsAsyncOperation();
@@ -434,7 +434,7 @@
         }
         catch (Exception ex)
         {
-            GlobalLog.Logger?.ReportError($"Failure occurred while retrieving the HostConfig file", ex);
+            _log.Error($"Failure occurred while retrieving the HostConfig file", ex);
         }
     }
 
@@ -516,11 +516,11 @@
                 }
                 else
                 {
-                    GlobalLog.Logger?.ReportInfo($"HostConfig file contents are null or empty - HostConfigFileContents: {hostConfigContents}");
+                    _log.Information($"HostConfig file contents are null or empty - HostConfigFileContents: {hostConfigContents}");
                 }
             });
         }
     }
 
     private void OnThemeChanged(object sender, ElementTheme e) => UpdateHostConfig();
-}
+}