Code Quality changes and dependency updates.

src/Directory.Build.props

@@ -58,11 +58,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.26">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.28">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19351-01" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
   <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true' And $(MSBuildProjectName.Contains('Addon.')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">

src/Greenshot.Addon.Box/BoxDestination.cs

@@ -119,12 +119,10 @@ namespace Greenshot.Addon.Box
 			get
             {
                 // TODO: Optimize this
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "box.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "box.png");
-			    {
                 return BitmapHelper.FromStream(bitmapStream);
             }
 		}
-		}
 
         /// <inheritdoc />
         public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
@@ -164,12 +162,10 @@ namespace Greenshot.Addon.Box
 
 	            if (url != null && _boxConfiguration.AfterUploadLinkToClipBoard)
                 {
-	                using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-	                {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(url);
                 }
-                }
 
 	            return url;
 	        }
@@ -206,8 +202,7 @@ namespace Greenshot.Addon.Box
             oauthHttpBehaviour.OnHttpMessageHandlerCreated = httpMessageHandler => new OAuth2HttpMessageHandler(_oauth2Settings, oauthHttpBehaviour, httpMessageHandler);
 
             // TODO: See if the PostAsync<Bitmap> can be used? Or at least the HttpContentFactory?
-            using (var imageStream = new MemoryStream())
+            using var imageStream = new MemoryStream();
-            {
             var multiPartContent = new MultipartFormDataContent();
             var parentIdContent = new StringContent(_boxConfiguration.FolderId);
             parentIdContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data")
@@ -258,7 +253,6 @@ namespace Greenshot.Addon.Box
             }
             return $"http://www.box.com/files/0/f/0/1/f_{response.Id}";
         }
-        }
 
     }
 }

src/Greenshot.Addon.Dropbox/DropboxDestination.cs

@@ -125,12 +125,10 @@ namespace Greenshot.Addon.Dropbox
 			get
             {
                 // TODO: Optimize this by caching
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "Dropbox.gif"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "Dropbox.gif");
-			    {
                 return BitmapHelper.FromStream(bitmapStream);
             }
 		}
-		}
 
         /// <inheritdoc />
         public override string Description => _dropboxLanguage.UploadMenuItem;
@@ -146,12 +144,10 @@ namespace Greenshot.Addon.Dropbox
 				exportInformation.ExportMade = true;
 				if (_dropboxPluginConfiguration.AfterUploadLinkToClipBoard)
                 {
-				    using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-				    {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(uploadUrl);
                 }
-                }
 			}
 		    _exportNotification.NotifyOfExport(this, exportInformation, surface);
 			return exportInformation;
@@ -166,30 +162,24 @@ namespace Greenshot.Addon.Dropbox
 	        try
 	        {
 	            var cancellationTokenSource = new CancellationTokenSource();
-                using (var ownedPleaseWaitForm = _pleaseWaitFormFactory(cancellationTokenSource))
+                using var ownedPleaseWaitForm = _pleaseWaitFormFactory(cancellationTokenSource);
-	            {
                 ownedPleaseWaitForm.Value.SetDetails("Dropbox", _dropboxLanguage.CommunicationWait);
                 ownedPleaseWaitForm.Value.Show();
                 try
                 {
                     var filename = surfaceToUpload.GenerateFilename(CoreConfiguration, _dropboxPluginConfiguration);
-	                    using (var imageStream = new MemoryStream())
+                    using var imageStream = new MemoryStream();
-	                    {
                     surfaceToUpload.WriteToStream(imageStream, CoreConfiguration, _dropboxPluginConfiguration);
                     imageStream.Position = 0;
-	                        using (var streamContent = new StreamContent(imageStream))
+                    using var streamContent = new StreamContent(imageStream);
-	                        {
                     streamContent.Headers.ContentType = new MediaTypeHeaderValue(surfaceToUpload.GenerateMimeType(CoreConfiguration, _dropboxPluginConfiguration));
                     dropboxUrl = await UploadAsync(filename, streamContent, null, cancellationToken).ConfigureAwait(false);
                 }
-	                    }
-	                }
                 finally
                 {
                     ownedPleaseWaitForm.Value.Close();
                 }
             }
-	        }
 	        catch (Exception e)
 	        {
 	            Log.Error().WriteLine(e);

src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs

@@ -89,13 +89,11 @@ namespace Greenshot.Addon.ExternalCommand
 	            {
 	                exportInformation.Uri = uriMatches[0].Groups[1].Value;
 
-	                using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-	                {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(exportInformation.Uri);
                 }
 	        }
-	        }
 
 	        if (_externalCommandDefinition.CommandBehavior.HasFlag(CommandBehaviors.DeleteOnExit))
 	        {

src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj

@@ -19,6 +19,6 @@
   </ItemGroup>
   
   <ItemGroup>
-	<PackageReference Include="CliWrap" Version="2.4.0" />
+	<PackageReference Include="CliWrap" Version="2.5.0" />
   </ItemGroup>
 </Project>

src/Greenshot.Addon.Flickr/FlickrDestination.cs

@@ -125,12 +125,10 @@ namespace Greenshot.Addon.Flickr
 			get
             {
                 // TODO: Optimize this by caching
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "flickr.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "flickr.png");
-			    {
                 return BitmapHelper.FromStream(bitmapStream);
             }
 		}
-		}
 
 	    public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
 	    {
@@ -175,12 +173,10 @@ namespace Greenshot.Addon.Flickr
 	            }
 	            if (_flickrConfiguration.AfterUploadLinkToClipBoard)
                 {
-	                using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-	                {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(uploadUrl);
                 }
-                }
 	            
 	        }
 	        catch (Exception e)
@@ -222,8 +218,7 @@ namespace Greenshot.Addon.Flickr
                 {
                     surfaceToUpload.WriteToStream(stream, CoreConfiguration, _flickrConfiguration);
                     stream.Position = 0;
-                    using (var streamContent = new StreamContent(stream))
+                    using var streamContent = new StreamContent(stream);
-                    {
                     streamContent.Headers.ContentType = new MediaTypeHeaderValue(surfaceToUpload.GenerateMimeType(CoreConfiguration, _flickrConfiguration));
                     streamContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data")
                     {
@@ -239,7 +234,6 @@ namespace Greenshot.Addon.Flickr
                         where element.Name == "photoid"
                         select element.Value).FirstOrDefault();
                 }
-                }
 
                 // Get Photo Info
                 signedParameters = new Dictionary<string, object>

src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs

@@ -103,12 +103,10 @@ namespace Greenshot.Addon.GooglePhotos
 			get
             {
                 // TODO: Optimize this by caching
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "GooglePhotos.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "GooglePhotos.png");
-			    {
                 return BitmapHelper.FromStream(bitmapStream);
             }
 		}
-		}
 
         /// <inheritdoc />
         public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
@@ -145,12 +143,10 @@ namespace Greenshot.Addon.GooglePhotos
 
 	            if (url != null && _googlePhotosConfiguration.AfterUploadLinkToClipBoard)
                 {
-	                using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-	                {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(url);
                 }
-                }
 	            return url;
 	        }
 	        catch (Exception e)
@@ -191,14 +187,12 @@ namespace Greenshot.Addon.GooglePhotos
             {
                 surface.WriteToStream(imageStream, CoreConfiguration, _googlePhotosConfiguration);
                 imageStream.Position = 0;
-                using (var content = new StreamContent(imageStream))
+                using var content = new StreamContent(imageStream);
-                {
                 content.Headers.Add("Content-Type", surface.GenerateMimeType(CoreConfiguration, _googlePhotosConfiguration));
 
                 oAuthHttpBehaviour.MakeCurrent();
                 response = await uploadUri.PostAsync<string>(content, token).ConfigureAwait(true);
             }
-            }
 
             return ParseResponse(response);
         }

src/Greenshot.Addon.Imgur/ImgurApi.cs

@@ -104,18 +104,14 @@ namespace Greenshot.Addon.Imgur
                 localBehaviour.UploadProgress = percent => Execute.OnUIThread(() => progress.Report((int)(percent * 100)));
             }
 
-            using (var imageStream = new MemoryStream())
+            using var imageStream = new MemoryStream();
-            {
             surfaceToUpload.WriteToStream(imageStream, _coreConfiguration, _imgurConfiguration);
             imageStream.Position = 0;
-                using (var content = new StreamContent(imageStream))
+            using var content = new StreamContent(imageStream);
-                {
             content.Headers.Add("Content-Type", surfaceToUpload.GenerateMimeType(_coreConfiguration, _imgurConfiguration));
             localBehaviour.MakeCurrent();
             return await uploadUri.PostAsync<ImgurImage>(content, token).ConfigureAwait(false);
         }
-            }
-        }
 
 	    /// <summary>
 	    ///     Do the actual upload to Picasa
@@ -135,18 +131,14 @@ namespace Greenshot.Addon.Imgur
                 localBehaviour.UploadProgress = percent => Execute.OnUIThread(() => progress.Report((int) (percent * 100)));
             }
             var oauthHttpBehaviour = OAuth2HttpBehaviourFactory.Create(oAuth2Settings, localBehaviour);
-            using (var imageStream = new MemoryStream())
+            using var imageStream = new MemoryStream();
-            {
             surfaceToUpload.WriteToStream(imageStream, _coreConfiguration, _imgurConfiguration);
             imageStream.Position = 0;
-                using (var content = new StreamContent(imageStream))
+            using var content = new StreamContent(imageStream);
-                {
             content.Headers.Add("Content-Type", surfaceToUpload.GenerateMimeType(_coreConfiguration, _imgurConfiguration));
             oauthHttpBehaviour.MakeCurrent();
             return await uploadUri.PostAsync<ImgurImage>(content, token).ConfigureAwait(false);
         }
-            }
-        }
 
 
         /// <summary>
@@ -187,8 +179,7 @@ namespace Greenshot.Addon.Imgur
         {
             var creditsUri = new Uri($"{_imgurConfiguration.ApiUrl}/credits.json");
             Behaviour.MakeCurrent();
-            using (var client = HttpClientFactory.Create(creditsUri))
+            using var client = HttpClientFactory.Create(creditsUri);
-            {
             var response = await client.GetAsync(creditsUri, token).ConfigureAwait(false);
             await response.HandleErrorAsync().ConfigureAwait(false);
             var creditsJson = await response.GetAsAsync<dynamic>(token).ConfigureAwait(false);
@@ -209,7 +200,6 @@ namespace Greenshot.Addon.Imgur
                 _imgurConfiguration.Credits = credits;
             }
         }
-        }
 
         /// <summary>
         ///     Retrieve information on an imgur image
@@ -224,8 +214,7 @@ namespace Greenshot.Addon.Imgur
             Log.Debug().WriteLine("Retrieving Imgur info for {0} with url {1}", id, imageUri);
 
             Behaviour.MakeCurrent();
-            using (var client = HttpClientFactory.Create(imageUri))
+            using var client = HttpClientFactory.Create(imageUri);
-            {
             var response = await client.GetAsync(imageUri, token).ConfigureAwait(false);
             // retrieving image data seems to throw a 403 (Unauthorized) if it has been deleted
             if ((response.StatusCode == HttpStatusCode.NotFound) || (response.StatusCode == HttpStatusCode.Redirect) || (response.StatusCode == HttpStatusCode.Unauthorized))
@@ -235,7 +224,6 @@ namespace Greenshot.Addon.Imgur
             await response.HandleErrorAsync().ConfigureAwait(false);
             return await response.GetAsAsync<ImgurImage>(token).ConfigureAwait(false);
         }
-        }
 
         /// <summary>
         ///     Retrieve the thumbnail of an imgur image

src/Greenshot.Addon.Imgur/ImgurDestination.cs

@@ -83,11 +83,9 @@ namespace Greenshot.Addon.Imgur
 			get
             {
                 // TODO: Optimize this, by caching
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "Imgur.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "Imgur.png");
-			    {
                 return BitmapHelper.FromStream(bitmapStream);
             }
-            }
 		}
 
 		public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
@@ -128,10 +126,11 @@ namespace Greenshot.Addon.Imgur
                         {
                             // Create thumbnail
                             using (var tmpImage = surfaceToUpload.GetBitmapForExport())
-                            using (var thumbnail = tmpImage.CreateThumbnail(90, 90))
                             {
+                                using var thumbnail = tmpImage.CreateThumbnail(90, 90);
                                 imgurImage.Image = thumbnail;
                             }
+
                             if (_imgurConfiguration.AnonymousAccess && _imgurConfiguration.TrackHistory)
                             {
                                 Log.Debug().WriteLine("Storing imgur upload for hash {0} and delete hash {1}", imgurImage.Data.Id, imgurImage.Data.Deletehash);
@@ -159,12 +158,10 @@ namespace Greenshot.Addon.Imgur
 
                     try
                     {
-                        using (var clipboardAccessToken = ClipboardNative.Access())
+                        using var clipboardAccessToken = ClipboardNative.Access();
-                        {
                         clipboardAccessToken.ClearContents();
                         clipboardAccessToken.SetAsUrl(uploadUrl.AbsoluteUri);
                     }
-                    }
                     catch (Exception ex)
                     {
                         Log.Error().WriteLine(ex, "Can't write to clipboard: ");

src/Greenshot.Addon.Imgur/ViewModels/ImgurConfigViewModel.cs

@@ -120,11 +120,9 @@ namespace Greenshot.Addon.Imgur.ViewModels
         /// </summary>
         public void ShowHistory()
         {
-            using (var imgurHistoryViewModel = ImgurHistoryViewModelFactory())
+            using var imgurHistoryViewModel = ImgurHistoryViewModelFactory();
-            {
             WindowManager.ShowDialog(imgurHistoryViewModel.Value);
         }
-        }
 
         /// <summary>
         /// Can the credentials be reset?

src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs

@@ -177,12 +177,10 @@ namespace Greenshot.Addon.Imgur.ViewModels
         /// </summary>
         public void CopyToClipboard()
         {
-            using (var clipboardAccessToken = ClipboardNative.Access())
+            using var clipboardAccessToken = ClipboardNative.Access();
-            {
             clipboardAccessToken.ClearContents();
             clipboardAccessToken.SetAsUrl(SelectedImgur.Data.Link?.AbsoluteUri);
         }
-        }
 
         /// <summary>
         /// Used from the View

src/Greenshot.Addon.InternetExplorer/InternetExplorerCaptureHelper.cs

@@ -392,7 +392,7 @@ namespace Greenshot.Addon.InternetExplorer
 				windowToCapture = InteropWindowQuery.GetForegroundWindow();
 			}
 			// Show backgroundform after retrieving the active window..
-			var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured...");
+			using var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured...");
 			backgroundForm.Show();
 			//BackgroundForm backgroundForm = BackgroundForm.ShowAndWait(language.GetString(LangKey.contextmenu_captureie), language.GetString(LangKey.wait_ie_capture));
 			try
@@ -659,11 +659,9 @@ namespace Greenshot.Addon.InternetExplorer
 				// Loop over the frames and clear their source area so we don't see any artifacts
 				foreach (var frameDocument in documentContainer.Frames)
                 {
-					using (var brush = new SolidBrush(clearColor))
+                    using var brush = new SolidBrush(clearColor);
-					{
                     graphicsTarget.FillRectangle(brush, frameDocument.SourceRectangle);
                 }
-				}
 				// Loop over the frames and capture their content
 				foreach (var frameDocument in documentContainer.Frames)
 				{

src/Greenshot.Addon.InternetExplorer/InternetExplorerHelper.cs

@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Dapplo.Log;
 using Dapplo.Windows.Desktop;
 using Microsoft.Win32;
 
@@ -31,8 +30,6 @@ namespace Greenshot.Addon.InternetExplorer {
     /// Util code for Internet Explorer
     /// </summary>
     public  class InternetExplorerHelper {
-		private static readonly LogSource Log = new LogSource();
-
 		// Internet explorer Registry key
 		private const string IeKey = @"Software\Microsoft\Internet Explorer";
 

src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj

@@ -21,6 +21,6 @@
   
   <ItemGroup>
 	<PackageReference Include="Dapplo.Jira" Version="0.9.2" />
-	<PackageReference Include="DynamicData" Version="6.13.13" />
+	<PackageReference Include="DynamicData" Version="6.14.1" />
   </ItemGroup>
 </Project>

src/Greenshot.Addon.Jira/JiraConnector.cs

@@ -91,7 +91,11 @@ namespace Greenshot.Addon.Jira
 		{
 			if (_jiraClient != null)
 			{
-				Task.Run(async () => await LogoutAsync()).Wait();
+				Task.Run(async () =>
+                {
+                    await LogoutAsync();
+                    _issueTypeBitmapCache.Dispose();
+                }).Wait();
 			}
 			FavIcon?.Dispose();
 		}
@@ -251,14 +255,12 @@ namespace Greenshot.Addon.Jira
         public async Task AttachAsync(string issueKey, ISurface surface, string filename = null, CancellationToken cancellationToken = default)
 		{
 			await CheckCredentialsAsync(cancellationToken).ConfigureAwait(true);
-			using (var memoryStream = new MemoryStream())
+            using var memoryStream = new MemoryStream();
-			{
             surface.WriteToStream(memoryStream, _coreConfiguration, _jiraConfiguration);
             memoryStream.Seek(0, SeekOrigin.Begin);
             var contentType = surface.GenerateMimeType(_coreConfiguration, _jiraConfiguration);
             await _jiraClient.Attachment.AttachAsync(issueKey, memoryStream, filename ?? surface.GenerateFilename(_coreConfiguration, _jiraConfiguration), contentType, cancellationToken).ConfigureAwait(false);
         }
-		}
 
 		/// <summary>
 		///     Add a comment to the supplied issue

src/Greenshot.Addon.Jira/JiraDestination.cs

@@ -137,14 +137,10 @@ namespace Greenshot.Addon.Jira
 				}
 				if (displayIcon == null)
                 {
-				    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "jira.svgz"))
+                    using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "jira.svgz");
-				    {
+                    using var gzStream = new GZipStream(bitmapStream, CompressionMode.Decompress);
-				        using (var gzStream = new GZipStream(bitmapStream, CompressionMode.Decompress))
-				        {
                     displayIcon = SvgBitmap.FromStream(gzStream);
-				        }
                     //displayIcon = BitmapHelper.FromStream(bitmapStream);
-                    }
                 }
 				return displayIcon;
 			}
@@ -195,8 +191,7 @@ namespace Greenshot.Addon.Jira
             {
                 // TODO: set filename
 			    // _jiraViewModel.SetFilename(filename);
-			    using (var jiraViewModel = _jiraViewModelFactory())
+                using var jiraViewModel = _jiraViewModelFactory();
-			    {
                 if (_windowManager.ShowDialog(jiraViewModel.Value) == true)
                 {
                     try
@@ -229,7 +224,6 @@ namespace Greenshot.Addon.Jira
                         MessageBox.Show(_jiraLanguage.UploadFailure + " " + e.Message);
                     }
                 }
-                }
             }
 		    _exportNotification.NotifyOfExport(this, exportInformation, surface);
             return exportInformation;

src/Greenshot.Addon.LegacyEditor/Controls/ColorButton.cs

@@ -53,18 +53,14 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 
 				if (Image != null)
                 {
-					using (var brush = value != Color.Transparent ? new SolidBrush(value) : (Brush) new HatchBrush(HatchStyle.Percent50, Color.White, Color.Gray))
+                    using var brush = value != Color.Transparent ? new SolidBrush(value) : (Brush) new HatchBrush(HatchStyle.Percent50, Color.White, Color.Gray);
-					{
+                    using var graphics = Graphics.FromImage(Image);
-						using (var graphics = Graphics.FromImage(Image))
-						{
                     int verticalOffset = Image.Height / 3;
                     int horizontalOffset = (Image.Width / 3) / 2;
                     int width = Image.Width - (Image.Width / 3);
                     int height = (Image.Height / 3) / 2;
                     graphics.FillRectangle(brush, new Rectangle(horizontalOffset, verticalOffset, width, height));
                 }
-					}
-				}
 				Invalidate();
 			}
 		}
@@ -78,8 +74,7 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 
 		private void ColorButtonClick(object sender, EventArgs e)
         {
-            using (var ownedColorDialog = _colorDialogFactory())
+            using var ownedColorDialog = _colorDialogFactory();
-            {
             var colorDialog = ownedColorDialog.Value;
             colorDialog.Color = SelectedColor;
             // Using the parent to make sure the dialog doesn't show on another window
@@ -97,4 +92,3 @@ namespace Greenshot.Addon.LegacyEditor.Controls
         }
 	}
 }
-}

src/Greenshot.Addon.LegacyEditor/Controls/ColorDialog.Designer.cs

@@ -39,6 +39,7 @@ namespace Greenshot.Addon.LegacyEditor.Controls {
 				if (components != null) {
 					components.Dispose();
 				}
+                _toolTip.Dispose();
             }
 			base.Dispose(disposing);
 		}

src/Greenshot.Addon.LegacyEditor/Controls/CustomToolStripProfessionalRenderer.cs

@@ -51,8 +51,7 @@ namespace Greenshot.Addon.LegacyEditor.Controls
             }
             var graphics = e.Graphics;
             var dropDownRect = e.ArrowRectangle;
