From 2b7966dc550cb61765ac7cdc0c90eefc4f8c6c1b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 4 May 2018 14:32:04 +0200
Subject: [PATCH] Depend on Umbraco.SqlServerCE, package in net47

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 12 +++++-------
 build/NuSpecs/UmbracoCms.nuspec      |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 5e836f602b..da4ee8acd6 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -58,6 +58,7 @@
         <dependency id="System.ValueTuple" version="[4.4.0,4.666666)" />
         <dependency id="System.Xml.ReaderWriter" version="[4.3.1,4.666666)" />
         <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.17,8.666666)" />
+        <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.666666)" />
         <!--
           although these are package references in csproj files, they cannot or
           should not be part of nuspecs, either because we directly distribute the
@@ -65,19 +66,16 @@
         -->
         <!--<dependency id="xmlrpcnet" version="[3.0.0.266,3.666666)" />-->
         <!--<dependency id="dotless" version="[1.5.2,1.666666)" />-->
-        <!--<dependency id="SqlServerCE" version="[4.0.0.1,4.666666)" />-->
     </dependencies>
   </metadata>
   <files>
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net47\Umbraco.Core.dll" />
     <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\Umbraco.Web.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net47\Umbraco.Web.dll" />
     <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\Umbraco.Web.xml" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net47\Umbraco.Web.UI.dll" />
     <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\Umbraco.Examine.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net47\Umbraco.Examine.dll" />
     <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\Umbraco.Examine.xml" />
 
     <file src="tools\install.core.ps1" target="tools\install.ps1" />
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 241a46d2c2..1679ff6f97 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -27,8 +27,6 @@
     <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
     <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
     <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-    <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
-    <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
     <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
     <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
     <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />