From f0795f63b55f65617f06aed4ebaa040cb6886cf0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 11 Aug 2020 10:40:37 +0200
Subject: [PATCH] Get the SqlCE dll from the SqlCE project instead of the
 executeable, now that the executable does not include SqlCE anymore by
 default

---
 build/NuSpecs/UmbracoCms.SqlCe.nuspec | 2 +-
 build/build.ps1                       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.SqlCe.nuspec b/build/NuSpecs/UmbracoCms.SqlCe.nuspec
index 02c3dff9b9..7af2e043eb 100644
--- a/build/NuSpecs/UmbracoCms.SqlCe.nuspec
+++ b/build/NuSpecs/UmbracoCms.SqlCe.nuspec
@@ -32,7 +32,7 @@
     <files>
         <!-- libs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.dll" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.dll" />
-        <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\netstandard2.0\System.Data.SqlServerCe.dll" /> <!-- Hack because the file from the package is only added to net472 projects -->
+        <file src="$BuildTmp$\SqlCe\System.Data.SqlServerCe.dll" target="lib\netstandard2.0\System.Data.SqlServerCe.dll" /> <!-- Hack because the file from the package is only added to net472 projects -->
 
         <!-- docs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.xml" />
diff --git a/build/build.ps1 b/build/build.ps1
index 4b06cbaebb..f043e7b860 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -168,10 +168,14 @@
       > $log
 
    # get files into WebApp\bin
-   & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+    & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
       --output "$($this.BuildTemp)\WebApp\bin\\" `
       > $log
 
+    & dotnet publish "$src\Umbraco.Persistance.SqlCe\Umbraco.Persistance.SqlCe.csproj" `
+      --output "$($this.BuildTemp)\SqlCe\" `
+      > $log
+
     # remove extra files
     $webAppBin = "$($this.BuildTemp)\WebApp\bin"
     $excludeDirs = @("$($webAppBin)\Config","$($webAppBin)\refs","$($webAppBin)\runtimes","$($webAppBin)\Umbraco","$($webAppBin)\wwwroot")