use api which supports deferring the update while the app is in use

sillsdev · Dec 12, 2024 · 407a3cc · 407a3cc
1 parent d0519d0
commit 407a3cc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj b/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj
@@ -37,8 +37,8 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)' == 'Debug' ">

diff --git a/backend/FwLite/FwLiteDesktop/Platforms/Windows/AppUpdateService.cs b/backend/FwLite/FwLiteDesktop/Platforms/Windows/AppUpdateService.cs
@@ -45,14 +45,24 @@ private async Task TryUpdate()
 
     private async Task ApplyUpdate(FwLiteRelease latestRelease)
     {
-        logger.LogInformation("New version available: {Version}", latestRelease.Version);
+        logger.LogInformation("New version available: {Version}, Current version: {CurrentVersion}", latestRelease.Version, AppVersion.Version);
         var packageManager = new PackageManager();
-        var asyncOperation = packageManager.AddPackageAsync(new Uri(latestRelease.Url), [], DeploymentOptions.None);
+        var asyncOperation = packageManager.AddPackageByUriAsync(new Uri(latestRelease.Url),
+            new AddPackageOptions()
+            {
+                DeferRegistrationWhenPackagesAreInUse = true,
+                ForceUpdateFromAnyVersion = true
+            });
         asyncOperation.Progress = (info, progressInfo) =>
         {
+            if (progressInfo.state == DeploymentProgressState.Queued)
+            {
+                logger.LogInformation("Queued update");
+                return;
+            }
             logger.LogInformation("Downloading update: {ProgressPercentage}%", progressInfo.percentage);
         };
-        var result = await asyncOperation.AsTask();
+        var result = await asyncOperation;
         if (!string.IsNullOrEmpty(result.ErrorText))
         {
             logger.LogError(result.ExtendedErrorCode, "Failed to download update: {ErrorText}", result.ErrorText);