From ed2cf3917816dcd745fbf1dd21fa07e82be0fa9a Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 4 Dec 2014 08:40:46 +0100 Subject: [PATCH] Moved Perspex.UnitTests to Perspex.Base.UnitTests. --- .../Perspex.Base.UnitTests.csproj | 6 +++--- .../PerspexObjectTests.cs | 3 +-- .../PerspexPropertyTests.cs | 3 +-- .../PriorityValueTEsts.cs | 3 +-- .../Properties/AssemblyInfo.cs | 0 .../app.config | 0 .../packages.config | 0 Perspex.sln | 12 ++++++------ 8 files changed, 12 insertions(+), 15 deletions(-) rename Perspex.UnitTests/Perspex.UnitTests.csproj => Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj (97%) rename {Perspex.UnitTests => Perspex.Base.UnitTests}/PerspexObjectTests.cs (99%) rename {Perspex.UnitTests => Perspex.Base.UnitTests}/PerspexPropertyTests.cs (97%) rename {Perspex.UnitTests => Perspex.Base.UnitTests}/PriorityValueTEsts.cs (98%) rename {Perspex.UnitTests => Perspex.Base.UnitTests}/Properties/AssemblyInfo.cs (100%) rename {Perspex.UnitTests => Perspex.Base.UnitTests}/app.config (100%) rename {Perspex.UnitTests => Perspex.Base.UnitTests}/packages.config (100%) diff --git a/Perspex.UnitTests/Perspex.UnitTests.csproj b/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj similarity index 97% rename from Perspex.UnitTests/Perspex.UnitTests.csproj rename to Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj index 90956ea27e..364484a35e 100644 --- a/Perspex.UnitTests/Perspex.UnitTests.csproj +++ b/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj @@ -6,8 +6,8 @@ {2905FF23-53FB-45E6-AA49-6AF47A172056} Library Properties - Perspex.UnitTests - Perspex.UnitTests + Perspex.Base.UnitTests + Perspex.Base.UnitTests v4.5 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -73,7 +73,7 @@ - + diff --git a/Perspex.UnitTests/PerspexObjectTests.cs b/Perspex.Base.UnitTests/PerspexObjectTests.cs similarity index 99% rename from Perspex.UnitTests/PerspexObjectTests.cs rename to Perspex.Base.UnitTests/PerspexObjectTests.cs index 216b27a7d8..2da8d172d4 100644 --- a/Perspex.UnitTests/PerspexObjectTests.cs +++ b/Perspex.Base.UnitTests/PerspexObjectTests.cs @@ -4,8 +4,7 @@ // // ----------------------------------------------------------------------- -using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Perspex.UnitTests +namespace Perspex.Base.UnitTests { using System; using System.Linq; diff --git a/Perspex.UnitTests/PerspexPropertyTests.cs b/Perspex.Base.UnitTests/PerspexPropertyTests.cs similarity index 97% rename from Perspex.UnitTests/PerspexPropertyTests.cs rename to Perspex.Base.UnitTests/PerspexPropertyTests.cs index bfca46d648..eb298c45d0 100644 --- a/Perspex.UnitTests/PerspexPropertyTests.cs +++ b/Perspex.Base.UnitTests/PerspexPropertyTests.cs @@ -4,8 +4,7 @@ // // ----------------------------------------------------------------------- -using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Perspex.UnitTests +namespace Perspex.Base.UnitTests { using System; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Perspex.UnitTests/PriorityValueTEsts.cs b/Perspex.Base.UnitTests/PriorityValueTEsts.cs similarity index 98% rename from Perspex.UnitTests/PriorityValueTEsts.cs rename to Perspex.Base.UnitTests/PriorityValueTEsts.cs index 742b9a0160..be2f48683d 100644 --- a/Perspex.UnitTests/PriorityValueTEsts.cs +++ b/Perspex.Base.UnitTests/PriorityValueTEsts.cs @@ -4,11 +4,10 @@ // // ----------------------------------------------------------------------- -namespace Perspex.UnitTests +namespace Perspex.Base.UnitTests { using System; using System.Linq; - using System.Reactive.Disposables; using System.Reactive.Linq; using System.Reactive.Subjects; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Perspex.UnitTests/Properties/AssemblyInfo.cs b/Perspex.Base.UnitTests/Properties/AssemblyInfo.cs similarity index 100% rename from Perspex.UnitTests/Properties/AssemblyInfo.cs rename to Perspex.Base.UnitTests/Properties/AssemblyInfo.cs diff --git a/Perspex.UnitTests/app.config b/Perspex.Base.UnitTests/app.config similarity index 100% rename from Perspex.UnitTests/app.config rename to Perspex.Base.UnitTests/app.config diff --git a/Perspex.UnitTests/packages.config b/Perspex.Base.UnitTests/packages.config similarity index 100% rename from Perspex.UnitTests/packages.config rename to Perspex.Base.UnitTests/packages.config diff --git a/Perspex.sln b/Perspex.sln index 47745d481e..7f3e24d7d9 100644 --- a/Perspex.sln +++ b/Perspex.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Win32", "Windows\Pe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.UnitTests", "Perspex.UnitTests\Perspex.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Windows\Perspex.Direct2D1.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}" @@ -51,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Gtk", "Gtk\Perspex. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication-Mono", "TestApplication\TestApplication-Mono.csproj", "{B6FDF644-8EE5-4A6B-8ECC-C2C2E4DAF116}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base.UnitTests", "Perspex.Base.UnitTests\Perspex.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -65,10 +65,6 @@ Global {E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|Any CPU.ActiveCfg = Release|Any CPU {E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}.Release|Any CPU.Build.0 = Release|Any CPU - {2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.Build.0 = Release|Any CPU {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E908F67-5543-4879-A1DC-08EACE79B3CD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -140,6 +136,10 @@ Global {B6FDF644-8EE5-4A6B-8ECC-C2C2E4DAF116}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6FDF644-8EE5-4A6B-8ECC-C2C2E4DAF116}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6FDF644-8EE5-4A6B-8ECC-C2C2E4DAF116}.Release|Any CPU.Build.0 = Release|Any CPU + {2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2905FF23-53FB-45E6-AA49-6AF47A172056}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2905FF23-53FB-45E6-AA49-6AF47A172056}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE