Skip to content

Commit 2e6925b

Browse files
codingadventurescodingadventures
committed
major cleanup
fixes unit and integration tests fixes install package on vsix installation change the name from linqbridgevs to bridgevs
1 parent c4881ec commit 2e6925b

Some content is hidden

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

41 files changed

+314
-253
lines changed

‎Src/BridgeVs.Locations/BridgeVs.Locations.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Test|AnyCPU' ">
2626
<DebugType>full</DebugType>
2727
<Optimize>false</Optimize>
28-
<DebugSymbols>true</DebugSymbols>
28+
<DebugSymbols>true</DebugSymbols>
2929
<OutputPath>bin\Test\</OutputPath>
3030
<DefineConstants>DEBUG;TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>

‎Src/BridgeVs.Locations/CommonFolderPaths.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ public static class CommonFolderPaths
8383

8484
public static readonly string CommonReferenceAssembliesPath = @"Common7\IDE\ReferenceAssemblies\v2.0";
8585

86+
public static readonly string Vs2012DebuggerVisualizerDestinationFolder = Documents + @"\Visual Studio 2012\Visualizers\";
87+
public static readonly string Vs2013DebuggerVisualizerDestinationFolder = Documents + @"\Visual Studio 2013\Visualizers\";
88+
public static readonly string Vs2015DebuggerVisualizerDestinationFolder = Documents + @"\Visual Studio 2015\Visualizers\";
89+
public static readonly string Vs2017DebuggerVisualizerDestinationFolder = Documents + @"\Visual Studio 2017\Visualizers\";
90+
8691
static CommonFolderPaths()
8792
{
8893

‎Src/Build/Tasks/CleanBuildTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class CleanBuildTask : ITask
3434
public bool Execute()
3535
{
3636
string visualizerAssemblyName = VisualizerAssemblyNameFormat.GetTargetVisualizerAssemblyName(VisualStudioVer, Assembly);
37-
string targetInstallationPath = VisualStudioOptions.GetInstallationPath(VisualStudioVer);
37+
string targetInstallationPath = VisualStudioOptions.GetVisualizerDestinationFolder(VisualStudioVer);
3838

3939
string visualizerFullPath = Path.Combine(targetInstallationPath, visualizerAssemblyName);
4040

‎Src/Build/Tasks/MapperBuildTask.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public bool Execute()
7272

7373
//this is where the current assembly being built is saved
7474
string currentBuildingFolder = Path.GetDirectoryName(Assembly);
75-
string targetInstallationPath = VisualStudioOptions.GetInstallationPath(VisualStudioVer);
75+
string targetInstallationPath = VisualStudioOptions.GetVisualizerDestinationFolder(VisualStudioVer);
7676

7777
Log.Write("Installation Path {0}", targetInstallationPath);
7878

@@ -135,7 +135,9 @@ private void CreateDotNetFrameworkVisualizer(string targetFolder, string install
135135
ILMerge merge = new ILMerge()
136136
{
137137
OutputFile = targetDotNetAssemblyVisualizerFilePath,
138+
#if DEBUG
138139
DebugInfo = true,
140+
#endif
139141
TargetKind = ILMerge.Kind.SameAsPrimaryAssembly,
140142
Closed = false
141143
};
@@ -175,7 +177,9 @@ private void MergeVisualizerWithDependencies(string visualizerInstallationPath,
175177
ILMerge merge = new ILMerge()
176178
{
177179
OutputFile = customVisualizerTargetInstallationPath,
180+
#if DEBUG
178181
DebugInfo = true,
182+
#endif
179183
TargetKind = ILMerge.Kind.SameAsPrimaryAssembly,
180184
Closed = false
181185
};

‎Src/Build/VisualStudioOptions.cs

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,14 @@
2626
using System;
2727
using System.Collections.Generic;
2828
using System.IO;
29-
using System.Reflection;
3029
using BridgeVs.Locations;
3130

3231
namespace BridgeVs.Build
3332
{
3433
internal class Settings
3534
{
36-
public string InstallationPaths;
37-
38-
public Assembly Assembly;
39-
35+
public string DebuggerVisualizerDestinationFolder;
36+
4037
public string AssemblyLocation;
4138

4239
public string MsBuildVersion;
@@ -46,13 +43,6 @@ internal class Settings
4643

4744
public static class VisualStudioOptions
4845
{
49-
private static readonly string MyDocuments = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
50-
private static readonly string Vs2012Path1 = MyDocuments + @"\Visual Studio 2012\Visualizers\";
51-
private static readonly string Vs2013Path1 = MyDocuments + @"\Visual Studio 2013\Visualizers\";
52-
private static readonly string Vs2015Path1 = MyDocuments + @"\Visual Studio 2015\Visualizers\";
53-
private static readonly string Vs2017Path1 = MyDocuments + @"\Visual Studio 2017\Visualizers\";
54-
55-
5646
private static readonly Dictionary<string, Settings> VisualStudioPaths;
5747

5848
static VisualStudioOptions()
@@ -62,38 +52,34 @@ static VisualStudioOptions()
6252
{
6353
"11.0", new Settings
6454
{
65-
InstallationPaths = Vs2012Path1,
55+
DebuggerVisualizerDestinationFolder = CommonFolderPaths.Vs2012DebuggerVisualizerDestinationFolder,
6656
AssemblyLocation = typeof(DynamicVisualizer.V11.Settings).Assembly.Location,
67-
Assembly = typeof(DynamicVisualizer.V11.Settings).Assembly,
6857
MsBuildVersion = "v4.0",
6958
CommonReferenceAssembliesLocation =new List<string> { Path.Combine(CommonFolderPaths.VisualStudio2012Path, CommonFolderPaths.CommonReferenceAssembliesPath)}
7059
}
7160
},
7261
{
7362
"12.0", new Settings
7463
{
75-
InstallationPaths = Vs2013Path1,
64+
DebuggerVisualizerDestinationFolder = CommonFolderPaths.Vs2013DebuggerVisualizerDestinationFolder,
7665
AssemblyLocation = typeof(DynamicVisualizer.V12.Settings).Assembly.Location,
77-
Assembly = typeof(DynamicVisualizer.V12.Settings).Assembly,
7866
MsBuildVersion = "v12.0",
7967
CommonReferenceAssembliesLocation =new List<string> { Path.Combine(CommonFolderPaths.VisualStudio2013Path, CommonFolderPaths.CommonReferenceAssembliesPath)}
8068
}
8169
},
8270
{
8371
"14.0", new Settings
8472
{
85-
InstallationPaths = Vs2015Path1,
73+
DebuggerVisualizerDestinationFolder = CommonFolderPaths.Vs2015DebuggerVisualizerDestinationFolder,
8674
AssemblyLocation =typeof(DynamicVisualizer.V14.Settings).Assembly.Location,
87-
Assembly = typeof(DynamicVisualizer.V14.Settings).Assembly,
8875
MsBuildVersion = "v14.0",
8976
CommonReferenceAssembliesLocation = new List<string> { Path.Combine(CommonFolderPaths.VisualStudio2015Path, CommonFolderPaths.CommonReferenceAssembliesPath)}
9077
}
9178
},
9279
{
9380
"15.0", new Settings
9481
{
95-
InstallationPaths = Vs2017Path1,
96-
Assembly = typeof(LINQBridgeVs.DynamicVisualizer.V15.Settings).Assembly,
82+
DebuggerVisualizerDestinationFolder = CommonFolderPaths.Vs2017DebuggerVisualizerDestinationFolder,
9783
AssemblyLocation = typeof(LINQBridgeVs.DynamicVisualizer.V15.Settings).Assembly.Location,
9884
MsBuildVersion = "v15.0",
9985
CommonReferenceAssembliesLocation =new List<string> { Path.Combine(CommonFolderPaths.VisualStudio2017CommPath, CommonFolderPaths.CommonReferenceAssembliesPath), Path.Combine(CommonFolderPaths.VisualStudio2017EntPath, CommonFolderPaths.CommonReferenceAssembliesPath), Path.Combine(CommonFolderPaths.VisualStudio2017ProPath, CommonFolderPaths.CommonReferenceAssembliesPath)}
@@ -117,11 +103,11 @@ public static string GetVisualizerAssemblyLocation(string visualStudioVersion)
117103
return VisualStudioPaths[visualStudioVersion].AssemblyLocation;
118104
}
119105

120-
public static string GetInstallationPath(string visualStudioVersion)
106+
public static string GetVisualizerDestinationFolder(string visualStudioVersion)
121107
{
122108
CheckVersion(visualStudioVersion);
123109

124-
return VisualStudioPaths[visualStudioVersion].InstallationPaths;
110+
return VisualStudioPaths[visualStudioVersion].DebuggerVisualizerDestinationFolder;
125111
}
126112

127113
public static List<string> GetCommonReferenceAssembliesPath(string visualStudioVersion)

‎Src/DynamicCore/DynamicDebuggerVisualizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public Form ShowLINQPad(Stream inData, string vsVersion)
154154
DeployLinqScript(message);
155155
Log.Write("LinqQuery Successfully deployed");
156156

157-
string linqQueryfileName = Path.Combine(CommonFolderPaths.LinqPadQueryFolder, "BridgeVs", message.FileName);
157+
string linqQueryfileName = Path.Combine(CommonFolderPaths.LinqPadQueryFolder, message.FileName);
158158

159159
ProcessStartInfo startInfo = new ProcessStartInfo
160160
{

‎Src/DynamicVisualizer.V11/BridgeVs.DynamicVisualizer.V11.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
<Project>{b84fbd50-0b10-4c25-8430-680fc6fc3fea}</Project>
6565
<Name>BridgeVs.DynamicCore</Name>
6666
</ProjectReference>
67+
<ProjectReference Include="..\Logging\BridgeVs.Logging.csproj">
68+
<Project>{0B546762-C8C0-45C6-BC42-C5D91D510351}</Project>
69+
<Name>BridgeVs.Logging</Name>
70+
</ProjectReference>
6771
</ItemGroup>
6872
<ItemGroup>
6973
<None Include="packages.config" />

‎Src/DynamicVisualizer.V11/DynamicDebuggerVisualizerV11.cs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
#endregion
2525

26+
using System;
2627
using System.IO;
2728
using System.Windows.Forms;
2829
using BridgeVs.DynamicCore;
30+
using BridgeVs.Logging;
2931
using Microsoft.VisualStudio.DebuggerVisualizers;
30-
using Microsoft.Win32;
3132

3233
namespace BridgeVs.DynamicVisualizer.V11
3334
{
@@ -40,17 +41,25 @@ public class DynamicDebuggerVisualizerV11 : DialogDebuggerVisualizer
4041

4142
protected override void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)
4243
{
43-
DynamicDebuggerVisualizer dynamicDebuggerVisualizer = new DynamicDebuggerVisualizer();
44-
Stream dataStream = objectProvider.GetData();
44+
Log.Configure("LINQBridgeVs", "DynamicDebuggerVisualizerV11");
45+
try
46+
{
47+
DynamicDebuggerVisualizer dynamicDebuggerVisualizer = new DynamicDebuggerVisualizer();
48+
Stream dataStream = objectProvider.GetData();
4549

46-
if (dataStream.Length == 0) return;
50+
if (dataStream.Length == 0)
51+
return;
52+
53+
Form formToShow = dynamicDebuggerVisualizer.ShowLINQPad(dataStream, VsReferencedVersion);
4754

48-
Form formToShow = dynamicDebuggerVisualizer.ShowLINQPad(dataStream, VsReferencedVersion);
4955
#if !TEST
50-
windowService.ShowDialog(formToShow);
56+
windowService.ShowDialog(formToShow);
5157
#endif
58+
}
59+
catch (Exception exception)
60+
{
61+
Log.Write(exception, "Error during LINQPad execution");
62+
}
5263
}
5364
}
54-
55-
56-
}
65+
}

‎Src/DynamicVisualizer.V14/BridgeVs.DynamicVisualizer.V14.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
<Name>BridgeVs.DynamicCore</Name>
6161
<Ilmerge>True</Ilmerge>
6262
</ProjectReference>
63+
<ProjectReference Include="..\Logging\BridgeVs.Logging.csproj">
64+
<Project>{0B546762-C8C0-45C6-BC42-C5D91D510351}</Project>
65+
<Name>BridgeVs.Logging</Name>
66+
</ProjectReference>
6367
</ItemGroup>
6468
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6569
<!-- <Target Name="AfterBuild" Condition=" '$(Configuration)' == 'Deploy' ">

‎Src/DynamicVisualizer.V14/DynamicDebuggerVisualizerV14.cs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
#endregion
2525

26+
using System;
2627
using System.IO;
2728
using System.Windows.Forms;
2829
using BridgeVs.DynamicCore;
30+
using BridgeVs.Logging;
2931
using Microsoft.VisualStudio.DebuggerVisualizers;
3032
using Microsoft.Win32;
3133

@@ -40,16 +42,25 @@ public class DynamicDebuggerVisualizerV14 : DialogDebuggerVisualizer
4042

4143
protected override void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)
4244
{
43-
DynamicDebuggerVisualizer dynamicDebuggerVisualizer = new DynamicDebuggerVisualizer();
44-
Stream dataStream = objectProvider.GetData();
45+
Log.Configure("LINQBridgeVs", "DynamicDebuggerVisualizerV14");
46+
try
47+
{
48+
DynamicDebuggerVisualizer dynamicDebuggerVisualizer = new DynamicDebuggerVisualizer();
49+
Stream dataStream = objectProvider.GetData();
4550

46-
if (dataStream.Length == 0) return;
51+
if (dataStream.Length == 0)
52+
return;
4753

48-
Form formToShow = dynamicDebuggerVisualizer.ShowLINQPad(dataStream, VsReferencedVersion);
54+
Form formToShow = dynamicDebuggerVisualizer.ShowLINQPad(dataStream, VsReferencedVersion);
4955

5056
#if !TEST
51-
windowService.ShowDialog(formToShow);
57+
windowService.ShowDialog(formToShow);
5258
#endif
59+
}
60+
catch (Exception exception)
61+
{
62+
Log.Write(exception, "Error during LINQPad execution");
63+
}
5364
}
5465
}
5566
}

0 commit comments

Comments
 (0)