-            using (var brush = new SolidBrush(e.ArrowColor))
+            using var brush = new SolidBrush(e.ArrowColor);
-            {
             int halfHeight = e.ArrowRectangle.Height / 2;
             int halfWidth = e.ArrowRectangle.Width / 2;
             var middle = new Point(dropDownRect.Left + halfWidth, dropDownRect.Top + halfHeight);
@@ -64,39 +63,30 @@ namespace Greenshot.Addon.LegacyEditor.Controls
             int horizontalArrowStart = middle.X - halfWidth;
             int horizontalArrowEnd = middle.X + halfWidth;
 
-                switch (e.Direction)
+            arrow = e.Direction switch
+            {
+                ArrowDirection.Up => new[]
                 {
-                    case ArrowDirection.Up:
-
-                        arrow = new[] {
                     new Point(horizontalArrowStart, verticalArrowEnd),
-                                     new Point(horizontalArrowEnd, verticalArrowEnd),
+                    new Point(horizontalArrowEnd, verticalArrowEnd), new Point(middle.X, verticalArrowStart)
-                                     new Point(middle.X, verticalArrowStart)};
+                },
-
+                ArrowDirection.Left => new[]
-                        break;
+                {
-                    case ArrowDirection.Left:
-                        arrow = new[] {
                     new Point(horizontalArrowEnd, verticalArrowStart),
-                                     new Point(horizontalArrowEnd, verticalArrowEnd),
+                    new Point(horizontalArrowEnd, verticalArrowEnd), new Point(horizontalArrowStart, middle.Y)
-                                     new Point(horizontalArrowStart, middle.Y)};
+                },
-
+                ArrowDirection.Right => new[]
-                        break;
+                {
-                    case ArrowDirection.Right:
-                        arrow = new[] {
                     new Point(horizontalArrowStart, verticalArrowStart),
-                                     new Point(horizontalArrowStart, verticalArrowEnd),
+                    new Point(horizontalArrowStart, verticalArrowEnd), new Point(horizontalArrowEnd, middle.Y)
-                                     new Point(horizontalArrowEnd, middle.Y)};
+                },
-
+                _ => new[]
-                        break;
+                {
-                    default:
-                        arrow = new[] {
                     new Point(horizontalArrowStart, verticalArrowStart),
-                                 new Point(horizontalArrowEnd, verticalArrowStart),
+                    new Point(horizontalArrowEnd, verticalArrowStart), new Point(middle.X, verticalArrowEnd)
-                                 new Point(middle.X, verticalArrowEnd) };
-                        break;
                 }
+            };
             graphics.FillPolygon(brush, arrow);
         }
     }
 }
-}

src/Greenshot.Addon.LegacyEditor/Controls/FontFamilyComboBox.cs

@@ -117,16 +117,11 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 		/// <param name="text"></param>
 		private void DrawText(Graphics graphics, FontFamily fontFamily, FontStyle fontStyle, Rectangle bounds, string text)
         {
-			using (var font = new Font(fontFamily, Font.Size + 5, fontStyle, GraphicsUnit.Pixel))
+            using var font = new Font(fontFamily, Font.Size + 5, fontStyle, GraphicsUnit.Pixel);
-			{
             // Make sure the text is visible by centering it in the line
-				using (var stringFormat = new StringFormat())
+            using var stringFormat = new StringFormat {LineAlignment = StringAlignment.Center};
-				{
-					stringFormat.LineAlignment = StringAlignment.Center;
             graphics.DrawString(text, font, Brushes.Black, bounds, stringFormat);
         }
-			}
-		}
 
 		private void BindableToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e)
 		{

src/Greenshot.Addon.LegacyEditor/Controls/Pipette.cs

@@ -39,7 +39,7 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 	{
 		private const int VkEsc = 27;
 		private readonly IBitmapWithNativeSupport _image;
-		private Cursor _cursor;
+		private readonly Cursor _cursor;
 		private bool _dragging;
 		private MovableShowColorForm _movableShowColorForm;
 
@@ -88,15 +88,13 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 		/// <returns>Cursor</returns>
 		private static Cursor CreateCursor(IBitmapWithNativeSupport bitmap, int hotspotX, int hotspotY)
         {
-			using (var iconHandle = new SafeIconHandle(bitmap.NativeBitmap.GetHicon()))
+            using var iconHandle = new SafeIconHandle(bitmap.NativeBitmap.GetHicon());
-			{
             NativeIconMethods.GetIconInfo(iconHandle, out var iconInfo);
             iconInfo.Hotspot = new NativePoint(hotspotX, hotspotY);
             iconInfo.IsIcon = false;
             var icon = NativeIconMethods.CreateIconIndirect(ref iconInfo);
             return new Cursor(icon);
         }
-		}
 
 		/// <summary>
 		///     This Dispose is called from the Dispose and the Destructor.
@@ -105,15 +103,12 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 		protected override void Dispose(bool disposing)
 		{
 			if (disposing)
-			{
-				if (_cursor != null)
 			{
 				_cursor.Dispose();
-				}
 				_movableShowColorForm?.Dispose();
+                _image.Dispose();
 			}
 			_movableShowColorForm = null;
-			_cursor = null;
             base.Dispose(disposing);
 		}
 

src/Greenshot.Addon.LegacyEditor/Controls/ToolStripColorButton.cs

@@ -61,13 +61,11 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 
 				if (Image != null)
                 {
-					using (var graphics = Graphics.FromImage(Image))
+                    using var graphics = Graphics.FromImage(Image);
-					{
                     int quarterSize = Image.Height / 4;
                     var colorArea = new Rectangle(0, Image.Height - quarterSize, Image.Width, quarterSize);
                     graphics.FillRectangle(brush, colorArea);
                 }
-				}
 
 				// cleanup GDI Object
 				brush.Dispose();
@@ -84,7 +82,7 @@ namespace Greenshot.Addon.LegacyEditor.Controls
 
 		private void ColorButtonClick(object sender, EventArgs e)
 		{
-			var colorDialog = new ColorDialog(_editorConfiguration, _greenshotLanguage)
+			using var colorDialog = new ColorDialog(_editorConfiguration, _greenshotLanguage)
 			{
 				Color = SelectedColor
 			};

src/Greenshot.Addon.LegacyEditor/Drawing/Adorners/TargetAdorner.cs

@@ -99,11 +99,8 @@ namespace Greenshot.Addon.LegacyEditor.Drawing.Adorners
 			var targetGraphics = paintEventArgs.Graphics;
 
 			var bounds = Bounds;
-            using (var brush = new SolidBrush(_color))
+            using var brush = new SolidBrush(_color);
-            {
             targetGraphics.FillRectangle(brush, bounds.X, bounds.Y, bounds.Width, bounds.Height);
-
-            }
         }
 
 		/// <summary>

src/Greenshot.Addon.LegacyEditor/Drawing/ArrowContainer.cs

@@ -57,22 +57,15 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			        return NativeRect.Empty;
 			    }
 
-			    using (var pen = new Pen(Color.White))
+                using var pen = new Pen(Color.White) {Width = lineThickness};
-			    {
-			        pen.Width = lineThickness;
                 SetArrowHeads((ArrowHeadCombination) GetFieldValue(FieldTypes.ARROWHEADS), pen);
-			        using (var path = new GraphicsPath())
+                using var path = new GraphicsPath();
-			        {
                 path.AddLine(Left, Top, Left + Width, Top + Height);
-			            using (var matrix = new Matrix())
+                using var matrix = new Matrix();
-			            {
                 NativeRectFloat drawingBounds = path.GetBounds(matrix, pen);
                 return drawingBounds.Inflate(2, 2).Round();
             }
 		}
-			    }
-			}
-		}
 
 		/// <summary>
 		///     Do not use the base, just override so we have our own defaults
@@ -110,8 +103,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 						var currentStep = 1;
 						while (currentStep <= steps)
                         {
-							using (var shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness))
+                            using var shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness);
-							{
                             SetArrowHeads(heads, shadowCapPen);
 
                             graphics.DrawLine(shadowCapPen,
@@ -124,15 +116,13 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
                             alpha = alpha - basealpha / steps;
                         }
 					}
-					}
+
-					using (var pen = new Pen(lineColor, lineThickness))
+                    using var pen = new Pen(lineColor, lineThickness);
-					{
                     SetArrowHeads(heads, pen);
                     graphics.DrawLine(pen, Left, Top, Left + Width, Top + Height);
                 }
 			}
 		}
-		}
 
 		private void SetArrowHeads(ArrowHeadCombination heads, Pen pen)
 		{
@@ -151,17 +141,12 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			var lineThickness = GetFieldValueAsInt(FieldTypes.LINE_THICKNESS) + 10;
 			if (lineThickness > 0)
             {
-				using (var pen = new Pen(Color.White))
+                using var pen = new Pen(Color.White) {Width = lineThickness};
-				{
-					pen.Width = lineThickness;
                 SetArrowHeads((ArrowHeadCombination) GetFieldValue(FieldTypes.ARROWHEADS), pen);
-					using (var path = new GraphicsPath())
+                using var path = new GraphicsPath();
-					{
                 path.AddLine(Left, Top, Left + Width, Top + Height);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 	}

src/Greenshot.Addon.LegacyEditor/Drawing/BitmapContainer.cs

@@ -109,14 +109,12 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			{
 				Log.Debug().WriteLine("Rotating element with {0} degrees.", rotateAngle);
 				DisposeShadow();
-				using (var tmpMatrix = new Matrix())
+                using var tmpMatrix = new Matrix();
-				{
                 using (_bitmap)
                 {
                     _bitmap = _bitmap.ApplyEffect(new RotateEffect(rotateAngle), tmpMatrix);
                 }
             }
-			}
 			base.Transform(matrix);
 		}
 
@@ -226,12 +224,10 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 		{
 			if (shadow && _shadowBitmap == null)
             {
-				using (var matrix = new Matrix())
+                using var matrix = new Matrix();
-				{
                 _shadowBitmap = _bitmap.ApplyEffect(new DropShadowEffect(), matrix);
             }
 		}
-		}
 
 		/// <summary>
 		///     Draw the actual container to the graphics object

src/Greenshot.Addon.LegacyEditor/Drawing/CropContainer.cs

@@ -79,8 +79,8 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			{
 				return;
 			}
-			using (Brush cropBrush = new SolidBrush(Color.FromArgb(100, 150, 150, 100)))
+
-			{
+            using Brush cropBrush = new SolidBrush(Color.FromArgb(100, 150, 150, 100));
             var cropRectangle = new NativeRect(Left, Top, Width, Height).Normalize();
             var selectionRect = new NativeRect(cropRectangle.Left - 1, cropRectangle.Top - 1, cropRectangle.Width + 1, cropRectangle.Height + 1);
 
@@ -98,4 +98,3 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
         }
 	}
 }
-}

src/Greenshot.Addon.LegacyEditor/Drawing/CursorContainer.cs

@@ -75,12 +75,11 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			{
 				return;
 			}
-			using (var fileCursor = new Cursor(filename))
+
-			{
+            using var fileCursor = new Cursor(filename);
             Cursor = fileCursor;
             Log.Debug().WriteLine("Loaded file: " + filename + " with resolution: " + Height + "," + Width);
         }
-		}
 
 		protected override void OnDeserialized(StreamingContext streamingContext)
 		{

src/Greenshot.Addon.LegacyEditor/Drawing/DrawableContainer.cs

@@ -603,13 +603,13 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 
 		protected void DrawSelectionBorder(Graphics g, NativeRect rect)
         {
-			using (var pen = new Pen(Color.MediumSeaGreen))
+            using var pen = new Pen(Color.MediumSeaGreen)
             {
-				pen.DashPattern = new float[] {1, 2};
+                DashPattern = new float[] {1, 2},
-				pen.Width = 1;
+                Width = 1
+            };
             g.DrawRectangle(pen, rect);
         }
-		}
 
 
 		public void ResizeTo(int width, int height)

src/Greenshot.Addon.LegacyEditor/Drawing/EllipseContainer.cs

@@ -83,32 +83,28 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 				var currentStep = lineVisible ? 1 : 0;
 				while (currentStep <= steps)
                 {
-					using (var shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100)))
+                    using var shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))
                     {
-						shadowPen.Width = lineVisible ? lineThickness : 1;
+                        Width = lineVisible ? lineThickness : 1
+                    };
                     var shadowRect = new NativeRect(rect.Left + currentStep, rect.Top + currentStep, rect.Width, rect.Height).Normalize();
                     graphics.DrawEllipse(shadowPen, shadowRect);
                     currentStep++;
                     alpha = alpha - basealpha / steps;
                 }
 			}
-			}
 			//draw the original shape
 			if (Colors.IsVisible(fillColor))
             {
-				using (Brush brush = new SolidBrush(fillColor))
+                using Brush brush = new SolidBrush(fillColor);
-				{
                 graphics.FillEllipse(brush, rect);
             }
-			}
 			if (lineVisible)
             {
-				using (var pen = new Pen(lineColor, lineThickness))
+                using var pen = new Pen(lineColor, lineThickness);
-				{
                 graphics.DrawEllipse(pen, rect);
             }
 		}
-		}
 
 		public override bool Contains(int x, int y)
 		{
@@ -152,15 +148,11 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			// check the rest of the lines
 			if (lineThickness > 0)
             {
-				using (var pen = new Pen(Color.White, lineThickness))
+                using var pen = new Pen(Color.White, lineThickness);
-				{
+                using var path = new GraphicsPath();
-					using (var path = new GraphicsPath())
-					{
                 path.AddEllipse(rect);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 	}

src/Greenshot.Addon.LegacyEditor/Drawing/FilterContainer.cs

@@ -86,24 +86,20 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 					var currentStep = lineVisible ? 1 : 0;
 					while (currentStep <= steps)
                     {
-						using (var shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness))
+                        using var shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness);
-						{
                         var shadowRect = new NativeRect(Left + currentStep, Top + currentStep, Width, Height).Normalize();
                         graphics.DrawRectangle(shadowPen, shadowRect);
                         currentStep++;
                         alpha = alpha - baseAlpha / steps;
                     }
 				}
-				}
 				var rect = new NativeRect(Left, Top, Width, Height).Normalize();
 				if (lineThickness > 0)
                 {
-					using (var pen = new Pen(lineColor, lineThickness))
+                    using var pen = new Pen(lineColor, lineThickness);
-					{
                     graphics.DrawRectangle(pen, rect);
                 }
 			}
 		}
 	}
 }
-}

src/Greenshot.Addon.LegacyEditor/Drawing/Filters/PixelizationFilter.cs

@@ -57,8 +57,8 @@ namespace Greenshot.Addon.LegacyEditor.Drawing.Filters
             {
                 pixelSize = rect.Height;
             }
-            using (var dest = FastBitmapFactory.CreateCloneOf(applyBitmap, area: rect))
+
-            {
+            using var dest = FastBitmapFactory.CreateCloneOf(applyBitmap, area: rect);
             using (var src = FastBitmapFactory.Create(applyBitmap, rect))
             {
                 var halbPixelSize = pixelSize / 2;
@@ -112,4 +112,3 @@ namespace Greenshot.Addon.LegacyEditor.Drawing.Filters
         }
     }
 }
-}

src/Greenshot.Addon.LegacyEditor/Drawing/FreehandContainer.cs

@@ -186,8 +186,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
 			
 			int lineThickness = GetFieldValueAsInt(FieldTypes.LINE_THICKNESS);
 			var lineColor = GetFieldValueAsColor(FieldTypes.LINE_COLOR);
-			using (var pen = new Pen(lineColor)) {
+            using var pen = new Pen(lineColor) {Width = lineThickness};
-				pen.Width = lineThickness;
             if (!(pen.Width > 0))
             {
                 return;
@@ -210,7 +209,6 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
             // Move back, otherwise everything is shifted
             graphics.TranslateTransform(-Left,-Top);
         }
-		}
 
         /// <summary>
         /// Draw a selectionborder around the freehand path
@@ -218,9 +216,10 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
         /// <param name="graphics">Graphics</param>
         /// <param name="linePen">Pen</param>
         /// <param name="path">GraphicsPath</param>
-        protected static void DrawSelectionBorder(Graphics graphics, Pen linePen, GraphicsPath path) {
+        protected static void DrawSelectionBorder(Graphics graphics, Pen linePen, GraphicsPath path)
-			using (var selectionPen = (Pen) linePen.Clone()) {
+        {
-				using (var selectionPath = (GraphicsPath)path.Clone()) {
+            using var selectionPen = (Pen) linePen.Clone();
+            using var selectionPath = (GraphicsPath)path.Clone();
             selectionPen.Width += 5;
             selectionPen.Color = Color.FromArgb(120, Color.LightSeaGreen);
             graphics.DrawPath(selectionPen, selectionPath);
@@ -230,8 +229,6 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
             selectionPen.Width = 1;
             graphics.DrawPath(selectionPen, selectionPath);
         }
-			}
-		}
 		
 		/// <summary>
 		/// Get the bounds in which we have something drawn, plus safety margin, these are not the normal bounds...
@@ -276,12 +273,10 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
 			bool returnValue = base.ClickableAt(x, y);
 			if (returnValue) {
 				int lineThickness = GetFieldValueAsInt(FieldTypes.LINE_THICKNESS);
-				using (var pen = new Pen(Color.White)) {
+                using var pen = new Pen(Color.White) {Width = lineThickness + 10};
-					pen.Width = lineThickness + 10;
                 lock (_freehandPathLock)
                 {
                     returnValue = _freehandPath.IsOutlineVisible(x - Left, y - Top, pen);
-                    }
                 }
             }
 			return returnValue;

src/Greenshot.Addon.LegacyEditor/Drawing/IconContainer.cs

@@ -69,12 +69,11 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			{
 				return;
 			}
-			using (var fileIcon = new Icon(filename))
+
-			{
+            using var fileIcon = new Icon(filename);
             Icon = fileIcon;
             Log.Debug().WriteLine("Loaded file: " + filename + " with resolution: " + Height + "," + Width);
         }
-		}
 
 		protected override void OnDeserialized(StreamingContext streamingContext)
 		{

src/Greenshot.Addon.LegacyEditor/Drawing/LineContainer.cs

@@ -92,8 +92,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 					var currentStep = 1;
 					while (currentStep <= steps)
                     {
-						using (var shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness))
+                        using var shadowCapPen = new Pen(Color.FromArgb(alpha, 100, 100, 100), lineThickness);
-						{
                         graphics.DrawLine(shadowCapPen,
                             Left + currentStep,
                             Top + currentStep,
@@ -104,16 +103,13 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 #pragma warning disable IDE0054 // Use compound assignment
                         alpha = alpha - basealpha / steps;
 #pragma warning restore IDE0054 // Use compound assignment
-                        }
                     }
 				}
 
-				using (var pen = new Pen(lineColor, lineThickness))
+                using var pen = new Pen(lineColor, lineThickness);
-				{
                 graphics.DrawLine(pen, Left, Top, Left + Width, Top + Height);
             }
 		}
-		}
 
         /// <inheritdoc />
 		public override bool ClickableAt(int x, int y)
@@ -121,16 +117,11 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			var lineThickness = GetFieldValueAsInt(FieldTypes.LINE_THICKNESS) + 5;
 			if (lineThickness > 0)
             {
-				using (var pen = new Pen(Color.White))
+                using var pen = new Pen(Color.White) {Width = lineThickness};
-				{
+                using var path = new GraphicsPath();
-					pen.Width = lineThickness;
-					using (var path = new GraphicsPath())
-					{
                 path.AddLine(Left, Top, Left + Width, Top + Height);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 

src/Greenshot.Addon.LegacyEditor/Drawing/RectangleContainer.cs

@@ -94,9 +94,9 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
 				int alpha = basealpha;
 				int steps = 5;
 				int currentStep = lineVisible ? 1 : 0;
-				while (currentStep <= steps) {
+				while (currentStep <= steps)
-					using (var shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100))) {
+                {
-						shadowPen.Width = lineVisible ? lineThickness : 1;
+                    using var shadowPen = new Pen(Color.FromArgb(alpha, 100, 100, 100)) {Width = lineVisible ? lineThickness : 1};
                     var shadowRect = new NativeRect(
                         rect.Left + currentStep,
                         rect.Top + currentStep,
@@ -107,21 +107,20 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
                     alpha = alpha - basealpha / steps;
                 }
 			}
-			}
 
 
-			if (Colors.IsVisible(fillColor)) {
+			if (Colors.IsVisible(fillColor))
-				using (Brush brush = new SolidBrush(fillColor)) {
+            {
+                using Brush brush = new SolidBrush(fillColor);
                 graphics.FillRectangle(brush, rect);
             }
-			}
 
 			graphics.SmoothingMode = SmoothingMode.HighSpeed;
-			if (lineVisible) {
+			if (lineVisible)
-				using (var pen = new Pen(lineColor, lineThickness)) {
+            {
+                using var pen = new Pen(lineColor, lineThickness);
                 graphics.DrawRectangle(pen, rect);
             }
-			}
 
 		}
 		public override bool ClickableAt(int x, int y) {
@@ -143,14 +142,13 @@ namespace Greenshot.Addon.LegacyEditor.Drawing {
 			}
 
 			// check the rest of the lines
-			if (lineThickness > 0) {
+			if (lineThickness > 0)
-				using (var pen = new Pen(Color.White, lineThickness)) {
+            {
-					using (var path = new GraphicsPath()) {
+                using var pen = new Pen(Color.White, lineThickness);
+                using var path = new GraphicsPath();
                 path.AddRectangle(rect);
                 return path.IsOutlineVisible(x, y, pen);
             }
-				}
-			}
 			return false;
 		}
 	}

src/Greenshot.Addon.LegacyEditor/Drawing/SpeechbubbleContainer.cs

@@ -55,18 +55,14 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 					var lineThickness = GetFieldValueAsInt(FieldTypes.LINE_THICKNESS);
 					var lineColor = GetFieldValueAsColor(FieldTypes.LINE_COLOR);
 					var shadow = GetFieldValueAsBool(FieldTypes.SHADOW);
-					using (var pen = new Pen(lineColor, lineThickness))
+                    using var pen = new Pen(lineColor, lineThickness);
-					{
                     var inflateValue = lineThickness + 2 + (shadow ? 6 : 0);
-						using (var tailPath = CreateTail())
+                    using var tailPath = CreateTail();
-						{
                     NativeRectFloat tailBounds = tailPath.GetBounds(new Matrix(), pen);
                     var bounds = new NativeRect(Left, Top, Width, Height).Normalize();
 
                     return tailBounds.Round().Union(bounds).Inflate(inflateValue, inflateValue);
                 }
-					}
-				}
 				return NativeRect.Empty;
 			}
 		}
@@ -237,10 +233,9 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 				var alpha = basealpha;
 				const int steps = 5;
 				var currentStep = lineVisible ? 1 : 0;
-				using (var shadowMatrix = new Matrix())
+                using var shadowMatrix = new Matrix();
-				using (var bubbleClone = (GraphicsPath) bubble.Clone())
+                using var bubbleClone = (GraphicsPath) bubble.Clone();
-				using (var tailClone = (GraphicsPath) tail.Clone())
+                using var tailClone = (GraphicsPath) tail.Clone();
-				{
                 shadowMatrix.Translate(1, 1);
                 while (currentStep <= steps)
                 {
@@ -256,18 +251,15 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
                     alpha = alpha - basealpha / steps;
                 }
             }
-			}
 
 			var state = graphics.Save();
 			// draw the tail border where the bubble is not visible
 			using (var clipRegion = new Region(bubble))
 			{
 				graphics.SetClip(clipRegion, CombineMode.Exclude);
-				using (var pen = new Pen(lineColor, lineThickness))
+                using var pen = new Pen(lineColor, lineThickness);
-				{
                 graphics.DrawPath(pen, tail);
             }
-			}
 			graphics.Restore(state);
 
 			if (Colors.IsVisible(fillColor))
@@ -289,12 +281,10 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 				using (var clipRegion = new Region(tail))
 				{
 					graphics.SetClip(clipRegion, CombineMode.Exclude);
-					using (var pen = new Pen(lineColor, lineThickness))
+                    using var pen = new Pen(lineColor, lineThickness);
-					{
                     //pen.EndCap = pen.StartCap = LineCap.Round;
                     graphics.DrawPath(pen, bubble);
                 }
-				}
 				graphics.Restore(state);
 			}
 
@@ -328,8 +318,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			{
 				var lineThickness = GetFieldValueAsInt(FieldTypes.LINE_THICKNESS);
 				var lineColor = GetFieldValueAsColor(FieldTypes.LINE_COLOR);
-				using (var pen = new Pen(lineColor, lineThickness))
+                using var pen = new Pen(lineColor, lineThickness);
-				{
                 using (var bubblePath = CreateBubble(lineThickness))
                 {
                     bubblePath.Widen(pen);
@@ -338,16 +327,14 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
                         return true;
                     }
                 }
-					using (var tailPath = CreateTail())
+
-					{
+                using var tailPath = CreateTail();
                 tailPath.Widen(pen);
                 if (tailPath.IsVisible(clickedPoint))
                 {
                     return true;
                 }
             }
-				}
-			}
 
 			return false;
 		}

src/Greenshot.Addon.LegacyEditor/Drawing/StepLabelContainer.cs

@@ -195,14 +195,11 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			{
 				EllipseContainer.DrawEllipse(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
 			}
-			using (var fam = new FontFamily(FontFamily.GenericSansSerif.Name))
+
-			{
+            using var fam = new FontFamily(FontFamily.GenericSansSerif.Name);
-				using (var font = new Font(fam, _fontSize, FontStyle.Bold, GraphicsUnit.Pixel))
+            using var font = new Font(fam, _fontSize, FontStyle.Bold, GraphicsUnit.Pixel);
-				{
             TextContainer.DrawText(graphics, rect, 0, lineColor, false, _stringFormat, text, font);
         }
-			}
-		}
 
 		public override bool ClickableAt(int x, int y)
 		{

src/Greenshot.Addon.LegacyEditor/Drawing/Surface.cs

@@ -257,6 +257,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
         /// </summary>
         /// <param name="coreConfiguration">ICoreConfiguration</param>
         /// <param name="editorConfiguration">IEditorConfiguration</param>
+        /// <param name="editorLanguage">IEditorLanguage</param>
         /// <param name="newBitmap">IBitmapWithNativeSupport</param>
         public Surface(ICoreConfiguration coreConfiguration, IEditorConfiguration editorConfiguration, IEditorLanguage editorLanguage, IBitmapWithNativeSupport newBitmap) : this(coreConfiguration, editorConfiguration, editorLanguage)
 		{
@@ -563,7 +564,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 		/// <param name="effect"></param>
 		public void ApplyBitmapEffect(IEffect effect)
 		{
-			var backgroundForm = new BackgroundForm("Effect", "Please wait");
+			using var backgroundForm = new BackgroundForm("Effect", "Please wait");
 			backgroundForm.Show();
 			Application.DoEvents();
 			try
@@ -1079,6 +1080,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 
 		protected override void Dispose(bool disposing)
 		{
+            // TODO: Check if we need to dispose _cursorContainer 
             if (disposing)
 			{
 				Count--;
@@ -2035,15 +2037,13 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 			        {
 			            var uri = new Uri(possibleUrl);
 
-			            using (var image = uri.GetAsAsync<Bitmap>().Result)
+                        using var image = uri.GetAsAsync<Bitmap>().Result;
-			            {
                         if (image != null)
                         {
                             AddImageContainer(BitmapWrapper.FromBitmap(image), mouse.X, mouse.Y);
                             return;
                         }
                     }
-                    }
 			    }
 			    catch (Exception ex)
 			    {
@@ -2054,8 +2054,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
 				{
 				    var uri = new Uri(possibleUrl);
 
-				    using (var image = uri.GetAsAsync<Bitmap>().Result)
+                    using var image = uri.GetAsAsync<Bitmap>().Result;
-				    {
                     if (image != null)
                     {
                         AddImageContainer(BitmapWrapper.FromBitmap(image), mouse.X, mouse.Y);
@@ -2063,7 +2062,6 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
                     }
                 }
 			}
-			}
 
 			foreach (var image in ClipboardHelper.GetBitmaps(e.Data))
 			{

src/Greenshot.Addon.LegacyEditor/Drawing/TextContainer.cs

@@ -262,8 +262,8 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
             };
 
             _textBox.DataBindings.Add("Text", this, "Text", false, DataSourceUpdateMode.OnPropertyChanged);
-            _textBox.LostFocus += textBox_LostFocus;
+            _textBox.LostFocus += TextBox_LostFocus;
-            _textBox.KeyDown += textBox_KeyDown;
+            _textBox.KeyDown += TextBox_KeyDown;
         }
 
         private void ShowTextBox()
@@ -306,8 +306,11 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
             _parent.Focus();
             _textBox?.Hide();
             _parent.KeysLocked = false;
+            if (_textBox != null)
+            {
                 _parent.Controls.Remove(_textBox);
             }
+        }
 
         /// <summary>
         /// Make sure the size of the font is scaled
@@ -336,8 +339,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
             var fontStyle = FontStyle.Regular;
 
             bool hasStyle = false;
-            using (var fontFamily = new FontFamily(fontFamilyName))
+            using var fontFamily = new FontFamily(fontFamilyName);
-            {
             bool boldAvailable = fontFamily.IsStyleAvailable(FontStyle.Bold);
             if (fontBold && boldAvailable)
             {
@@ -373,7 +375,6 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
             }
             return new Font(fontFamily, fontSize, fontStyle, GraphicsUnit.Pixel);
         }
-        }
 
         /// <summary>
         /// Generate the Font-Formal so we can draw correctly
@@ -487,7 +488,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
             _textBox.ForeColor = lineColor;
         }
 
-        private void textBox_KeyDown(object sender, KeyEventArgs e)
+        private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
             // ESC and Enter/Return (w/o Shift) hide text editor
             if (e.KeyCode == Keys.Escape || ((e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter) && e.Modifiers == Keys.None))
@@ -518,7 +519,7 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
             }
         }
 
-        private void textBox_LostFocus(object sender, EventArgs e)
+        private void TextBox_LostFocus(object sender, EventArgs e)
         {
             // next change will be made undoable
             makeUndoable = true;
@@ -593,14 +594,13 @@ namespace Greenshot.Addon.LegacyEditor.Drawing
                     {
                         shadowRect = shadowRect.Inflate(-textOffset, -textOffset);
                     }
-                    using (Brush fontBrush = new SolidBrush(Color.FromArgb(alpha, 100, 100, 100)))
+
-                    {
+                    using Brush fontBrush = new SolidBrush(Color.FromArgb(alpha, 100, 100, 100));
                     graphics.DrawString(text, font, fontBrush, (Rectangle)shadowRect, stringFormat);
                     currentStep++;
                     alpha = alpha - basealpha / steps;
                 }
             }
-            }
 
             if (lineThickness > 0)
             {

src/Greenshot.Addon.LegacyEditor/EditorConfigurationExtensions.cs

@@ -66,13 +66,13 @@ namespace Greenshot.Addon.LegacyEditor
                     {
                         switch (fieldType.ValueType)
                         {
-                            case var intType when fieldType.ValueType == typeof(int):
+                            case var _ when fieldType.ValueType == typeof(int):
                                 fieldValue = Convert.ToInt32(preferredValue);
                                 break;
-                            case var boolType when fieldType.ValueType == typeof(bool):
+                            case var _ when fieldType.ValueType == typeof(bool):
                                 fieldValue = Convert.ToBoolean(preferredValue);
                                 break;
-                            case var colorType when fieldType.ValueType == typeof(Color):
+                            case var _ when fieldType.ValueType == typeof(Color):
                                 var color = Color.FromName(preferredStringValue);
                                 fieldValue = color;
                                 if (Color.Empty == color)
@@ -80,22 +80,22 @@ namespace Greenshot.Addon.LegacyEditor
                                     fieldValue = Color.FromArgb(Convert.ToInt32(preferredValue));
                                 }
                                 break;
-                            case var alignType when fieldType.ValueType == typeof(StringAlignment):
+                            case var _ when fieldType.ValueType == typeof(StringAlignment):
                                 fieldValue = Enum.Parse(typeof(StringAlignment), preferredStringValue, true);
                                 break;
-                            case var fieldFlagType when fieldType.ValueType == typeof(FieldFlag):
+                            case var _ when fieldType.ValueType == typeof(FieldFlag):
                                 fieldValue = Enum.Parse(typeof(FieldFlag), preferredStringValue, true);
                                 break;
-                            case var preparedFilterType when fieldType.ValueType == typeof(PreparedFilter):
+                            case var _ when fieldType.ValueType == typeof(PreparedFilter):
                                 fieldValue = Enum.Parse(typeof(PreparedFilter), preferredStringValue, true);
                                 break;
-                            case var arrowHeadCombinationType when fieldType.ValueType == typeof(ArrowContainer.ArrowHeadCombination):
+                            case var _ when fieldType.ValueType == typeof(ArrowContainer.ArrowHeadCombination):
                                 fieldValue = Enum.Parse(typeof(ArrowContainer.ArrowHeadCombination), preferredStringValue, true);
                                 break;
-                            case var floatType when fieldType.ValueType == typeof(float):
+                            case var _ when fieldType.ValueType == typeof(float):
                                 fieldValue = Convert.ToSingle(preferredValue, CultureInfo.InvariantCulture);
                                 break;
-                            case var doubleType when fieldType.ValueType == typeof(double):
+                            case var _ when fieldType.ValueType == typeof(double):
                                 fieldValue = Convert.ToDouble(preferredValue, CultureInfo.InvariantCulture);
                                 break;
                             default:

src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.Designer.cs

@@ -41,6 +41,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms {
 					components.Dispose();
 				}
 			}
+            _destinationScaleHandler.Dispose();
             // Make sure that clipboard changes are not longer processed.
             _clipboardSubscription?.Dispose();
 			// Remove all other stuff

src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs

@@ -350,8 +350,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
         /// <param name="e"></param>
         private void PropertiesToolStrip_Paint(object sender, PaintEventArgs e)
         {
-            using (var cbBorderPen = new Pen(SystemColors.ActiveBorder))
+            using var cbBorderPen = new Pen(SystemColors.ActiveBorder);
-            {
             // Loop over all items in the propertiesToolStrip
             foreach (ToolStripItem item in propertiesToolStrip.Items)
             {
@@ -370,7 +369,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms
                 }
             }
         }
-        }
 
         /// <summary>
         ///     Get all the destinations and display them in the file menu and the buttons
@@ -901,15 +899,14 @@ namespace Greenshot.Addon.LegacyEditor.Forms
             {
                 return;
             }
-            using (Stream streamWrite = File.OpenWrite(saveFileDialog.FileName))
+
-            {
+            using Stream streamWrite = File.OpenWrite(saveFileDialog.FileName);
             _surface.SaveElementsToStream(streamWrite);
         }
-        }
 
         private void LoadElementsToolStripMenuItemClick(object sender, EventArgs e)
         {
-            var openFileDialog = new OpenFileDialog
+            using var openFileDialog = new OpenFileDialog
             {
                 Filter = "Greenshot templates (*.gst)|*.gst"
             };
@@ -1105,8 +1102,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
         private void BtnResizeClick(object sender, EventArgs e)
         {
             var resizeEffect = new ResizeEffect(_surface.Screenshot.Width, _surface.Screenshot.Height, true);
-            using (var resizeSettingsForm = _resizeSettingsFormFactory(resizeEffect))
+            using var resizeSettingsForm = _resizeSettingsFormFactory(resizeEffect);
-            {
             var result = resizeSettingsForm.Value.ShowDialog(this);
             if (result == DialogResult.OK)
             {
@@ -1114,7 +1110,6 @@ namespace Greenshot.Addon.LegacyEditor.Forms
                 UpdateUndoRedoSurfaceDependencies();
             }
         }
-        }
 
         /// <summary>
         ///     This is used when the torn-edge button is used

src/Greenshot.Addon.Lutim/Configuration/ILutimLanguage.cs

@@ -17,7 +17,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using System.ComponentModel;
 using Dapplo.Config.Language;
 
 namespace Greenshot.Addon.Lutim.Configuration

src/Greenshot.Addon.Lutim/Entities/LutimInfo.cs

@@ -48,12 +48,10 @@ namespace Greenshot.Addon.Lutim.Entities
         {
             get
             {
-                using (var memoryStream = new MemoryStream(Convert.FromBase64String(ThumbBase64)))
+                using var memoryStream = new MemoryStream(Convert.FromBase64String(ThumbBase64));
-                {
                 return Image.FromStream(memoryStream);
             }
         }
-        }
 
         [JsonProperty("filename")]
         public string Filename { get; set; }

src/Greenshot.Addon.Lutim/LutimApi.cs

@@ -29,7 +29,6 @@ using Dapplo.HttpExtensions;
 using Dapplo.Log;
 using Greenshot.Addon.Lutim.Configuration;
 using Greenshot.Addon.Lutim.Entities;
-using Greenshot.Addons.Core;
 using Greenshot.Addons.Interfaces;
 
 namespace Greenshot.Addon.Lutim
@@ -41,12 +40,10 @@ namespace Greenshot.Addon.Lutim
 	{
 	    private static readonly LogSource Log = new LogSource();
 	    private readonly ILutimConfiguration _lutimConfiguration;
-	    private readonly ICoreConfiguration _coreConfiguration;
 
-	    public LutimApi(ILutimConfiguration lutimConfiguration, ICoreConfiguration coreConfiguration)
+	    public LutimApi(ILutimConfiguration lutimConfiguration)
 	    {
 	        _lutimConfiguration = lutimConfiguration;
-	        _coreConfiguration = coreConfiguration;
 	    }
 
 		/// <summary>
@@ -87,13 +84,13 @@ namespace Greenshot.Addon.Lutim
 				}
 				catch (ArgumentException)
 				{
-					Log.Info().WriteLine("Bad format of lutim history item for short {0}", key);
+					Log.Info().WriteLine("Bad format of Lutim history item for short {0}", key);
 				    _lutimConfiguration.LutimUploadHistory.Remove(key);
 				    _lutimConfiguration.RuntimeLutimHistory.Remove(key);
 				}
 				catch (Exception e)
 				{
-					Log.Error().WriteLine(e, "Problem loading lutim history for short " + key);
+					Log.Error().WriteLine(e, "Problem loading Lutim history for short " + key);
 				}
 			}
 		}

src/Greenshot.Addon.Lutim/LutimDestination.cs

@@ -84,14 +84,13 @@ namespace Greenshot.Addon.Lutim  {
 
         /// <inheritdoc />
         public override IBitmapWithNativeSupport DisplayIcon {
-			get {
+			get
-                // TODO: Optimize this by caching
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "Lutim.png"))
             {
+                // TODO: Optimize this by caching
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "Lutim.png");
                 return BitmapHelper.FromStream(bitmapStream);
             }
 		}
-		}
 
         /// <inheritdoc />
         public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
@@ -155,12 +154,10 @@ namespace Greenshot.Addon.Lutim  {
                     }
                     try
                     {
-                        using (var clipboardAccessToken = ClipboardNative.Access())
+                        using var clipboardAccessToken = ClipboardNative.Access();
-                        {
                         clipboardAccessToken.ClearContents();
                         clipboardAccessToken.SetAsUrl(uploadUrl);
                     }
-                    }
                     catch (Exception ex)
                     {
                         Log.Error().WriteLine(ex, "Can't write to clipboard: ");

src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs

@@ -181,12 +181,10 @@ namespace Greenshot.Addon.Lutim.ViewModels
         public void CopyToClipboard()
         {
             // TODO: Build url
-            using (var clipboardAccessToken = ClipboardNative.Access())
+            using var clipboardAccessToken = ClipboardNative.Access();
-            {
             clipboardAccessToken.ClearContents();
             clipboardAccessToken.SetAsUrl(SelectedLutim.LutimInfo.Short);
         }
-        }
 
         /// <summary>
         /// Clear the whole history

src/Greenshot.Addon.Office/Destinations/OneNoteDestination.cs

@@ -49,6 +49,7 @@ namespace Greenshot.Addon.Office.Destinations
         /// <summary>
         /// Constructor used for dependency wiring
         /// </summary>
+        /// <param name="oneNoteExporter">OneNoteExporter</param>
         /// <param name="coreConfiguration">ICoreConfiguration</param>
         /// <param name="greenshotLanguage">IGreenshotLanguage</param>
         /// <param name="exportNotification">ExportNotification</param>
@@ -59,7 +60,7 @@ namespace Greenshot.Addon.Office.Destinations
 	        ExportNotification exportNotification
         ) : base(coreConfiguration, greenshotLanguage)
         {
-            this._oneNoteExporter = oneNoteExporter;
+            _oneNoteExporter = oneNoteExporter;
             _exportNotification = exportNotification;
             _exePath = PluginUtils.GetExePath("ONENOTE.EXE");
 		    if (_exePath != null && !File.Exists(_exePath))
@@ -71,6 +72,7 @@ namespace Greenshot.Addon.Office.Destinations
         /// <summary>
         /// Constructor used for dependency wiring, and being able to specify a page
         /// </summary>
+        /// <param name="oneNoteExporter">OneNoteExporter</param>
         /// <param name="page">OneNotePage</param>
         /// <param name="coreConfiguration">ICoreConfiguration</param>
         /// <param name="greenshotLanguage">IGreenshotLanguage</param>

src/Greenshot.Addon.Office/OfficeAddonModule.cs

@@ -49,11 +49,9 @@ namespace Greenshot.Addon.Office
         private bool HasApplication(string applicationName)
         {
             string registryPath = $@"{applicationName}\CLSID";
-            using (var registryKey = Registry.ClassesRoot.OpenSubKey(registryPath, false))
+            using var registryKey = Registry.ClassesRoot.OpenSubKey(registryPath, false);
-            {
             return registryKey != null && Guid.TryParse(registryKey.GetValue(null) as string, out _);
         }
-        }
         
         /// <summary>
         /// Define the dependencies of this project

src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs

@@ -82,27 +82,22 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <returns>IEnumerable with names of the workbooks</returns>
         public static IEnumerable<string> GetWorkbooks()
         {
-            using (var excelApplication = GetExcelApplication())
+            using var excelApplication = GetExcelApplication();
-            {
             if ((excelApplication == null) || (excelApplication.ComObject == null))
             {
                 yield break;
             }
-                using (var workbooks = DisposableCom.Create(excelApplication.ComObject.Workbooks))
+
-                {
+            using var workbooks = DisposableCom.Create(excelApplication.ComObject.Workbooks);
             for (int i = 1; i <= workbooks.ComObject.Count; i++)
             {
-                        using (var workbook = DisposableCom.Create(workbooks.ComObject[i]))
+                using var workbook = DisposableCom.Create(workbooks.ComObject[i]);
-                        {
                 if (workbook != null)
                 {
                     yield return workbook.ComObject.Name;
                 }
             }
         }
-                }
-            }
-        }
 
         /// <summary>
         ///     Initialize static excel variables like version and currentuser
@@ -129,27 +124,22 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <param name="imageSize"></param>
         public static void InsertIntoExistingWorkbook(string workbookName, string tmpFile, Size imageSize)
         {
-            using (var excelApplication = GetExcelApplication())
+            using var excelApplication = GetExcelApplication();
-            {
             if ((excelApplication == null) || (excelApplication.ComObject == null))
             {
                 return;
             }
-                using (var workbooks = DisposableCom.Create(excelApplication.ComObject.Workbooks))
+
-                {
+            using var workbooks = DisposableCom.Create(excelApplication.ComObject.Workbooks);
             for (int i = 1; i <= workbooks.ComObject.Count; i++)
             {
-                        using (var workbook = DisposableCom.Create((_Workbook)workbooks.ComObject[i]))
+                using var workbook = DisposableCom.Create((_Workbook)workbooks.ComObject[i]);
-                        {
                 if ((workbook != null) && workbook.ComObject.Name.StartsWith(workbookName))
                 {
                     InsertIntoExistingWorkbook(workbook, tmpFile, imageSize);
                 }
             }
         }
-                }
-            }
-        }
 
         /// <summary>
         ///     Insert a file into an already created workbook
@@ -159,21 +149,19 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <param name="imageSize"></param>
         private static void InsertIntoExistingWorkbook(IDisposableCom<_Workbook> workbook, string tmpFile, Size imageSize)
         {
-            using (var workSheet = DisposableCom.Create(workbook.ComObject.ActiveSheet as Worksheet))
+            using var workSheet = DisposableCom.Create(workbook.ComObject.ActiveSheet as Worksheet);
-            {
             if (workSheet == null)
             {
                 return;
             }
-                using (var shapes = DisposableCom.Create(workSheet.ComObject.Shapes))
+
-                {
+            using var shapes = DisposableCom.Create(workSheet.ComObject.Shapes);
             if (shapes == null)
             {
                 return;
             }
 
-                    using (var shape = DisposableCom.Create(shapes.ComObject.AddPicture(tmpFile, MsoTriState.msoFalse, MsoTriState.msoTrue, 0, 0, imageSize.Width, imageSize.Height)))
+            using var shape = DisposableCom.Create(shapes.ComObject.AddPicture(tmpFile, MsoTriState.msoFalse, MsoTriState.msoTrue, 0, 0, imageSize.Width, imageSize.Height));
-                    {
             if (shape == null)
             {
                 return;
@@ -185,15 +173,10 @@ namespace Greenshot.Addon.Office.OfficeExport
             shape.ComObject.ScaleHeight(1, MsoTriState.msoTrue, MsoScaleFrom.msoScaleFromTopLeft);
             shape.ComObject.ScaleWidth(1, MsoTriState.msoTrue, MsoScaleFrom.msoScaleFromTopLeft);
             workbook.ComObject.Activate();
-                        using (var application = DisposableCom.Create(workbook.ComObject.Application))
+            using var application = DisposableCom.Create(workbook.ComObject.Application);
-                        {
             var excelWindow = InteropWindowFactory.CreateFor((IntPtr) application.ComObject.Hwnd);
             excelWindow.ToForegroundAsync();
         }
-                    }
-                }
-            }
-        }
 
         /// <summary>
         ///     Add an image-file to a newly created workbook
@@ -202,23 +185,17 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <param name="imageSize"></param>
         public static void InsertIntoNewWorkbook(string tmpFile, Size imageSize)
         {
-            using (var excelApplication = GetOrCreateExcelApplication())
+            using var excelApplication = GetOrCreateExcelApplication();
-            {
             if (excelApplication == null)
             {
                 return;
             }
 
             excelApplication.ComObject.Visible = true;
-                using (var workbooks = DisposableCom.Create(excelApplication.ComObject.Workbooks))
+            using var workbooks = DisposableCom.Create(excelApplication.ComObject.Workbooks);
-                {
+            using var workbook = DisposableCom.Create((_Workbook)workbooks.ComObject.Add());
-                    using (var workbook = DisposableCom.Create((_Workbook)workbooks.ComObject.Add()))
-                    {
             InsertIntoExistingWorkbook(workbook, tmpFile, imageSize);
         }
     }
-            }
-        }
-    }
 
 }

src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs

@@ -57,8 +57,7 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <returns>bool true if export worked</returns>
         public bool ExportToNewPage(ISurface surfaceToUpload)
         {
-            using (var oneNoteApplication = GetOrCreateOneNoteApplication())
+            using var oneNoteApplication = GetOrCreateOneNoteApplication();
-            {
             var newPage = new OneNotePage();
             string unfiledNotesSectionId = GetSectionId(oneNoteApplication, SpecialLocation.slUnfiledNotesSection);
             if (unfiledNotesSectionId == null)
@@ -73,7 +72,6 @@ namespace Greenshot.Addon.Office.OfficeExport
             newPage.Name = surfaceToUpload.CaptureDetails.Title;
             return ExportToPage(oneNoteApplication, surfaceToUpload, newPage);
         }
-        }
 
         /// <summary>
         ///     Export the capture to the specified page
@@ -83,11 +81,9 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <returns>bool true if everything worked</returns>
         public bool ExportToPage(ISurface surfaceToUpload, OneNotePage page)
         {
-            using (var oneNoteApplication = GetOrCreateOneNoteApplication())
+            using var oneNoteApplication = GetOrCreateOneNoteApplication();
-            {
             return ExportToPage(oneNoteApplication, surfaceToUpload, page);
         }
-        }
 
         /// <summary>
         ///     Export the capture to the specified page
@@ -103,8 +99,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                 return false;
             }
 
-            using (var pngStream = new MemoryStream())
+            using var pngStream = new MemoryStream();
-            {
             var pngOutputSettings = new SurfaceOutputSettings(_coreConfiguration, OutputFormats.png, 100, false);
             ImageOutput.SaveToStream(surfaceToUpload, pngStream, pngOutputSettings);
             var base64String = Convert.ToBase64String(pngStream.GetBuffer());
@@ -122,7 +117,6 @@ namespace Greenshot.Addon.Office.OfficeExport
             }
             return true;
         }
-        }
 
         /// <summary>
         ///     Call this to get the running Excel application, returns null if there isn't any.
