From fe1a4f7d4f24f15b14268e1940abfc7aa716d62e Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 4 May 2018 14:24:07 +0200
Subject: [PATCH 01/14] Depend on Umbraco.SqlServerCE

---
 src/Umbraco.Core/Umbraco.Core.csproj            |  2 +-
 .../Umbraco.Tests.Benchmarks.csproj             |  9 +--------
 src/Umbraco.Tests/Umbraco.Tests.csproj          | 10 +---------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj        | 17 ++++++++---------
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 82955491e7..50b5f51d7c 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -77,7 +77,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NPoco" Version="3.9.3" />
     <PackageReference Include="Semver" Version="2.0.4" />
-    <PackageReference Include="SqlServerCE" Version="4.0.0.1" />
+    <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 5d494c5e4d..e6c4bf5e3c 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -72,7 +72,7 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
     <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="NPoco" Version="3.9.3" />
-    <PackageReference Include="SqlServerCE" Version="4.0.0.1" />
+    <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="System.AppContext" Version="4.3.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
@@ -162,12 +162,5 @@
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild">
-    <ItemGroup>
-      <SqlCE64 Include="$(NuGetPackages)SqlServerCE\4.0.0.1\amd64\*.*" />
-      <SqlCE86 Include="$(NuGetPackages)SqlServerCE\4.0.0.1\x86\*.*" />
-    </ItemGroup>
-    <Message Text="Copy SqlCe files to $(TargetDir)" Importance="high" />
-    <Copy SourceFiles="@(SqlCe64)" DestinationFolder="$(TargetDir)amd64" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(SqlCe86)" DestinationFolder="$(TargetDir)x86" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 1c7e0d4c7a..4a0d553192 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -110,7 +110,7 @@
     <PackageReference Include="Selenium.WebDriver" Version="3.11.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="SharpZipLib" Version="0.86.0" />
-    <PackageReference Include="SqlServerCE" Version="4.0.0.1" />
+    <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
@@ -606,13 +606,5 @@
     <Message Text="WebPublishingTasks:    $(WebPublishingTasks)" Importance="high" />
     <Message Text="NuGetPackageFolders:   $(NuGetPackageFolders)" Importance="high" />
     <Message Text="NuGetPackages:         $(NuGetPackages)" Importance="high" />
-    <!-- copy SqlCe -->
-    <ItemGroup>
-      <SqlCE64 Include="$(NuGetPackages)SqlServerCE\4.0.0.1\amd64\*.*" />
-      <SqlCE86 Include="$(NuGetPackages)SqlServerCE\4.0.0.1\x86\*.*" />
-    </ItemGroup>
-    <Message Text="Copy SqlCe files to $(TargetDir)" Importance="high" />
-    <Copy SourceFiles="@(SqlCe64)" DestinationFolder="$(TargetDir)amd64" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(SqlCe86)" DestinationFolder="$(TargetDir)x86" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5db12b7041..86eff3b3ac 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -112,6 +112,13 @@
     <PackageReference Include="MySql.Data" Version="6.10.7" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SqlServerCE" Version="4.0.0.1" />
+    <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
+    <PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
+    <PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
+    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
+    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="Umbraco.ModelsBuilder" Version="8.0.0-alpha.17" />
   </ItemGroup>
@@ -607,14 +614,6 @@
     <Message Text="WebPublishingTasks:    $(WebPublishingTasks)" Importance="high" />
     <Message Text="NuGetPackageFolders:   $(NuGetPackageFolders)" Importance="high" />
     <Message Text="NuGetPackages:         $(NuGetPackages)" Importance="high" />
