Merge pull request #3 from koszeggy/Development

Releasing version v2.3.0
koszeggy · Oct 7, 2020 · d142605 · d142605
2 parents 8232a13 + 9c67724
commit d142605
Show file tree

Hide file tree

Showing 112 changed files with 8,429 additions and 1,482 deletions.
diff --git a/...ft.Drawing.DebuggerVisualizers.Package/KGySoft.Drawing.DebuggerVisualizers.Package.csproj b/...ft.Drawing.DebuggerVisualizers.Package/KGySoft.Drawing.DebuggerVisualizers.Package.csproj
@@ -101,11 +101,11 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="KGySoft.CoreLibraries, Version=5.3.0.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\KGySoft.CoreLibraries.5.3.0\lib\net45\KGySoft.CoreLibraries.dll</HintPath>
+    <Reference Include="KGySoft.CoreLibraries, Version=5.4.0.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\KGySoft.CoreLibraries.5.4.0\lib\net45\KGySoft.CoreLibraries.dll</HintPath>
     </Reference>
-    <Reference Include="KGySoft.Drawing, Version=5.2.1.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\KGySoft.Drawing.5.2.1\lib\net45\KGySoft.Drawing.dll</HintPath>
+    <Reference Include="KGySoft.Drawing, Version=5.3.0.0, Culture=neutral, PublicKeyToken=b45eba277439ddfe, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\KGySoft.Drawing.5.3.0\lib\net45\KGySoft.Drawing.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.GraphModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>

diff --git a/KGySoft.Drawing.DebuggerVisualizers.Package/_Classes/Ids.cs b/KGySoft.Drawing.DebuggerVisualizers.Package/_Classes/Ids.cs
@@ -30,7 +30,7 @@ internal static class Ids
         internal const string ResourceTitle = "110";
         internal const string ResourceDetails = "112";
         internal const int IconResourceId = 400;
-        internal const string Version = "2.2.1"; // Note: in .vsixmanifest it should be adjusted manually
+        internal const string Version = "2.3.0"; // Note: in .vsixmanifest it should be adjusted manually
         internal const int ExecuteImagingToolsCommandId = 0x0100;
         internal const int ManageDebuggerVisualizerInstallationsCommandId = 0x0101;
 

diff --git a/KGySoft.Drawing.DebuggerVisualizers.Package/packages.config b/KGySoft.Drawing.DebuggerVisualizers.Package/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="KGySoft.CoreLibraries" version="5.3.0" targetFramework="net46" />
-  <package id="KGySoft.Drawing" version="5.2.1" targetFramework="net46" />
+  <package id="KGySoft.CoreLibraries" version="5.4.0" targetFramework="net46" />
+  <package id="KGySoft.Drawing" version="5.3.0" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.26930" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.16" targetFramework="net46" />

diff --git a/KGySoft.Drawing.DebuggerVisualizers.Package/source.extension.vsixmanifest b/KGySoft.Drawing.DebuggerVisualizers.Package/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="fd42f5a8-4449-4c07-8b60-b6bd58b67118" Version="2.2.1" Language="en-US" Publisher="KGy SOFT" />
+    <Identity Id="fd42f5a8-4449-4c07-8b60-b6bd58b67118" Version="2.3.0" Language="en-US" Publisher="KGy SOFT" />
     <DisplayName>KGy SOFT Drawing DebuggerVisualizers</DisplayName>
     <Description xml:space="preserve">Debugger Visualizers for System.Drawing types such as Image (Bitmap and Metafile), Icon, Graphics, BitmapData, ColorPalette and Color.</Description>
     <MoreInfo>https://github.com/koszeggy/KGySoft.Drawing.Tools</MoreInfo>
@@ -11,7 +11,7 @@
     <PreviewImage>Resources\Preview.png</PreviewImage>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="[12.0,)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="[12.0,17.0)" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />

diff --git a/KGySoft.Drawing.DebuggerVisualizers.Test/KGySoft.Drawing.DebuggerVisualizers.Test.csproj b/KGySoft.Drawing.DebuggerVisualizers.Test/KGySoft.Drawing.DebuggerVisualizers.Test.csproj
@@ -19,9 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KGySoft.CoreLibraries" Version="5.3.0" />
-    <PackageReference Include="KGySoft.Drawing" Version="5.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="KGySoft.CoreLibraries" Version="5.4.0" />
+    <PackageReference Include="KGySoft.Drawing" Version="5.3.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/KGySoft.Drawing.DebuggerVisualizers.Test/Properties/AssemblyInfo.cs b/KGySoft.Drawing.DebuggerVisualizers.Test/Properties/AssemblyInfo.cs
@@ -35,6 +35,6 @@
 // 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("2.2.1.0")]