@@ -166,8 +160,7 @@ namespace Greenshot.Addon.Office.OfficeExport
             var pages = new List<OneNotePage>();
             try
             {
-                using (var oneNoteApplication = GetOrCreateOneNoteApplication())
+                using var oneNoteApplication = GetOrCreateOneNoteApplication();
-                {
                 if (oneNoteApplication != null)
                 {
                     // ReSharper disable once RedundantAssignment
@@ -180,8 +173,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                         try
                         {
                             reader = new StringReader(notebookXml);
-                                using (var xmlReader = new XmlTextReader(reader))
+                            using var xmlReader = new XmlTextReader(reader);
-                                {
                             reader = null;
                             OneNoteSection currentSection = null;
                             OneNoteNotebook currentNotebook = null;
@@ -192,15 +184,17 @@ namespace Greenshot.Addon.Office.OfficeExport
                                     string id = xmlReader.GetAttribute("ID");
                                     if ((id != null) && ((currentNotebook == null) || !id.Equals(currentNotebook.Id)))
                                     {
-                                                currentNotebook = new OneNoteNotebook();
+                                        currentNotebook = new OneNoteNotebook
-                                                currentNotebook.Id = xmlReader.GetAttribute("ID");
+                                        {
-                                                currentNotebook.Name = xmlReader.GetAttribute("name");
+                                            Id = xmlReader.GetAttribute("ID"),
+                                            Name = xmlReader.GetAttribute("name")
+                                        };
                                     }
                                 }
                                 if ("one:Section".Equals(xmlReader.Name))
                                 {
                                     string id = xmlReader.GetAttribute("ID");
-                                            if ((id != null) && ((currentSection == null) || !id.Equals(currentSection.Id)))
+                                    if (id != null && (currentSection == null || !id.Equals(currentSection.Id)))
                                     {
                                         currentSection = new OneNoteSection
                                         {
@@ -233,7 +227,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                                 }
                             }
                         }
-                            }
                         finally
                         {
                             if (reader != null)
@@ -244,7 +237,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-            }
             catch (COMException cEx)
             {
                 if (cEx.ErrorCode == unchecked((int)0x8002801D))
@@ -294,8 +286,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                 try
                 {
                     reader = new StringReader(notebookXml);
-                    using (var xmlReader = new XmlTextReader(reader))
+                    using var xmlReader = new XmlTextReader(reader);
-                    {
                     while (xmlReader.Read())
                     {
                         if (!"one:Section".Equals(xmlReader.Name))
@@ -310,7 +301,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                         }
                     }
                 }
-                }
                 finally
                 {
                     if (reader != null)

src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs

@@ -86,8 +86,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                 if (_outlookVersion.Major >= (int)OfficeVersions.Office2013)
                 {
                     // Check inline "panel" for Outlook 2013
-                    using (var activeExplorer = DisposableCom.Create((_Explorer)outlookApplication.ComObject.ActiveExplorer()))
+                    using var activeExplorer = DisposableCom.Create((_Explorer)outlookApplication.ComObject.ActiveExplorer());
-                    {
                     // Only if we have one and if the capture is the one we selected
                     if ((activeExplorer != null) && activeExplorer.ComObject.Caption.StartsWith(inspectorCaption))
                     {
@@ -115,10 +114,8 @@ namespace Greenshot.Addon.Office.OfficeExport
                         }
                     }
                 }
-                }
 
-                using (var inspectors = DisposableCom.Create(outlookApplication.ComObject.Inspectors))
+                using var inspectors = DisposableCom.Create(outlookApplication.ComObject.Inspectors);
-                {
                 if ((inspectors == null) || (inspectors.ComObject.Count == 0))
                 {
                     return false;
@@ -126,8 +123,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                 Log.Debug().WriteLine("Got {0} inspectors to check", inspectors.ComObject.Count);
                 for (int i = 1; i <= inspectors.ComObject.Count; i++)
                 {
-                        using (var inspector = DisposableCom.Create((_Inspector)inspectors.ComObject[i]))
+                    using var inspector = DisposableCom.Create((_Inspector)inspectors.ComObject[i]);
-                        {
                     string currentCaption = inspector.ComObject.Caption;
                     if (!currentCaption.StartsWith(inspectorCaption))
                     {
@@ -182,8 +178,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-                }
-            }
             return false;
         }
 
@@ -239,8 +233,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                     {
                         using (wordDocument)
                         {
-                            using (var application = DisposableCom.Create(wordDocument.ComObject.Application))
+                            using var application = DisposableCom.Create(wordDocument.ComObject.Application);
-                            {
                             try
                             {
                                 if (_wordExporter.InsertIntoExistingDocument(application, wordDocument, tmpFile, null, null))
@@ -255,7 +248,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                             }
                         }
                     }
-                    }
                     else if (isAppointment)
                     {
                         Log.Info().WriteLine("Can't export to an appointment if no word editor is used");
@@ -296,8 +288,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                     // The following might cause a security popup... can't ignore it.
                     try
                     {
-                        var document2 = inspector.ComObject.HTMLEditor as IHTMLDocument2;
+                        if (inspector.ComObject.HTMLEditor is IHTMLDocument2 document2)
-                        if (document2 != null)
                         {
                             var selection = document2.selection;
                             if (selection != null)
@@ -332,10 +323,8 @@ namespace Greenshot.Addon.Office.OfficeExport
                 }
 
                 // Create the attachment (if inlined the attachment isn't visible as attachment!)
-                using (var attachments = DisposableCom.Create(mailItem.Attachments))
+                using var attachments = DisposableCom.Create(mailItem.Attachments);
-                {
+                using var attachment = DisposableCom.Create(attachments.ComObject.Add(tmpFile, OlAttachmentType.olByValue, inlinePossible ? 0 : 1, attachmentName));
-                    using (var attachment = DisposableCom.Create(attachments.ComObject.Add(tmpFile, OlAttachmentType.olByValue, inlinePossible ? 0 : 1, attachmentName)))
-                    {
                 if (_outlookVersion.Major >= (int)OfficeVersions.Office2007)
                 {
                     // Add the content id to the attachment, this only works for Outlook >= 2007
@@ -351,8 +340,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-                }
-            }
             catch (Exception ex)
             {
                 string caption = "n.a.";
@@ -401,8 +388,7 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <param name="url"></param>
         private void ExportToNewEmail(IDisposableCom<Application> outlookApplication, EmailFormat format, string tmpFile, string subject, string attachmentName, string to, string cc, string bcc, string url)
         {
-            using (var newItem = DisposableCom.Create((MailItem)outlookApplication.ComObject.CreateItem(OlItemType.olMailItem)))
+            using var newItem = DisposableCom.Create((MailItem)outlookApplication.ComObject.CreateItem(OlItemType.olMailItem));
-            {
             if (newItem == null)
             {
                 return;
@@ -454,19 +440,16 @@ namespace Greenshot.Addon.Office.OfficeExport
                     // Create the attachment (and dispose the COM object after using)
                     using (var attachments = DisposableCom.Create(newMail.Attachments))
                     {
-                            using (var attachment = DisposableCom.Create(attachments.ComObject.Add(tmpFile, OlAttachmentType.olByValue, 0, attachmentName)))
+                        using var attachment = DisposableCom.Create(attachments.ComObject.Add(tmpFile, OlAttachmentType.olByValue, 0, attachmentName));
-                            {
                         // add content ID to the attachment
                         if (_outlookVersion.Major >= (int)OfficeVersions.Office2007)
                         {
                             try
                             {
                                 contentId = Guid.NewGuid().ToString();
-                                        using (var propertyAccessor = DisposableCom.Create(attachment.ComObject.PropertyAccessor))
+                                using var propertyAccessor = DisposableCom.Create(attachment.ComObject.PropertyAccessor);
-                                        {
                                 propertyAccessor.ComObject.SetProperty(AttachmentContentId, contentId);
                             }
-                                    }
                             catch
                             {
                                 Log.Info().WriteLine("Error working with the PropertyAccessor, using filename as contentid");
@@ -474,7 +457,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                             }
                         }
                     }
-                        }
 
                     newMail.BodyFormat = OlBodyFormat.olFormatHTML;
                     string href = "";
@@ -516,8 +498,7 @@ namespace Greenshot.Addon.Office.OfficeExport
             // So not save, otherwise the email is always stored in Draft folder.. (newMail.Save();)
             newMail.Display(false);
 
-                using (var inspector = DisposableCom.Create((_Inspector)newMail.GetInspector))
+            using var inspector = DisposableCom.Create((_Inspector)newMail.GetInspector);
-                {
             if (inspector != null)
             {
                 try
@@ -531,8 +512,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                 }
             }
         }
-            }
-        }
 
         /// <summary>
         ///     Helper method to create an outlook mail item with attachment
@@ -620,16 +599,14 @@ namespace Greenshot.Addon.Office.OfficeExport
                 }
                 string defaultProfile = (string)profilesKey.GetValue(DefaultProfileValue);
                 Log.Debug().WriteLine("defaultProfile={0}", defaultProfile);
-                using (var profileKey = profilesKey.OpenSubKey(defaultProfile + @"\" + AccountKey, false))
+                using var profileKey = profilesKey.OpenSubKey(defaultProfile + @"\" + AccountKey, false);
-                {
                 if (profileKey != null)
                 {
                     string[] numbers = profileKey.GetSubKeyNames();
                     foreach (string number in numbers)
                     {
                         Log.Debug().WriteLine("Found subkey {0}", number);
-                            using (var numberKey = profileKey.OpenSubKey(number, false))
+                        using var numberKey = profileKey.OpenSubKey(number, false);
-                            {
                         if (numberKey != null)
                         {
                             byte[] val = (byte[])numberKey.GetValue(NewSignatureValue);
@@ -646,16 +623,11 @@ namespace Greenshot.Addon.Office.OfficeExport
                                 }
                             }
                             Log.Debug().WriteLine("Found email signature: {0}", signatureName);
-                                    string extension;
+                            var extension = format switch
-                                    switch (format)
                             {
-                                        case EmailFormat.Text:
+                                EmailFormat.Text => ".txt",
-                                            extension = ".txt";
+                                _ => ".htm"
-                                            break;
+                            };
-                                        default:
-                                            extension = ".htm";
-                                            break;
-                                    }
                             string signatureFile = Path.Combine(SignaturePath, signatureName + extension);
                             if (File.Exists(signatureFile))
                             {
@@ -666,8 +638,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-                }
-            }
             return null;
         }
 
@@ -694,11 +664,9 @@ namespace Greenshot.Addon.Office.OfficeExport
                 {
                     using (var mapiNamespace = DisposableCom.Create(outlookApplication.ComObject.GetNamespace("MAPI")))
                     {
-                        using (var currentUser = DisposableCom.Create(mapiNamespace.ComObject.CurrentUser))
+                        using var currentUser = DisposableCom.Create(mapiNamespace.ComObject.CurrentUser);
-                        {
                         _currentUser = currentUser.ComObject.Name;
                     }
-                    }
                     Log.Info().WriteLine("Current user: {0}", _currentUser);
                 }
                 catch (Exception exNs)
@@ -717,8 +685,7 @@ namespace Greenshot.Addon.Office.OfficeExport
             IDictionary<string, OlObjectClass> inspectorCaptions = new SortedDictionary<string, OlObjectClass>();
             try
             {
-                using (var outlookApplication = GetOutlookApplication())
+                using var outlookApplication = GetOutlookApplication();
-                {
                 if (outlookApplication == null)
                 {
                     return inspectorCaptions;
@@ -728,8 +695,7 @@ namespace Greenshot.Addon.Office.OfficeExport
                 if (_outlookVersion.Major >= (int)OfficeVersions.Office2013)
                 {
                     // Check inline "panel" for Outlook 2013
-                        using (var activeExplorer = DisposableCom.Create(outlookApplication.ComObject.ActiveExplorer()))
+                    using var activeExplorer = DisposableCom.Create(outlookApplication.ComObject.ActiveExplorer());
-                        {
                     if (activeExplorer != null)
                     {
                         var untypedInlineResponse = activeExplorer.ComObject.ActiveInlineResponse;
@@ -760,16 +726,13 @@ namespace Greenshot.Addon.Office.OfficeExport
                         }
                     }
                 }
-                    }
 
-                    using (var inspectors = DisposableCom.Create(outlookApplication.ComObject.Inspectors))
+                using var inspectors = DisposableCom.Create(outlookApplication.ComObject.Inspectors);
-                    {
                 if ((inspectors != null) && (inspectors.ComObject.Count > 0))
                 {
                     for (int i = 1; i <= inspectors.ComObject.Count; i++)
                     {
-                                using (var inspector = DisposableCom.Create(inspectors.ComObject[i]))
+                        using var inspector = DisposableCom.Create(inspectors.ComObject[i]);
-                                {
                         string caption = inspector.ComObject.Caption;
                         // Fix double entries in the directory, TODO: store on something uniq
                         if (inspectorCaptions.ContainsKey(caption))
@@ -812,9 +775,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-                    }
-                }
-            }
             catch (Exception ex)
             {
                 Log.Warn().WriteLine(ex, "Problem retrieving word destinations, ignoring: ");

src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs

@@ -81,10 +81,8 @@ namespace Greenshot.Addon.Office.OfficeExport
                             slide = DisposableCom.Create(slides.ComObject.Add(slides.ComObject.Count + 1, _officeConfiguration.PowerpointSlideLayout));
                         }
 
-                        using (var shapes = DisposableCom.Create(slide.ComObject.Shapes))
+                        using var shapes = DisposableCom.Create(slide.ComObject.Shapes);
-                        {
+                        using var shapeForLocation = DisposableCom.Create(shapes.ComObject[2]);
-                            using (var shapeForLocation = DisposableCom.Create(shapes.ComObject[2]))
-                            {
                         // Shapes[2] is the image shape on this layout.
                         shapeForCaption = DisposableCom.Create(shapes.ComObject[1]);
                         if (width > shapeForLocation.ComObject.Width)
@@ -111,20 +109,15 @@ namespace Greenshot.Addon.Office.OfficeExport
                         }
                         shapeForLocation.ComObject.Height = imageSize.Height;
                     }
-                        }
-                    }
                     catch (Exception e)
                     {
                         Log.Error().WriteLine(e, "Powerpoint shape creating failed");
-                        using (var slides = DisposableCom.Create(presentation.ComObject.Slides))
+                        using var slides = DisposableCom.Create(presentation.ComObject.Slides);
-                        {
                         slide = DisposableCom.Create(slides.ComObject.Add(slides.ComObject.Count + 1, PpSlideLayout.ppLayoutBlank));
                     }
-                    }
                     using (var shapes = DisposableCom.Create(slide.ComObject.Shapes))
                     {
-                        using (var shape = DisposableCom.Create(shapes.ComObject.AddPicture(tmpFile, MsoTriState.msoFalse, MsoTriState.msoTrue, 0, 0, width, height)))
+                        using var shape = DisposableCom.Create(shapes.ComObject.AddPicture(tmpFile, MsoTriState.msoFalse, MsoTriState.msoTrue, 0, 0, width, height));
-                        {
                         if (_officeConfiguration.PowerpointLockAspectRatio)
                         {
                             shape.ComObject.LockAspectRatio = MsoTriState.msoTrue;
@@ -147,7 +140,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                         shape.ComObject.Top = top;
                         shape.ComObject.AlternativeText = title;
                     }
-                    }
                     if (shapeForCaption != null)
                     {
                         try
@@ -155,15 +147,11 @@ namespace Greenshot.Addon.Office.OfficeExport
                             using (shapeForCaption)
                             {
                                 // Using try/catch to make sure problems with the text range don't give an exception.
-                                using (var textFrame = DisposableCom.Create(shapeForCaption.ComObject.TextFrame))
+                                using var textFrame = DisposableCom.Create(shapeForCaption.ComObject.TextFrame);
-                                {
+                                using var textRange = DisposableCom.Create(textFrame.ComObject.TextRange);
-                                    using (var textRange = DisposableCom.Create(textFrame.ComObject.TextRange))
-                                    {
                                 textRange.ComObject.Text = title;
                             }
                         }
-                            }
-                        }
                         catch (Exception ex)
                         {
                             Log.Warn().WriteLine(ex, "Problem setting the title to a text-range");
@@ -172,17 +160,11 @@ namespace Greenshot.Addon.Office.OfficeExport
                     // Activate/Goto the slide
                     try
                     {
-                        using (var application = DisposableCom.Create(presentation.ComObject.Application))
+                        using var application = DisposableCom.Create(presentation.ComObject.Application);
-                        {
+                        using var activeWindow = DisposableCom.Create(application.ComObject.ActiveWindow);
-                            using (var activeWindow = DisposableCom.Create(application.ComObject.ActiveWindow))
+                        using var view = DisposableCom.Create(activeWindow.ComObject.View);
-                            {
-                                using (var view = DisposableCom.Create(activeWindow.ComObject.View))
-                                {
                         view.ComObject.GotoSlide(slide.ComObject.SlideNumber);
                     }
-                            }
-                        }
-                    }
                     catch (Exception ex)
                     {
                         Log.Warn().WriteLine(ex, "Problem going to the slide");
@@ -211,13 +193,12 @@ namespace Greenshot.Addon.Office.OfficeExport
                 {
                     return false;
                 }
-                using (var presentations = DisposableCom.Create(powerpointApplication.ComObject.Presentations))
+
-                {
+                using var presentations = DisposableCom.Create(powerpointApplication.ComObject.Presentations);
                 Log.Debug().WriteLine("Open Presentations: {0}", presentations.ComObject.Count);
                 for (int i = 1; i <= presentations.ComObject.Count; i++)
                 {
-                        using (var presentation = DisposableCom.Create(presentations.ComObject[i]))
+                    using var presentation = DisposableCom.Create(presentations.ComObject[i]);
-                        {
                     if (presentation == null)
                     {
                         continue;
@@ -237,8 +218,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-                }
-            }
             return false;
         }
 
@@ -286,20 +265,17 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <returns></returns>
         public IEnumerable<string> GetPowerpointPresentations()
         {
-            using (var powerpointApplication = GetPowerPointApplication())
+            using var powerpointApplication = GetPowerPointApplication();
-            {
             if (powerpointApplication == null)
             {
                 yield break;
             }
 
-                using (var presentations = DisposableCom.Create(powerpointApplication.ComObject.Presentations))
+            using var presentations = DisposableCom.Create(powerpointApplication.ComObject.Presentations);
-                {
             Log.Debug().WriteLine("Open Presentations: {0}", presentations.ComObject.Count);
             for (int i = 1; i <= presentations.ComObject.Count; i++)
             {
-                        using (var presentation = DisposableCom.Create(presentations.ComObject[i]))
+                using var presentation = DisposableCom.Create(presentations.ComObject[i]);
-                        {
                 if (presentation == null)
                 {
                     continue;
@@ -318,9 +294,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                 yield return presentation.ComObject.Name;
             }
         }
-                }
-            }
-        }
 
         /// <summary>
         ///     Initialize static powerpoint variables like version
@@ -355,10 +328,8 @@ namespace Greenshot.Addon.Office.OfficeExport
                 {
                     powerpointApplication.ComObject.Activate();
                     powerpointApplication.ComObject.Visible = MsoTriState.msoTrue;
-                    using (var presentations = DisposableCom.Create(powerpointApplication.ComObject.Presentations))
+                    using var presentations = DisposableCom.Create(powerpointApplication.ComObject.Presentations);
-                    {
+                    using var presentation = DisposableCom.Create(presentations.ComObject.Add());
-                        using (var presentation = DisposableCom.Create(presentations.ComObject.Add()))
-                        {
                     try
                     {
                         AddPictureToPresentation(presentation, tmpFile, imageSize, title);
@@ -370,8 +341,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                 }
             }
-                }
-            }
             return isPictureAdded;
         }
 

src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs

@@ -55,8 +55,7 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <returns></returns>
         private IDisposableCom<InlineShape> AddPictureToSelection(IDisposableCom<Selection> selection, string tmpFile)
         {
-            using (var shapes = DisposableCom.Create(selection.ComObject.InlineShapes))
+            using var shapes = DisposableCom.Create(selection.ComObject.InlineShapes);
-            {
             var shape = DisposableCom.Create(shapes.ComObject.AddPicture(tmpFile, false, true, Type.Missing));
             // Lock aspect ratio
             if (_officeConfiguration.WordLockAspectRatio)
@@ -67,7 +66,6 @@ namespace Greenshot.Addon.Office.OfficeExport
             selection.ComObject.MoveDown(WdUnits.wdLine, 1, Type.Missing);
             return shape;
         }
-        }
 
         /// <summary>
         ///     Call this to get the running Word application, or create a new instance
@@ -113,18 +111,16 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <returns></returns>
         public IEnumerable<string> GetWordDocuments()
         {
-            using (var wordApplication = GetWordApplication())
+            using var wordApplication = GetWordApplication();
-            {
             if (wordApplication == null)
             {
                 yield break;
             }
-                using (var documents = DisposableCom.Create(wordApplication.ComObject.Documents))
+
-                {
+            using var documents = DisposableCom.Create(wordApplication.ComObject.Documents);
             for (int i = 1; i <= documents.ComObject.Count; i++)
             {
-                        using (var document = DisposableCom.Create(documents.ComObject[i]))
+                using var document = DisposableCom.Create(documents.ComObject[i]);
-                        {
                 if (document.ComObject.ReadOnly)
                 {
                     continue;
@@ -136,15 +132,11 @@ namespace Greenshot.Addon.Office.OfficeExport
                         continue;
                     }
                 }
-                            using (var activeWindow = DisposableCom.Create(document.ComObject.ActiveWindow))
+
-                            {
+                using var activeWindow = DisposableCom.Create(document.ComObject.ActiveWindow);
                 yield return activeWindow.ComObject.Caption;
             }
         }
-                    }
-                }
-            }
-        }
 
         /// <summary>
         ///     Initialize static word variables like version
@@ -177,23 +169,18 @@ namespace Greenshot.Addon.Office.OfficeExport
                 {
                     return false;
                 }
-                using (var documents = DisposableCom.Create(wordApplication.ComObject.Documents))
+
-                {
+                using var documents = DisposableCom.Create(wordApplication.ComObject.Documents);
                 for (int i = 1; i <= documents.ComObject.Count; i++)
                 {
-                        using (var wordDocument = DisposableCom.Create((_Document)documents.ComObject[i]))
+                    using var wordDocument = DisposableCom.Create((_Document)documents.ComObject[i]);
-                        {
+                    using var activeWindow = DisposableCom.Create(wordDocument.ComObject.ActiveWindow);
-                            using (var activeWindow = DisposableCom.Create(wordDocument.ComObject.ActiveWindow))
-                            {
                     if (activeWindow.ComObject.Caption.StartsWith(wordCaption))
                     {
                         return InsertIntoExistingDocument(wordApplication, wordDocument, tmpFile, null, null);
                     }
                 }
             }
-                    }
-                }
-            }
             return false;
         }
 
@@ -219,8 +206,8 @@ namespace Greenshot.Addon.Office.OfficeExport
             {
                 Log.Warn().WriteLine(ex);
             }
-            using (var selection = DisposableCom.Create(wordApplication.ComObject.Selection))
+
-            {
+            using var selection = DisposableCom.Create(wordApplication.ComObject.Selection);
             if (selection == null)
             {
                 Log.Info().WriteLine("No selection to insert {0} into found.", tmpFile);
@@ -238,11 +225,9 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                     try
                     {
-                            using (var hyperlinks = DisposableCom.Create(wordDocument.ComObject.Hyperlinks))
+                        using var hyperlinks = DisposableCom.Create(wordDocument.ComObject.Hyperlinks);
-                            {
                         hyperlinks.ComObject.Add(shape, screentip, Type.Missing, screentip, Type.Missing, Type.Missing);
                     }
-                        }
                     catch (Exception e)
                     {
                         Log.Warn().WriteLine("Couldn't add hyperlink for image: {0}", e.Message);
@@ -251,18 +236,12 @@ namespace Greenshot.Addon.Office.OfficeExport
             }
             try
             {
-                    using (var activeWindow = DisposableCom.Create(wordDocument.ComObject.ActiveWindow))
+                using var activeWindow = DisposableCom.Create(wordDocument.ComObject.ActiveWindow);
-                    {
                 activeWindow.ComObject.Activate();
-                        using (var activePane = DisposableCom.Create(activeWindow.ComObject.ActivePane))
+                using var activePane = DisposableCom.Create(activeWindow.ComObject.ActivePane);
-                        {
+                using var view = DisposableCom.Create(activePane.ComObject.View);
-                            using (var view = DisposableCom.Create(activePane.ComObject.View))
-                            {
                 view.ComObject.Zoom.Percentage = 100;
             }
-                        }
-                    }
-                }
             catch (Exception e)
             {
                 if (e.InnerException != null)
@@ -294,7 +273,6 @@ namespace Greenshot.Addon.Office.OfficeExport
             }
             return true;
         }
-        }
 
         /// <summary>
         /// Insert a capture into a new document
@@ -304,8 +282,7 @@ namespace Greenshot.Addon.Office.OfficeExport
         /// <param name="tooltip">string</param>
         public void InsertIntoNewDocument(string tmpFile, string address, string tooltip)
         {
-            using (var wordApplication = GetOrCreateWordApplication())
+            using var wordApplication = GetOrCreateWordApplication();
-            {
             if (wordApplication == null)
             {
                 return;
@@ -317,15 +294,12 @@ namespace Greenshot.Addon.Office.OfficeExport
             object newTemplate = false;
             object documentType = 0;
             object documentVisible = true;
-                using (var documents = DisposableCom.Create(wordApplication.ComObject.Documents))
+            using var documents = DisposableCom.Create(wordApplication.ComObject.Documents);
-                {
+            using var wordDocument = DisposableCom.Create(documents.ComObject.Add(template, newTemplate, documentType, documentVisible));
-                    using (var wordDocument = DisposableCom.Create(documents.ComObject.Add(template, newTemplate, documentType, documentVisible)))
-                    {
             using (var selection = DisposableCom.Create(wordApplication.ComObject.Selection))
             {
                 // Add Picture
-                            using (var shape = AddPictureToSelection(selection, tmpFile))
+                using var shape = AddPictureToSelection(selection, tmpFile);
-                            {
                 if (!string.IsNullOrEmpty(address))
                 {
                     object screentip = Type.Missing;
@@ -335,21 +309,18 @@ namespace Greenshot.Addon.Office.OfficeExport
                     }
                     try
                     {
-                                        using (var hyperlinks = DisposableCom.Create(wordDocument.ComObject.Hyperlinks))
+                        using var hyperlinks = DisposableCom.Create(wordDocument.ComObject.Hyperlinks);
-                                        {
                         using (DisposableCom.Create(hyperlinks.ComObject.Add(shape, screentip, Type.Missing, screentip, Type.Missing, Type.Missing)))
                         {
                             // Do nothing
                         }
                     }
-                                    }
                     catch (Exception e)
                     {
                         Log.Warn().WriteLine("Couldn't add hyperlink for image: {0}", e.Message);
                     }
                 }
             }
-                        }
             try
             {
                 wordDocument.ComObject.Activate();
@@ -361,10 +332,8 @@ namespace Greenshot.Addon.Office.OfficeExport
             }
             try
             {
-                            using (var activeWindow = DisposableCom.Create(wordDocument.ComObject.ActiveWindow))
+                using var activeWindow = DisposableCom.Create(wordDocument.ComObject.ActiveWindow);
-                            {
                 activeWindow.ComObject.Activate();
-                            }
                 // ReSharper disable once EmptyGeneralCatchClause
             }
             catch (Exception ex)
@@ -372,9 +341,6 @@ namespace Greenshot.Addon.Office.OfficeExport
                 Log.Warn().WriteLine(ex);
             }
         }
-                }
-            }
-        }
 
         /// <summary>
         ///     Check if the used version is higher than Office 2003

src/Greenshot.Addon.OneDrive/OneDriveDestination.cs

@@ -126,12 +126,10 @@ namespace Greenshot.Addon.OneDrive
             get
             {
                 // TODO: Optimize this by caching
-                using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "onedrive.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "onedrive.png");
-                {
                 return BitmapHelper.FromStream(bitmapStream);
             }
         }
-        }
 
         /// <inheritdoc />
         public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface,
@@ -188,12 +186,10 @@ namespace Greenshot.Addon.OneDrive
 
                 if (_oneDriveConfiguration.AfterUploadLinkToClipBoard)
                 {
-                    using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-                    {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(response.AbsoluteUri);
                 }
-                }
 
                 return response;
             }
@@ -227,18 +223,14 @@ namespace Greenshot.Addon.OneDrive
                 localBehaviour.UploadProgress = percent => { Execute.OnUIThread(() => progress.Report((int)(percent * 100))); };
             }
             var oauthHttpBehaviour = OAuth2HttpBehaviourFactory.Create(oAuth2Settings, localBehaviour);
-            using (var imageStream = new MemoryStream())
+            using var imageStream = new MemoryStream();
-            {
             surfaceToUpload.WriteToStream(imageStream, CoreConfiguration, _oneDriveConfiguration);
             imageStream.Position = 0;
-                using (var content = new StreamContent(imageStream))
+            using var content = new StreamContent(imageStream);
-                {
             content.Headers.Add("Content-Type", surfaceToUpload.GenerateMimeType(CoreConfiguration, _oneDriveConfiguration));
             oauthHttpBehaviour.MakeCurrent();
             return await uploadUri.PutAsync<OneDriveUploadResponse>(content, token);
         }
-            }
-        }
 
         private async Task<OneDriveGetLinkResponse> CreateSharableLinkAync(OAuth2Settings oAuth2Settings,
             string imageId, OneDriveLinkType oneDriveLinkType)

src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs

@@ -187,12 +187,10 @@ namespace Greenshot.Addon.Photobucket
 			get
             {
                 // TODO: Optimize this
-			    using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "photobucket-logo.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "photobucket-logo.png");
-			    {
                 return BitmapHelper.FromStream(bitmapStream);
             }
 		}
-		}
 
         /// <inheritdoc />
         public override bool IsDynamic => true;
@@ -295,8 +293,7 @@ namespace Greenshot.Addon.Photobucket
             {
                 surfaceToUpload.WriteToStream(imageStream, CoreConfiguration, _photobucketConfiguration);
                 imageStream.Position = 0;
-                using (var streamContent = new StreamContent(imageStream))
+                using var streamContent = new StreamContent(imageStream);
-                {
                 streamContent.Headers.ContentType = new MediaTypeHeaderValue(surfaceToUpload.GenerateMimeType(CoreConfiguration, _photobucketConfiguration));
                 streamContent.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data")
                 {
@@ -318,7 +315,6 @@ namespace Greenshot.Addon.Photobucket
                     throw;
                 }
             }
-            }
 
             if (responseString == null)
             {

src/Greenshot.Addon.Tfs/TfsClient.cs

@@ -145,12 +145,10 @@ namespace Greenshot.Addon.Tfs
 
             var filename = surface.GenerateFilename(_coreConfiguration, _tfsConfiguration);
             var attachmentUri = apiUri.AppendSegments("wit", "attachments").ExtendQuery("fileName", filename);
-            using (var imageStream = new MemoryStream())
+            using var imageStream = new MemoryStream();
-            {
             surface.WriteToStream(imageStream, _coreConfiguration, _tfsConfiguration);
             imageStream.Position = 0;
-                using (var content = new StreamContent(imageStream))
+            using var content = new StreamContent(imageStream);
-                {
             content.SetContentType("application/octet-stream");
             var createAttachmentresult = await client.PostAsync<HttpResponse<CreateAttachmentResult, string>>(attachmentUri, content).ConfigureAwait(false);
             if (createAttachmentresult.HasError)
@@ -159,8 +157,6 @@ namespace Greenshot.Addon.Tfs
             }
             return createAttachmentresult.Response;
         }
-            }
-        }
 
         /// <summary>
         /// Link the WorkItem and the attachment that was created

src/Greenshot.Addon.Tfs/TfsDestination.cs

@@ -165,12 +165,10 @@ namespace Greenshot.Addon.Tfs
             get
             {
                 // TODO: Optimize this by using a cache
-                using (var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "vsts.png"))
+                using var bitmapStream = _resourceProvider.ResourceAsStream(GetType().Assembly, "vsts.png");
-                {
                 return BitmapHelper.FromStream(bitmapStream);
             }
         }
-        }
 
         /// <inheritdoc />
         public override async Task<ExportInformation> ExportCaptureAsync(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
@@ -224,12 +222,10 @@ namespace Greenshot.Addon.Tfs
 
                 if (_tfsConfiguration.AfterUploadLinkToClipBoard)
                 {
-                    using (var clipboardAccessToken = ClipboardNative.Access())
+                    using var clipboardAccessToken = ClipboardNative.Access();
-                    {
                     clipboardAccessToken.ClearContents();
                     clipboardAccessToken.SetAsUrl(response.AbsoluteUri);
                 }
-                }
 
                 return response;
             }

src/Greenshot.Addons/Animation/AnimatorBase.cs

@@ -67,18 +67,13 @@ namespace Greenshot.Addons.Animation
 		/// </summary>
 		protected double EasingValue
 		{
-			get
+			get =>
+                EasingMode switch
                 {
-				switch (EasingMode)
+                    EasingModes.EaseOut => Easing.EaseOut(CurrentFrameNr / (double) Frames, EasingType),
-				{
+                    EasingModes.EaseInOut => Easing.EaseInOut(CurrentFrameNr / (double) Frames, EasingType),
-					case EasingModes.EaseOut:
+                    _ => Easing.EaseIn(CurrentFrameNr / (double) Frames, EasingType)
-						return Easing.EaseOut(CurrentFrameNr / (double) Frames, EasingType);
+                };
-					case EasingModes.EaseInOut:
-						return Easing.EaseInOut(CurrentFrameNr / (double) Frames, EasingType);
-					default:
-						return Easing.EaseIn(CurrentFrameNr / (double) Frames, EasingType);
-				}
-			}
         }
 
 		/// <summary>

src/Greenshot.Addons/Animation/Easing.cs

@@ -47,27 +47,18 @@ namespace Greenshot.Addons.Animation
         /// <param name="linearStep">double</param>
         /// <param name="type">EasingTypes</param>
         /// <returns>double</returns>
-		public static double EaseIn(double linearStep, EasingTypes type)
+		public static double EaseIn(double linearStep, EasingTypes type) =>
+            type switch
             {
-			switch (type)
+                EasingTypes.Step => (linearStep < 0.5 ? 0 : 1),
-			{
+                EasingTypes.Linear => linearStep,
-				case EasingTypes.Step:
+                EasingTypes.Sine => EaseSine.EaseIn(linearStep),
-					return linearStep < 0.5 ? 0 : 1;
+                EasingTypes.Quadratic => EasePower.EaseIn(linearStep, 2),
-				case EasingTypes.Linear:
+                EasingTypes.Cubic => EasePower.EaseIn(linearStep, 3),
-					return linearStep;
+                EasingTypes.Quartic => EasePower.EaseIn(linearStep, 4),
-				case EasingTypes.Sine:
+                EasingTypes.Quintic => EasePower.EaseIn(linearStep, 5),
-					return EaseSine.EaseIn(linearStep);
+                _ => throw new NotImplementedException()
-				case EasingTypes.Quadratic:
+            };
-					return EasePower.EaseIn(linearStep, 2);
-				case EasingTypes.Cubic:
-					return EasePower.EaseIn(linearStep, 3);
-				case EasingTypes.Quartic:
-					return EasePower.EaseIn(linearStep, 4);
-				case EasingTypes.Quintic:
-					return EasePower.EaseIn(linearStep, 5);
-			}
-			throw new NotImplementedException();
-		}
 
         /// <summary>
         /// Apply ease in-out
@@ -87,27 +78,18 @@ namespace Greenshot.Addons.Animation
         /// <param name="linearStep">double</param>
         /// <param name="type">EasingTypes</param>
         /// <returns>double</returns>
-		public static double EaseInOut(double linearStep, EasingTypes type)
+		public static double EaseInOut(double linearStep, EasingTypes type) =>
+            type switch
             {
-			switch (type)
+                EasingTypes.Step => (linearStep < 0.5 ? 0 : 1),
-			{
+                EasingTypes.Linear => linearStep,
-				case EasingTypes.Step:
+                EasingTypes.Sine => EaseSine.EaseInOut(linearStep),
-					return linearStep < 0.5 ? 0 : 1;
+                EasingTypes.Quadratic => EasePower.EaseInOut(linearStep, 2),
-				case EasingTypes.Linear:
+                EasingTypes.Cubic => EasePower.EaseInOut(linearStep, 3),
-					return linearStep;
+                EasingTypes.Quartic => EasePower.EaseInOut(linearStep, 4),
-				case EasingTypes.Sine:
+                EasingTypes.Quintic => EasePower.EaseInOut(linearStep, 5),
-					return EaseSine.EaseInOut(linearStep);
+                _ => throw new NotImplementedException()
-				case EasingTypes.Quadratic:
+            };
-					return EasePower.EaseInOut(linearStep, 2);
-				case EasingTypes.Cubic:
-					return EasePower.EaseInOut(linearStep, 3);
-				case EasingTypes.Quartic:
-					return EasePower.EaseInOut(linearStep, 4);
-				case EasingTypes.Quintic:
-					return EasePower.EaseInOut(linearStep, 5);
-			}
-			throw new NotImplementedException();
-		}
 
         /// <summary>
 	    /// Apply easy out 
@@ -115,26 +97,17 @@ namespace Greenshot.Addons.Animation
 	    /// <param name="linearStep">double</param>
 	    /// <param name="type">EasingTypes</param>
 	    /// <returns>double</returns>
-        public static double EaseOut(double linearStep, EasingTypes type)
+        public static double EaseOut(double linearStep, EasingTypes type) =>
+            type switch
             {
-			switch (type)
+                EasingTypes.Step => (linearStep < 0.5 ? 0 : 1),
-			{
+                EasingTypes.Linear => linearStep,
-				case EasingTypes.Step:
+                EasingTypes.Sine => EaseSine.EaseOut(linearStep),
-					return linearStep < 0.5 ? 0 : 1;
+                EasingTypes.Quadratic => EasePower.EaseOut(linearStep, 2),
-				case EasingTypes.Linear:
+                EasingTypes.Cubic => EasePower.EaseOut(linearStep, 3),
-					return linearStep;
+                EasingTypes.Quartic => EasePower.EaseOut(linearStep, 4),
-				case EasingTypes.Sine:
+                EasingTypes.Quintic => EasePower.EaseOut(linearStep, 5),
-					return EaseSine.EaseOut(linearStep);
+                _ => throw new NotImplementedException()
-				case EasingTypes.Quadratic:
+            };
-					return EasePower.EaseOut(linearStep, 2);
-				case EasingTypes.Cubic:
-					return EasePower.EaseOut(linearStep, 3);
-				case EasingTypes.Quartic:
-					return EasePower.EaseOut(linearStep, 4);
-				case EasingTypes.Quintic:
-					return EasePower.EaseOut(linearStep, 5);
-			}
-			throw new NotImplementedException();
-		}
     }
 }

src/Greenshot.Addons/Controls/AnimatingForm.cs

@@ -83,11 +83,9 @@ namespace Greenshot.Addons.Controls
 				if (_vRefresh == 0)
                 {
                     // get te hDC of the desktop to get the VREFRESH
-					using (var desktopHandle = SafeWindowDcHandle.FromDesktop())
+                    using var desktopHandle = SafeWindowDcHandle.FromDesktop();
-					{
                     _vRefresh = Gdi32Api.GetDeviceCaps(desktopHandle, DeviceCaps.VREFRESH);
                 }
-				}
 				// A vertical refresh rate value of 0 or 1 represents the display hardware's default refresh rate.
 				// As there is currently no know way to get the default, we guess it.
 				if (_vRefresh <= 1)

src/Greenshot.Addons/Controls/MovableShowColorForm.cs

@@ -102,8 +102,7 @@ namespace Greenshot.Addons.Controls
 		/// <returns>Color at the specified screenCoordinates</returns>
 		private static Color GetPixelColor(Point screenCoordinates)
         {
-			using (var screenDc = SafeWindowDcHandle.FromDesktop())
+            using var screenDc = SafeWindowDcHandle.FromDesktop();
-			{
             try
             {
                 var pixel = Gdi32Api.GetPixel(screenDc, screenCoordinates.X, screenCoordinates.Y);
@@ -117,4 +116,3 @@ namespace Greenshot.Addons.Controls
         }
 	}
 }
-}

src/Greenshot.Addons/Core/BitmapScreenCapture.cs

@@ -132,6 +132,7 @@ namespace Greenshot.Addons.Core
             _safeDibSectionHandle.Dispose();
             _safeCompatibleDcHandle.Dispose();
             _desktopDcHandle.Dispose();
+            _bitmap.Dispose();
         }
  
     }

src/Greenshot.Addons/Core/ClipboardHelper.cs

@@ -122,9 +122,8 @@ EndSelection:<<<<<<<4
 					try
 					{
 					    User32Api.GetWindowThreadProcessId(hWnd, out var pid);
-						using (var me = Process.GetCurrentProcess())
+                        using var me = Process.GetCurrentProcess();
-						using (var ownerProcess = Process.GetProcessById(pid))
+                        using var ownerProcess = Process.GetProcessById(pid);
-						{
                         // Exclude myself
                         if (me.Id != ownerProcess.Id)
                         {
@@ -141,7 +140,6 @@ EndSelection:<<<<<<<4
                             }
                         }
                     }
