Finalized AppInstallerUpdateHandler

Author: Weatherlights

Source/.vs/wcommsixwrap/FileContentIndex/3606d1c8-6384-4759-9950-fd687a7f8528.vsidx

@@ -33,6 +33,7 @@ internal class AppInstallerUpdateHandler
         public bool WaitForUpdateSearchToFinish = true;
         public bool mandatoryInstallationFailure = false;
         private bool restartOnMandatoryUpdate = true;
+        private bool treatAvailableUpdateAsMandatory = false;
         public bool hasMandatoryUpdates { get; set; }
         public Uri AppInstallerUri { get; set; }
 
@@ -95,6 +96,11 @@ public void processXml(XmlReader reader)
                             if (reader.Value.Equals("false"))
                                 restartOnMandatoryUpdate = false;
                             break;
+                        case "TreatAvailableUpdateAsMandatory":
+                            reader.Read();
+                            if (reader.Value.Equals("true"))
+                                treatAvailableUpdateAsMandatory = true;
+                            break;
                         case "AppInstallerUri":
                             reader.Read();
                             AppInstallerUri = new Uri(reader.Value);
@@ -203,14 +209,21 @@ public async void InstallOnStart()
                 IAsyncOperation<PackageUpdateAvailabilityResult> searchOperation = package.CheckUpdateAvailabilityAsync();
 
                 searchOperation.AsTask().Wait();
-
+                
                 updateresult = await searchOperation.AsTask();
-
                 switch (updateresult.Availability)
                 {
                     case PackageUpdateAvailability.Available:
                         myLogWriter.LogWrite("Found available updates.");
-                        hasMandatoryUpdates = true;
+                        if (treatAvailableUpdateAsMandatory)
+                        {
+                            hasMandatoryUpdates = true;
+                            myLogWriter.LogWrite("treatAvailableUpdateAsMandatory is set. Will treat available update as mandatory.");
+                        } else
+                        {
+                            installOnExit = true;
+                            myLogWriter.LogWrite("treatAvailableUpdateAsMandatory is not set. Will install update on exit.");
+                        }
                         break;
                     case PackageUpdateAvailability.Required:
                         //Queue up the update and close the current instance
@@ -225,17 +238,10 @@ public async void InstallOnStart()
                     case PackageUpdateAvailability.Unknown:
                     default:
                         // Log and ignore error.
-                        myLogWriter.LogWrite("Failed to process updates.");
+                        myLogWriter.LogWrite("Failed to process updates.",3);
                         break;
                 }
 
-                    //MessageBox.Show("Updates found", "Searching", MessageBoxButton.OK, MessageBoxImage.Information);
-                    
-             
-  
-
-                    
-
                     executeUpdateProcedure = true;
                     if (executeUpdateProcedure)
                     {
@@ -286,12 +292,12 @@ public async void InstallOnStart()
                                 myLogWriter.LogWrite("Mandatory updates need to be installed and will now be enforced.");
                                 UpdateHandlerWindow updateHandlerWindow = new UpdateHandlerWindow(packageManager, AppInstallerUri, caption, message, captionFailRequired, messageFailRequired);
                                 myLogWriter.LogWrite("Window has been initialized.");
-                                updateHandlerWindow.ShowDialog();
-                                myLogWriter.LogWrite("InstallUpdate has finished execution.");
-                                if (!updateHandlerWindow.failure)
-                                {
+                                 updateHandlerWindow.ShowDialog();
 
 
+                            myLogWriter.LogWrite("InstallUpdate has finished execution.");
+                                if (!updateHandlerWindow.failure)
+                                {
                                     myLogWriter.LogWrite("App has been scheduled for a restart.");
                                 }
                                 // await InstallUpdate(updates);
@@ -350,13 +356,13 @@ private async Task InstallUpdate()
             myLogWriter.LogWrite("Status: " + installOperation.Status.ToString());
             //updateHandlerForm.ShowDialog();
 
-            myLogWriter.LogWrite("Showing Update Dialog");
+            
 
-            installOperation.AsTask().Wait();
+            
 
             var installResult = await installOperation;
             //updateHandlerForm.Close();
-            myLogWriter.LogWrite("Closed Update dialog");
+            myLogWriter.LogWrite("Finished update");
             //StorePackageUpdateResult downloadResult =
             //    await context.TrySilentDownloadAndInstallStorePackageUpdatesAsync(storePackageUpdates);
             bool success = true;

Source/.vs/wcommsixwrap/FileContentIndex/ab1bbee0-a452-4893-9516-925326389db0.vsidx

@@ -38,7 +38,7 @@ static void Main(string[] args)
  //           bool test2 = configReader.validateFileAgainstHash("C:\\Users\\hauke\\GitHub\\Winget-AutoUpdate-Intune\\WinGet-AutoUpdate-Configurator\\wcommsixconfig.cat", "C:\\Users\\hauke\\GitHub\\Winget-AutoUpdate-Intune\\WinGet-AutoUpdate-Configurator\\Winget-AutoUpdate-x64.exe.wrunconfig");
 
             LogWriter myLogWriter = new LogWriter("Main");
-            myLogWriter.LogWrite("WCOMMSIXWRAP started.");
+            myLogWriter.LogWrite("MSIX Powerwrapper started.");
 
             myLogWriter.LogWrite("Configuration location is " + configlocation);
 
@@ -146,7 +146,7 @@ static void Main(string[] args)
 
             if (myAppInstallerUpdateHandler != null)
             {
-                myLogWriter.LogWrite("Executing myUpdateHandler.Execute();");
+                myLogWriter.LogWrite("Executing myAppInstallerUpdateHandler.Execute();");
 
                 myAppInstallerUpdateHandler.Execute();
                 if (myAppInstallerUpdateHandler.hasMandatoryUpdates && myAppInstallerUpdateHandler.WaitForUpdateSearchToFinish)

Source/.vs/wcommsixwrap/FileContentIndex/ad16267c-e895-469d-a0a6-c7a29e120ae2.vsidx

@@ -259,6 +259,8 @@ public async void InstallOnStart() {
                                 UpdateHandlerWindow updateHandlerWindow = new UpdateHandlerWindow(context, updates, caption, message, captionFailRequired, messageFailRequired);
                                 myLogWriter.LogWrite("Window has been initialized.");
                                 updateHandlerWindow.ShowDialog();
+
+                                
                                 myLogWriter.LogWrite("InstallUpdate has finished execution.");
                                 if ( !updateHandlerWindow.failure )
                                 {