-[assembly: AssemblyFileVersion("2.2.1.0")]
-[assembly: AssemblyInformationalVersion("2.2.1")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyInformationalVersion("2.3.0")]
diff --git a/KGySoft.Drawing.DebuggerVisualizers.Test/View/DebuggerTestForm.cs b/KGySoft.Drawing.DebuggerVisualizers.Test/View/DebuggerTestForm.cs
@@ -46,6 +46,7 @@ public DebuggerTestForm()
             cmbPixelFormat.DataSource = viewModel.PixelFormats;
 
             commandBindings.AddPropertyBinding(chbAsImage, nameof(CheckBox.Checked), nameof(viewModel.AsImage), viewModel);
+            commandBindings.AddPropertyBinding(viewModel, nameof(viewModel.PixelFormat), nameof(ComboBox.SelectedItem), cmbPixelFormat);
             commandBindings.AddPropertyBinding(cmbPixelFormat, nameof(ComboBox.SelectedValue), nameof(viewModel.PixelFormat), viewModel);
 
             commandBindings.AddPropertyBinding(rbBitmap, nameof(RadioButton.Checked), nameof(viewModel.Bitmap), viewModel);

diff --git a/KGySoft.Drawing.DebuggerVisualizers.Test/View/DebuggerTestForm.resx b/KGySoft.Drawing.DebuggerVisualizers.Test/View/DebuggerTestForm.resx
diff --git a/KGySoft.Drawing.DebuggerVisualizers.Test/ViewModel/DebuggerTestFormViewModel.cs b/KGySoft.Drawing.DebuggerVisualizers.Test/ViewModel/DebuggerTestFormViewModel.cs
@@ -28,7 +28,6 @@
 
 using KGySoft.ComponentModel;
 using KGySoft.CoreLibraries;
-using KGySoft.Drawing.Imaging;
 using KGySoft.Reflection;
 
 using Microsoft.VisualStudio.DebuggerVisualizers;
@@ -72,7 +71,7 @@ internal class DebuggerTestFormViewModel : ObservableObjectBase
         internal bool AsImage { get => Get<bool>(); set => Set(value); }
         internal bool AsImageEnabled { get => Get<bool>(); set => Set(value); }
         internal PixelFormat[] PixelFormats => Get(() => Enum<PixelFormat>.GetValues().Where(pf => pf.IsValidFormat()).OrderBy(pf => pf & PixelFormat.Max).ToArray());
-        internal PixelFormat PixelFormat { get => Get<PixelFormat>(); set => Set(value); }
+        internal PixelFormat PixelFormat { get => Get(PixelFormat.Format32bppArgb); set => Set(value); }
         internal bool PixelFormatEnabled { get => Get<bool>(); set => Set(value); }
 
         internal bool Bitmap { get => Get<bool>(); set => Set(value); }

diff --git a/KGySoft.Drawing.DebuggerVisualizers/KGySoft.Drawing.DebuggerVisualizers.csproj b/KGySoft.Drawing.DebuggerVisualizers/KGySoft.Drawing.DebuggerVisualizers.csproj
@@ -17,9 +17,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KGySoft.CoreLibraries" Version="5.3.0" />
-    <PackageReference Include="KGySoft.Drawing" Version="5.2.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="KGySoft.CoreLibraries" Version="5.4.0" />
+    <PackageReference Include="KGySoft.Drawing" Version="5.3.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/KGySoft.Drawing.DebuggerVisualizers/Properties/AssemblyInfo.cs b/KGySoft.Drawing.DebuggerVisualizers/Properties/AssemblyInfo.cs
@@ -40,9 +40,9 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.1.0")]
-[assembly: AssemblyFileVersion("2.2.1.0")]
-[assembly: AssemblyInformationalVersion("2.2.1")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyInformationalVersion("2.3.0")]
 
 // Image
 [assembly: DebuggerVisualizer(typeof(ImageDebuggerVisualizer), typeof(ImageSerializer),