Merge pull request #36 from Laerdal/ksidirop/MAN-225-fw-install-file-…

…upload-retry-enhancement refa: convert '!(ex is FooException)' to 'ex is not FooException' which is more readable
Laerdal · Aug 29, 2023 · b162c2c · b162c2c
2 parents 2436e48 + d1581f4
commit b162c2c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Laerdal.McuMgr/Shared/DeviceResetter/DeviceResetter.cs b/Laerdal.McuMgr/Shared/DeviceResetter/DeviceResetter.cs
@@ -114,8 +114,8 @@ public async Task ResetAsync(int timeoutInMs = -1)
                 throw new DeviceResetTimeoutException(timeoutInMs, ex);
             }
             catch (Exception ex) when (
-                !(ex is ArgumentException) //10 wops probably missing native lib symbols!
-                && !(ex is TimeoutException)
+                ex is not ArgumentException //10 wops probably missing native lib symbols!
+                && ex is not TimeoutException
                 && !(ex is IDeviceResetterException)
             )
             {

diff --git a/Laerdal.McuMgr/Shared/FileDownloader/FileDownloader.cs b/Laerdal.McuMgr/Shared/FileDownloader/FileDownloader.cs
@@ -223,8 +223,8 @@ public async Task<byte[]> DownloadAsync(
                     continue;
                 }
                 catch (Exception ex) when (
-                    !(ex is ArgumentException) //10 wops probably missing native lib symbols!
-                    && !(ex is TimeoutException)
+                    ex is not ArgumentException //10 wops probably missing native lib symbols!
+                    && ex is not TimeoutException
                     && !(ex is IDownloadException) //this accounts for both cancellations and download exceptions!
                 )
                 {

diff --git a/Laerdal.McuMgr/Shared/FileUploader/FileUploader.cs b/Laerdal.McuMgr/Shared/FileUploader/FileUploader.cs
@@ -217,8 +217,8 @@ public async Task UploadAsync(
                     continue;
                 }
                 catch (Exception ex) when (
-                    !(ex is ArgumentException) //10 wops probably missing native lib symbols!
-                    && !(ex is TimeoutException)
+                    ex is not ArgumentException //10 wops probably missing native lib symbols!
+                    && ex is not TimeoutException
                     && !(ex is IUploadException) //this accounts for both cancellations and upload errors
                 )
                 {

diff --git a/Laerdal.McuMgr/Shared/FirmwareEraser/FirmwareEraser.cs b/Laerdal.McuMgr/Shared/FirmwareEraser/FirmwareEraser.cs
@@ -127,8 +127,8 @@ public async Task EraseAsync(int imageIndex = 1, int timeoutInMs = -1)
                 throw new FirmwareErasureTimeoutException(timeoutInMs, ex);
             }
             catch (Exception ex) when (
-                !(ex is ArgumentException) //10 wops probably missing native lib symbols!
-                && !(ex is TimeoutException)
+                ex is not ArgumentException //10 wops probably missing native lib symbols!
+                && ex is not TimeoutException
                 && !(ex is IFirmwareEraserException)
             )
             {

diff --git a/Laerdal.McuMgr/Shared/FirmwareInstaller/FirmwareInstaller.cs b/Laerdal.McuMgr/Shared/FirmwareInstaller/FirmwareInstaller.cs
@@ -195,9 +195,9 @@ public async Task InstallAsync(
                     continue;
                 }
                 catch (Exception ex) when (
-                    !(ex is ArgumentException) //10 wops probably missing native lib symbols!
-                    && !(ex is TimeoutException)
-                    && !(ex is IFirmwareInstallationException) //this accounts for both cancellations and installation errors
+                    ex is not ArgumentException //10 wops probably missing native lib symbols!
+                    && ex is not TimeoutException
+                    && ex is not IFirmwareInstallationException //this accounts for both cancellations and installation errors
                 )
                 {
                     OnStateChanged(new StateChangedEventArgs( //for consistency