-					}
 					catch (Exception e)
 					{
 						Log.Warn().WriteLine(e, "Non critical error: Couldn't get clipboard process, trying to use the title.");
@@ -483,8 +481,7 @@ EndSelection:<<<<<<<4
 								var fileHeader = BitmapFileHeader.Create(infoHeader);
 								var fileHeaderBytes = BinaryStructHelper.ToByteArray(fileHeader);
 
-								using (var bitmapStream = new MemoryStream())
+                                using var bitmapStream = new MemoryStream();
-								{
                                 bitmapStream.Write(fileHeaderBytes, 0, fileHeaderSize);
                                 bitmapStream.Write(dibBuffer, 0, dibBuffer.Length);
                                 bitmapStream.Seek(0, SeekOrigin.Begin);
@@ -494,7 +491,6 @@ EndSelection:<<<<<<<4
                                     return image;
                                 }
                             }
-							}
 							else
 							{
 								Log.Info().WriteLine("Using special DIBV5 / Format17 format reader");

src/Greenshot.Addons/Core/Credentials/CredentialsDialog.cs

@@ -327,7 +327,8 @@ namespace Greenshot.Addons.Core.Credentials
 			info.pszMessageText = Message;
 			if (Banner != null)
             {
-				info.hbmBanner = new Bitmap(Banner, ValidBannerWidth, ValidBannerHeight).GetHbitmap();
+                using var bitmap = new Bitmap(Banner, ValidBannerWidth, ValidBannerHeight);
+                info.hbmBanner = bitmap.GetHbitmap();
 			}
 			info.cbSize = Marshal.SizeOf(info);
 			return info;
@@ -380,34 +381,19 @@ namespace Greenshot.Addons.Core.Credentials
 
 		/// <summary>Returns a DialogResult from the specified code.</summary>
 		/// <param name="code">The credential return code.</param>
-		private DialogResult GetDialogResult(CredUiReturnCodes code)
+		private DialogResult GetDialogResult(CredUiReturnCodes code) =>
+            code switch
             {
-			DialogResult result;
+                CredUiReturnCodes.NoError => DialogResult.OK,
-			switch (code)
+                CredUiReturnCodes.ErrorCancelled => DialogResult.Cancel,
-			{
+                CredUiReturnCodes.ErrorNoSuchLogonSession => throw new ApplicationException("No such logon session."),
-				case CredUiReturnCodes.NoError:
+                CredUiReturnCodes.ErrorNotFound => throw new ApplicationException("Not found."),
-					result = DialogResult.OK;
+                CredUiReturnCodes.ErrorInvalidAccountName => throw new ApplicationException("Invalid account name."),
-					break;
+                CredUiReturnCodes.ErrorInsufficientBuffer => throw new ApplicationException("Insufficient buffer."),
-				case CredUiReturnCodes.ErrorCancelled:
+                CredUiReturnCodes.ErrorInvalidParameter => throw new ApplicationException("Invalid parameter."),
-					result = DialogResult.Cancel;
+                CredUiReturnCodes.ErrorInvalidFlags => throw new ApplicationException("Invalid flags."),
-					break;
+                _ => throw new ApplicationException("Unknown credential result encountered.")
-				case CredUiReturnCodes.ErrorNoSuchLogonSession:
+            };
-					throw new ApplicationException("No such logon session.");
-				case CredUiReturnCodes.ErrorNotFound:
-					throw new ApplicationException("Not found.");
-				case CredUiReturnCodes.ErrorInvalidAccountName:
-					throw new ApplicationException("Invalid account name.");
-				case CredUiReturnCodes.ErrorInsufficientBuffer:
-					throw new ApplicationException("Insufficient buffer.");
-				case CredUiReturnCodes.ErrorInvalidParameter:
-					throw new ApplicationException("Invalid parameter.");
-				case CredUiReturnCodes.ErrorInvalidFlags:
-					throw new ApplicationException("Invalid flags.");
-				default:
-					throw new ApplicationException("Unknown credential result encountered.");
-			}
-			return result;
-		}
 
         /// <summary>
 	    ///     http://www.pinvoke.net/default.aspx/credui.CredUIPromptForCredentialsW

src/Greenshot.Addons/Core/EmailConfigHelper.cs

@@ -57,11 +57,9 @@ namespace Greenshot.Addons.Core
         /// <returns>bool</returns>
         public static bool HasMapi()
         {
-			using (var key = Registry.LocalMachine.OpenSubKey(MapiLocationKey, false))
+            using var key = Registry.LocalMachine.OpenSubKey(MapiLocationKey, false);
-			{
             return key != null && "1".Equals(key.GetValue(MapiKey, "0"));
         }
-		}
 
         /// <summary>
         /// Get the path of Outlook from the registry

src/Greenshot.Addons/Core/ExplorerHelper.cs

@@ -67,13 +67,11 @@ namespace Greenshot.Addons.Core
                         UseShellExecute = true
                     };
 					// Start the explorer process and select the file
-					using (var explorer = Process.Start(processStartInfo))
+                    using var explorer = Process.Start(processStartInfo);
-					{
                     explorer?.WaitForInputIdle(500);
                     return true;
                 }
 			}
-			}
 			catch (Exception ex)
 			{
 				// Make sure we show what we tried to open in the exception

src/Greenshot.Addons/Core/ImageOutput.cs

@@ -96,7 +96,7 @@ namespace Greenshot.Addons.Core
 				// Set the text
 				var byteString = Encoding.ASCII.GetBytes(text + " ");
 				// Set Zero byte for String end.
-				byteString[byteString.Length - 1] = 0;
+				byteString[^1] = 0;
 				propertyItem.Value = byteString;
 				propertyItem.Len = text.Length + 1;
 			}
@@ -128,7 +128,7 @@ namespace Greenshot.Addons.Core
 						if (CoreConfiguration.OutputFilePromptQuality)
 						{
                             // TODO: Use factory
-							var qualityDialog = new QualityDialog(outputSettings, CoreConfiguration, GreenshotLanguage);
+							using var qualityDialog = new QualityDialog(outputSettings, CoreConfiguration, GreenshotLanguage);
 							qualityDialog.ShowDialog();
 						}
 						// TODO: For now we always overwrite, should be changed
@@ -310,24 +310,18 @@ namespace Greenshot.Addons.Core
 				var imageStream = new MemoryStream();
 				if (bitmap.Width == size && bitmap.Height == size)
                 {
-					using (var clonedImage = bitmap.CloneBitmap(PixelFormat.Format32bppArgb))
+                    using var clonedImage = bitmap.CloneBitmap(PixelFormat.Format32bppArgb);
-					{
                     clonedImage.NativeBitmap.Save(imageStream, ImageFormat.Png);
                     imageSizes.Add(new Size(size, size));
                 }
-				}
 				else
                 {
                     // Resize to the specified size, first make sure the image is 32bpp
-					using (var clonedImage = bitmap.CloneBitmap(PixelFormat.Format32bppArgb))
+                    using var clonedImage = bitmap.CloneBitmap(PixelFormat.Format32bppArgb);
-					{
+                    using var resizedImage = clonedImage.Resize(true, true, Color.Empty, size, size, null);
-						using (var resizedImage = clonedImage.Resize(true, true, Color.Empty, size, size, null))
-						{
                     resizedImage.NativeBitmap.Save(imageStream, ImageFormat.Png);
                     imageSizes.Add(resizedImage.Size);
                 }
-					}
-				}
 
 				imageStream.Seek(0, SeekOrigin.Begin);
 				encodedImages.Add(imageStream);
@@ -395,13 +389,11 @@ namespace Greenshot.Addons.Core
 	            Log.Info().WriteLine("Greenshot file format: {0}", greenshotMarker);
 	            const int filesizeLocation = 8 + markerSize;
 	            surfaceFileStream.Seek(-filesizeLocation, SeekOrigin.End);
-	            using (var reader = new BinaryReader(surfaceFileStream))
+                using var reader = new BinaryReader(surfaceFileStream);
-	            {
                 var bytesWritten = reader.ReadInt64();
                 surfaceFileStream.Seek(-(bytesWritten + filesizeLocation), SeekOrigin.End);
                 returnSurface.LoadElementsFromStream(surfaceFileStream);
             }
-	        }
 	        if (fileImage == null)
 	        {
 	            return returnSurface;
@@ -567,11 +559,9 @@ namespace Greenshot.Addons.Core
 				// Output the surface elements, size and marker to the stream
 				if (outputSettings.Format == OutputFormats.greenshot)
                 {
-					using (var tmpStream = new MemoryStream())
+                    using var tmpStream = new MemoryStream();
-					{
                     var bytesWritten = surface.SaveElementsToStream(tmpStream);
-						using (var writer = new BinaryWriter(tmpStream))
+                    using var writer = new BinaryWriter(tmpStream);
-						{
                     writer.Write(bytesWritten);
                     var v = Assembly.GetExecutingAssembly().GetName().Version;
                     var marker = Encoding.ASCII.GetBytes($"Greenshot{v.Major:00}.{v.Minor:00}");
@@ -579,8 +569,6 @@ namespace Greenshot.Addons.Core
                     tmpStream.WriteTo(stream);
                 }
 			}
-				}
-			}
 			finally
 			{
 				memoryStream?.Dispose();
@@ -630,8 +618,7 @@ namespace Greenshot.Addons.Core
 					RedirectStandardError = true,
 					UseShellExecute = true
 				};
-				using (var process = Process.Start(processStartInfo))
+                using var process = Process.Start(processStartInfo);
-				{
                 if (process != null)
                 {
                     process.WaitForExit();
@@ -651,7 +638,6 @@ namespace Greenshot.Addons.Core
                     Log.Error().WriteLine("Error: {0}", process.StandardError.ReadToEnd());
                 }
             }
-			}
 			catch (Exception e)
 			{
 				Log.Error().WriteLine(e, "Error while processing PNG image: ");
@@ -722,8 +708,7 @@ namespace Greenshot.Addons.Core
 			var isAlpha = Image.IsAlphaPixelFormat(bitmapToSave.PixelFormat);
 			if (outputSettings.ReduceColors || !isAlpha && CoreConfiguration.OutputFileAutoReduceColors)
             {
-				using (var quantizer = new WuQuantizer(bitmapToSave))
+                using var quantizer = new WuQuantizer(bitmapToSave);
-				{
                 var colorCount = quantizer.GetColorCount();
                 Log.Info().WriteLine("Image with format {0} has {1} colors", bitmapToSave.PixelFormat, colorCount);
                 if (!outputSettings.ReduceColors && colorCount >= 256)
@@ -747,7 +732,6 @@ namespace Greenshot.Addons.Core
                     Log.Warn().WriteLine(e, "Error occurred while Quantizing the image, ignoring and using original. Error: ");
                 }
             }
-			}
 			else if (isAlpha && !outputSettings.ReduceColors)
 			{
 				Log.Info().WriteLine("Skipping 'optional' color reduction as the image has alpha");
@@ -838,14 +822,12 @@ namespace Greenshot.Addons.Core
             // TODO: This should not be done here, remove this!!
 			if (copyPathToClipboard)
             {
-			    using (var clipboardAccessToken = ClipboardNative.Access())
+                using var clipboardAccessToken = ClipboardNative.Access();
-			    {
                 clipboardAccessToken.ClearContents();
                 // TODO: File??
                 clipboardAccessToken.SetAsUnicodeString(fullPath);
             }
 		}
-		}
 
 		/// <summary>
 		///     Get the OutputFormats for a filename

src/Greenshot.Addons/Core/InteropWindowCaptureExtensions.cs

@@ -187,8 +187,7 @@ namespace Greenshot.Addons.Core
                 {
                     // Assume using it's own location
                     formLocation = windowRectangle.Location;
-                    using (var workingArea = new Region(Screen.PrimaryScreen.Bounds))
+                    using var workingArea = new Region(Screen.PrimaryScreen.Bounds);
-                    {
                     // Find the screen where the window is and check if it fits
                     foreach (var screen in Screen.AllScreens)
                     {
@@ -218,7 +217,6 @@ namespace Greenshot.Addons.Core
                         doesCaptureFit = true;
                     }
                 }
-                }
                 else if (!WindowsVersion.IsWindows8OrLater)
                 {
                     //GetClientRect(out windowRectangle);
@@ -251,8 +249,7 @@ namespace Greenshot.Addons.Core
                         if (!doesCaptureFit)
                         {
                             // if GDI is allowed.. (a screenshot won't be better than we comes if we continue)
-                            using (var thisWindowProcess = Process.GetProcessById(interopWindow.GetProcessId()))
+                            using var thisWindowProcess = Process.GetProcessById(interopWindow.GetProcessId());
-                            {
                             if (!interopWindow.IsApp() && WindowCapture.IsGdiAllowed(thisWindowProcess))
                             {
                                 // we return null which causes the capturing code to try another method.
@@ -261,7 +258,6 @@ namespace Greenshot.Addons.Core
                         }
                     }
                 }
-                }
                 // Prepare the displaying of the Thumbnail
                 var props = new DwmThumbnailProperties
                 {
@@ -289,8 +285,7 @@ namespace Greenshot.Addons.Core
 
                     try
                     {
-                        using (var whiteBitmap = WindowCapture.CaptureRectangle(captureRectangle))
+                        using var whiteBitmap = WindowCapture.CaptureRectangle(captureRectangle);
-                        {
                         // Apply a white color
                         tempForm.BackColor = Color.Black;
                         // Make sure everything is visible
@@ -303,12 +298,9 @@ namespace Greenshot.Addons.Core
                         }
                         // Make sure all changes are processed and visible
                         Application.DoEvents();
-                            using (var blackBitmap = WindowCapture.CaptureRectangle(captureRectangle))
+                        using var blackBitmap = WindowCapture.CaptureRectangle(captureRectangle);
-                            {
                         capturedBitmap = ApplyTransparency(blackBitmap, whiteBitmap);
                     }
-                        }
-                    }
                     catch (Exception e)
                     {
                         Log.Warn().WriteLine(e, "Exception: ");
@@ -400,8 +392,7 @@ namespace Greenshot.Addons.Core
         /// <param name="image">The bitmap to remove the corners from.</param>
         private static void RemoveCorners(IBitmapWithNativeSupport image)
         {
-            using (var fastBitmap = FastBitmapFactory.Create(image))
+            using var fastBitmap = FastBitmapFactory.Create(image);
-            {
             for (var y = 0; y < CoreConfiguration.WindowCornerCutShape.Count; y++)
             {
                 for (var x = 0; x < CoreConfiguration.WindowCornerCutShape[y]; x++)
@@ -413,7 +404,6 @@ namespace Greenshot.Addons.Core
                 }
             }
         }
-        }
 
         /// <summary>
         ///     Apply transparency by comparing a transparent capture with a black and white background
@@ -425,13 +415,11 @@ namespace Greenshot.Addons.Core
         /// <returns>Bitmap with transparency</returns>
         private static IBitmapWithNativeSupport ApplyTransparency(IBitmapWithNativeSupport blackBitmap, IBitmapWithNativeSupport whiteBitmap)
         {
-            using (var targetBuffer = FastBitmapFactory.CreateEmpty(blackBitmap.Size, PixelFormat.Format32bppArgb, Color.Transparent))
+            using var targetBuffer = FastBitmapFactory.CreateEmpty(blackBitmap.Size, PixelFormat.Format32bppArgb, Color.Transparent);
-            {
             targetBuffer.SetResolution(blackBitmap.HorizontalResolution, blackBitmap.VerticalResolution);
             using (var blackBuffer = FastBitmapFactory.Create(blackBitmap))
             {
-                    using (var whiteBuffer = FastBitmapFactory.Create(whiteBitmap))
+                using var whiteBuffer = FastBitmapFactory.Create(whiteBitmap);
-                    {
                 for (var y = 0; y < blackBuffer.Height; y++)
                 {
                     for (var x = 0; x < blackBuffer.Width; x++)
@@ -466,9 +454,7 @@ namespace Greenshot.Addons.Core
                     }
                 }
             }
-                }
             return targetBuffer.UnlockAndReturnBitmap();
         }
     }
 }
-}

src/Greenshot.Addons/Core/ObjectExtensions.cs

@@ -52,13 +52,11 @@ namespace Greenshot.Addons.Core
 			}
 
 			IFormatter formatter = new BinaryFormatter();
-			using (var stream = new MemoryStream())
+            using var stream = new MemoryStream();
-			{
             formatter.Serialize(stream, source);
             stream.Seek(0, SeekOrigin.Begin);
             return (T) formatter.Deserialize(stream);
         }
-		}
 
 		/// <summary>
 		///     Clone the content from source to destination

src/Greenshot.Addons/Core/WindowCapture.cs

@@ -116,12 +116,10 @@ namespace Greenshot.Addons.Core
                     // Set the location
                     capture.CursorLocation = new NativePoint(x, y);
 
-                    using (var icon = Icon.FromHandle(safeIcon.DangerousGetHandle()))
+                    using var icon = Icon.FromHandle(safeIcon.DangerousGetHandle());
-                    {
                     capture.Cursor = icon;
                 }
             }
-            }
             return capture;
         }
 
@@ -305,8 +303,7 @@ namespace Greenshot.Addons.Core
                 }
 
                 // create a device context we can copy to
-                using (var safeCompatibleDcHandle = Gdi32Api.CreateCompatibleDC(desktopDcHandle))
+                using var safeCompatibleDcHandle = Gdi32Api.CreateCompatibleDC(desktopDcHandle);
-                {
                 // Check if the device context is there, if not throw an error with as much info as possible!
                 if (safeCompatibleDcHandle.IsInvalid)
                 {
@@ -324,8 +321,7 @@ namespace Greenshot.Addons.Core
 
                 // create a bitmap we can copy it to, using GetDeviceCaps to get the width/height
                 // the returned (out) IntPtr _ is not used for our purposes. It returns a pointer to the raw bits that make up the bitmap.
-                    using (var safeDibSectionHandle = Gdi32Api.CreateDIBSection(desktopDcHandle, ref bmi, DibColors.PalColors, out _, IntPtr.Zero, 0))
+                using var safeDibSectionHandle = Gdi32Api.CreateDIBSection(desktopDcHandle, ref bmi, DibColors.PalColors, out _, IntPtr.Zero, 0);
-                    {
                 if (safeDibSectionHandle.IsInvalid)
                 {
                     // Get Exception before the error is lost
@@ -371,16 +367,13 @@ namespace Greenshot.Addons.Core
                                 captureRegion.Exclude(screen.Bounds);
                             }
                             // If the region is not empty, we have "offscreenContent"
-                                    using (var screenGraphics = Graphics.FromHwnd(User32Api.GetDesktopWindow()))
+                            using var screenGraphics = Graphics.FromHwnd(User32Api.GetDesktopWindow());
-                                    {
                             offscreenContent = !captureRegion.IsEmpty(screenGraphics);
                         }
-                                }
                         // Check if we need to have a transparent background, needed for offscreen content
                         if (offscreenContent)
                         {
-                                    using (var tmpBitmap = Image.FromHbitmap(safeDibSectionHandle.DangerousGetHandle()))
+                            using var tmpBitmap = Image.FromHbitmap(safeDibSectionHandle.DangerousGetHandle());
-                                    {
                             // Create a new bitmap which has a transparent background
                             var returnBitmap = new UnmanagedBitmap<Bgra32>(tmpBitmap.Width, tmpBitmap.Height, tmpBitmap.HorizontalResolution, tmpBitmap.VerticalResolution);
                             returnBitmap.Span.Fill(Color.Transparent.FromColorWithAlpha());
@@ -399,7 +392,6 @@ namespace Greenshot.Addons.Core
 
                             return returnBitmap;
                         }
-                                }
                         else
                         {
                             // All screens, which are inside the capture, are of equal size
@@ -420,8 +412,6 @@ namespace Greenshot.Addons.Core
                     throw exception;
                 }
             }
-                }
-            }
 
             return null;
         }

src/Greenshot.Addons/Extensions/ClipboardBitmapExtensions.cs

@@ -178,15 +178,13 @@ namespace Greenshot.Addons.Extensions
         /// <param name="outputSettings">SurfaceOutputSettings specifying how to output the surface</param>
         public static void SetAsBitmap(this IClipboardAccessToken clipboardAccessToken, ISurface surface, SurfaceOutputSettings outputSettings)
         {
-            using (var bitmapStream = new MemoryStream())
+            using var bitmapStream = new MemoryStream();
-            {
             ImageOutput.SaveToStream(surface, bitmapStream, outputSettings);
             bitmapStream.Seek(0, SeekOrigin.Begin);
             // Set the stream
             var clipboardFormat = ClipboardFormatExtensions.MapFormatToId(outputSettings.Format.ToString().ToUpperInvariant());
             clipboardAccessToken.SetAsStream(clipboardFormat, bitmapStream);
         }
-        }
 
         /// <summary>
         /// Place the surface as Format17 bitmap on the clipboard
@@ -196,8 +194,7 @@ namespace Greenshot.Addons.Extensions
         public static void SetAsFormat17(this IClipboardAccessToken clipboardAccessToken, ISurface surface, ICoreConfiguration coreConfiguration)
         {
             // Create the stream for the clipboard
-            using (var dibV5Stream = new MemoryStream())
+            using var dibV5Stream = new MemoryStream();
-            {
             var outputSettings = new SurfaceOutputSettings(coreConfiguration, OutputFormats.bmp, 100, false);
             bool dispose = ImageOutput.CreateBitmapFromSurface(surface, outputSettings, out var bitmapToSave);
             // Create the BITMAPINFOHEADER
@@ -230,7 +227,6 @@ namespace Greenshot.Addons.Extensions
                 bitmapToSave.Dispose();
             }
         }
-        }
 
         /// <summary>
         ///     Helper method so get the bitmap bytes
@@ -269,8 +265,7 @@ namespace Greenshot.Addons.Extensions
         /// <param name="surface">ISurface</param>
         public static void SetAsDeviceIndependendBitmap(this IClipboardAccessToken clipboardAccessToken, ISurface surface, ICoreConfiguration coreConfiguration)
         {
-            using (var bitmapStream = new MemoryStream())
+            using var bitmapStream = new MemoryStream();
-            {
             ImageOutput.SaveToStream(surface, bitmapStream, new SurfaceOutputSettings(coreConfiguration) {Format = OutputFormats.bmp});
             bitmapStream.Seek(Marshal.SizeOf(typeof(BitmapFileHeader)), SeekOrigin.Begin);
             // Set the stream
@@ -278,4 +273,3 @@ namespace Greenshot.Addons.Extensions
         }
     }
 }
