Skip to content

Commit 9e81ea3

Browse files
aberusaberus
committed
Merge branch 'release/v0.7'
2 parents 5f68022 + 441205d commit 9e81ea3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+170
-990
lines changed

‎ImageVisualizer.sln

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageVisualizer14", "ImageV
1313
EndProject
1414
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageVisualizer15", "ImageVisualizer15\ImageVisualizer15.csproj", "{0A095313-31F1-4677-ACC2-60BCF5ADFC5D}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageVisualizer16", "ImageVisualizer16\ImageVisualizer16.csproj", "{63D1D741-7C82-447B-B5F8-68B3BE3470D2}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageVisualizer16.UI", "ImageVisualizer16.UI\ImageVisualizer16.UI.csproj", "{63D1D741-7C82-447B-B5F8-68B3BE3470D2}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageVisualizerPackage", "ImageVisualizerPackage\ImageVisualizerPackage.csproj", "{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}"
19-
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsWixActions", "IsWixActions\IsWixActions.csproj", "{BE81A841-CF04-4BAB-9251-BE22D400E989}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageVisualizer16.Common", "ImageVisualizer16.Common\ImageVisualizer16.Common.csproj", "{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}"
2119
EndProject
22-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVisualizer", "SetupVisualizer\SetupVisualizer.wixproj", "{49BAF40F-9365-482B-BC8E-43557931B415}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageVisualizer16.DebuggeeSide", "ImageVisualizer16.DebuggeeSide\ImageVisualizer16.DebuggeeSide.csproj", "{552D4CE4-EF94-4232-B8EA-C5F26E930220}"
2321
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestVisualizerCS", "TestVisualizerCS\TestVisualizerCS.csproj", "{CBD84815-3DF2-43E9-B483-178DC89054E8}"
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageVisualizerPackage", "ImageVisualizerPackage\ImageVisualizerPackage.csproj", "{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}"
2523
EndProject
26-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestVisualizerVB", "TestVisualizerVB\TestVisualizerVB.vbproj", "{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}"
24+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVisualizer", "SetupVisualizer\SetupVisualizer.wixproj", "{49BAF40F-9365-482B-BC8E-43557931B415}"
2725
EndProject
2826
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6AE77D16-314C-4016-A4C0-016E1EEF6F80}"
2927
ProjectSection(SolutionItems) = preProject
@@ -86,6 +84,22 @@ Global
8684
{63D1D741-7C82-447B-B5F8-68B3BE3470D2}.Release|Any CPU.Build.0 = Release|Any CPU
8785
{63D1D741-7C82-447B-B5F8-68B3BE3470D2}.Release|x86.ActiveCfg = Release|Any CPU
8886
{63D1D741-7C82-447B-B5F8-68B3BE3470D2}.Release|x86.Build.0 = Release|Any CPU
87+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Debug|x86.ActiveCfg = Debug|Any CPU
90+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Debug|x86.Build.0 = Debug|Any CPU
91+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Release|Any CPU.ActiveCfg = Release|Any CPU
92+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Release|Any CPU.Build.0 = Release|Any CPU
93+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Release|x86.ActiveCfg = Release|Any CPU
94+
{B271E1B1-BB78-4864-8DB5-BC48FB1CB132}.Release|x86.Build.0 = Release|Any CPU
95+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Debug|Any CPU.Build.0 = Debug|Any CPU
97+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Debug|x86.ActiveCfg = Debug|Any CPU
98+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Debug|x86.Build.0 = Debug|Any CPU
99+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Release|Any CPU.ActiveCfg = Release|Any CPU
100+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Release|Any CPU.Build.0 = Release|Any CPU
101+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Release|x86.ActiveCfg = Release|Any CPU
102+
{552D4CE4-EF94-4232-B8EA-C5F26E930220}.Release|x86.Build.0 = Release|Any CPU
89103
{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90104
{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
91105
{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -94,34 +108,12 @@ Global
94108
{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}.Release|Any CPU.Build.0 = Release|Any CPU
95109
{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}.Release|x86.ActiveCfg = Release|Any CPU
96110
{FB4C20B3-659C-4D7E-9832-7BFB165DF2E0}.Release|x86.Build.0 = Release|Any CPU
97-
{BE81A841-CF04-4BAB-9251-BE22D400E989}.Debug|Any CPU.ActiveCfg = Debug|x86
98-
{BE81A841-CF04-4BAB-9251-BE22D400E989}.Debug|x86.ActiveCfg = Debug|x86
99-
{BE81A841-CF04-4BAB-9251-BE22D400E989}.Debug|x86.Build.0 = Debug|x86
100-
{BE81A841-CF04-4BAB-9251-BE22D400E989}.Release|Any CPU.ActiveCfg = Release|x86
101-
{BE81A841-CF04-4BAB-9251-BE22D400E989}.Release|x86.ActiveCfg = Release|x86
102-
{BE81A841-CF04-4BAB-9251-BE22D400E989}.Release|x86.Build.0 = Release|x86
103111
{49BAF40F-9365-482B-BC8E-43557931B415}.Debug|Any CPU.ActiveCfg = Debug|x86
104112
{49BAF40F-9365-482B-BC8E-43557931B415}.Debug|x86.ActiveCfg = Debug|x86
105113
{49BAF40F-9365-482B-BC8E-43557931B415}.Release|Any CPU.ActiveCfg = Release|x86
106114
{49BAF40F-9365-482B-BC8E-43557931B415}.Release|Any CPU.Build.0 = Release|x86
107115
{49BAF40F-9365-482B-BC8E-43557931B415}.Release|x86.ActiveCfg = Release|x86
108116
{49BAF40F-9365-482B-BC8E-43557931B415}.Release|x86.Build.0 = Release|x86
109-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
111-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Debug|x86.ActiveCfg = Debug|Any CPU
112-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Debug|x86.Build.0 = Debug|Any CPU
113-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
114-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Release|Any CPU.Build.0 = Release|Any CPU
115-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Release|x86.ActiveCfg = Release|Any CPU
116-
{CBD84815-3DF2-43E9-B483-178DC89054E8}.Release|x86.Build.0 = Release|Any CPU
117-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Debug|Any CPU.Build.0 = Debug|Any CPU
119-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Debug|x86.ActiveCfg = Debug|Any CPU
120-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Debug|x86.Build.0 = Debug|Any CPU
121-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Release|Any CPU.ActiveCfg = Release|Any CPU
122-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Release|Any CPU.Build.0 = Release|Any CPU
123-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Release|x86.ActiveCfg = Release|Any CPU
124-
{C696B7CD-D21C-4442-91E6-E2E9CBA0D566}.Release|x86.Build.0 = Release|Any CPU
125117
EndGlobalSection
126118
GlobalSection(SolutionProperties) = preSolution
127119
HideSolutionNode = FALSE

‎ImageVisualizer11/ImageVisualizer11.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ImageVisualizer</RootNamespace>
1111
<AssemblyName>Aberus.VisualStudio.Debugger.ImageVisualizer</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -48,7 +48,6 @@
4848
<Reference Include="System.Data.DataSetExtensions" />
4949
<Reference Include="Microsoft.CSharp" />
5050
<Reference Include="System.Data" />
51-
<Reference Include="System.Net.Http" />
5251
<Reference Include="System.Xml" />
5352
<Reference Include="WindowsBase" />
5453
<Reference Include="WindowsFormsIntegration" />

‎ImageVisualizer12/ImageVisualizer12.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ImageVisualizer</RootNamespace>
1111
<AssemblyName>Aberus.VisualStudio.Debugger.ImageVisualizer</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -48,7 +48,6 @@
4848
<Reference Include="System.Data.DataSetExtensions" />
4949
<Reference Include="Microsoft.CSharp" />
5050
<Reference Include="System.Data" />
51-
<Reference Include="System.Net.Http" />
5251
<Reference Include="System.Xml" />
5352
<Reference Include="WindowsBase" />
5453
<Reference Include="WindowsFormsIntegration" />

‎ImageVisualizer14/ImageControl.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public void SetImage(object sourceBitmap)
4141
{
4242
sourceBitmap = method.Invoke(sourceBitmap, null);
4343
}
44+
4445
if (sourceBitmap is System.Drawing.Bitmap)
4546
{
4647
BitmapSource bitmap = null;
@@ -72,9 +73,9 @@ public void SetImage(object sourceBitmap)
7273
DisplayImage.Source = bitmap;
7374
}
7475
}
75-
else if (sourceBitmap is SerializableBitmapImage)
76+
else if (sourceBitmap is SerializableBitmapImage source)
7677
{
77-
DisplayImage.Source = (SerializableBitmapImage)sourceBitmap;
78+
DisplayImage.Source = source;
7879
}
7980
}
8081
}

