From 3e47d38a715bd2a6ca9b9f7ecf7b63b94e0f3918 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Fri, 28 Dec 2012 20:51:08 -0100 Subject: [PATCH] Adding missing directory seperator in FullpathToRoot. Changing Umbraco.Core to use the SqlCe assemblies from the nuget package instead of those in the GAC, as that could cause problems for the build of the Umbraco.Core.dll. --- src/Umbraco.Core/Configuration/GlobalSettings.cs | 2 +- src/Umbraco.Core/Umbraco.Core.csproj | 4 ++-- src/Umbraco.Core/packages.config | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 8199ebfda5..855745244f 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -223,7 +223,7 @@ namespace Umbraco.Core.Configuration /// The fullpath to root. public static string FullpathToRoot { - get { return IOHelper.GetRootDirectorySafe(); } + get { return IOHelper.GetRootDirectorySafe() + System.IO.Path.DirectorySeparatorChar; } } /// diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index af92db2f2c..b60ac5e56e 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -48,11 +48,11 @@ False - ..\..\lib\SQLCE4\System.Data.SqlServerCe.dll + ..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.dll False - ..\..\lib\SQLCE4\System.Data.SqlServerCe.Entity.dll + ..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.Entity.dll diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config index 0d95c3d75b..287a84c472 100644 --- a/src/Umbraco.Core/packages.config +++ b/src/Umbraco.Core/packages.config @@ -6,4 +6,5 @@ + \ No newline at end of file