Shutdown when checking failed. Update version to 16.1.0-preview2

JetBrains · Sep 15, 2022 · e10fa27 · e10fa27
1 parent d75ad4c
commit e10fa27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/JetBrains.Etw.HostService.Updater/JetBrains.Etw.HostService.Updater.csproj b/JetBrains.Etw.HostService.Updater/JetBrains.Etw.HostService.Updater.csproj
@@ -14,7 +14,7 @@
     <Company>JetBrains s.r.o.</Company>
     <Copyright>Copyright © 2021-$([System.DateTime]::Now.ToString('yyyy')) JetBrains s.r.o.</Copyright>
     <Authors>Mikhail Pilin</Authors>
-    <Version>16.1.0-preview1</Version>
+    <Version>16.1.0-preview2</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />

diff --git a/JetBrains.Etw.HostService.Updater/Views/MainWindow.xaml.cs b/JetBrains.Etw.HostService.Updater/Views/MainWindow.xaml.cs
@@ -22,33 +22,34 @@ public MainWindow([NotNull] ILogger logger, [NotNull] Options options)
     {
       if (options == null) throw new ArgumentNullException(nameof(options));
       myLogger = logger ?? throw new ArgumentNullException(nameof(logger));
-     
+
       myDownloadDelay = options.CheckInterval != null;
 
       var loggerContext = Logger.Context;
       var anonymousPermanentUserId = new AnonymousPermanentUserIdAccessor(logger);
 
       void CheckForUpdate()
       {
-        UpdateRequest updateRequest;
         try
         {
           var installedVersion = options.CheckForVersion ?? VersionControl.GetInstalledVersion(logger);
-          updateRequest = installedVersion != null ? UpdateChecker.Check(logger, options.BaseUri ?? UpdateChecker.PublicBaseUri, "EHS", installedVersion, anonymousPermanentUserId.GetOrGenerate()) : null;
+          var updateRequest = installedVersion != null ? UpdateChecker.Check(logger, options.BaseUri ?? UpdateChecker.PublicBaseUri, "EHS", installedVersion, anonymousPermanentUserId.GetOrGenerate()) : null;
+
+          Interlocked.Exchange(ref myUpdateRequest, updateRequest);
+          myViewModel.SetUpdateRequest(updateRequest);
+          if (updateRequest == null)
+          {
+            logger.Info($"{loggerContext} res=exit_no_update");
+            Application.Current.Shutdown();
+          }
         }
         catch (Exception e)
         {
           logger.Exception(e);
-          return;
-        }
-
-        Interlocked.Exchange(ref myUpdateRequest, updateRequest);
-        myViewModel.SetUpdateRequest(updateRequest);
-        if (updateRequest == null)
-        {
-          logger.Info($"{loggerContext} res=exit_no_update");
+          logger.Info($"{loggerContext} res=exit_exception");
           Application.Current.Shutdown();
         }
+
       }
 
       CheckForUpdate();