-}

src/Greenshot.Addons/Extensions/ClipboardHtmlExtensions.cs

@@ -155,8 +155,7 @@ EndSelection:<<<<<<<4
         /// <param name="coreConfiguration">ICoreConfiguration</param>
         public static void SetAsEmbeddedHtml(this IClipboardAccessToken clipboardAccessToken, ISurface surface, ICoreConfiguration coreConfiguration)
         {
-            using (var pngStream = new MemoryStream())
+            using var pngStream = new MemoryStream();
-            {
             var pngOutputSettings = new SurfaceOutputSettings(coreConfiguration, OutputFormats.png, 100, false);
             ImageOutput.SaveToStream(surface, pngStream, pngOutputSettings);
             pngStream.Seek(0, SeekOrigin.Begin);
@@ -164,7 +163,6 @@ EndSelection:<<<<<<<4
             var htmlText = GenerateHtmlDataUrlString(new NativeSize(surface.Width, surface.Height), pngStream);
             clipboardAccessToken.SetAsHtml(htmlText);
         }
-        }
 
         /// <summary>
         /// Place HTML on the clipboard

src/Greenshot.Addons/Greenshot.Addons.csproj

@@ -16,10 +16,10 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.1.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.1.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.1.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.1.3" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.1.4" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.10.7" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.10.7" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.10.7" />
@@ -27,9 +27,9 @@
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.6" />
     <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.6" />
     <PackageReference Include="Dapplo.Windows.Icons" Version="0.11.6" />
-    <PackageReference Include="gong-wpf-dragdrop" Version="2.1.0" />
+    <PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0223" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0" />
-    <PackageReference Include="Svg" Version="3.0.49" />
+    <PackageReference Include="Svg" Version="3.0.84" />
   </ItemGroup>
 
   <ItemGroup>

src/Greenshot.Addons/Resources/GreenshotResources.cs

@@ -48,11 +48,9 @@ namespace Greenshot.Addons.Resources
         /// <returns>BitmapSource</returns>
 	    public BitmapSource GreenshotIconAsBitmapSource()
         {
-            using (var icon = GetGreenshotIcon())
+            using var icon = GetGreenshotIcon();
-            {
             return icon.ToBitmapSource();
         }
-        }
 
         /// <summary>
         /// Get the Greenshot logo as an Icon
@@ -71,11 +69,9 @@ namespace Greenshot.Addons.Resources
         /// <returns>Icon</returns>
 	    public Icon GetIcon(string name, Type type = null)
         {
-	        using (var iconStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources", $"{name}.Icon.ico"))
+            using var iconStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources", $"{name}.Icon.ico");
-	        {
             return new Icon(iconStream);
         }
-	    }
 
         /// <summary>
         /// Get the Greenshot logo as a Bitmap
@@ -99,11 +95,10 @@ namespace Greenshot.Addons.Resources
 	            name += ".png";
 
 	        }
-	        using (var imageStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources",  name))
+
-	        {
+            using var imageStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources",  name);
             return BitmapHelper.FromStream(imageStream);
         }
-	    }
 
         /// <summary>
         /// Get a byte[] from an embedded resource
@@ -113,12 +108,10 @@ namespace Greenshot.Addons.Resources
         /// <returns>bate[]</returns>
 	    public byte[] GetBytes(string name, Type type = null)
         {
-            using (var stream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources", name))
+            using var stream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources", name);
-            using (var memoryStream = new MemoryStream())
+            using var memoryStream = new MemoryStream();
-            {
             stream.CopyTo(memoryStream);
             return memoryStream.ToArray();
         }
     }
 }
-}

src/Greenshot.Addons/ViewModels/ExportNotificationViewModel.cs

@@ -63,11 +63,9 @@ namespace Greenshot.Addons.ViewModels
             Information = exportInformation;
             Source = source;
 
-            using (var bitmap = exportedSurface.GetBitmapForExport())
+            using var bitmap = exportedSurface.GetBitmapForExport();
-            {
             ExportBitmapSource = bitmap.NativeBitmap.ToBitmapSource();
         }
-        }
 
         /// <summary>
         /// The greenshot icon

src/Greenshot.Addons/ViewModels/FileConfigPartViewModel.cs

@@ -112,10 +112,11 @@ namespace Greenshot.Addons.ViewModels
         /// </summary>
         public void SelectOutputPath()
         {
-            using (var folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog())
+            using var folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog
             {
+                SelectedPath = FilenameHelper.FillVariables(CoreConfiguration.OutputFilePath, false)
+            };
             // Get the storage location and replace the environment variables
-                folderBrowserDialog.SelectedPath = FilenameHelper.FillVariables(CoreConfiguration.OutputFilePath, false);
             if (folderBrowserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
                 // Only change if there is a change, otherwise we might overwrite the environment variables
@@ -125,7 +126,6 @@ namespace Greenshot.Addons.ViewModels
                 }
             }
         }
-        }
 
         /// <summary>
         /// Specifies if the global settings can be modified, which is the case when there are is no DestinationFileConfiguration

src/Greenshot.Core/Extensions/InteropWindowCaptureExtensions.cs

@@ -166,8 +166,7 @@ namespace Greenshot.Core.Extensions
                 {
                     // Assume using it's own location
                     formLocation = windowRectangle.Location;
-                    using (var workingArea = new Region())
+                    using var workingArea = new Region();
-                    {
                     // Find the screen where the window is and check if it fits
                     foreach (var displayInfo in DisplayInfo.AllDisplayInfos)
                     {
@@ -196,7 +195,6 @@ namespace Greenshot.Core.Extensions
                         doesCaptureFit = true;
                     }
                 }
-                }
                 else if (!WindowsVersion.IsWindows8OrLater)
                 {
                     //GetClientRect(out windowRectangle);
@@ -229,8 +227,7 @@ namespace Greenshot.Core.Extensions
                         if (!doesCaptureFit)
                         {
                             // if GDI is allowed.. (a screenshot won't be better than we comes if we continue)
-                            using (var thisWindowProcess = Process.GetProcessById(interopWindow.GetProcessId()))
+                            using var thisWindowProcess = Process.GetProcessById(interopWindow.GetProcessId());
-                            {
                             if (!interopWindow.IsApp() && IsGdiAllowed(thisWindowProcess, captureConfiguration))
                             {
                                 // we return null which causes the capturing code to try another method.
@@ -239,7 +236,6 @@ namespace Greenshot.Core.Extensions
                         }
                     }
                 }
-                }
                 // Prepare the displaying of the Thumbnail
                 var props = new DwmThumbnailProperties
                 {

src/Greenshot.Core/Sources/ScreenSource.cs

@@ -95,8 +95,7 @@ namespace Greenshot.Core.Sources
                 }
 
                 // create a device context we can copy to
-                using (var safeCompatibleDcHandle = Gdi32Api.CreateCompatibleDC(desktopDcHandle))
+                using var safeCompatibleDcHandle = Gdi32Api.CreateCompatibleDC(desktopDcHandle);
-                {
                 // Check if the device context is there, if not throw an error with as much info as possible!
                 if (safeCompatibleDcHandle.IsInvalid)
                 {
@@ -112,8 +111,7 @@ namespace Greenshot.Core.Sources
                 Win32.SetLastError(0);
 
                 // create a bitmap we can copy it to, using GetDeviceCaps to get the width/height
-                    using (var safeDibSectionHandle = Gdi32Api.CreateDIBSection(desktopDcHandle, ref bmi, 0, out var _, IntPtr.Zero, 0))
+                using var safeDibSectionHandle = Gdi32Api.CreateDIBSection(desktopDcHandle, ref bmi, 0, out var _, IntPtr.Zero, 0);
-                    {
                 if (safeDibSectionHandle.IsInvalid)
                 {
                     // Get Exception before the error is lost
@@ -157,11 +155,9 @@ namespace Greenshot.Core.Sources
                         captureRegion.Exclude(displayInfo.Bounds);
                     }
                     // If the region is not empty, we have "offscreenContent"
-                            using (var screenGraphics = Graphics.FromHwnd(User32Api.GetDesktopWindow()))
+                    using var screenGraphics = Graphics.FromHwnd(User32Api.GetDesktopWindow());
-                            {
                     offscreenContent = !captureRegion.IsEmpty(screenGraphics);
                 }
-                        }
                 // Check if we need to have a transparent background, needed for offscreen content
                 if (offscreenContent)
                 {
@@ -174,8 +170,6 @@ namespace Greenshot.Core.Sources
                     capturedBitmapSource = modifiedImage;
                 }
             }
-                }
-            }
             var result = new CaptureElement<BitmapSource>(captureBounds.Location, capturedBitmapSource)
             {
                 ElementType = CaptureElementType.Screen

src/Greenshot.Gfx/BitmapFactory.cs

@@ -171,8 +171,7 @@ namespace Greenshot.Gfx
                 // Make sure both images have the same resolution
                 newImage.SetResolution(sourceBitmap.HorizontalResolution, sourceBitmap.VerticalResolution);
 
-                using (var graphics = Graphics.FromImage(newImage))
+                using var graphics = Graphics.FromImage(newImage);
-                {
                 if (fromTransparentToNon)
                 {
                     // Rule 2: Make sure the background color is white
@@ -188,7 +187,6 @@ namespace Greenshot.Gfx
                     graphics.DrawImage(sourceBitmap.NativeBitmap, 0, 0, sourceRect, GraphicsUnit.Pixel);
                 }
             }
-            }
             else
             {
                 // Let GDI+ decide how to convert, need to test what is quicker...

src/Greenshot.Gfx/BitmapHelper.cs

@@ -462,13 +462,11 @@ namespace Greenshot.Gfx
 				graphics.CompositingQuality = CompositingQuality.HighQuality;
 				graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
 				// draw original with a TextureBrush so we have nice anti-aliasing!
-				using (Brush textureBrush = new TextureBrush(sourceBitmap.NativeBitmap, WrapMode.Clamp))
+                using Brush textureBrush = new TextureBrush(sourceBitmap.NativeBitmap, WrapMode.Clamp);
-				{
                 // We need to do a translate-transform otherwise the image is wrapped
                 graphics.TranslateTransform(offset.X, offset.Y);
                 graphics.FillRectangle(textureBrush, 0, 0, sourceBitmap.Width, sourceBitmap.Height);
             }
-			}
 			return returnImage;
 		}
 
@@ -492,13 +490,11 @@ namespace Greenshot.Gfx
 		/// <param name="colorMatrix">ColorMatrix to apply</param>
 		public static void ApplyColorMatrix(this IBitmapWithNativeSupport source, NativeRect sourceRect, IBitmapWithNativeSupport dest, NativeRect destRect, ColorMatrix colorMatrix)
         {
-			using (var imageAttributes = new ImageAttributes())
+            using var imageAttributes = new ImageAttributes();
-			{
             imageAttributes.ClearColorMatrix();
             imageAttributes.SetColorMatrix(colorMatrix);
             source.ApplyImageAttributes(sourceRect, dest, destRect, imageAttributes);
         }
-		}
 
 		/// <summary>
 		///     Apply image attributes to the image
@@ -532,8 +528,8 @@ namespace Greenshot.Gfx
 			{
 				destRect = new NativeRect(0, 0, dest.Width, dest.Height);
 			}
-			using (var graphics = Graphics.FromImage(dest.NativeBitmap))
+
-			{
+            using var graphics = Graphics.FromImage(dest.NativeBitmap);
             // Make sure we draw with the best quality!
             graphics.SmoothingMode = SmoothingMode.HighQuality;
             graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
@@ -543,7 +539,6 @@ namespace Greenshot.Gfx
 
             graphics.DrawImage(source.NativeBitmap, destRect, sourceRect.X, sourceRect.Y, sourceRect.Width, sourceRect.Height, GraphicsUnit.Pixel, imageAttributes);
         }
-		}
 
 		/// <summary>
 		///     Checks if the supplied Bitmap has a PixelFormat we support
@@ -712,12 +707,10 @@ namespace Greenshot.Gfx
 				graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
 				graphics.SmoothingMode = SmoothingMode.HighQuality;
 				graphics.InterpolationMode = interpolationMode;
-				using (var wrapMode = new ImageAttributes())
+                using var wrapMode = new ImageAttributes();
-				{
                 wrapMode.SetWrapMode(WrapMode.TileFlipXY);
                 graphics.DrawImage(sourceImage.NativeBitmap, new NativeRect(destX, destY, destWidth, destHeight), 0, 0, sourceImage.Width, sourceImage.Height, GraphicsUnit.Pixel, wrapMode);
             }
-			}
 			return newBitmap;
 		}
 
@@ -737,8 +730,8 @@ namespace Greenshot.Gfx
 	        {
 	            toCount = toCount & 0xffffff;
 	        }
-	        using (var bb = FastBitmapFactory.Create(sourceImage))
+
-	        {
+            using var bb = FastBitmapFactory.Create(sourceImage);
             Parallel.For(0, bb.Height, () => 0, (y, state, initialColorCount) =>
             {
                 var currentColors = initialColorCount;
@@ -765,7 +758,6 @@ namespace Greenshot.Gfx
                 
             return colors;
         }
-	    }
 
         /// <summary>
         ///     Create an image from a stream, if an extension is supplied more formats are supported.
@@ -834,11 +826,9 @@ namespace Greenshot.Gfx
 			}
 			if (width == original.Width * 4)
             {
-				using (var scale2X = original.Scale2X())
+                using var scale2X = original.Scale2X();
-				{
                 return scale2X.Scale2X();
             }
-			}
 			return original.Resize(true, width, width, interpolationMode: InterpolationMode.NearestNeighbor);
 		}
 
@@ -865,8 +855,8 @@ namespace Greenshot.Gfx
 	        }
 	        bool result = true;
 	        using (var fastBitmap1 = FastBitmapFactory.Create(bitmap1))
-	        using (var fastBitmap2 = FastBitmapFactory.Create(bitmap2))
             {
+                using var fastBitmap2 = FastBitmapFactory.Create(bitmap2);
                 Parallel.For(0, fastBitmap1.Height, (y, state) =>
                 {
                     unsafe
@@ -888,6 +878,7 @@ namespace Greenshot.Gfx
                     }
                 });
             }
+
             return result;
 	    }
 

src/Greenshot.Gfx/BoxBlur.cs

@@ -36,11 +36,9 @@ namespace Greenshot.Gfx
         public static void ApplyBoxBlur(this IBitmapWithNativeSupport destinationBitmap, int range)
         {
             // We only need one fastbitmap as we use it as source and target (the reading is done for one line H/V, writing after "parsing" one line H/V)
-            using (var fastBitmap = FastBitmapFactory.Create(destinationBitmap))
+            using var fastBitmap = FastBitmapFactory.Create(destinationBitmap);
-            {
             fastBitmap.ApplyBoxBlur(range);
         }
-        }
 
         /// <summary>
         ///     Apply BoxBlur to the fastBitmap

src/Greenshot.Gfx/Effects/BorderEffect.cs

@@ -76,22 +76,19 @@ namespace Greenshot.Gfx.Effects
 	            using (var path = new GraphicsPath())
 	            {
 	                path.AddRectangle(new NativeRect(borderSize >> 1, borderSize >> 1, newImage.Width - borderSize, newImage.Height - borderSize));
-	                using (var pen = new Pen(borderColor, borderSize))
+                    using var pen = new Pen(borderColor, borderSize) {
-	                {
+                        LineJoin = LineJoin.Round,
-	                    pen.LineJoin = LineJoin.Round;
+                        StartCap = LineCap.Round,
-	                    pen.StartCap = LineCap.Round;
+                        EndCap = LineCap.Round
-	                    pen.EndCap = LineCap.Round;
+                    };
                     graphics.DrawPath(pen, path);
                 }
-	            }
 	            // draw original with a TextureBrush so we have nice anti-aliasing!
-	            using (Brush textureBrush = new TextureBrush(sourceBitmap.NativeBitmap, WrapMode.Clamp))
+                using Brush textureBrush = new TextureBrush(sourceBitmap.NativeBitmap, WrapMode.Clamp);
-	            {
                 // We need to do a translate-tranform otherwise the image is wrapped
                 graphics.TranslateTransform(offset.X, offset.Y);
                 graphics.FillRectangle(textureBrush, 0, 0, sourceBitmap.Width, sourceBitmap.Height);
             }
-	        }
 	        return newImage;
 	    }
 

src/Greenshot.Gfx/Effects/MonochromeEffect.cs

@@ -51,8 +51,7 @@ namespace Greenshot.Gfx.Effects
 	    /// <returns>b/w bitmap</returns>
 	    public static IBitmapWithNativeSupport CreateMonochrome(IBitmapWithNativeSupport sourceBitmap, byte threshold)
         {
-	        using (var fastBitmap = FastBitmapFactory.CreateCloneOf(sourceBitmap, sourceBitmap.PixelFormat))
+            using var fastBitmap = FastBitmapFactory.CreateCloneOf(sourceBitmap, sourceBitmap.PixelFormat);
-	        {
             Parallel.For(0, fastBitmap.Height, y =>
             {
                 // TODO: use stackalloc / unsafe
@@ -66,7 +65,6 @@ namespace Greenshot.Gfx.Effects
             });
             return fastBitmap.UnlockAndReturnBitmap();
         }
-	    }
 
 
     }

src/Greenshot.Gfx/Effects/TornEdgeEffect.cs

@@ -193,19 +193,15 @@ namespace Greenshot.Gfx.Effects
 	            path.CloseFigure();
 
 	            // Draw the created figure with the original image by using a TextureBrush so we have anti-aliasing
-	            using (var graphics = Graphics.FromImage(returnBitmap.NativeBitmap))
+                using var graphics = Graphics.FromImage(returnBitmap.NativeBitmap);
-	            {
                 graphics.SmoothingMode = SmoothingMode.HighQuality;
                 graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
                 graphics.CompositingQuality = CompositingQuality.HighQuality;
                 graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
-	                using (Brush brush = new TextureBrush(sourceBitmap.NativeBitmap))
+                using Brush brush = new TextureBrush(sourceBitmap.NativeBitmap);
-	                {
                 // Important note: If the target wouldn't be at 0,0 we need to translate-transform!!
                 graphics.FillPath(brush, path);
             }
-	            }
-	        }
 	        return returnBitmap;
 	    }
 

src/Greenshot.Gfx/Extensions/BitmapExtensions.cs

@@ -34,35 +34,25 @@ namespace Greenshot.Gfx.Extensions
         /// </summary>
         /// <param name="bitmap">IBitmapWithNativeSupport</param>
         /// <returns>IBitmapWithNativeSupport</returns>
-        public static IBitmapWithNativeSupport Scale2X(this IBitmapWithNativeSupport bitmap)
+        public static IBitmapWithNativeSupport Scale2X(this IBitmapWithNativeSupport bitmap) =>
+            bitmap switch
             {
-            switch (bitmap)
+                UnmanagedBitmap<Bgra32> unmanagedBitmap => unmanagedBitmap.Scale2X(),
-            {
+                UnmanagedBitmap<Bgr32> unmanagedBitmap => unmanagedBitmap.Scale2X(),
-                case UnmanagedBitmap<Bgra32> unmanagedBitmap:
+                _ => ScaleX.Scale2X(bitmap)
-                    return unmanagedBitmap.Scale2X();
+            };
-                case UnmanagedBitmap<Bgr32> unmanagedBitmap:
-                    return unmanagedBitmap.Scale2X();
-            }
-
-            return ScaleX.Scale2X(bitmap);
-        }
 
         /// <summary>
         /// Scale3x
         /// </summary>
         /// <param name="bitmap">IBitmapWithNativeSupport</param>
         /// <returns>IBitmapWithNativeSupport</returns>
-        public static IBitmapWithNativeSupport Scale3X(this IBitmapWithNativeSupport bitmap)
+        public static IBitmapWithNativeSupport Scale3X(this IBitmapWithNativeSupport bitmap) =>
+            bitmap switch
             {
-            switch (bitmap)
+                UnmanagedBitmap<Bgra32> unmanagedBitmap => unmanagedBitmap.Scale3X(),
-            {
+                UnmanagedBitmap<Bgr32> unmanagedBitmap => unmanagedBitmap.Scale3X(),
-                case UnmanagedBitmap<Bgra32> unmanagedBitmap:
+                _ => ScaleX.Scale3X(bitmap)
-                    return unmanagedBitmap.Scale3X();
+            };
-                case UnmanagedBitmap<Bgr32> unmanagedBitmap:
-                    return unmanagedBitmap.Scale3X();
-            }
-
-            return ScaleX.Scale3X(bitmap);
-        }
     }
 }

src/Greenshot.Gfx/Formats/GenericGdiFormatReader.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -20,8 +19,7 @@ namespace Greenshot.Gfx.Formats
         /// <inheritdoc/>
         public IBitmapWithNativeSupport Read(Stream stream, string extension = null)
         {
-            using (var tmpImage = Image.FromStream(stream, true, true))
+            using var tmpImage = Image.FromStream(stream, true, true);
-            {
             if (!(tmpImage is Bitmap bitmap))
             {
                 return null;
@@ -31,4 +29,3 @@ namespace Greenshot.Gfx.Formats
         }
     }
 }
-}

src/Greenshot.Gfx/Formats/IcoFormatReader.cs

@@ -28,14 +28,12 @@ namespace Greenshot.Gfx.Formats
             // Icon logic, try to get the Vista icon, else the biggest possible
             try
             {
-                using (var tmpBitmap = ExtractVistaIcon(stream))
+                using var tmpBitmap = ExtractVistaIcon(stream);
-                {
                 if (tmpBitmap != null)
                 {
                     return tmpBitmap.CloneBitmap(PixelFormat.Format32bppArgb);
                 }
             }
-            }
             catch (Exception vistaIconException)
             {
                 Log.Warn().WriteLine(vistaIconException, "Can't read icon");
@@ -45,14 +43,10 @@ namespace Greenshot.Gfx.Formats
                 // No vista icon, try normal icon
                 stream.Position = 0;
                 // We create a copy of the bitmap, so everything else can be disposed
-                using (var tmpIcon = new Icon(stream, new Size(1024, 1024)))
+                using var tmpIcon = new Icon(stream, new Size(1024, 1024));
-                {
+                using var tmpImage = tmpIcon.ToBitmap();
-                    using (var tmpImage = tmpIcon.ToBitmap())
-                    {
                 return tmpImage.CloneBitmap(PixelFormat.Format32bppArgb);
             }
-                }
-            }
             catch (Exception iconException)
             {
                 Log.Warn().WriteLine(iconException, "Can't read icon");
@@ -89,12 +83,10 @@ namespace Greenshot.Gfx.Formats
                     }
                     var iImageSize = BitConverter.ToInt32(srcBuf, sizeIconDir + sizeIconDirEntry * iIndex + 8);
                     var iImageOffset = BitConverter.ToInt32(srcBuf, sizeIconDir + sizeIconDirEntry * iIndex + 12);
