Skip to content

Commit 6e92d8e

Browse files
xfischerxfischer
committed
Code cleanup. Resolves #10 and #9
Removed WPF controls
1 parent 7143062 commit 6e92d8e

28 files changed

Lines changed: 127 additions & 1227 deletions

‎SqlServerSpatial.Toolkit NuGet/SqlServerSpatial.Toolkit.0.1.1.0.nupkg‎

-2.4 KB
Binary file not shown.

‎SqlServerSpatial.Toolkit NuGet/SqlServerSpatial.Toolkit.0.1.2.0.nupkg‎

54.3 KB
Binary file not shown.

‎SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2013/DebuggerSideBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Windows.Media;
44
using Microsoft.SqlServer.Types;
55
using Microsoft.VisualStudio.DebuggerVisualizers;
6-
using SqlServerSpatial.Toolkit.Viewers;
6+
using SqlServerSpatial.Toolkit.Debugging;
77

88
namespace SqlServerSpatial.Toolkit.Visualizer
99
{
@@ -21,7 +21,7 @@ protected override void Show(IDialogVisualizerService windowService, IVisualizer
2121

2222
using (FrmGeometryViewer frmViewer = new FrmGeometryViewer())
2323
{
24-
frmViewer.Viewer.SetGeometry(new SqlGeometryStyled(geometry, null, Color.FromArgb(200, 0, 175, 0), Colors.Black, 1f));
24+
frmViewer.Viewer.SetGeometry(SqlGeomStyledFactory.Create(geometry, null, Color.FromArgb(200, 0, 175, 0), Colors.Black, 1f));
2525

2626
// Show the grid with the list
2727
windowService.ShowDialog(frmViewer);

‎SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
3333
// en utilisant '*', comme indiqué ci-dessous :
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]

‎SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015/SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015.csproj‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<Reference Include="PresentationCore" />
3939
<Reference Include="PresentationFramework" />
4040
<Reference Include="SqlServerSpatial.Toolkit, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\Solution.VS2015\packages\SqlServerSpatial.Toolkit.0.1.0.0\lib\net40\SqlServerSpatial.Toolkit.dll</HintPath>
42-
<Private>True</Private>
41+
<SpecificVersion>False</SpecificVersion>
42+
<HintPath>..\Binaries\Core\SqlServerSpatial.Toolkit.dll</HintPath>
4343
</Reference>
4444
<Reference Include="System" />
4545
<Reference Include="System.Core" />
@@ -79,16 +79,6 @@
7979
<Link>SqlServerTypes\x86\SqlServerSpatial110.dll</Link>
8080
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8181
</Content>
82-
<Content Include="..\Solution.VS2015\packages\SqlServerSpatial.Toolkit.0.1.0.0\toolkit\SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2013.dll">
83-
<Link>SqlServerSpatial.Toolkit\SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2013.dll</Link>
84-
</Content>
85-
<Content Include="..\Solution.VS2015\packages\SqlServerSpatial.Toolkit.0.1.0.0\toolkit\SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015.dll">
86-
<Link>SqlServerSpatial.Toolkit\SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015.dll</Link>
87-
</Content>
88-
<Content Include="..\Solution.VS2015\packages\SqlServerSpatial.Toolkit.0.1.0.0\toolkit\SqlServerSpatial.Toolkit.Viewer.exe">
89-
<Link>SqlServerSpatial.Toolkit\SqlServerSpatial.Toolkit.Viewer.exe</Link>
90-
</Content>
91-
<Content Include="SqlServerSpatial.Toolkit\readme.htm" />
9282
<Content Include="SqlServerTypes\readme.htm" />
9383
</ItemGroup>
9484
<ItemGroup>

‎SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015/SqlServerSpatial.Toolkit/readme.htm‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎SqlServerSpatial.Toolkit.DebuggerVisualizer.VS2015/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net4" />
4-
<package id="SqlServerSpatial.Toolkit" version="0.1.0.0" targetFramework="net4" />
54
</packages>

‎SqlServerSpatial.Toolkit.Test/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
3333
// en utilisant '*', comme indiqué ci-dessous :
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.1.0")]
36-
[assembly: AssemblyFileVersion("0.1.1.0")]
35+
[assembly: AssemblyVersion("0.1.2.0")]
36+
[assembly: AssemblyFileVersion("0.1.2.0")]

‎SqlServerSpatial.Toolkit.Viewer/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private void LaunchTraceViewer(string traceFilePath)
283283
Window wnd = new Window();
284284
wnd.Title = "SqlServer Spatial Trace Viewer";
285285
wnd.Content = ctlTraceViewer;
286-
wnd.Closed += (o, e) => { ctlTraceViewer.Close(); };
286+
wnd.Closed += (o, e) => { ctlTraceViewer.Dispose(); };
287287
wnd.Show();
288288
}
289289

‎SqlServerSpatial.Toolkit.Viewer/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
5252
// en utilisant '*', comme indiqué ci-dessous :
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("0.1.1.0")]
55-
[assembly: AssemblyFileVersion("0.1.1.0")]
54+
[assembly: AssemblyVersion("0.1.2.0")]
55+
[assembly: AssemblyFileVersion("0.1.2.0")]

0 commit comments

Comments
 (0)