diff --git a/src/Orchard.Specs/Hosting/WebHost.cs b/src/Orchard.Specs/Hosting/WebHost.cs index d834cbe01..95f71b609 100644 --- a/src/Orchard.Specs/Hosting/WebHost.cs +++ b/src/Orchard.Specs/Hosting/WebHost.cs @@ -17,7 +17,12 @@ namespace Orchard.Specs.Hosting { _tempSite = Path.Get(System.IO.Path.GetTempFileName()).Delete().CreateDirectory(); - _orchardWebPath = baseDir.Parent.Parent.Parent.Combine("Orchard.Web"); + // Trying the two known relative paths to the Orchard.Web directory. + // The second one is for the target "spec" in orchard.proj. + _orchardWebPath = baseDir.Up(3).Combine("Orchard.Web"); + if (!_orchardWebPath.Exists) { + _orchardWebPath = baseDir.Up(2).Combine("src").Combine("Orchard.Web"); + } baseDir.Combine("Hosting").Combine(templateName) .DeepCopy(_tempSite); diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 992a66ad9..346b649ba 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -63,8 +63,6 @@ False ..\..\lib\fluentnhibernate\log4net.dll - - False ..\..\lib\fluentnhibernate\NHibernate.dll diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 00e849f60..745ae30fd 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -55,8 +55,6 @@ False ..\..\lib\fluentnhibernate\FluentNHibernate.dll - - False ..\..\lib\moq\Moq.dll