Sideload UpdateService Download fix (#9254)

Author: puppetsw

src/Files.Backend/Services/IUpdateService.cs

@@ -15,6 +15,8 @@ public interface IUpdateService : INotifyPropertyChanged
         /// </summary>
         bool IsUpdating { get; }
 
+        uint DownloadPercentage { get; }
+
         Task DownloadUpdates();
 
         Task DownloadMandatoryUpdates();

src/Files.Uwp/App.xaml.cs

@@ -213,9 +213,7 @@ await Task.WhenAll(
             // Check for required updates
             var updateService = Ioc.Default.GetRequiredService<IUpdateService>();
             await updateService.CheckForUpdates();
-#if SIDELOAD
-            //await updateService.DownloadUpdates();
-#else
+#if !SIDELOAD
             await updateService.DownloadMandatoryUpdates();
 #endif
 

src/Files.Uwp/ServicesImplementation/SideloadUpdateService.cs

@@ -38,6 +38,8 @@ public bool IsUpdating
             private set => SetProperty(ref _isUpdating, value);
         }
 
+        public uint DownloadPercentage { get; private set; }
+
         public async Task DownloadUpdates()
         {
             if (!IsUpdateAvailable)
@@ -48,18 +50,47 @@ public async Task DownloadUpdates()
             IsUpdating = true;
 
             App.Logger.Info($"SIDELOAD: Updating: {DownloadUri.AbsoluteUri}");
+
             PackageManager pm = new PackageManager();
-            // Use DeploymentOptions.ForceApplicationShutdown to force shutdown.
-            await pm.UpdatePackageAsync(DownloadUri, null, DeploymentOptions.None);
-            App.Logger.Info($"SIDELOAD: Finished updating: {DownloadUri.AbsoluteUri}");
+            DeploymentResult deploymentResult = null;
 
-            IsUpdating = false;
-            IsUpdateAvailable = false;
+            try
+            {
+                var progress = new Progress<DeploymentProgress>(report =>
+                {
+                    DownloadPercentage = report.percentage;
+                    // UNDONE: Removed as it floods the log files.
+                    // App.Logger.Info($"SIDELOAD: Download State: {report.state}");
+                    // App.Logger.Info($"SIDELOAD: Download Percentage: {report.percentage}%");
+
+                    if (DownloadPercentage == 100)
+                    {
+                        App.Logger.Info($"SIDELOAD: Finished updating: {DownloadUri.AbsoluteUri}");
+                    }
+                });
+
+                // Have to use ForceTargetAppShutdown flag as the appinstaller won't update while it's being used.
+                deploymentResult = await pm.RequestAddPackageByAppInstallerFileAsync(
+                    DownloadUri,
+                    AddPackageByAppInstallerOptions.ForceTargetAppShutdown,
+                    pm.GetDefaultPackageVolume()).AsTask(progress);
+
+            }
+            catch (Exception e)
+            {
+                App.Logger.Error(e, e.Message);
+                App.Logger.Info(deploymentResult?.ErrorText ?? "No error message from deploymentResult.");
+            }
+            finally
+            {
+                IsUpdating = false;
+                IsUpdateAvailable = false;
+            }
         }
 
         public Task DownloadMandatoryUpdates()
         {
-            throw new NotImplementedException();
+            throw new NotSupportedException("This method is not supported by this service.");
         }
 
         public async Task CheckForUpdates()

src/Files.Uwp/ServicesImplementation/UpdateService.cs

@@ -42,6 +42,9 @@ private set
             }
         }
 
+        // TODO: This needs to be implemented in this service.
+        public uint DownloadPercentage { get; }
+
         public UpdateService()
         {
             _updatePackages = new List<StorePackageUpdate>();