-    <!-- copy SqlCe -->
-    <ItemGroup>
-      <SqlCE64 Include="$(NuGetPackages)SqlServerCE\4.0.0.1\amd64\*.*" />
-      <SqlCE86 Include="$(NuGetPackages)SqlServerCE\4.0.0.1\x86\*.*" />
-    </ItemGroup>
-    <Message Text="Copy SqlCe files to $(TargetDir)" Importance="high" />
-    <Copy SourceFiles="@(SqlCe64)" DestinationFolder="$(TargetDir)amd64" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(SqlCe86)" DestinationFolder="$(TargetDir)x86" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="true" />
     <!-- Create web.config file from Template if it doesn't exist -->
     <Message Text="Copy Web.Template.config to Web.config" Importance="high" Condition="!Exists('$(ProjectDir)Web.config')" />
     <Copy SourceFiles="$(ProjectDir)web.Template.config" DestinationFiles="$(ProjectDir)Web.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Web.config')" />
@@ -642,7 +641,7 @@
     <ItemGroup>
       <BelleLib Include="$(ProjectDir)Umbraco\lib" />
     </ItemGroup>
-    <RemoveDir Directories="@(BelleLib)" Condition="Exists('$(ProjectDir)Umbraco\lib') and !Exists('$(SolutionDir)preserve.belle')"/>
+    <RemoveDir Directories="@(BelleLib)" Condition="Exists('$(ProjectDir)Umbraco\lib') and !Exists('$(SolutionDir)preserve.belle')" />
   </Target>
   <Target Name="AfterBuild">
     <Message Text="-AfterBuild-" Importance="high" />

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 02/14] 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" />

From 8c815cf47e751919ece7d15ffe62131d5167b553 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 15 May 2018 12:52:43 +0200
Subject: [PATCH 03/14] Git-ignore local directory

---
 .gitignore | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c180fa693..be42ec2747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+#
+# Umbraco Cms Git Ignore
+#
+
+# common files
 *.obj
 *.pdb
 *.user
@@ -9,21 +14,29 @@
 *.vs10x
 *.ndproj
 
+# common directories
 .DS_Store
 ._.DS_Store
+.vs/
+/local/
 
-[Bb]in
+# build directories
+[Bb]in/
 [Db]ebug*/
-obj/
 [Rr]elease*/
+obj/
 
+# tools
 _ReSharper*/
-
 _NCrunch_*/
 *.ncrunchsolution
 *.ncrunchsolution.user
 *.ncrunchproject
 *.crunchsolution.cache
+tools/NDepend/
+
+
+
 
 [Tt]est[Rr]esult*
 [Bb]uild[Ll]og.*