‎ImageVisualizer14/ImageVisualizer14.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ImageVisualizer</RootNamespace>
1111
<AssemblyName>Aberus.VisualStudio.Debugger.ImageVisualizer</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -48,7 +48,6 @@
4848
<Reference Include="System.Data.DataSetExtensions" />
4949
<Reference Include="Microsoft.CSharp" />
5050
<Reference Include="System.Data" />
51-
<Reference Include="System.Net.Http" />
5251
<Reference Include="System.Xml" />
5352
<Reference Include="WindowsBase" />
5453
<Reference Include="WindowsFormsIntegration" />

‎ImageVisualizer14/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Aleksander Berus")]
1212
[assembly: AssemblyProduct("Image Debugger Visualizer")]
13-
[assembly: AssemblyCopyright("Copyright © aberus.com 2016-2019")]
13+
[assembly: AssemblyCopyright("Aleksander Berus. All rights reserved.")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

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

‎ImageVisualizer14/SerializableBitmapImage.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ namespace ImageVisualizer
1010
public class SerializableBitmapImage : ISerializable
1111
{
1212
public BitmapSource bitmapSource;
13-
private string expression;
13+
private readonly string expression;
1414

1515
public BitmapImage Image { get; private set; }
1616

17-
internal SerializableBitmapImage(BitmapImage image)
17+
public SerializableBitmapImage(BitmapImage image)
1818
{
1919
this.Image = image;
2020
}
2121

22-
internal SerializableBitmapImage(BitmapSource source)
22+
public SerializableBitmapImage(BitmapSource source)
2323
{
2424
bitmapSource = source;
2525
}
@@ -32,8 +32,7 @@ protected SerializableBitmapImage(SerializationInfo info, StreamingContext conte
3232
{
3333
try
3434
{
35-
var array = i.Value as byte[];
36-
if (array != null)
35+
if (i.Value is byte[] array)
3736
{
3837
var stream = new MemoryStream(array);
3938
stream.Seek(0, SeekOrigin.Begin);
@@ -89,7 +88,7 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
8988

9089
if (source != null)
9190
{
92-
using (MemoryStream memoryStream = new MemoryStream())
91+
using (var memoryStream = new MemoryStream())
9392
{
9493
var encoder = new PngBitmapEncoder();
9594
encoder.Frames.Add(BitmapFrame.Create(source));

‎ImageVisualizer14/Visualizer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using ImageVisualizer;
33
using Microsoft.VisualStudio.DebuggerVisualizers;
44

5-
[assembly: System.Diagnostics.DebuggerVisualizer(typeof(Visualizer), typeof(ImageVisualizerObjectSource), Target = typeof(System.Drawing.Bitmap), Description = "Image Visualizer")]
5+
//System.Drawing.Bitmap
6+
[assembly: System.Diagnostics.DebuggerVisualizer(typeof(Visualizer), typeof(VisualizerObjectSource), Target = typeof(System.Drawing.Bitmap), Description = "Image Visualizer")]
7+
//System.Windows.Media.ImageSource, System.Windows.Media.Imaging.BitmapImage, System.Windows.Media.Imaging.BitmapSource
68
[assembly: System.Diagnostics.DebuggerVisualizer(typeof(Visualizer), typeof(ImageVisualizerObjectSource), Target = typeof(System.Windows.Media.ImageSource), Description = "Image Visualizer")]
7-
//[assembly: System.Diagnostics.DebuggerVisualizer(typeof(Visualizer), typeof(ImageVisualizerObjectSource), Target = typeof(System.Windows.Media.Imaging.BitmapImage), Description = "Image Visualizer")]
8-
//[assembly: System.Diagnostics.DebuggerVisualizer(typeof(Visualizer), typeof(ImageVisualizerObjectSource), Target = typeof(System.Windows.Media.Imaging.BitmapSource), Description = "Image Visualizer")]
99

1010
namespace ImageVisualizer
1111
{

‎ImageVisualizer15/ImageVisualizer15.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ImageVisualizer</RootNamespace>
1111
<AssemblyName>Aberus.VisualStudio.Debugger.ImageVisualizer</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -49,7 +49,6 @@
4949
<Reference Include="System.Data.DataSetExtensions" />
5050
<Reference Include="Microsoft.CSharp" />
5151
<Reference Include="System.Data" />
52-
<Reference Include="System.Net.Http" />
5352
<Reference Include="System.Xml" />
5453
<Reference Include="WindowsBase" />
5554
<Reference Include="WindowsFormsIntegration" />

‎ImageVisualizer16.Common/ImageVisualizer16.Common.csproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp3.0;net40</TargetFrameworks>
5+
<RootNamespace>ImageVisualizer</RootNamespace>
6+
<UseWPF>true</UseWPF>
7+
<AssemblyName>Aberus.VisualStudio.Debugger.ImageVisualizer.Common</AssemblyName>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Include="..\ImageVisualizer14\SerializableBitmapImage.cs" Link="SerializableBitmapImage.cs" />
12+
</ItemGroup>
13+
14+
</Project>

0 commit comments

Comments
 (0)