From 06c463e9cc3ccb10c5deefc553f09a94e4e4cb4e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 12 Aug 2020 08:53:01 +0200
Subject: [PATCH] Update nuget package dll paths

---
 build/NuSpecs/UmbracoCms.Core.nuspec  | 40 +++++++++++++--------------
 build/NuSpecs/UmbracoCms.SqlCe.nuspec |  8 +++---
 build/NuSpecs/UmbracoCms.Web.nuspec   | 18 ++++++------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 6e00e02bbe..c72e01baa3 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -68,31 +68,31 @@
     </metadata>
     <files>
         <!-- Umbraco.Examine.Lucene HACK remove this when Examine lucene is a real netstandard dependency -->
-        <file src="$BuildTmp$\WebApp\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
+        <file src="$BuildTmp$\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
 
         <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.dll" target="lib\netstandard2.0\Umbraco.Configuration.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\netstandard2.0\Umbraco.Core.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.dll" target="lib\net472\Umbraco.Examine.Lucene.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.dll" target="lib\netstandard2.0\Umbraco.Infrastructure.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.dll" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Configuration.dll" target="lib\netstandard2.0\Umbraco.Configuration.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.dll" target="lib\netstandard2.0\Umbraco.Core.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\net472\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.dll" target="lib\netstandard2.0\Umbraco.Infrastructure.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.dll" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.dll" />
 
         <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.xml" target="lib\netstandard2.0\Umbraco.Configuration.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\netstandard2.0\Umbraco.Core.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.xml" target="lib\net472\Umbraco.Examine.Lucene.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.xml" target="lib\netstandard2.0\Umbraco.Examine.Lucene.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.xml" target="lib\netstandard2.0\Umbraco.Infrastructure.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.xml" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Configuration.xml" target="lib\netstandard2.0\Umbraco.Configuration.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.xml" target="lib\netstandard2.0\Umbraco.Core.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\net472\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\netstandard2.0\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.xml" target="lib\netstandard2.0\Umbraco.Infrastructure.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.xml" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.xml" />
 
         <!-- symbols -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.pdb" target="lib\netstandard2.0\Umbraco.Configuration.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.pdb" target="lib\netstandard2.0\Umbraco.Core.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.pdb" target="lib\net472\Umbraco.Examine.Lucene.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.pdb" target="lib\netstandard2.0\Umbraco.Examine.Lucene.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.pdb" target="lib\netstandard2.0\Umbraco.Infrastructure.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.pdb" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Configuration.pdb" target="lib\netstandard2.0\Umbraco.Configuration.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\netstandard2.0\Umbraco.Core.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\net472\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\netstandard2.0\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.pdb" target="lib\netstandard2.0\Umbraco.Infrastructure.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.pdb" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.pdb" />
     </files>
 </package>
diff --git a/build/NuSpecs/UmbracoCms.SqlCe.nuspec b/build/NuSpecs/UmbracoCms.SqlCe.nuspec
index 02c3dff9b9..eb4df4892a 100644
--- a/build/NuSpecs/UmbracoCms.SqlCe.nuspec
+++ b/build/NuSpecs/UmbracoCms.SqlCe.nuspec
@@ -31,13 +31,13 @@
     </metadata>
     <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$\bin\Umbraco.Persistance.SqlCe.dll" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.dll" />
+        <file src="$BuildTmp$\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 -->
 
         <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Persistance.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.xml" />
 
         <!-- symbols -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.pdb" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Persistance.SqlCe.pdb" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.pdb" />
     </files>
 </package>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 3ba1fa3573..a35cea9df7 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -39,21 +39,21 @@
     </metadata>
     <files>
         <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.BackOffice.dll" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Common.dll" target="lib\netcoreapp3.1\Umbraco.Web.Common.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Website.dll" target="lib\netcoreapp3.1\Umbraco.Web.Website.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.dll" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.dll" target="lib\netcoreapp3.1\Umbraco.Web.Common.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.dll" target="lib\netcoreapp3.1\Umbraco.Web.Website.dll" />
         <!--Umbraco.ModelsBuilder.Embedded-->
 
         <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.BackOffice.xml" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Common.xml" target="lib\netcoreapp3.1\Umbraco.Web.Common.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Website.xml" target="lib\netcoreapp3.1\Umbraco.Web.Website.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.xml" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.xml" target="lib\netcoreapp3.1\Umbraco.Web.Common.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.xml" target="lib\netcoreapp3.1\Umbraco.Web.Website.xml" />
         <!--Umbraco.ModelsBuilder.Embedded-->
 
         <!-- symbols -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.BackOffice.pdb" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Common.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Common.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Website.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Website.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.pdb" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Common.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Website.pdb" />
         <!--Umbraco.ModelsBuilder.Embedded-->
     </files>
 </package>