Merge branch 'release/v1.0.1'

Author: aberus

src/ImageVisualizer14/ImageForm.cs

@@ -79,13 +79,35 @@ public ImageForm(IVisualizerObjectProvider objectProvider)
                 {
                     objectBitmap = method.Invoke(objectBitmap, null);
                 }
-
+                
                 BitmapSource bitmapSource = null;
 
                 if (objectBitmap is Bitmap)
                 {
                     var hObject = ((Bitmap)objectBitmap).GetHbitmap();
-                    
+
+                    try
+                    {
+                        bitmapSource = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
+                               hObject,
+                               IntPtr.Zero,
+                               Int32Rect.Empty,
+                               BitmapSizeOptions.FromEmptyOptions());
+                    }
+                    catch (Win32Exception)
+                    {
+                        bitmapSource = null;
+                    }
+                    finally
+                    {
+                        DeleteObject(hObject);
+                    }
+                }
+#if VS16 || VS17
+                else if(objectBitmap is SerializableBitmap x)
+                {
+                    var hObject = ((Bitmap)x).GetHbitmap();
+
                     try
                     {
                         bitmapSource = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
@@ -103,6 +125,7 @@ public ImageForm(IVisualizerObjectProvider objectProvider)
                         DeleteObject(hObject);
                     }
                 }
+#endif
                 else if (objectBitmap is SerializableBitmapImage serializableBitmapImage)
                 {
                     bitmapSource = serializableBitmapImage;

src/ImageVisualizer14/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

src/ImageVisualizerPackage/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

src/ImageVisualizerPackage/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
 	<Metadata>
-		<Identity Id="2443c97f-77f2-47ea-b473-7f34832b2f86" Version="1.0.0" Language="en-US" Publisher="Aleksander Berus" />
+		<Identity Id="2443c97f-77f2-47ea-b473-7f34832b2f86" Version="1.0.1" Language="en-US" Publisher="Aleksander Berus" />
 		<DisplayName>Debugger Image Visualizer</DisplayName>
 		<Description xml:space="preserve">A debug visualizer for Visual Studio that allows you to visually view the graphic content of images during debugging.</Description>
 		<MoreInfo>https://github.com/aberus/ImageVisualizer</MoreInfo>

src/SetupVisualizer/License.rtf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?define ProductVersion = "1.0.0"?>
+<?define ProductVersion = "1.0.1"?>
 <?define ProductUpgradeCode = "5a2e7ccd-6ced-4a6b-9745-d8d73ed070cc"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
   <Product Id="*" Name="Debugger Image Visualizer for Visual Studio" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Aleksander Berus" UpgradeCode="$(var.ProductUpgradeCode)">