diff --git a/MySql/Source/MySql.Data/MySql.Data.csproj b/MySql/Source/MySql.Data/MySql.Data.csproj
index 32925e0d..10047f39 100644
--- a/MySql/Source/MySql.Data/MySql.Data.csproj
+++ b/MySql/Source/MySql.Data/MySql.Data.csproj
@@ -7,7 +7,7 @@
2.0
4.0
NET_40_OR_GREATER
- 0.6.0
+ 0.6.1
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}
diff --git a/NPlot/NPlot.csproj b/NPlot/NPlot.csproj
index fbe346cd..bc6381d4 100644
--- a/NPlot/NPlot.csproj
+++ b/NPlot/NPlot.csproj
@@ -9,7 +9,7 @@
Library
NPlot
NPlot
- 0.6.0
+ 0.6.1
true
diff --git a/Npgsql/Npgsql.csproj b/Npgsql/Npgsql.csproj
index 6232f27a..fd6aea25 100644
--- a/Npgsql/Npgsql.csproj
+++ b/Npgsql/Npgsql.csproj
@@ -9,7 +9,7 @@
Library
Npgsql
Npgsql
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
index 38cf9ac4..eb83c997 100644
--- a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
+++ b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
@@ -9,7 +9,7 @@
Exe
Ntp.Analyzer.Cli
Ntp.Analyzer.Cli.Program
- 0.6.0
+ 0.6.1
Ntp.Analyzer.Cli
diff --git a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj
index ddc98b03..a4cfb014 100644
--- a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj
+++ b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Analyzer.Data
Ntp.Analyzer.Data
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj
index bd36f0ef..34a5a029 100644
--- a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj
+++ b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Analyzer.Import
Ntp.Analyzer.Import
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj b/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj
index 4897e4fe..5556b39a 100644
--- a/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj
+++ b/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Analyzer.Localize
Ntp.Analyzer.Localize
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Analyzer.Localize/VersionInfo.cs b/Ntp.Analyzer.Localize/VersionInfo.cs
index 60864fa4..b6aad27b 100644
--- a/Ntp.Analyzer.Localize/VersionInfo.cs
+++ b/Ntp.Analyzer.Localize/VersionInfo.cs
@@ -28,7 +28,7 @@ namespace Ntp.Analyzer.Localize
{
public static class VersionInfo
{
- public static readonly string Number = "0.6.0";
+ public static readonly string Number = "0.6.1";
public static readonly string Text = "v" + Number;
}
diff --git a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj
index 74fcf744..e64aeb53 100644
--- a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj
+++ b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Analyzer.Objects
Ntp.Analyzer.Objects
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
index 1bc0d54f..2a6459af 100644
--- a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
+++ b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Analyzer.Process
Ntp.Analyzer.Process
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
index 860fe614..5b9d1e33 100644
--- a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
+++ b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
@@ -8,7 +8,7 @@
{9790FACF-170E-43C7-889A-D4445FC7E7A1}
Exe
Ntp.Analyzer.Validate.Cli
- 0.6.0
+ 0.6.1
Ntp.Analyzer.Validate.Cli.Program
Ntp.Analyzer.Validate.Cli
diff --git a/Ntp.Analyzer.sln b/Ntp.Analyzer.sln
index e00d30f7..0d489a38 100644
--- a/Ntp.Analyzer.sln
+++ b/Ntp.Analyzer.sln
@@ -59,6 +59,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ntp.Common", "Ntp.Common\Nt
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ntp.Log", "Ntp.Log\Ntp.Log.csproj", "{909C8729-ED63-4603-85EA-34A1FC4D63D9}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot", "OxyPlot\OxyPlot.csproj", "{197B9F4F-FF78-48E9-982F-938C59C6E49E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.Gdi", "OxyPlot.Gdi\OxyPlot.Gdi.csproj", "{D4554296-094E-4CAC-8EAE-44EB250666C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.Gdi.Example", "OxyPlot.Gdi.Example\OxyPlot.Gdi.Example.csproj", "{BBAECBB8-149A-42EE-A4F4-6207D7954F8B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -99,6 +105,14 @@ Global
{13FA10AB-D656-4D72-BC69-2525D484C9DE}.Release|Any CPU.Build.0 = Release|Any CPU
{13FA10AB-D656-4D72-BC69-2525D484C9DE}.Server|Any CPU.ActiveCfg = Server|Any CPU
{13FA10AB-D656-4D72-BC69-2525D484C9DE}.Server|Any CPU.Build.0 = Server|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Develop|Any CPU.ActiveCfg = Release|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Develop|Any CPU.Build.0 = Release|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Server|Any CPU.ActiveCfg = Release|Any CPU
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}.Server|Any CPU.Build.0 = Release|Any CPU
{1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F0A20C9-71C7-4A2C-8DB3-5D18E0E49227}.Develop|Any CPU.ActiveCfg = Develop|Any CPU
@@ -211,6 +225,14 @@ Global
{B982916F-F2F1-4975-89A6-C8BACDC65542}.Release|Any CPU.Build.0 = Release|Any CPU
{B982916F-F2F1-4975-89A6-C8BACDC65542}.Server|Any CPU.ActiveCfg = Server|Any CPU
{B982916F-F2F1-4975-89A6-C8BACDC65542}.Server|Any CPU.Build.0 = Server|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Develop|Any CPU.ActiveCfg = Release|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Develop|Any CPU.Build.0 = Release|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Server|Any CPU.ActiveCfg = Release|Any CPU
+ {BBAECBB8-149A-42EE-A4F4-6207D7954F8B}.Server|Any CPU.Build.0 = Release|Any CPU
{C2DEBED1-FE91-4929-B686-8E920731E88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2DEBED1-FE91-4929-B686-8E920731E88C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2DEBED1-FE91-4929-B686-8E920731E88C}.Develop|Any CPU.ActiveCfg = Develop|Any CPU
@@ -227,6 +249,14 @@ Global
{CCF0EE0C-E3E4-4A75-AFEB-C709ED51E90F}.Release|Any CPU.Build.0 = Release|Any CPU
{CCF0EE0C-E3E4-4A75-AFEB-C709ED51E90F}.Server|Any CPU.ActiveCfg = Server|Any CPU
{CCF0EE0C-E3E4-4A75-AFEB-C709ED51E90F}.Server|Any CPU.Build.0 = Server|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Develop|Any CPU.ActiveCfg = Release|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Develop|Any CPU.Build.0 = Release|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Server|Any CPU.ActiveCfg = Release|Any CPU
+ {D4554296-094E-4CAC-8EAE-44EB250666C6}.Server|Any CPU.Build.0 = Release|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Develop|Any CPU.ActiveCfg = Develop|Any CPU
@@ -434,7 +464,7 @@ Global
$36.inheritsScope = application/xml
$36.scope = application/xml
description = NTP Analyzer is a tool dedicated to analyze the operation of time servers.
- version = 0.6.0
+ version = 0.6.1
StartupItem = Ntp.Analyzer.Cli\Ntp.Analyzer.Cli.csproj
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
diff --git a/Ntp.Analyzer/Ntp.Analyzer.csproj b/Ntp.Analyzer/Ntp.Analyzer.csproj
index b559e3e7..eb99d3a6 100644
--- a/Ntp.Analyzer/Ntp.Analyzer.csproj
+++ b/Ntp.Analyzer/Ntp.Analyzer.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Analyzer
Ntp.Analyzer
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Common/Ntp.Common.csproj b/Ntp.Common/Ntp.Common.csproj
index f8dc5b28..68d6914b 100644
--- a/Ntp.Common/Ntp.Common.csproj
+++ b/Ntp.Common/Ntp.Common.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Common
Ntp.Common
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Config/Ntp.Config.csproj b/Ntp.Config/Ntp.Config.csproj
index 7e5e9a9a..c7d9598d 100644
--- a/Ntp.Config/Ntp.Config.csproj
+++ b/Ntp.Config/Ntp.Config.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Config
Ntp.Config
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Data.Provider/Ntp.Data.Provider.csproj b/Ntp.Data.Provider/Ntp.Data.Provider.csproj
index f9545ff3..e57fc35c 100644
--- a/Ntp.Data.Provider/Ntp.Data.Provider.csproj
+++ b/Ntp.Data.Provider/Ntp.Data.Provider.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Data.Provider
Ntp.Data.Provider
- 0.6.0
+ 0.6.1
true
@@ -62,5 +62,9 @@
{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}
MySql.Data
+
+ {9D13B739-62B1-4190-B386-7A9547304EB3}
+ Npgsql
+
\ No newline at end of file
diff --git a/Ntp.Data/Ntp.Data.csproj b/Ntp.Data/Ntp.Data.csproj
index 1d49e976..50727000 100644
--- a/Ntp.Data/Ntp.Data.csproj
+++ b/Ntp.Data/Ntp.Data.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Data
Ntp.Data
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Interop/Ntp.Interop.csproj b/Ntp.Interop/Ntp.Interop.csproj
index 5e0997e5..dbb0c37e 100644
--- a/Ntp.Interop/Ntp.Interop.csproj
+++ b/Ntp.Interop/Ntp.Interop.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Interop
Ntp.Interop
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Log/Ntp.Log.csproj b/Ntp.Log/Ntp.Log.csproj
index de69aa3c..1c4db131 100644
--- a/Ntp.Log/Ntp.Log.csproj
+++ b/Ntp.Log/Ntp.Log.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Log
Ntp.Analyzer.Log
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj b/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj
index 7e5f76b4..33b62bf8 100644
--- a/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj
+++ b/Ntp.Monitor.Cli/Ntp.Monitor.Cli.csproj
@@ -8,7 +8,7 @@
{0349CF56-C07C-46B5-B9CD-2BCB2709EE0A}
Exe
Ntp.Monitor.Cli
- 0.6.0
+ 0.6.1
Ntp.Monitor.Cli
diff --git a/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj b/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj
index 61e75795..5cbe689b 100644
--- a/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj
+++ b/Ntp.Monitor.Client/Ntp.Monitor.Client.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Monitor.Client
Ntp.Monitor.Client
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj b/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj
index 87c09dcb..b442cd2e 100644
--- a/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj
+++ b/Ntp.Monitor.Server/Ntp.Monitor.Server.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Monitor.Server
Ntp.Monitor.Server
- 0.6.0
+ 0.6.1
true
diff --git a/Ntp.Process/Ntp.Process.csproj b/Ntp.Process/Ntp.Process.csproj
index 57fe331e..303ddb54 100644
--- a/Ntp.Process/Ntp.Process.csproj
+++ b/Ntp.Process/Ntp.Process.csproj
@@ -9,7 +9,7 @@
Library
Ntp.Process
Ntp.Process
- 0.6.0
+ 0.6.1
true
diff --git a/OxyPlot.Example/Form1.Designer.cs b/OxyPlot.Gdi.Example/Form1.Designer.cs
similarity index 96%
rename from OxyPlot.Example/Form1.Designer.cs
rename to OxyPlot.Gdi.Example/Form1.Designer.cs
index 4adb1ee3..934b5845 100644
--- a/OxyPlot.Example/Form1.Designer.cs
+++ b/OxyPlot.Gdi.Example/Form1.Designer.cs
@@ -4,7 +4,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-using OxyPlot.WindowsForms;
+using OxyPlot.Gdi;
namespace WindowsFormsDemo
{
@@ -36,7 +36,7 @@ namespace WindowsFormsDemo
///
private void InitializeComponent()
{
- this.plot1 = new OxyPlot.WindowsForms.PlotView();
+ this.plot1 = new OxyPlot.Gdi.PlotView();
this.SuspendLayout();
//
// plot1
diff --git a/OxyPlot.Example/Form1.cs b/OxyPlot.Gdi.Example/Form1.cs
similarity index 100%
rename from OxyPlot.Example/Form1.cs
rename to OxyPlot.Gdi.Example/Form1.cs
diff --git a/OxyPlot.Example/Form1.resx b/OxyPlot.Gdi.Example/Form1.resx
similarity index 100%
rename from OxyPlot.Example/Form1.resx
rename to OxyPlot.Gdi.Example/Form1.resx
diff --git a/OxyPlot.Example/OxyPlot.Example.csproj b/OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj
similarity index 93%
rename from OxyPlot.Example/OxyPlot.Example.csproj
rename to OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj
index 59f6c340..5a782f8c 100644
--- a/OxyPlot.Example/OxyPlot.Example.csproj
+++ b/OxyPlot.Gdi.Example/OxyPlot.Gdi.Example.csproj
@@ -11,7 +11,7 @@
512
8.0.30703
2.0
- 0.6.0
+ 0.6.1
true
@@ -85,7 +85,11 @@
-->
-
+
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}
+ OxyPlot
+
+
{D4554296-094E-4CAC-8EAE-44EB250666C6}
OxyPlot.Gdi
diff --git a/OxyPlot.Example/Program.cs b/OxyPlot.Gdi.Example/Program.cs
similarity index 100%
rename from OxyPlot.Example/Program.cs
rename to OxyPlot.Gdi.Example/Program.cs
diff --git a/OxyPlot.Example/Properties/AssemblyInfo.cs b/OxyPlot.Gdi.Example/Properties/AssemblyInfo.cs
similarity index 100%
rename from OxyPlot.Example/Properties/AssemblyInfo.cs
rename to OxyPlot.Gdi.Example/Properties/AssemblyInfo.cs
diff --git a/OxyPlot.Example/Properties/GlobalAssemblyInfo.cs b/OxyPlot.Gdi.Example/Properties/GlobalAssemblyInfo.cs
similarity index 100%
rename from OxyPlot.Example/Properties/GlobalAssemblyInfo.cs
rename to OxyPlot.Gdi.Example/Properties/GlobalAssemblyInfo.cs
diff --git a/OxyPlot.Example/Properties/Resources.Designer.cs b/OxyPlot.Gdi.Example/Properties/Resources.Designer.cs
similarity index 100%
rename from OxyPlot.Example/Properties/Resources.Designer.cs
rename to OxyPlot.Gdi.Example/Properties/Resources.Designer.cs
diff --git a/OxyPlot.Example/Properties/Resources.resx b/OxyPlot.Gdi.Example/Properties/Resources.resx
similarity index 100%
rename from OxyPlot.Example/Properties/Resources.resx
rename to OxyPlot.Gdi.Example/Properties/Resources.resx
diff --git a/OxyPlot.Example/Properties/Settings.Designer.cs b/OxyPlot.Gdi.Example/Properties/Settings.Designer.cs
similarity index 100%
rename from OxyPlot.Example/Properties/Settings.Designer.cs
rename to OxyPlot.Gdi.Example/Properties/Settings.Designer.cs
diff --git a/OxyPlot.Example/Properties/Settings.settings b/OxyPlot.Gdi.Example/Properties/Settings.settings
similarity index 100%
rename from OxyPlot.Example/Properties/Settings.settings
rename to OxyPlot.Gdi.Example/Properties/Settings.settings
diff --git a/OxyPlot.WindowsForms/GraphicsRenderContext.cs b/OxyPlot.Gdi/GraphicsRenderContext.cs
similarity index 99%
rename from OxyPlot.WindowsForms/GraphicsRenderContext.cs
rename to OxyPlot.Gdi/GraphicsRenderContext.cs
index 29b9bab9..227c2699 100644
--- a/OxyPlot.WindowsForms/GraphicsRenderContext.cs
+++ b/OxyPlot.Gdi/GraphicsRenderContext.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
using System;
using System.Collections.Generic;
diff --git a/OxyPlot.WindowsForms/NamespaceDoc.cs b/OxyPlot.Gdi/NamespaceDoc.cs
similarity index 95%
rename from OxyPlot.WindowsForms/NamespaceDoc.cs
rename to OxyPlot.Gdi/NamespaceDoc.cs
index abf3348f..1fba35d8 100644
--- a/OxyPlot.WindowsForms/NamespaceDoc.cs
+++ b/OxyPlot.Gdi/NamespaceDoc.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
///
/// The OxyPlot.WindowsForms namespace contains controls for Windows Forms and a bitmap exporter.
diff --git a/OxyPlot.WindowsForms/OxyPlot.Gdi.csproj b/OxyPlot.Gdi/OxyPlot.Gdi.csproj
similarity index 92%
rename from OxyPlot.WindowsForms/OxyPlot.Gdi.csproj
rename to OxyPlot.Gdi/OxyPlot.Gdi.csproj
index 78fe3aad..250ad6aa 100644
--- a/OxyPlot.WindowsForms/OxyPlot.Gdi.csproj
+++ b/OxyPlot.Gdi/OxyPlot.Gdi.csproj
@@ -12,7 +12,7 @@
512
8.0.30703
2.0
- 0.6.0
+ 0.6.1
true
@@ -62,4 +62,10 @@
-->
+
+
+ {197B9F4F-FF78-48E9-982F-938C59C6E49E}
+ OxyPlot
+
+
\ No newline at end of file
diff --git a/OxyPlot.WindowsForms/PlotModelExtensions.cs b/OxyPlot.Gdi/PlotModelExtensions.cs
similarity index 98%
rename from OxyPlot.WindowsForms/PlotModelExtensions.cs
rename to OxyPlot.Gdi/PlotModelExtensions.cs
index d73353f8..cd1dd712 100644
--- a/OxyPlot.WindowsForms/PlotModelExtensions.cs
+++ b/OxyPlot.Gdi/PlotModelExtensions.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
using System;
using System.Drawing;
diff --git a/OxyPlot.WindowsForms/PlotView.cs b/OxyPlot.Gdi/PlotView.cs
similarity index 99%
rename from OxyPlot.WindowsForms/PlotView.cs
rename to OxyPlot.Gdi/PlotView.cs
index 53c24e81..0d9dc2ea 100644
--- a/OxyPlot.WindowsForms/PlotView.cs
+++ b/OxyPlot.Gdi/PlotView.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
using System;
using System.ComponentModel;
diff --git a/OxyPlot.WindowsForms/PngExporter.cs b/OxyPlot.Gdi/PngExporter.cs
similarity index 99%
rename from OxyPlot.WindowsForms/PngExporter.cs
rename to OxyPlot.Gdi/PngExporter.cs
index e6357002..8859d6da 100644
--- a/OxyPlot.WindowsForms/PngExporter.cs
+++ b/OxyPlot.Gdi/PngExporter.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
using System.Drawing;
using System.Drawing.Imaging;
diff --git a/OxyPlot.WindowsForms/Properties/AssemblyInfo.cs b/OxyPlot.Gdi/Properties/AssemblyInfo.cs
similarity index 100%
rename from OxyPlot.WindowsForms/Properties/AssemblyInfo.cs
rename to OxyPlot.Gdi/Properties/AssemblyInfo.cs
diff --git a/OxyPlot.WindowsForms/Properties/GlobalAssemblyInfo.cs b/OxyPlot.Gdi/Properties/GlobalAssemblyInfo.cs
similarity index 100%
rename from OxyPlot.WindowsForms/Properties/GlobalAssemblyInfo.cs
rename to OxyPlot.Gdi/Properties/GlobalAssemblyInfo.cs
diff --git a/OxyPlot.WindowsForms/SvgExporter.cs b/OxyPlot.Gdi/SvgExporter.cs
similarity index 98%
rename from OxyPlot.WindowsForms/SvgExporter.cs
rename to OxyPlot.Gdi/SvgExporter.cs
index 1b1c8de8..c9faf35b 100644
--- a/OxyPlot.WindowsForms/SvgExporter.cs
+++ b/OxyPlot.Gdi/SvgExporter.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
using System;
using System.Drawing;
diff --git a/OxyPlot.WindowsForms/Utilities/ConverterExtensions.cs b/OxyPlot.Gdi/Utilities/ConverterExtensions.cs
similarity index 99%
rename from OxyPlot.WindowsForms/Utilities/ConverterExtensions.cs
rename to OxyPlot.Gdi/Utilities/ConverterExtensions.cs
index ddfdfbeb..988e83ef 100644
--- a/OxyPlot.WindowsForms/Utilities/ConverterExtensions.cs
+++ b/OxyPlot.Gdi/Utilities/ConverterExtensions.cs
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------------------------------------------------
-namespace OxyPlot.WindowsForms
+namespace OxyPlot.Gdi
{
using System;
using System.Drawing;
diff --git a/OxyPlot/OxyPlot.csproj b/OxyPlot/OxyPlot.csproj
index 81d233a0..000706bb 100644
--- a/OxyPlot/OxyPlot.csproj
+++ b/OxyPlot/OxyPlot.csproj
@@ -12,7 +12,7 @@
512
8.0.30703
2.0
- 0.6.0
+ 0.6.1
true