@@ -97,7 +110,6 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
 src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
 
 src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-tools/NDepend/
 
 src/Umbraco.Web.UI/App_Plugins/*
 src/*.psess
@@ -146,7 +158,6 @@ apidocs/api/*
 build/docs.zip
 build/ui-docs.zip
 build/csharp-docs.zip
-.vs/
 src/packages/
 src/PrecompiledWeb/*
 
@@ -155,3 +166,7 @@ build.out/
 build.tmp/
 build/hooks/
 build/temp/
+
+
+
+# eof
\ No newline at end of file

From a39a9b7a892a56b8fc4c7fe603e51486d6c49a36 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 16 May 2018 16:02:51 +0200
Subject: [PATCH 04/14] Cleanup nuspec

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index da4ee8acd6..45a188b637 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -59,28 +59,23 @@
         <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
-          DLLs (SqlServerCE) of ... well ... I don't know
-        -->
-        <!--<dependency id="xmlrpcnet" version="[3.0.0.266,3.666666)" />-->
-        <!--<dependency id="dotless" version="[1.5.2,1.666666)" />-->
     </dependencies>
   </metadata>
   <files>
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net47\Umbraco.Core.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
+
+    <!-- docs -->
     <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
-    <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\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\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" />
 
-    <!-- produce symbols package -->
+    <!-- symbols -->
     <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
     <file src="$BuildTmp$\..\src\Umbraco.Core\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
     <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib" />

From a6ea270d93f727abb196f6701c7e9bb5923797b9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 16 May 2018 21:52:40 +0200
Subject: [PATCH 05/14] Cleanup build

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

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 45a188b637..d4abf61bdb 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -21,8 +21,8 @@
         <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.666666)" />
         <dependency id="Examine" version="[1.0.0-beta025,1.666666)" />
         <dependency id="HtmlAgilityPack" version="[1.7.2,1.666666)" />
-        <dependency id="ImageProcessor.Web" version="[4.9.1.2,4.666666)" />
-        <dependency id="ImageProcessor.Web.Config" version="[2.4.0,2.666666)" />
+        <dependency id="ImageProcessor.Web" version="[4.9.2.19,4.666666)" />
+        <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.666666)" />
         <dependency id="LightInject" version="[5.1.2,5.666666)" />
         <dependency id="LightInject.Annotation" version="[1.1.0,1.666666)" />
         <dependency id="LightInject.Mvc" version="[2.0.0,2.666666)" />
diff --git a/build/build.ps1 b/build/build.ps1
index 3bdf2ba6e1..a34fa21a25 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -298,10 +298,10 @@
     # copy libs
     Write-Host "Copy SqlCE libraries"
     $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
-    $this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\bin", `
-      { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
-    $this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\WebApp\bin", `
-      { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
+    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
+    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
+    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
+    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
 
     # copy Belle
     Write-Host "Copy Belle"

From f44c5ad757cd46f2a5ccc73a762628f078a6510b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 12:17:42 +0200
Subject: [PATCH 06/14] Cleanup nuget, bindings, build

---
 build/NuSpecs/UmbracoCms.Core.nuspec          |  6 +--
 src/SolutionInfo.cs                           |  2 +-
 .../Configuration/UmbracoVersion.cs           |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  1 -
 src/Umbraco.Web.UI/web.Template.config        | 48 ++++---------------
 src/umbraco.sln                               |  1 +
 6 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index d4abf61bdb..09967cfe9a 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -17,10 +17,11 @@
     <dependencies>
         <dependency id="AutoMapper" version="[6.2.2,6.666666)" />
         <dependency id="ClientDependency" version="[1.9.6,1.666666)" />
-        <dependency id="ClientDependency-Mvc5" version="[1.8.0.0,1.666666)" />
+        <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.666666)" />
         <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.666666)" />
         <dependency id="Examine" version="[1.0.0-beta025,1.666666)" />
         <dependency id="HtmlAgilityPack" version="[1.7.2,1.666666)" />
+        <dependency id="ImageProcessor" version="[2.6.1.19,2.666666)" />
         <dependency id="ImageProcessor.Web" version="[4.9.2.19,4.666666)" />
         <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.666666)" />
         <dependency id="LightInject" version="[5.1.2,5.666666)" />
@@ -35,7 +36,6 @@
         <dependency id="Microsoft.AspNet.Mvc" version="[5.2.4,5.666666)" />
         <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.666666)" />
         <dependency id="Microsoft.AspNet.WebApi" version="[5.2.4,5.666666)" />
-        <dependency id="Microsoft.CodeAnalysis.CSharp" version="[2.7.0,2.666666)" />
         <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[1.0.8,1.666666)" />
         <dependency id="Microsoft.Net.Compilers" version="[2.7.0,2.666666)" />
         <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.666666)" />
@@ -46,7 +46,6 @@
         <dependency id="MySql.Data" version="[6.10.7,6.666666)" />
         <dependency id="Newtonsoft.Json" version="[11.0.2,11.666666)" />
         <dependency id="NPoco" version="[3.9.3,3.666666)" />
-        <dependency id="NuGet.Core" version="[2.14.0,2.666666)" />
         <dependency id="Semver" version="[2.0.4,2.666666)" />
         <dependency id="System.Reflection.Metadata" version="[1.5.0,1.666666)" />
         <dependency id="System.Reflection.Primitives" version="[4.3.0,4.666666)" />
@@ -56,7 +55,6 @@
         <dependency id="System.Text.Encoding.CodePages" version="[4.4.0,4.666666)" />
         <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.666666)" />
         <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)" />
     </dependencies>
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 37150025fa..a17dec7148 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0-alpha.34")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.35")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 063125e462..a1060701b0 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Configuration
         /// <summary>
         /// Gets the version comment of the executing code (eg "beta").
         /// </summary>
-        public static string CurrentComment => "alpha.34";
+        public static string CurrentComment => "alpha.35";
 
         /// <summary>
         /// Gets the assembly version of Umbraco.Code.dll.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 86eff3b3ac..a8b45758ec 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -111,7 +111,6 @@
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="MySql.Data" Version="6.10.7" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
     <PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index a511f34660..901e9ea6d3 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -241,34 +241,14 @@
 
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-				<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
-			</dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.7.2.0" newVersion="1.7.2.0" />
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Lucene.Net" publicKeyToken="85089178b9ac3181" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.0.3.0" newVersion="3.0.3.0"/>
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.CodeAnalysis.Analyzers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0"/>
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.CodeAnalysis.Common" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
@@ -294,20 +274,20 @@
                 <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
+                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0"/>
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+                <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0"/>
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+                <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
@@ -317,18 +297,6 @@
                 <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
-            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 02a5367e04..f21b257639 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -91,6 +91,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "About", "About", "{420D2458
 		..\LICENSE.md = ..\LICENSE.md
 		..\PULL_REQUEST_TEMPLATE.md = ..\PULL_REQUEST_TEMPLATE.md
 		..\README.md = ..\README.md
+		..\V8_GETTING_STARTED.md = ..\V8_GETTING_STARTED.md
 	EndProjectSection
 EndProject
 Global

From 40f2558a70109629cbf0c910e026044df3c4ef1d Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 13:03:37 +0200
Subject: [PATCH 07/14] Cleanup

---
 build/build.ps1 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/build.ps1 b/build/build.ps1
index a34fa21a25..e2a85f0c1a 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -388,11 +388,6 @@
 
     Write-Host "Create NuGet packages"
 
-    # see https://docs.microsoft.com/en-us/nuget/schema/nuspec
-    # note - warnings about SqlCE native libs being outside of 'lib' folder,
-    # nothing much we can do about it as it's intentional yet there does not
-    # seem to be a way to disable the warning
-
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
         -Version "$($this.Version.Semver.ToString())" `

From de9f4f8d0b89a4d01721889305b364974ca7baf5 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 13:19:35 +0200
Subject: [PATCH 08/14] Cleanup references and dependencies

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 85 ++++++++++++++--------------
 src/Umbraco.Core/Umbraco.Core.csproj |  4 +-
 src/Umbraco.Web/Umbraco.Web.csproj   |  4 +-
 3 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 09967cfe9a..787b0d6673 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -15,48 +15,49 @@
     <language>en-US</language>
     <tags>umbraco</tags>
     <dependencies>
-        <dependency id="AutoMapper" version="[6.2.2,6.666666)" />
-        <dependency id="ClientDependency" version="[1.9.6,1.666666)" />
-        <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.666666)" />
-        <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.666666)" />
-        <dependency id="Examine" version="[1.0.0-beta025,1.666666)" />
-        <dependency id="HtmlAgilityPack" version="[1.7.2,1.666666)" />
-        <dependency id="ImageProcessor" version="[2.6.1.19,2.666666)" />
-        <dependency id="ImageProcessor.Web" version="[4.9.2.19,4.666666)" />
-        <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.666666)" />
-        <dependency id="LightInject" version="[5.1.2,5.666666)" />
-        <dependency id="LightInject.Annotation" version="[1.1.0,1.666666)" />
-        <dependency id="LightInject.Mvc" version="[2.0.0,2.666666)" />
-        <dependency id="LightInject.WebApi" version="[2.0.0,2.666666)" />
-        <dependency id="log4net" version="[2.0.8,2.666666)" />
-        <dependency id="Log4Net.Async" version="[2.0.4,2.666666)" />
-        <dependency id="Lucene.Net.Contrib" version="[3.0.3,3.666666)" />
-        <dependency id="Markdown" version="[2.2.1,2.666666)" />
-        <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1,2.666666)" />
-        <dependency id="Microsoft.AspNet.Mvc" version="[5.2.4,5.666666)" />
-        <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.666666)" />
-        <dependency id="Microsoft.AspNet.WebApi" version="[5.2.4,5.666666)" />
-        <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[1.0.8,1.666666)" />
-        <dependency id="Microsoft.Net.Compilers" version="[2.7.0,2.666666)" />
-        <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.666666)" />
-        <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0,4.666666)" />
-        <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0,4.666666)" />
-        <dependency id="Microsoft.Web.Xdt" version="[2.1.2,2.666666)" />
-        <dependency id="MiniProfiler" version="[3.2.0.157,3.666666)" />
-        <dependency id="MySql.Data" version="[6.10.7,6.666666)" />
-        <dependency id="Newtonsoft.Json" version="[11.0.2,11.666666)" />
-        <dependency id="NPoco" version="[3.9.3,3.666666)" />
-        <dependency id="Semver" version="[2.0.4,2.666666)" />
-        <dependency id="System.Reflection.Metadata" version="[1.5.0,1.666666)" />
-        <dependency id="System.Reflection.Primitives" version="[4.3.0,4.666666)" />
-        <dependency id="System.Runtime.Handles" version="[4.3.0,4.666666)" />
-        <dependency id="System.Security.Cryptography.Algorithms" version="[4.3.1,4.666666)" />
-        <dependency id="System.Security.Cryptography.X509Certificates" version="[4.3.2,4.666666)" />
-        <dependency id="System.Text.Encoding.CodePages" version="[4.4.0,4.666666)" />
-        <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.666666)" />
-        <dependency id="System.ValueTuple" version="[4.4.0,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)" />
+      <dependency id="AutoMapper" version="[6.2.2,6.666666)" />
+      <dependency id="ClientDependency" version="[1.9.6,1.666666)" />
+      <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.666666)" />
+      <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.666666)" />
+      <dependency id="Examine" version="[1.0.0-beta025,1.666666)" />
+      <dependency id="HtmlAgilityPack" version="[1.7.2,1.666666)" />
+      <dependency id="ImageProcessor" version="[2.6.1.19,2.666666)" />
+      <dependency id="ImageProcessor.Web" version="[4.9.2.19,4.666666)" />
+      <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.666666)" />
+      <dependency id="LightInject" version="[5.1.2,5.666666)" />
+      <dependency id="LightInject.Annotation" version="[1.1.0,1.666666)" />
+      <dependency id="LightInject.Mvc" version="[2.0.0,2.666666)" />
+      <dependency id="LightInject.WebApi" version="[2.0.0,2.666666)" />
+      <dependency id="log4net" version="[2.0.8,2.666666)" />
+      <dependency id="Log4Net.Async" version="[2.0.4,2.666666)" />
+      <dependency id="Lucene.Net.Contrib" version="[3.0.3,3.666666)" />
+      <dependency id="Markdown" version="[2.2.1,2.666666)" />
+      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1,2.666666)" />
+      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.6,5.666666)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.666666)" />
+      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.6,5.666666)" />
+      <dependency id="Microsoft.CodeAnalysis.CSharp" version="[2.8.0,2.666666)" />
+      <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[1.0.8,1.666666)" />
+      <dependency id="Microsoft.Net.Compilers" version="[2.8.0,2.666666)" />
+      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.666666)" />
+      <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0,4.666666)" />
+      <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0,4.666666)" />
+      <dependency id="Microsoft.Web.Xdt" version="[2.1.2,2.666666)" />
+      <dependency id="MiniProfiler" version="[3.2.0.157,3.666666)" />
+      <dependency id="MySql.Data" version="[6.10.7,6.666666)" />
+      <dependency id="Newtonsoft.Json" version="[11.0.2,11.666666)" />
+      <dependency id="NPoco" version="[3.9.3,3.666666)" />
+      <dependency id="Semver" version="[2.0.4,2.666666)" />
+      <dependency id="System.Reflection.Metadata" version="[1.5.0,1.666666)" />
+      <dependency id="System.Reflection.Primitives" version="[4.3.0,4.666666)" />
+      <dependency id="System.Runtime.Handles" version="[4.3.0,4.666666)" />
+      <dependency id="System.Security.Cryptography.Algorithms" version="[4.3.1,4.666666)" />
+      <dependency id="System.Security.Cryptography.X509Certificates" version="[4.3.2,4.666666)" />
+      <dependency id="System.Text.Encoding.CodePages" version="[4.4.0,4.666666)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.666666)" />
+      <dependency id="System.ValueTuple" version="[4.4.0,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)" />
     </dependencies>
   </metadata>
   <files>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 978c6d4ae5..021746017a 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -67,9 +67,7 @@
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Log4Net.Async" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.1" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client">
-      <Version>5.2.6</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.0" />
     <PackageReference Include="Microsoft.Web.Xdt" Version="2.1.2" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 4d2c6fb850..5c6346822e 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -74,9 +74,7 @@
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.6" />
     <PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.6" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client">
-      <Version>5.2.6</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
     <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="4.0.0" />

From 7387379aea651b26bc94abe0457c743cc4e8c055 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 15:18:15 +0200
Subject: [PATCH 09/14] Upgrade to ModelsBuilder -alpha.18

---
 build/NuSpecs/UmbracoCms.Core.nuspec     | 2 +-
 build/NuSpecs/UmbracoCms.nuspec          | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 787b0d6673..60fe8a49fa 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -56,7 +56,7 @@
       <dependency id="System.Text.Encoding.CodePages" version="[4.4.0,4.666666)" />
       <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.666666)" />
       <dependency id="System.ValueTuple" version="[4.4.0,4.666666)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.17,8.666666)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.18,8.666666)" />
       <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.666666)" />
     </dependencies>
   </metadata>
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 1679ff6f97..fc3cde4936 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -16,7 +16,7 @@
     <tags>umbraco</tags>
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.17, 9.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.18, 9.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 3.0.0)" />
     </dependencies>
   </metadata>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 31492453ec..e2c0e46b2b 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -116,7 +116,7 @@
     <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    <PackageReference Include="Umbraco.ModelsBuilder" Version="8.0.0-alpha.17" />
+    <PackageReference Include="Umbraco.ModelsBuilder" Version="8.0.0-alpha.18" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">

From 6e7bb41190e25ec473e865884c2625d73210a22b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 15:33:38 +0200
Subject: [PATCH 10/14] Version 8.0.0-alpha.36

---
 src/SolutionInfo.cs                              | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index a17dec7148..1304854f52 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0-alpha.35")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.36")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index a1060701b0..0b34f03081 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Configuration
         /// <summary>
         /// Gets the version comment of the executing code (eg "beta").
         /// </summary>
-        public static string CurrentComment => "alpha.35";
+        public static string CurrentComment => "alpha.36";
 
         /// <summary>
         /// Gets the assembly version of Umbraco.Code.dll.

From 76bf84f8eadba204df053fc208378154b2cca14f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 16:34:05 +0200
Subject: [PATCH 11/14] Forgot to update binding redirects

---
 src/Umbraco.Web.UI/web.Template.config | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 3b9835877a..8cc75b52e2 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -245,14 +245,6 @@
                 <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
@@ -277,10 +269,6 @@
                 <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0"/>
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0"/>
@@ -291,11 +279,11 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0"/>
             </dependentAssembly>
         </assemblyBinding>
     </runtime>

From 6c61eb2d69f47418e2fc365a43fb92706fda94a4 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 16:34:11 +0200
Subject: [PATCH 12/14] Fix tests

---
 src/Umbraco.Tests/App.config | 71 +++++++++++++++---------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index e5a8fcd1a6..0ef88c8962 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -105,79 +105,68 @@
   </startup>
 
   <runtime>
-
       <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
           <dependentAssembly>
-              <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-1.7.2.0" newVersion="1.7.2.0" />
+              <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+              <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Lucene.Net" publicKeyToken="85089178b9ac3181" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-3.0.3.0" newVersion="3.0.3.0" />
+              <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+              <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+              <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+              <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+              <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
+              <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+              <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+              <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+              <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+              <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+              <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
           </dependentAssembly>
           <dependentAssembly>
-              <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+              <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+              <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
           </dependentAssembly>
-          <dependentAssembly>
-              <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-          </dependentAssembly>
-          <dependentAssembly>
-              <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
-          </dependentAssembly>
-          
       </assemblyBinding>
-
   </runtime>
 
 </configuration>

From 6ce24bf1a102a5994066786c5f4545eedf07f1d8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 17:24:30 +0200
Subject: [PATCH 13/14] Various fixes

---
 src/Umbraco.Tests/App.config                       |  1 +
 src/Umbraco.Tests/Strings/StringValidationTests.cs | 11 +++++++++++
 src/Umbraco.Web.UI/web.Template.config             |  1 +
 src/Umbraco.Web/Routing/UrlProvider.cs             |  7 +++----
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 0ef88c8962..6339a1ced4 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -63,6 +63,7 @@
     <add key="umbracoTimeOutInMinutes" value="20"/>
     <add key="umbracoDefaultUILanguage" value="en"/>
     <add key="umbracoUseHttps" value="false"/>
+    <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
   </appSettings>
 
   <connectionStrings>
diff --git a/src/Umbraco.Tests/Strings/StringValidationTests.cs b/src/Umbraco.Tests/Strings/StringValidationTests.cs
index 24ba6fbb2a..b76783080b 100644
--- a/src/Umbraco.Tests/Strings/StringValidationTests.cs
+++ b/src/Umbraco.Tests/Strings/StringValidationTests.cs
@@ -24,6 +24,17 @@ namespace Umbraco.Tests.Strings
 
             Assert.IsFalse(foo.IsValid("fdsa"));
             Assert.IsFalse(foo.IsValid("fdsa@"));
+
+            // IsValid can be either a powerful regex OR a dummy test,
+            // and by default it depends on System.ComponentModel.DataAnnotations.AppSettings.DisableRegEx
+            // which ends up using BinaryCompatibility.Current.TargetsAtLeastFramework472 so for some reason
+            // in 472 we are not using the regex anymore
+            //
+            // it can be forced, though with an app settings
+            // dataAnnotations:dataTypeAttribute:disableRegEx = false
+            //
+            // since Umbraco is now 4.7.2+, the setting is required for the following tests to pass
+
             Assert.IsFalse(foo.IsValid("fdsa@fdsa"));
             Assert.IsFalse(foo.IsValid("fdsa@fdsa."));
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 8cc75b52e2..aaa1f4d850 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -56,6 +56,7 @@
         <add key="webpages:Enabled" value="false" />
         <add key="enableSimpleMembership" value="false" />
         <add key="autoFormsAuthentication" value="false" />
+        <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
 
         <add key="log4net.Config" value="config\log4net.config" />
         <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs
index 6fa818f392..ea84bbf4e1 100644
--- a/src/Umbraco.Web/Routing/UrlProvider.cs
+++ b/src/Umbraco.Web/Routing/UrlProvider.cs
@@ -188,11 +188,10 @@ namespace Umbraco.Web.Routing
             if (content == null)
                 return "#";
 
-            // this the ONLY place where we deal with default culture - IUrlProvider always receive a culture
+            // this the ONLY place where we deal with default culture - IUrlProvider always receive a culture
+            // be nice with tests, assume things can be null, ultimately fall back to invariant
             if (culture == null)
-            {
-                culture = _variationContextAccessor.VariationContext.Culture;
-            }
+                culture = _variationContextAccessor?.VariationContext?.Culture ?? "";
 
             if (current == null)
                 current = _umbracoContext.CleanedUmbracoUrl;

From c13e3ec220f09e0b64301932460861964acdb08c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 17 May 2018 18:17:04 +0200
Subject: [PATCH 14/14] Version 8.0.0-alpha.37

---
 src/SolutionInfo.cs                              | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 1304854f52..9a1987c6b9 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0-alpha.36")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.37")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 0b34f03081..e3f0e2c61c 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Configuration
         /// <summary>
         /// Gets the version comment of the executing code (eg "beta").
         /// </summary>
-        public static string CurrentComment => "alpha.36";
+        public static string CurrentComment => "alpha.37";
 
         /// <summary>
         /// Gets the assembly version of Umbraco.Code.dll.