-                    using (var destStream = new MemoryStream())
+                    using var destStream = new MemoryStream();
-                    {
                     destStream.Write(srcBuf, iImageOffset, iImageSize);
                     destStream.Seek(0, SeekOrigin.Begin);
                     bmpPngExtracted = BitmapWrapper.FromBitmap(new Bitmap(destStream)); // This is PNG! :)
-                    }
                     break;
                 }
             }

src/Greenshot.Gfx/Greenshot.Gfx.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="Dapplo.Log" Version="1.3.26" />
     <PackageReference Include="Dapplo.Windows" Version="0.11.6" />
     <PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.6" />
-    <PackageReference Include="Svg" Version="3.0.49" />
+    <PackageReference Include="Svg" Version="3.0.84" />
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 </Project>

src/Greenshot.Gfx/Quantizer/WuQuantizer.cs

@@ -105,11 +105,9 @@ namespace Greenshot.Gfx.Quantizer
 			}
 
 			// Use a bitmap to store the initial match, which is just as good as an array and saves us 2x the storage
-			using (var sourceFastBitmap = FastBitmapFactory.Create(sourceBitmap))
+            using var sourceFastBitmap = FastBitmapFactory.Create(sourceBitmap);
-			{
             sourceFastBitmap.Lock();
-                using (var destinationFastBitmap = FastBitmapFactory.CreateEmpty(sourceBitmap.Size, PixelFormat.Format8bppIndexed, Color.White) as FastChunkyBitmap)
+            using var destinationFastBitmap = FastBitmapFactory.CreateEmpty(sourceBitmap.Size, PixelFormat.Format8bppIndexed, Color.White) as FastChunkyBitmap;
-				{
             for (var y = 0; y < sourceFastBitmap.Height; y++)
             {
                 for (var x = 0; x < sourceFastBitmap.Width; x++)
@@ -150,8 +148,6 @@ namespace Greenshot.Gfx.Quantizer
             }
             _resultBitmap = destinationFastBitmap.UnlockAndReturnBitmap();
         }
-			}
-		}
 
         /// <inheritdoc/>
 		public void Dispose()
@@ -200,8 +196,7 @@ namespace Greenshot.Gfx.Quantizer
 			using (var bbbDest = FastBitmapFactory.Create(_resultBitmap) as FastChunkyBitmap)
 			{
 				bbbDest.Lock();
-				using (var bbbSrc = FastBitmapFactory.Create(_sourceBitmap))
+                using var bbbSrc = FastBitmapFactory.Create(_sourceBitmap);
-				{
                 bbbSrc.Lock();
                 for (var y = 0; y < bbbSrc.Height; y++)
                 {
@@ -231,7 +226,6 @@ namespace Greenshot.Gfx.Quantizer
                     }
                 }
             }
-			}
 
 			// generates palette
 			var imagePalette = _resultBitmap.NativeBitmap.Palette;
@@ -349,8 +343,7 @@ namespace Greenshot.Gfx.Quantizer
 
 			using (var dest = FastBitmapFactory.Create(_resultBitmap) as FastChunkyBitmap)
             {
-				using (var src = FastBitmapFactory.Create(_sourceBitmap))
+                using var src = FastBitmapFactory.Create(_sourceBitmap);
-				{
                 var lookup = new Dictionary<Color, byte>();
                 for (var y = 0; y < src.Height; y++)
                 {
@@ -412,7 +405,6 @@ namespace Greenshot.Gfx.Quantizer
                     }
                 }
             }
-			}
 
 
 			// generates palette
@@ -524,61 +516,44 @@ namespace Greenshot.Gfx.Quantizer
 		/// <summary>
 		///     Splits the cube in given position, and color direction.
 		/// </summary>
-		private static long Top(WuColorCube cube, int direction, int position, long[,,] moment)
+		private static long Top(WuColorCube cube, int direction, int position, long[,,] moment) =>
+            direction switch
             {
-			switch (direction)
+                Red => (moment[position, cube.GreenMaximum, cube.BlueMaximum] -
-			{
-				case Red:
-					return moment[position, cube.GreenMaximum, cube.BlueMaximum] -
                         moment[position, cube.GreenMaximum, cube.BlueMinimum] -
                         moment[position, cube.GreenMinimum, cube.BlueMaximum] +
-					       moment[position, cube.GreenMinimum, cube.BlueMinimum];
+                        moment[position, cube.GreenMinimum, cube.BlueMinimum]),
-
+                Green => (moment[cube.RedMaximum, position, cube.BlueMaximum] -
-				case Green:
-					return moment[cube.RedMaximum, position, cube.BlueMaximum] -
                           moment[cube.RedMaximum, position, cube.BlueMinimum] -
                           moment[cube.RedMinimum, position, cube.BlueMaximum] +
-					       moment[cube.RedMinimum, position, cube.BlueMinimum];
+                          moment[cube.RedMinimum, position, cube.BlueMinimum]),
-
+                Blue => (moment[cube.RedMaximum, cube.GreenMaximum, position] -
-				case Blue:
-					return moment[cube.RedMaximum, cube.GreenMaximum, position] -
                          moment[cube.RedMaximum, cube.GreenMinimum, position] -
                          moment[cube.RedMinimum, cube.GreenMaximum, position] +
-					       moment[cube.RedMinimum, cube.GreenMinimum, position];
+                         moment[cube.RedMinimum, cube.GreenMinimum, position]),
-
+                _ => 0
-				default:
+            };
-					return 0;
-			}
-		}
 
         /// <summary>
 		///     Splits the cube in a given color direction at its minimum.
 		/// </summary>
-		private static long Bottom(WuColorCube cube, int direction, long[,,] moment)
+		private static long Bottom(WuColorCube cube, int direction, long[,,] moment) =>
+            direction switch
             {
-			switch (direction)
+                Red => (-moment[cube.RedMinimum, cube.GreenMaximum, cube.BlueMaximum] +
-			{
-				case Red:
-					return -moment[cube.RedMinimum, cube.GreenMaximum, cube.BlueMaximum] +
                         moment[cube.RedMinimum, cube.GreenMaximum, cube.BlueMinimum] +
                         moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMaximum] -
-					       moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMinimum];
+                        moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMinimum]),
-
+                Green => (-moment[cube.RedMaximum, cube.GreenMinimum, cube.BlueMaximum] +
-				case Green:
-					return -moment[cube.RedMaximum, cube.GreenMinimum, cube.BlueMaximum] +
                           moment[cube.RedMaximum, cube.GreenMinimum, cube.BlueMinimum] +
                           moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMaximum] -
-					       moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMinimum];
+                          moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMinimum]),
-
+                Blue => (-moment[cube.RedMaximum, cube.GreenMaximum, cube.BlueMinimum] +
-				case Blue:
-					return -moment[cube.RedMaximum, cube.GreenMaximum, cube.BlueMinimum] +
                          moment[cube.RedMaximum, cube.GreenMinimum, cube.BlueMinimum] +
                          moment[cube.RedMinimum, cube.GreenMaximum, cube.BlueMinimum] -
-					       moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMinimum];
+                         moment[cube.RedMinimum, cube.GreenMinimum, cube.BlueMinimum]),
-				default:
+                _ => 0
-					return 0;
+            };
-			}
-		}
 
         /// <summary>
 		///     Calculates statistical variance for a given cube.

src/Greenshot.Gfx/ScaleX.cs

@@ -36,9 +36,8 @@ namespace Greenshot.Gfx
         /// <param name="original">Bitmap to scale 2x</param>
         public static IBitmapWithNativeSupport Scale2X(IBitmapWithNativeSupport original)
         {
-            using (var source = (IFastBitmapWithClip)FastBitmapFactory.Create(original))
+            using var source = (IFastBitmapWithClip)FastBitmapFactory.Create(original);
-            using (var destination = (IFastBitmapWithClip)FastBitmapFactory.CreateEmpty(new Size(original.Width << 1, original.Height << 1), original.PixelFormat))
+            using var destination = (IFastBitmapWithClip)FastBitmapFactory.CreateEmpty(new Size(original.Width << 1, original.Height << 1), original.PixelFormat);
-            {
             // Every pixel from input texture produces 4 output pixels, for more details check out http://scale2x.sourceforge.net/algorithm.html
             Parallel.For(0, source.Height, y =>
             {
@@ -86,7 +85,6 @@ namespace Greenshot.Gfx
             });
             return destination.UnlockAndReturnBitmap();
         }
-        }
 
         /// <summary>
         ///     Use "Scale3x" algorithm to produce bitmap from the original.
@@ -95,9 +93,8 @@ namespace Greenshot.Gfx
         [SuppressMessage("ReSharper", "AccessToDisposedClosure")]
         public static IBitmapWithNativeSupport Scale3X(IBitmapWithNativeSupport original)
         {
-            using (var source = (IFastBitmapWithClip)FastBitmapFactory.Create(original))
+            using var source = (IFastBitmapWithClip)FastBitmapFactory.Create(original);
-            using (var destination = (IFastBitmapWithClip)FastBitmapFactory.CreateEmpty(new Size(original.Width * 3, original.Height * 3), original.PixelFormat))
+            using var destination = (IFastBitmapWithClip)FastBitmapFactory.CreateEmpty(new Size(original.Width * 3, original.Height * 3), original.PixelFormat);
-            {
             // Every pixel from input texture produces 6 output pixels, for more details check out http://scale2x.sourceforge.net/algorithm.html
             Parallel.For(0, source.Height, y =>
             {
@@ -178,7 +175,6 @@ namespace Greenshot.Gfx
             });
             return destination.UnlockAndReturnBitmap();
         }
-        }
 
         /// <summary>
         ///     Checks if the colors are the same.

src/Greenshot.Gfx/UnmanagedBitmap.cs

@@ -133,24 +133,14 @@ namespace Greenshot.Gfx
         {
             get
             {
-                PixelFormat format;
                 TPixelLayout empty = default;
-                switch (empty)
+                return empty switch
                 {
-                    case Bgr24 _:
+                    Bgr24 _ => PixelFormat.Format24bppRgb,
-                        format = PixelFormat.Format24bppRgb;
+                    Bgra32 _ => PixelFormat.Format32bppArgb,
-                        break;
+                    Bgr32 _ => PixelFormat.Format32bppRgb,
-                    case Bgra32 _:
+                    _ => throw new NotSupportedException("Unknown pixel format")
-                        format = PixelFormat.Format32bppArgb;
+                };
-                        break;
-                    case Bgr32 _:
-                        format = PixelFormat.Format32bppRgb;
-                        break;
-                    default:
-                        throw new NotSupportedException("Unknown pixel format");
-                }
-
-                return format;
             }
         }
         
@@ -162,17 +152,13 @@ namespace Greenshot.Gfx
             get
             {
                 TPixelLayout empty = default;
-                switch (empty)
+                return empty switch
                 {
-                    case Bgr24 _:
+                    Bgr24 _ => PixelFormats.Bgr24,
-                        return PixelFormats.Bgr24;
+                    Bgra32 _ => PixelFormats.Bgra32,
-                    case Bgra32 _:
+                    Bgr32 _ => PixelFormats.Bgr32,
-                        return PixelFormats.Bgra32;
+                    _ => throw new NotSupportedException("Unknown pixel format")
-                    case Bgr32 _:
+                };
-                        return PixelFormats.Bgr32;
-                    default:
-                        throw new NotSupportedException("Unknown pixel format");
-                }
             }
         }
 

src/Greenshot.PerformanceTests/CapturePerformance.cs

@@ -18,7 +18,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
-using System.Drawing.Imaging;
 using System.IO;
 using BenchmarkDotNet.Attributes;
 using Dapplo.Log;
@@ -75,8 +74,7 @@ namespace Greenshot.PerformanceTests
         //[Benchmark]
         public void Capture()
         {
-            using (var capture = WindowCapture.CaptureScreen())
+            using var capture = WindowCapture.CaptureScreen();
-            {
             if (capture.Bitmap == null)
             {
                 throw new NotSupportedException();
@@ -86,7 +84,6 @@ namespace Greenshot.PerformanceTests
                 throw new NotSupportedException();
             }
         }
-        }
         
         /// <summary>
         /// Capture the screen with buffered settings

src/Greenshot.PerformanceTests/GfxPerformance.cs

@@ -40,12 +40,10 @@ namespace Greenshot.PerformanceTests
         {
             _unmanagedTestBitmap = new UnmanagedBitmap<Bgr32>(400, 400);
             _unmanagedTestBitmap.Span.Fill(new Bgr32 { B = 255, G = 255, R = 255, Unused = 0});
-            using (var graphics = Graphics.FromImage(_unmanagedTestBitmap.NativeBitmap))
+            using var graphics = Graphics.FromImage(_unmanagedTestBitmap.NativeBitmap);
-            using (var pen = new SolidBrush(Color.Blue))
+            using var pen = new SolidBrush(Color.Blue);
-            {
             graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
         }
-        }
 
         [GlobalCleanup]
         public void Dispose()
@@ -60,20 +58,17 @@ namespace Greenshot.PerformanceTests
         [Arguments(PixelFormat.Format32bppArgb)]
         public void WuQuantizer(PixelFormat pixelFormat)
         {
-            using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White))
+            using var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White);
-            {
             using (var graphics = Graphics.FromImage(bitmap.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             var quantizer = new WuQuantizer(bitmap);
-                using (var quantizedImage = quantizer.GetQuantizedImage())
+            using var quantizedImage = quantizer.GetQuantizedImage();
-                {
             quantizedImage.NativeBitmap.Save(@"quantized.png", ImageFormat.Png);
         }
-            }
-        }
 
         [Benchmark]
         [Arguments(PixelFormat.Format24bppRgb)]
@@ -81,46 +76,42 @@ namespace Greenshot.PerformanceTests
         [Arguments(PixelFormat.Format32bppArgb)]
         public void Blur_FastBitmap(PixelFormat pixelFormat)
         {
-            using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White))
+            using var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White);
-            {
             using (var graphics = Graphics.FromImage(bitmap.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             bitmap.ApplyBoxBlur(10);
         }
-        }
 
         [Benchmark]
         public void Blur_UnmanagedBitmap()
         {
-            using (var unmanagedBitmap = new UnmanagedBitmap<Bgr32>(400, 400))
+            using var unmanagedBitmap = new UnmanagedBitmap<Bgr32>(400, 400);
-            {
             unmanagedBitmap.Span.Fill(new Bgr32 { B = 255, G = 255, R = 255 });
             using (var graphics = Graphics.FromImage(unmanagedBitmap.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
 
             unmanagedBitmap.ApplyBoxBlur(10);
         }
-        }
 
         [Benchmark]
         public void Blur_Old()
         {
-            using (var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppRgb, Color.White))
+            using var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppRgb, Color.White);
-            {
             using (var graphics = Graphics.FromImage(bitmap.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             BoxBlurOld.ApplyOldBoxBlur(bitmap, 10);
         }
-        }
 
         [Benchmark]
         public void Scale2x_FastBitmap()

src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj

@@ -16,9 +16,9 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
     <PackageReference Include="CommandLineParser" Version="2.6.0" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.0" />
     <PackageReference Include="SharpAvi" Version="2.1.2" />
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>

src/Greenshot.Tests/BlurTests.cs

@@ -37,49 +37,50 @@ namespace Greenshot.Tests
         [InlineData(PixelFormat.Format32bppArgb)]
         public void Test_Blur(PixelFormat pixelFormat)
         {
-            using (var bitmapNew = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White))
+            using var bitmapNew = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White);
-            using (var bitmapOld = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White))
+            using var bitmapOld = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White);
-            {
             using (var graphics = Graphics.FromImage(bitmapNew.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
                 bitmapNew.ApplyBoxBlur(10);
             }
+
             using (var graphics = Graphics.FromImage(bitmapOld.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
                 BoxBlurOld.ApplyOldBoxBlur(bitmapOld, 10);
             }
+
             bitmapOld.NativeBitmap.Save(@"old.png", ImageFormat.Png);
             bitmapNew.NativeBitmap.Save(@"new.png", ImageFormat.Png);
 
             Assert.True(bitmapOld.IsEqualTo(bitmapNew), "New blur doesn't compare to old.");
         }
-        }
 
 
         [Fact]
         public void Test_Blur_UnmanagedBitmap()
         {
-            using (var bitmapNew = new UnmanagedBitmap<Bgr32>(400, 400))
+            using var bitmapNew = new UnmanagedBitmap<Bgr32>(400, 400);
-            using (var bitmapOld = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppRgb, Color.White))
+            using var bitmapOld = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format32bppRgb, Color.White);
-            {
             using (var graphics = Graphics.FromImage(bitmapOld.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             BoxBlurOld.ApplyOldBoxBlur(bitmapOld, 10);
             bitmapOld.NativeBitmap.Save(@"old.png", ImageFormat.Png);
 
             bitmapNew.Span.Fill(new Bgr32 { B = 255, G = 255, R = 255 });
             using (var graphics = Graphics.FromImage(bitmapNew.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             bitmapNew.ApplyBoxBlur(10);
             bitmapNew.NativeBitmap.Save(@"new.png", ImageFormat.Png);
 
@@ -87,4 +88,3 @@ namespace Greenshot.Tests
         }
     }
 }
-}

src/Greenshot.Tests/CaptureTests.cs

@@ -86,8 +86,7 @@ namespace Greenshot.Tests
         [Fact]
         public void Test_GdiScreenCapture()
         {
-            using (var gdiScreenCapture = new GdiScreenCapture())
+            using var gdiScreenCapture = new GdiScreenCapture();
-            {
             gdiScreenCapture.CaptureFrame();
             using (var bitmap = gdiScreenCapture.CurrentFrameAsBitmap())
             {
@@ -107,7 +106,6 @@ namespace Greenshot.Tests
 
             gdiScreenCapture.CaptureFrame();
         }
-        }
 
         /// <summary>
         /// Test if a capture from a window works
@@ -144,11 +142,12 @@ namespace Greenshot.Tests
             var template = new SimpleTemplate();
             var bitmapSource = template.Apply(capture).ToBitmapSource();
             using (var outputStream = bitmapSource.ToStream(OutputFormats.png))
-            using (var fileStream = File.Create("Test_CaptureFlow_DwmWindowSource.png"))
             {
+                using var fileStream = File.Create("Test_CaptureFlow_DwmWindowSource.png");
                 outputStream.Seek(0, SeekOrigin.Begin);
                 await outputStream.CopyToAsync(fileStream);
             }
+
             Assert.Equal(bounds.Size, bitmapSource.Size());
         }
 
@@ -159,8 +158,7 @@ namespace Greenshot.Tests
         [Fact]
         public void Test_BitmapCapture()
         {
-            using (var screenBitmapCapture = new BitmapScreenCapture())
+            using var screenBitmapCapture = new BitmapScreenCapture();
-            {
             screenBitmapCapture.CaptureFrame();
                 
             Assert.NotNull(screenBitmapCapture.CurrentFrameAsBitmap());
@@ -169,8 +167,7 @@ namespace Greenshot.Tests
             screenBitmapCapture.CurrentFrameAsBitmap().NativeBitmap.Save(testFile1, ImageFormat.Png);
                 
             var testFile2 = Path.Combine(Path.GetTempPath(), @"test-bitmapsource.png");
-                using (var fileStream = new FileStream(testFile2, FileMode.Create))
+            using var fileStream = new FileStream(testFile2, FileMode.Create);
-                {
             var encoder = new PngBitmapEncoder
             {
                 Interlace = PngInterlaceOption.Off
@@ -180,5 +177,3 @@ namespace Greenshot.Tests
         }
     }
 }
-    }
-}

src/Greenshot.Tests/FilterTests.cs

@@ -19,27 +19,27 @@ namespace Greenshot.Tests
         [Fact]
         public void TestBlur()
         {
-            using (var bitmap1 = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format24bppRgb, Color.White))
+            using var bitmap1 = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format24bppRgb, Color.White);
-            using (var bitmap2 = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format24bppRgb, Color.White))
+            using var bitmap2 = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format24bppRgb, Color.White);
-            {
             using (var graphics = Graphics.FromImage(bitmap1.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             bitmap1.NativeBitmap.Save("bitmap0.png", ImageFormat.Png);
             bitmap1.ApplyBoxBlur(10);
             bitmap1.NativeBitmap.Save("bitmap1.png", ImageFormat.Png);
 
             using (var graphics = Graphics.FromImage(bitmap2.NativeBitmap))
-                using (var pen = new SolidBrush(Color.Blue))
             {
+                using var pen = new SolidBrush(Color.Blue);
                 graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
             }
+
             BoxBlurOld.ApplyOldBoxBlur(bitmap2, 10);
             bitmap2.NativeBitmap.Save("bitmap2.png", ImageFormat.Png);
             Assert.True(bitmap1.IsEqualTo(bitmap2));
         }
     }
 }
-}

src/Greenshot.Tests/Greenshot.Tests.csproj

@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
     <PackageReference Include="CommandLineParser" Version="2.6.0" />
     <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.26" />
     <PackageReference Include="Dapplo.Windows" Version="0.11.6" />

src/Greenshot.Tests/Implementation/BoxBlurOld.cs

@@ -18,11 +18,9 @@ namespace Greenshot.Tests.Implementation
         public static void ApplyOldBoxBlur(this IBitmapWithNativeSupport destinationBitmap, int range)
         {
             // We only need one fastbitmap as we use it as source and target (the reading is done for one line H/V, writing after "parsing" one line H/V)
-            using (var fastBitmap = FastBitmapFactory.Create(destinationBitmap))
+            using var fastBitmap = FastBitmapFactory.Create(destinationBitmap);
-            {
             fastBitmap.ApplyOldBoxBlur(range);
         }
-        }
 
         /// <summary>
         ///     Apply BoxBlur to the fastBitmap