From 78ebc1912105e15c6082357583e522cde2750051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Wed, 2 Oct 2019 22:27:51 +0200
Subject: [PATCH 01/14] Port to v8

---
 README.md                                     |   4 +-
 appveyor.yml                                  |   2 +-
 build/package.proj                            |   4 +-
 src/Our.Umbraco.UnVersion.sln                 |  16 +-
 src/Our.Umbraco.UnVersion/Bootstrap.cs        |  33 +--
 .../Our.Umbraco.UnVersion.csproj              | 226 ++++++++++++++++--
 .../Services/UnVersionService.cs              | 176 +++-----------
 .../UnVersionComponent.cs                     |  40 ++++
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  |  15 +-
 src/Our.Umbraco.UnVersion/UnVersionContext.cs |  23 --
 .../Web/UI/Config/unVersion.config            |   2 +-
 src/Our.Umbraco.UnVersion/packages.config     |  68 ++++--
 12 files changed, 360 insertions(+), 249 deletions(-)
 create mode 100644 src/Our.Umbraco.UnVersion/UnVersionComponent.cs
 delete mode 100644 src/Our.Umbraco.UnVersion/UnVersionContext.cs

diff --git a/README.md b/README.md
index d66740b..09f883c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This package automaticaly removes any previous versions for those times when a v
 
 ### Installation
 
-> *Note:* UnVersion has been developed against **Umbraco v7.1.4** and will support that version and above.
+> *Note:* UnVersion has been developed against **Umbraco v8.2.? (Pending PR)** and will support that version and above.
 
 UnVersion can be installed from either Our Umbraco or NuGet package repositories, or build manually from the source-code:
 
@@ -34,7 +34,7 @@ We also have a [MyGet package repository](https://www.myget.org/gallery/umbraco-
 
 If you prefer, you can compile UnVersion yourself, you'll need:
 
-* Visual Studio 2012 (or above)
+* Visual Studio 2017 (or above)
 
 To clone it locally click the "Clone in Windows" button above or run the following git commands.
 
diff --git a/appveyor.yml b/appveyor.yml
index 1819f67..64097f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 # version format
-version: 2.2.0.{build}
+version: 3.0.0.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
diff --git a/build/package.proj b/build/package.proj
index f9855ac..024e138 100644
--- a/build/package.proj
+++ b/build/package.proj
@@ -18,8 +18,8 @@
 	<PropertyGroup>
 		<ProjectName>Our.Umbraco.UnVersion</ProjectName>
 		<PackageName>UnVersion</PackageName>
-		<MinUmbracoVersion>7.1.4</MinUmbracoVersion>
-		<Readme>A content un-versioning package for Umbraco 7.1+</Readme>
+		<MinUmbracoVersion>8.2.1</MinUmbracoVersion>
+		<Readme>A content un-versioning package for Umbraco 8.2+</Readme>
 		<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
 		<AuthorUrl>https://github.com/umco/umbraco-unversion/graphs/contributors</AuthorUrl>
 		<PackageLicenseName>MIT license</PackageLicenseName>
diff --git a/src/Our.Umbraco.UnVersion.sln b/src/Our.Umbraco.UnVersion.sln
index f84d868..d6bf3a8 100644
--- a/src/Our.Umbraco.UnVersion.sln
+++ b/src/Our.Umbraco.UnVersion.sln
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.UnVersion", "Our.Umbraco.UnVersion\Our.Umbraco.UnVersion.csproj", "{A3E6B76A-35AC-415A-BCED-971223D63BAC}"
 EndProject
@@ -21,6 +22,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{BA0FC6AB-55AD-4AFF-A5EB-AF4A654C7341}"
+	ProjectSection(SolutionItems) = preProject
+		..\docs\developers-guide.md = ..\docs\developers-guide.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,5 +43,9 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{AE05CC62-1E54-4E24-AA99-B7EED3CFFA3C} = {E155CD07-7718-4EE8-B51E-FECABE034A33}
+		{BA0FC6AB-55AD-4AFF-A5EB-AF4A654C7341} = {E155CD07-7718-4EE8-B51E-FECABE034A33}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AAE25AE6-314C-45E6-BD87-04A97F90EE16}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Our.Umbraco.UnVersion/Bootstrap.cs b/src/Our.Umbraco.UnVersion/Bootstrap.cs
index 8edf8c9..0728d83 100644
--- a/src/Our.Umbraco.UnVersion/Bootstrap.cs
+++ b/src/Our.Umbraco.UnVersion/Bootstrap.cs
@@ -1,40 +1,19 @@
 using System.IO;
 using System.Web;
 using Our.Umbraco.UnVersion.Services;
-using Umbraco.Core;
 using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Publishing;
 using Umbraco.Core.Services;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
 
 namespace Our.Umbraco.UnVersion
 {
-    public class Bootstrap : ApplicationEventHandler
+    public class Bootstrap : IUserComposer
     {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication,
-            ApplicationContext applicationContext)
-        {
-            // Init config
-            var appPath = umbracoApplication.Server.MapPath("~/");
-            var configFilePath = Path.Combine(appPath, @"config\unVersion.config");
-            var config = new UnVersionConfig(configFilePath);
-
-            // Init context
-            UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
-
-            // Hookup event listener
-            ContentService.Published += ContentServicePublished;
-        }
-
-        void ContentServicePublished(IPublishingStrategy sender, PublishEventArgs<IContent> e)
+        public void Compose(Composition composition)
         {
-            if (HttpContext.Current == null)
-                return;
-
-            foreach (var entity in e.PublishedEntities)
-            {
-                UnVersionContext.Instance.UnVersionService.UnVersion(entity);
-            }
+            composition.Register<IUnVersionConfig, UnVersionConfig>(Lifetime.Singleton);
+            composition.Register<IUnVersionService, UnVersionService>(Lifetime.Singleton);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 9a3c94a..905d42a 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Our.Umbraco.UnVersion</RootNamespace>
     <AssemblyName>Our.Umbraco.UnVersion</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -28,6 +28,9 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
+    <Use64BitIISExpress />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,34 +52,199 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="interfaces">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\interfaces.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\log4net.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\System.Data.SqlServerCe.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
     </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
+    </Reference>
+    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
-    <Reference Include="umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\umbraco.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.8.1.0\lib\net472\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.1.0\lib\net472\Umbraco.Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.1.0\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Core">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\Umbraco.Core.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.1.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -85,8 +253,8 @@
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="Services\IUnVersionService.cs" />
     <Compile Include="Services\UnVersionService.cs" />
+    <Compile Include="UnVersionComponent.cs" />
     <Compile Include="UnVersionConfig.cs" />
-    <Compile Include="UnVersionContext.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web\UI\Config\UnVersion.config" />
@@ -94,6 +262,15 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="web.config" />
+    <None Include="web.Debug.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
+    <None Include="web.Release.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
+  </ItemGroup>
   <!--<PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -120,6 +297,13 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index aea1832..12a8b2b 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -4,24 +4,27 @@
 using System.Data;
 using System.Data.SqlClient;
 using System.Data.SqlServerCe;
-using System.Reflection;
-using log4net;
-using umbraco;
 using Umbraco.Core.Models;
+using Umbraco.Core.Logging;
+using Umbraco.Web;
+using System.Linq;
+using Umbraco.Core.Services;
 
 namespace Our.Umbraco.UnVersion.Services
 {
     public class UnVersionService : IUnVersionService
     {
-        private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+        private readonly ILogger _logger;
+        private readonly IUmbracoContextFactory _context;
+        private readonly IContentService _contentService;
         private readonly IUnVersionConfig _config;
-        private readonly bool _catchSqlExceptions;
 
-        public UnVersionService(IUnVersionConfig config, bool catchSqlExceptions)
+        public UnVersionService(IUnVersionConfig config, ILogger logger, IUmbracoContextFactory context, IContentService contentService)
         {
+            _logger = logger;
             _config = config;
-            _catchSqlExceptions = catchSqlExceptions;
+            _context = context;
+            _contentService = contentService;
         }
 
         public void UnVersion(IContent content)
@@ -36,9 +39,7 @@ public void UnVersion(IContent content)
 
             if (configEntries.Count <= 0)
             {
-                if (Logger.IsDebugEnabled)
-                    Logger.Debug("No unversion configuration found for type " + content.ContentType.Alias);
-
+                _logger.Debug<UnVersionService>("No unversion configuration found for type " + content.ContentType.Alias);
                 return;
             }
 
@@ -48,7 +49,7 @@ public void UnVersion(IContent content)
 
                 if (!String.IsNullOrEmpty(configEntry.RootXPath))
                 {
-                    if (content.Level > 1 && content.Parent() != null)
+                    if (content.Level > 1 && content.ParentId > 0)
                     {
                         var ids = GetNodeIdsFromXpath(configEntry.RootXPath);
                         isValid = ids.Contains(content.ParentId);
@@ -58,154 +59,31 @@ public void UnVersion(IContent content)
                 if (!isValid)
                     continue;
 
-                var connStr = ConfigurationManager.ConnectionStrings["umbracoDbDSN"];
-
-                using (var conn = connStr.ProviderName.Contains("SqlServerCe")
-                    ? (IDbConnection)new SqlCeConnection(connStr.ConnectionString)
-                    : (IDbConnection)new SqlConnection(connStr.ConnectionString))
+                if (configEntry.MaxDays < int.MaxValue)
                 {
-
-                    conn.Open();
-
-                    var vesionsToKeep = VersionsToKeep(content.Id, configEntry, conn);
-                    var versionsToKeepString = string.Join(",", vesionsToKeep);
-
-                    if (Logger.IsDebugEnabled)
-                        Logger.Debug("Keeping versions " + versionsToKeepString);
-
-                    var sqlStrings = new List<string> {
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsPreviewXml
-                                    WHERE	nodeId = {0} AND versionId NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString),
-
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsPropertyData
-                                    WHERE	contentNodeId = {0} AND versionId  NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString),
-
-
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsContentVersion
-                                    WHERE	contentId = {0} AND versionId  NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString),
-
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsDocument 
-                                    WHERE	nodeId = {0} AND versionId  NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString)
-                    };
-
-                    foreach (var sqlString in sqlStrings)
-                    {
-                        ExecuteSql(sqlString, conn);
-                    }
-
-                    conn.Close();
+                    _contentService.DeleteVersions(content.Id, DateTime.Now.AddDays(-configEntry.MaxDays));
                 }
-            }
-        }
-
-        void ExecuteSql(string sql, IDbConnection connection)
-        {
-            if (Logger.IsDebugEnabled)
-                Logger.Debug(sql);
-
-            var command = connection.CreateCommand();
-            command.CommandType = CommandType.Text;
-            command.CommandText = sql;
 
-            if (_catchSqlExceptions)
-            {
-                try
+                if (configEntry.MaxCount < int.MaxValue)
                 {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception ex)
-                {
-                    Logger.Warn("Executing " + sql, ex);
+                    var versionIds = _contentService.GetVersionIds(content.Id, configEntry.MaxCount + 1);
+                    if (versionIds.Count() > configEntry.MaxCount)
+                    {
+                        _contentService.DeleteVersion(content.Id, versionIds.Last(), true);
+                    }
                 }
             }
-            else
-            {
-                command.ExecuteNonQuery();
-            }
-        }
-
-        private IEnumerable<string> VersionsToKeep(int contentId, UnVersionConfigEntry configEntry, IDbConnection connection)
-        {
-            // Get a list of all versions
-            // TODO: Need to find a better way to do this, but SQL CE 4 doesn't allow sub queries
-            var sql = string.Format(@"SELECT			
-                                    cv.VersionId,
-	                                cv.VersionDate,
-	                                d.published,
-	                                d.newest
-                FROM				cmsContentVersion cv
-                LEFT OUTER JOIN		cmsDocument d ON d.versionId = cv.VersionId
-                WHERE				cv.ContentId = {0}
-                ORDER BY            cv.VersionDate DESC",
-                contentId);
-
-            if (Logger.IsDebugEnabled)
-                Logger.Debug(sql);
-
-            var command = connection.CreateCommand();
-            command.CommandType = CommandType.Text;
-            command.CommandText = sql;
-
-            var versionsToKeep = new List<string>();
-            var readerIndex = 0;
-
-            try
-            {
-                using (var reader = command.ExecuteReader())
-		    {
-			    while (reader.Read())
-			    {
-				    var versionId = reader.GetGuid(0);
-				    var versionDate = reader.GetDateTime(1);
-				    var published = !reader.IsDBNull(2) && reader.GetBoolean(2);
-				    var newest = !reader.IsDBNull(3) && reader.GetBoolean(3);
-
-				    readerIndex++;
-
-				    var daysDiff = (DateTime.Now - versionDate).Days;
-				    if (published || newest || (daysDiff < configEntry.MaxDays && readerIndex <= configEntry.MaxCount))
-					    versionsToKeep.Add("'" + versionId.ToString("D") + "'");
-			    }
-
-			    reader.Close();
-			    reader.Dispose();
-		    }
-            }
-            catch (Exception ex)
-            {
-                Logger.Warn(ex);
-
-                if (!_catchSqlExceptions)
-                    throw ex;
-            }
-
-            return versionsToKeep;
         }
 
         private List<int> GetNodeIdsFromXpath(string xpath)
         {
             var ids = new List<int>();
-            var nodes = library.GetXmlNodeByXPath(xpath);
-
-            while (nodes.MoveNext())
-                ids.Add(Convert.ToInt32(nodes.Current.GetAttribute("id", "")));
-
+            using (var cref = _context.EnsureUmbracoContext())
+            {
+                var cache = cref.UmbracoContext.Content;
+                var nodes = cache.GetByXPath(xpath);
+                ids = nodes.Select(x => x.Id).ToList();
+            }
             return ids;
         }
     }
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
new file mode 100644
index 0000000..9d7e050
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
@@ -0,0 +1,40 @@
+using Our.Umbraco.UnVersion.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Services.Implement;
+
+namespace Our.Umbraco.UnVersion
+{
+    public class UnVersionComposer : ComponentComposer<UnVersionComponent>
+    {
+    }
+    public class UnVersionComponent : IComponent
+    {
+        private readonly IUnVersionService unVersionService;
+
+        public UnVersionComponent(IUnVersionService _unVersionService)
+        {
+            unVersionService = _unVersionService;
+        }
+
+        public void Initialize()
+        {
+            ContentService.Published += ContentService_Published;
+        }
+
+        private void ContentService_Published(global::Umbraco.Core.Services.IContentService sender, global::Umbraco.Core.Events.ContentPublishedEventArgs e)
+        {
+            foreach (var content in e.PublishedEntities) {
+                unVersionService.UnVersion(content);
+            }
+        }
+
+        public void Terminate()
+        {
+        }
+    }
+}
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index 58036e8..5199f89 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -2,29 +2,34 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Web;
 using System.Xml;
-using log4net;
+using Umbraco.Core.Logging;
 
 namespace Our.Umbraco.UnVersion
 {
     public class UnVersionConfig : IUnVersionConfig
     {
-        private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly ILogger _logger;
 
         public IDictionary<string, List<UnVersionConfigEntry>> ConfigEntries { get; set; }
 
-        public UnVersionConfig(string configPath)
+        public UnVersionConfig(ILogger logger)
         {
+            _logger = logger;
             ConfigEntries = new Dictionary<string, List<UnVersionConfigEntry>>();
 
-            LoadXmlConfig(configPath);
+            var appPath = HttpRuntime.AppDomainAppPath;
+            var configFilePath = Path.Combine(appPath, @"config\unVersion.config");
+
+            LoadXmlConfig(configFilePath);
         }
 
         private void LoadXmlConfig(string configPath)
         {
             if (!File.Exists(configPath))
             {
-                Logger.Warn("Couldn't find config file " + configPath);
+                _logger.Warn<UnVersionConfig>("Couldn't find config file " + configPath);
                 return;
             }
 
diff --git a/src/Our.Umbraco.UnVersion/UnVersionContext.cs b/src/Our.Umbraco.UnVersion/UnVersionContext.cs
deleted file mode 100644
index be6a538..0000000
--- a/src/Our.Umbraco.UnVersion/UnVersionContext.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using Our.Umbraco.UnVersion.Services;
-
-namespace Our.Umbraco.UnVersion
-{
-    public class UnVersionContext
-    {
-        public IUnVersionService UnVersionService { get; internal set; }
-
-        #region Singleton
-
-        private static readonly Lazy<UnVersionContext> _instance = new Lazy<UnVersionContext>(() => new UnVersionContext());
-
-        public static UnVersionContext Instance
-        {
-            get { return _instance.Value; }
-        }
-
-        private UnVersionContext() { }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/Web/UI/Config/unVersion.config b/src/Our.Umbraco.UnVersion/Web/UI/Config/unVersion.config
index 27dd576..514d749 100644
--- a/src/Our.Umbraco.UnVersion/Web/UI/Config/unVersion.config
+++ b/src/Our.Umbraco.UnVersion/Web/UI/Config/unVersion.config
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <unVersionConfig>
-  <add docTypeAlias="newsPage" rootXpath="//node[@nodeTypeAlias='newsIndex']" maxDays="2" maxCount="10" />
+  <add docTypeAlias="newsPage" rootXpath="//newsIndex" maxDays="2" maxCount="10" />
 </unVersionConfig>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/packages.config b/src/Our.Umbraco.UnVersion/packages.config
index d0f2fca..4818022 100644
--- a/src/Our.Umbraco.UnVersion/packages.config
+++ b/src/Our.Umbraco.UnVersion/packages.config
@@ -1,25 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
   <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
+  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
+  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="LightInject" version="5.4.0" targetFramework="net472" />
+  <package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
+  <package id="LightInject.Mvc" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.WebApi" version="2.0.0" targetFramework="net472" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
+  <package id="Markdown" version="2.2.1" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net472" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="4.0.138" targetFramework="net472" />
+  <package id="MiniProfiler.Shared" version="4.0.138" targetFramework="net472" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
+  <package id="NPoco" version="3.9.4" targetFramework="net472" />
+  <package id="Owin" version="1.0" targetFramework="net472" />
+  <package id="Semver" version="2.0.4" targetFramework="net472" />
+  <package id="Serilog" version="2.8.0" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net472" />
+  <package id="Serilog.Filters.Expressions" version="2.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
+  <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.1.4" targetFramework="net45" />
+  <package id="Superpower" version="2.0.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.1.0" targetFramework="net472" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From e1fa4f48da5ddca260120bc1e9cef98762142da6 Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 11:22:53 +0100
Subject: [PATCH 02/14] Clean Project from V7-stuff and and nuget packagfes

---
 src/Our.Umbraco.UnVersion/Bootstrap.cs        |  3 +-
 .../Our.Umbraco.UnVersion.csproj              | 28 +------------------
 src/Our.Umbraco.UnVersion/packages.config     | 25 -----------------
 3 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 src/Our.Umbraco.UnVersion/packages.config

diff --git a/src/Our.Umbraco.UnVersion/Bootstrap.cs b/src/Our.Umbraco.UnVersion/Bootstrap.cs
index 8edf8c9..4aaeebf 100644
--- a/src/Our.Umbraco.UnVersion/Bootstrap.cs
+++ b/src/Our.Umbraco.UnVersion/Bootstrap.cs
@@ -11,8 +11,7 @@ namespace Our.Umbraco.UnVersion
 {
     public class Bootstrap : ApplicationEventHandler
     {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication,
-            ApplicationContext applicationContext)
+        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
         {
             // Init config
             var appPath = umbracoApplication.Server.MapPath("~/");
diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 9a3c94a..84da5df 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -28,6 +28,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,35 +50,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="interfaces">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\log4net.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
-    <Reference Include="umbraco">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\umbraco.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Umbraco.Core">
-      <HintPath>..\packages\UmbracoCms.Core.7.1.4\lib\Umbraco.Core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrap.cs" />
@@ -91,9 +68,6 @@
   <ItemGroup>
     <Content Include="Web\UI\Config\UnVersion.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
   <!--<PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Our.Umbraco.UnVersion/packages.config b/src/Our.Umbraco.UnVersion/packages.config
deleted file mode 100644
index d0f2fca..0000000
--- a/src/Our.Umbraco.UnVersion/packages.config
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
-  <package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
-  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
-  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
-  <package id="ImageProcessor" version="1.9.0.0" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="3.2.3.0" targetFramework="net45" />
-  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="UmbracoCms.Core" version="7.1.4" targetFramework="net45" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
-</packages>
\ No newline at end of file

From d826b59d3e35c2af24bbaa7be819fac7ea941630 Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 11:24:41 +0100
Subject: [PATCH 03/14] Bump framework-version to 4.7.2

---
 src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 84da5df..bc26a08 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Our.Umbraco.UnVersion</RootNamespace>
     <AssemblyName>Our.Umbraco.UnVersion</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -52,9 +52,15 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrap.cs" />

From cd6e3eb88352d61d47ca93eabc2cf77064f7109c Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 11:37:54 +0100
Subject: [PATCH 04/14] Version that builds for V8

---
 src/Our.Umbraco.UnVersion/Bootstrap.cs        |  48 ++---
 .../Our.Umbraco.UnVersion.csproj              | 200 ++++++++++++++++++
 .../Services/UnVersionService.cs              |  43 ++--
 .../UnVersionComponent.cs                     |  48 +++++
 .../UnVersionComposer.cs                      |  16 ++
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  |   7 +-
 src/Our.Umbraco.UnVersion/packages.config     |  56 +++++
 7 files changed, 370 insertions(+), 48 deletions(-)
 create mode 100644 src/Our.Umbraco.UnVersion/UnVersionComponent.cs
 create mode 100644 src/Our.Umbraco.UnVersion/UnVersionComposer.cs
 create mode 100644 src/Our.Umbraco.UnVersion/packages.config

diff --git a/src/Our.Umbraco.UnVersion/Bootstrap.cs b/src/Our.Umbraco.UnVersion/Bootstrap.cs
index 4aaeebf..fae670b 100644
--- a/src/Our.Umbraco.UnVersion/Bootstrap.cs
+++ b/src/Our.Umbraco.UnVersion/Bootstrap.cs
@@ -4,36 +4,36 @@
 using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
-using Umbraco.Core.Publishing;
+//using Umbraco.Core.Publishing;
 using Umbraco.Core.Services;
 
 namespace Our.Umbraco.UnVersion
 {
-    public class Bootstrap : ApplicationEventHandler
-    {
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            // Init config
-            var appPath = umbracoApplication.Server.MapPath("~/");
-            var configFilePath = Path.Combine(appPath, @"config\unVersion.config");
-            var config = new UnVersionConfig(configFilePath);
+    //public class Bootstrap : ApplicationEventHandler
+    //{
+    //    protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+    //    {
+    //        // Init config
+    //        var appPath = umbracoApplication.Server.MapPath("~/");
+    //        var configFilePath = Path.Combine(appPath, @"config\unVersion.config");
+    //        var config = new UnVersionConfig(configFilePath);
 
-            // Init context
-            UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
+    //        // Init context
+    //        UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
 
-            // Hookup event listener
-            ContentService.Published += ContentServicePublished;
-        }
+    //        // Hookup event listener
+    //        ContentService.Published += ContentServicePublished;
+    //    }
 
-        void ContentServicePublished(IPublishingStrategy sender, PublishEventArgs<IContent> e)
-        {
-            if (HttpContext.Current == null)
-                return;
+    //    //void ContentServicePublished(IPublishingStrategy sender, PublishEventArgs<IContent> e)
+    //    //{
+    //    //    if (HttpContext.Current == null)
+    //    //        return;
 
-            foreach (var entity in e.PublishedEntities)
-            {
-                UnVersionContext.Instance.UnVersionService.UnVersion(entity);
-            }
-        }
-    }
+    //    //    foreach (var entity in e.PublishedEntities)
+    //    //    {
+    //    //        UnVersionContext.Instance.UnVersionService.UnVersion(entity);
+    //    //    }
+    //    //}
+    //}
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index bc26a08..6014879 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -29,6 +29,8 @@
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
     <Use64BitIISExpress />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,17 +52,203 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+    </Reference>
+    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrap.cs" />
@@ -68,12 +256,17 @@
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="Services\IUnVersionService.cs" />
     <Compile Include="Services\UnVersionService.cs" />
+    <Compile Include="UnVersionComponent.cs" />
+    <Compile Include="UnVersionComposer.cs" />
     <Compile Include="UnVersionConfig.cs" />
     <Compile Include="UnVersionContext.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Web\UI\Config\UnVersion.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <!--<PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -100,6 +293,13 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index aea1832..5ede663 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -5,15 +5,15 @@
 using System.Data.SqlClient;
 using System.Data.SqlServerCe;
 using System.Reflection;
-using log4net;
-using umbraco;
+//using log4net;
+//using umbraco;
 using Umbraco.Core.Models;
 
 namespace Our.Umbraco.UnVersion.Services
 {
     public class UnVersionService : IUnVersionService
     {
-        private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly IUnVersionConfig _config;
         private readonly bool _catchSqlExceptions;
@@ -36,8 +36,8 @@ public void UnVersion(IContent content)
 
             if (configEntries.Count <= 0)
             {
-                if (Logger.IsDebugEnabled)
-                    Logger.Debug("No unversion configuration found for type " + content.ContentType.Alias);
+                //if (Logger.IsDebugEnabled)
+                //    Logger.Debug("No unversion configuration found for type " + content.ContentType.Alias);
 
                 return;
             }
@@ -48,11 +48,12 @@ public void UnVersion(IContent content)
 
                 if (!String.IsNullOrEmpty(configEntry.RootXPath))
                 {
-                    if (content.Level > 1 && content.Parent() != null)
-                    {
-                        var ids = GetNodeIdsFromXpath(configEntry.RootXPath);
-                        isValid = ids.Contains(content.ParentId);
-                    }
+                    // TODO: Fix in some otherway
+                    //if (content.Level > 1 && content.Parent() != null)
+                    //{
+                    //    var ids = GetNodeIdsFromXpath(configEntry.RootXPath);
+                    //    isValid = ids.Contains(content.ParentId);
+                    //}
                 }
 
                 if (!isValid)
@@ -70,8 +71,8 @@ public void UnVersion(IContent content)
                     var vesionsToKeep = VersionsToKeep(content.Id, configEntry, conn);
                     var versionsToKeepString = string.Join(",", vesionsToKeep);
 
-                    if (Logger.IsDebugEnabled)
-                        Logger.Debug("Keeping versions " + versionsToKeepString);
+                    //if (Logger.IsDebugEnabled)
+                    //    Logger.Debug("Keeping versions " + versionsToKeepString);
 
                     var sqlStrings = new List<string> {
                         string.Format(@"
@@ -116,8 +117,8 @@ FROM	cmsDocument
 
         void ExecuteSql(string sql, IDbConnection connection)
         {
-            if (Logger.IsDebugEnabled)
-                Logger.Debug(sql);
+            //if (Logger.IsDebugEnabled)
+            //    Logger.Debug(sql);
 
             var command = connection.CreateCommand();
             command.CommandType = CommandType.Text;
@@ -131,7 +132,7 @@ void ExecuteSql(string sql, IDbConnection connection)
                 }
                 catch (Exception ex)
                 {
-                    Logger.Warn("Executing " + sql, ex);
+                    //Logger.Warn("Executing " + sql, ex);
                 }
             }
             else
@@ -155,8 +156,8 @@ FROM				cmsContentVersion cv
                 ORDER BY            cv.VersionDate DESC",
                 contentId);
 
-            if (Logger.IsDebugEnabled)
-                Logger.Debug(sql);
+            //if (Logger.IsDebugEnabled)
+            //    Logger.Debug(sql);
 
             var command = connection.CreateCommand();
             command.CommandType = CommandType.Text;
@@ -189,7 +190,7 @@ FROM				cmsContentVersion cv
             }
             catch (Exception ex)
             {
-                Logger.Warn(ex);
+                //Logger.Warn(ex);
 
                 if (!_catchSqlExceptions)
                     throw ex;
@@ -201,10 +202,10 @@ FROM				cmsContentVersion cv
         private List<int> GetNodeIdsFromXpath(string xpath)
         {
             var ids = new List<int>();
-            var nodes = library.GetXmlNodeByXPath(xpath);
+            //var nodes = library.GetXmlNodeByXPath(xpath);
 
-            while (nodes.MoveNext())
-                ids.Add(Convert.ToInt32(nodes.Current.GetAttribute("id", "")));
+            //while (nodes.MoveNext())
+            //    ids.Add(Convert.ToInt32(nodes.Current.GetAttribute("id", "")));
 
             return ids;
         }
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
new file mode 100644
index 0000000..12b2792
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
@@ -0,0 +1,48 @@
+using System.IO;
+using System.Web;
+using Our.Umbraco.UnVersion.Services;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Events;
+using Umbraco.Core.IO;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+using Umbraco.Web;
+
+namespace Our.Umbraco.UnVersion
+{
+    public class UnVersionComponent : IComponent
+    {
+        public UnVersionComponent(IUmbracoContextFactory contextFactory)
+        {
+            
+        }
+
+        public void Initialize()
+        {
+            // Init config
+            var configFilePath = Path.Combine(SystemDirectories.Config,"\\unVersion.config");
+            var config = new UnVersionConfig(configFilePath);
+
+            // Init context
+            UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
+
+            ContentService.Published += ContentServicePublished;
+        }
+
+        private void ContentServicePublished(IContentService sender, ContentPublishedEventArgs e)
+        {
+            if (HttpContext.Current == null)
+                return;
+
+            foreach (var entity in e.PublishedEntities)
+            {
+                UnVersionContext.Instance.UnVersionService.UnVersion(entity);
+            }
+        }
+
+        public void Terminate()
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
new file mode 100644
index 0000000..ffab6a6
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Our.Umbraco.UnVersion
+{
+    public class UnVersionComposer : IUserComposer
+    {
+        public void Compose(Composition composition)
+        {
+            composition.Components().Append<UnVersionComponent>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index 58036e8..51ed307 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -3,13 +3,13 @@
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using log4net;
+
 
 namespace Our.Umbraco.UnVersion
 {
     public class UnVersionConfig : IUnVersionConfig
     {
-        private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public IDictionary<string, List<UnVersionConfigEntry>> ConfigEntries { get; set; }
 
@@ -24,7 +24,8 @@ private void LoadXmlConfig(string configPath)
         {
             if (!File.Exists(configPath))
             {
-                Logger.Warn("Couldn't find config file " + configPath);
+                //TODO: Use Umbraco logger
+                //Logger.Warn("Couldn't find config file " + configPath);
                 return;
             }
 
diff --git a/src/Our.Umbraco.UnVersion/packages.config b/src/Our.Umbraco.UnVersion/packages.config
new file mode 100644
index 0000000..1f75dc2
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion/packages.config
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
+  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
+  <package id="LightInject" version="5.4.0" targetFramework="net472" />
+  <package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
+  <package id="LightInject.Mvc" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.WebApi" version="2.0.0" targetFramework="net472" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
+  <package id="Markdown" version="2.2.1" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
+  <package id="MiniProfiler" version="4.0.138" targetFramework="net472" />
+  <package id="MiniProfiler.Shared" version="4.0.138" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
+  <package id="NPoco" version="3.9.4" targetFramework="net472" />
+  <package id="Owin" version="1.0" targetFramework="net472" />
+  <package id="Semver" version="2.0.4" targetFramework="net472" />
+  <package id="Serilog" version="2.8.0" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net472" />
+  <package id="Serilog.Filters.Expressions" version="2.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
+  <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
+  <package id="Superpower" version="2.0.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.0.0" targetFramework="net472" />
+</packages>
\ No newline at end of file

From 811a459af2b7ff3983182586464794bb4fde3934 Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 13:14:45 +0100
Subject: [PATCH 05/14] Worked on updated service

---
 .../Services/UnVersionService.cs              | 263 +++++++++++-------
 .../UnVersionComponent.cs                     |  20 +-
 2 files changed, 179 insertions(+), 104 deletions(-)

diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index 5ede663..508c3b6 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -4,10 +4,14 @@
 using System.Data;
 using System.Data.SqlClient;
 using System.Data.SqlServerCe;
+using System.Linq;
 using System.Reflection;
+using NPoco;
 //using log4net;
 //using umbraco;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web;
 
 namespace Our.Umbraco.UnVersion.Services
 {
@@ -18,14 +22,27 @@ public class UnVersionService : IUnVersionService
         private readonly IUnVersionConfig _config;
         private readonly bool _catchSqlExceptions;
 
+        private IUmbracoContextFactory _contextFactory;
+        private IContentService _contentService;
+
         public UnVersionService(IUnVersionConfig config, bool catchSqlExceptions)
         {
             _config = config;
             _catchSqlExceptions = catchSqlExceptions;
         }
 
+        public void FooBarTesting()
+        {
+            IContent content;
+            IContentService cs = null;
+
+            
+
+        }
+
         public void UnVersion(IContent content)
         {
+
             var configEntries = new List<UnVersionConfigEntry>();
 
             if (_config.ConfigEntries.ContainsKey(content.ContentType.Alias))
@@ -46,101 +63,150 @@ public void UnVersion(IContent content)
             {
                 var isValid = true;
 
+                // Check the RootXPath if configured
                 if (!String.IsNullOrEmpty(configEntry.RootXPath))
                 {
                     // TODO: Fix in some otherway
-                    //if (content.Level > 1 && content.Parent() != null)
-                    //{
-                    //    var ids = GetNodeIdsFromXpath(configEntry.RootXPath);
-                    //    isValid = ids.Contains(content.ParentId);
-                    //}
+                    if (content.Level > 1 && content.ParentId > 0)
+                    {
+                        var ids = GetNodeIdsFromXpath(configEntry.RootXPath);
+                        isValid = ids.Contains(content.ParentId);
+                    }
                 }
 
                 if (!isValid)
                     continue;
 
-                var connStr = ConfigurationManager.ConnectionStrings["umbracoDbDSN"];
+                // Getting all versions (guess nobody keeps over 20 000 versions of a content node)
+                var allVersions = _contentService.GetVersionsSlim(content.Id, 0, 20000).ToList();
+
+                if(!allVersions.Any())
+                    continue;
+
+                List<int> versionIdsToDelete = new List<int>();
 
-                using (var conn = connStr.ProviderName.Contains("SqlServerCe")
-                    ? (IDbConnection)new SqlCeConnection(connStr.ConnectionString)
-                    : (IDbConnection)new SqlConnection(connStr.ConnectionString))
+                int iterationCount = 0;
+                foreach (var version in allVersions)
                 {
+                    iterationCount++;
 
-                    conn.Open();
-
-                    var vesionsToKeep = VersionsToKeep(content.Id, configEntry, conn);
-                    var versionsToKeepString = string.Join(",", vesionsToKeep);
-
-                    //if (Logger.IsDebugEnabled)
-                    //    Logger.Debug("Keeping versions " + versionsToKeepString);
-
-                    var sqlStrings = new List<string> {
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsPreviewXml
-                                    WHERE	nodeId = {0} AND versionId NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString),
-
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsPropertyData
-                                    WHERE	contentNodeId = {0} AND versionId  NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString),
-
-
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsContentVersion
-                                    WHERE	contentId = {0} AND versionId  NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString),
-
-                        string.Format(@"
-                                    DELETE
-                                    FROM	cmsDocument 
-                                    WHERE	nodeId = {0} AND versionId  NOT IN ({1})",
-                        content.Id,
-                        versionsToKeepString)
-                    };
-
-                    foreach (var sqlString in sqlStrings)
+                    // If we have a maxCount and the current iteration is above that max-count
+                    if (configEntry.MaxCount > 0 && iterationCount > configEntry.MaxCount)
                     {
-                        ExecuteSql(sqlString, conn);
+                        versionIdsToDelete.Add(version.VersionId);
+                        // no need to compare dates since we've already added this version for deletion
+                        continue;
                     }
+                    
+                    // If we have a max days and the current version is older
+                    if (configEntry.MaxDays > 0)
+                    {
+                        var dateRemoveBefore = DateTime.Now.AddDays(0 - configEntry.MaxDays);
+                        if (version.UpdateDate < dateRemoveBefore)
+                        {
+                            versionIdsToDelete.Add(version.VersionId);
+                        }
+                    }
+
+                    // remove all version with count above the limit and with date older than the limit.
 
-                    conn.Close();
                 }
-            }
-        }
 
-        void ExecuteSql(string sql, IDbConnection connection)
-        {
-            //if (Logger.IsDebugEnabled)
-            //    Logger.Debug(sql);
 
-            var command = connection.CreateCommand();
-            command.CommandType = CommandType.Text;
-            command.CommandText = sql;
+                /*
+                    readerIndex++;
+                    var daysDiff = (DateTime.Now - versionDate).Days;
+                    if (published || newest || (daysDiff < configEntry.MaxDays && readerIndex <= configEntry.MaxCount))
+                 */
 
-            if (_catchSqlExceptions)
-            {
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception ex)
-                {
-                    //Logger.Warn("Executing " + sql, ex);
-                }
-            }
-            else
-            {
-                command.ExecuteNonQuery();
+                //TODO: Get all version, order by date, remove all version with count above the limit and with date older than the limit.
+
+
+
+
+
+                //var connStr = ConfigurationManager.ConnectionStrings["umbracoDbDSN"];
+
+                //using (var conn = connStr.ProviderName.Contains("SqlServerCe")
+                //    ? (IDbConnection)new SqlCeConnection(connStr.ConnectionString)
+                //    : (IDbConnection)new SqlConnection(connStr.ConnectionString))
+                //{
+
+                //    conn.Open();
+
+                //    var vesionsToKeep = VersionsToKeep(content.Id, configEntry, conn);
+                //    var versionsToKeepString = string.Join(",", vesionsToKeep);
+
+                //    //if (Logger.IsDebugEnabled)
+                //    //    Logger.Debug("Keeping versions " + versionsToKeepString);
+
+                //    var sqlStrings = new List<string> {
+                //        string.Format(@"
+                //                    DELETE
+                //                    FROM	cmsPreviewXml
+                //                    WHERE	nodeId = {0} AND versionId NOT IN ({1})",
+                //        content.Id,
+                //        versionsToKeepString),
+
+                //        string.Format(@"
+                //                    DELETE
+                //                    FROM	cmsPropertyData
+                //                    WHERE	contentNodeId = {0} AND versionId  NOT IN ({1})",
+                //        content.Id,
+                //        versionsToKeepString),
+
+
+                //        string.Format(@"
+                //                    DELETE
+                //                    FROM	cmsContentVersion
+                //                    WHERE	contentId = {0} AND versionId  NOT IN ({1})",
+                //        content.Id,
+                //        versionsToKeepString),
+
+                //        string.Format(@"
+                //                    DELETE
+                //                    FROM	cmsDocument 
+                //                    WHERE	nodeId = {0} AND versionId  NOT IN ({1})",
+                //        content.Id,
+                //        versionsToKeepString)
+                //    };
+
+                //    foreach (var sqlString in sqlStrings)
+                //    {
+                //        ExecuteSql(sqlString, conn);
+                //    }
+
+                //    conn.Close();
+                //}
             }
         }
 
+        //void ExecuteSql(string sql, IDbConnection connection)
+        //{
+        //    //if (Logger.IsDebugEnabled)
+        //    //    Logger.Debug(sql);
+
+        //    var command = connection.CreateCommand();
+        //    command.CommandType = CommandType.Text;
+        //    command.CommandText = sql;
+
+        //    if (_catchSqlExceptions)
+        //    {
+        //        try
+        //        {
+        //            command.ExecuteNonQuery();
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            //Logger.Warn("Executing " + sql, ex);
+        //        }
+        //    }
+        //    else
+        //    {
+        //        command.ExecuteNonQuery();
+        //    }
+        //}
+
         private IEnumerable<string> VersionsToKeep(int contentId, UnVersionConfigEntry configEntry, IDbConnection connection)
         {
             // Get a list of all versions
@@ -169,24 +235,24 @@ FROM				cmsContentVersion cv
             try
             {
                 using (var reader = command.ExecuteReader())
-		    {
-			    while (reader.Read())
-			    {
-				    var versionId = reader.GetGuid(0);
-				    var versionDate = reader.GetDateTime(1);
-				    var published = !reader.IsDBNull(2) && reader.GetBoolean(2);
-				    var newest = !reader.IsDBNull(3) && reader.GetBoolean(3);
-
-				    readerIndex++;
-
-				    var daysDiff = (DateTime.Now - versionDate).Days;
-				    if (published || newest || (daysDiff < configEntry.MaxDays && readerIndex <= configEntry.MaxCount))
-					    versionsToKeep.Add("'" + versionId.ToString("D") + "'");
-			    }
-
-			    reader.Close();
-			    reader.Dispose();
-		    }
+                {
+                    while (reader.Read())
+                    {
+                        var versionId = reader.GetGuid(0);
+                        var versionDate = reader.GetDateTime(1);
+                        var published = !reader.IsDBNull(2) && reader.GetBoolean(2);
+                        var newest = !reader.IsDBNull(3) && reader.GetBoolean(3);
+
+                        readerIndex++;
+
+                        var daysDiff = (DateTime.Now - versionDate).Days;
+                        if (published || newest || (daysDiff < configEntry.MaxDays && readerIndex <= configEntry.MaxCount))
+                            versionsToKeep.Add("'" + versionId.ToString("D") + "'");
+                    }
+
+                    reader.Close();
+                    reader.Dispose();
+                }
             }
             catch (Exception ex)
             {
@@ -201,13 +267,16 @@ FROM				cmsContentVersion cv
 
         private List<int> GetNodeIdsFromXpath(string xpath)
         {
-            var ids = new List<int>();
-            //var nodes = library.GetXmlNodeByXPath(xpath);
+            using (var ctx = _contextFactory.EnsureUmbracoContext())
+            {
+                var nodes = ctx.UmbracoContext.ContentCache.GetByXPath(xpath);
+
+                if(nodes == null)
+                    return new List<int>();
 
-            //while (nodes.MoveNext())
-            //    ids.Add(Convert.ToInt32(nodes.Current.GetAttribute("id", "")));
+                return nodes.Select(x => x.Id).ToList();
+            }
 
-            return ids;
         }
     }
 }
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
index 12b2792..e42433d 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
@@ -12,21 +12,27 @@ namespace Our.Umbraco.UnVersion
 {
     public class UnVersionComponent : IComponent
     {
+        private readonly IUmbracoContextFactory _contextFactory;
+
         public UnVersionComponent(IUmbracoContextFactory contextFactory)
         {
-            
+            _contextFactory = contextFactory;
         }
 
         public void Initialize()
         {
-            // Init config
-            var configFilePath = Path.Combine(SystemDirectories.Config,"\\unVersion.config");
-            var config = new UnVersionConfig(configFilePath);
+            using (var ctx = _contextFactory.EnsureUmbracoContext())
+            {
+                
+                var configFilePath = ctx.UmbracoContext.HttpContext.Server.MapPath(Path.Combine(SystemDirectories.Config, "\\unVersion.config"));
+                var config = new UnVersionConfig(configFilePath);
 
-            // Init context
-            UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
+                // Init context
+                UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
 
-            ContentService.Published += ContentServicePublished;
+                ContentService.Published += ContentServicePublished;
+            }
+            
         }
 
         private void ContentServicePublished(IContentService sender, ContentPublishedEventArgs e)

From fb77905932e3f48525816da1f996f530550879ad Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 13:53:34 +0100
Subject: [PATCH 06/14] Added unit tests

---
 .../Our.Umbraco.UnVersion.Tests.csproj        | 191 ++++++++++++++++++
 .../Properties/AssemblyInfo.cs                |  20 ++
 .../Services/UnVersionServiceTests.cs         |  68 +++++++
 src/Our.Umbraco.UnVersion.Tests/TestHelper.cs |  21 ++
 src/Our.Umbraco.UnVersion.Tests/app.config    |  35 ++++
 .../packages.config                           |  36 ++++
 src/Our.Umbraco.UnVersion.sln                 |  16 +-
 .../Our.Umbraco.UnVersion.csproj              |   1 +
 .../Services/UnVersionService.cs              |  76 ++++---
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  |   2 +-
 10 files changed, 431 insertions(+), 35 deletions(-)
 create mode 100644 src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
 create mode 100644 src/Our.Umbraco.UnVersion.Tests/Properties/AssemblyInfo.cs
 create mode 100644 src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
 create mode 100644 src/Our.Umbraco.UnVersion.Tests/TestHelper.cs
 create mode 100644 src/Our.Umbraco.UnVersion.Tests/app.config
 create mode 100644 src/Our.Umbraco.UnVersion.Tests/packages.config

diff --git a/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj b/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
new file mode 100644
index 0000000..c4f0f75
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DB4825F3-92CB-44CA-96F1-2680026DAFB1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Our.Umbraco.UnVersion.Tests</RootNamespace>
+    <AssemblyName>Our.Umbraco.UnVersion.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.13.1\lib\net45\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+    </Reference>
+    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Services\UnVersionServiceTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestHelper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Our.Umbraco.UnVersion\Our.Umbraco.UnVersion.csproj">
+      <Project>{a3e6b76a-35ac-415a-bced-971223d63bac}</Project>
+      <Name>Our.Umbraco.UnVersion</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
+</Project>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion.Tests/Properties/AssemblyInfo.cs b/src/Our.Umbraco.UnVersion.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0f61368
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Our.Umbraco.UnVersion.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Our.Umbraco.UnVersion.Tests")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("db4825f3-92cb-44ca-96f1-2680026dafb1")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs b/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
new file mode 100644
index 0000000..02b0cf7
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Our.Umbraco.UnVersion.Services;
+using Umbraco.Core.Models;
+
+namespace Our.Umbraco.UnVersion.Tests
+{
+    [TestClass]
+    public class ServiceTests
+    {
+        [TestMethod]
+        public void GetVersions_Returns_Right_Based_On_Date()
+        {
+            
+            var config = new UnVersionConfigEntry() {MaxDays = 10};
+
+            List<IContent> versions = new List<IContent>()
+            {
+                TestHelper.GetVersionMock(1, new DateTime(2019, 12, 10)).Object, // should be deleted
+                TestHelper.GetVersionMock(2, new DateTime(2019, 12, 19)).Object, // should be deleted
+                TestHelper.GetVersionMock(3, new DateTime(2019, 12, 20)).Object // should be kept
+            };
+            
+            var service = new UnVersionService(null,false);
+
+            var res = service.GetVersionsToDelete(versions, config, new DateTime(2019, 12, 30));
+
+            Assert.IsTrue(res.Contains(1));
+            Assert.IsTrue(res.Contains(2));
+            Assert.IsFalse(res.Contains(3));
+
+        }
+
+        [TestMethod]
+        public void GetVersions_Returns_Right_Based_Max_Count()
+        {
+            var config = new UnVersionConfigEntry() { MaxCount = 5 };
+
+            List<IContent> versions = new List<IContent>()
+            {
+                TestHelper.GetVersionMock(10, new DateTime(2019, 12, 10)).Object, // should be kept
+                TestHelper.GetVersionMock(20, new DateTime(2019, 12, 19)).Object, // should be kept
+                TestHelper.GetVersionMock(30, new DateTime(2019, 12, 20)).Object, // should be kept
+                TestHelper.GetVersionMock(40, new DateTime(2019, 12, 10)).Object, // should be kept
+                TestHelper.GetVersionMock(50, new DateTime(2019, 12, 19)).Object, // should be kept
+                TestHelper.GetVersionMock(60, new DateTime(2019, 12, 20)).Object, // should be deleted
+                TestHelper.GetVersionMock(70, new DateTime(2019, 12, 10)).Object, // should be deleted
+                TestHelper.GetVersionMock(80, new DateTime(2019, 12, 19)).Object, // should be deleted
+                TestHelper.GetVersionMock(90, new DateTime(2019, 12, 20)).Object, // should be deleted
+            };
+
+            var service = new UnVersionService(null, false);
+
+            var res = service.GetVersionsToDelete(versions, config, new DateTime(2019, 12, 30));
+
+            Assert.IsFalse(res.Contains(50));
+
+            Assert.IsTrue(res.Contains(60));
+            Assert.IsTrue(res.Contains(70));
+            Assert.IsTrue(res.Contains(80));
+            Assert.IsTrue(res.Contains(90));
+
+        }
+
+    }
+}
diff --git a/src/Our.Umbraco.UnVersion.Tests/TestHelper.cs b/src/Our.Umbraco.UnVersion.Tests/TestHelper.cs
new file mode 100644
index 0000000..383fde1
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion.Tests/TestHelper.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Moq;
+using Umbraco.Core.Models;
+
+namespace Our.Umbraco.UnVersion.Tests
+{
+    public static class TestHelper
+    {
+        public static Mock<IContent> GetVersionMock(int versionId, DateTime updateDate)
+        {
+            var mock = new Mock<IContent>();
+            mock.Setup(x => x.VersionId).Returns(versionId);
+            mock.Setup(x => x.UpdateDate).Returns(updateDate);
+            return mock;
+        }
+    }
+}
diff --git a/src/Our.Umbraco.UnVersion.Tests/app.config b/src/Our.Umbraco.UnVersion.Tests/app.config
new file mode 100644
index 0000000..430296e
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion.Tests/app.config
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion.Tests/packages.config b/src/Our.Umbraco.UnVersion.Tests/packages.config
new file mode 100644
index 0000000..3a5f343
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion.Tests/packages.config
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
+  <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
+  <package id="LightInject" version="5.4.0" targetFramework="net472" />
+  <package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
+  <package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
+  <package id="MiniProfiler" version="4.0.138" targetFramework="net472" />
+  <package id="MiniProfiler.Shared" version="4.0.138" targetFramework="net472" />
+  <package id="Moq" version="4.13.1" targetFramework="net472" />
+  <package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="1.3.2" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
+  <package id="NPoco" version="3.9.4" targetFramework="net472" />
+  <package id="Owin" version="1.0" targetFramework="net472" />
+  <package id="Semver" version="2.0.4" targetFramework="net472" />
+  <package id="Serilog" version="2.8.0" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net472" />
+  <package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net472" />
+  <package id="Serilog.Filters.Expressions" version="2.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
+  <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
+  <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Superpower" version="2.0.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+  <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion.sln b/src/Our.Umbraco.UnVersion.sln
index f84d868..a6c1c62 100644
--- a/src/Our.Umbraco.UnVersion.sln
+++ b/src/Our.Umbraco.UnVersion.sln
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.108
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.UnVersion", "Our.Umbraco.UnVersion\Our.Umbraco.UnVersion.csproj", "{A3E6B76A-35AC-415A-BCED-971223D63BAC}"
 EndProject
@@ -21,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.UnVersion.Tests", "Our.Umbraco.UnVersion.Tests\Our.Umbraco.UnVersion.Tests.csproj", "{DB4825F3-92CB-44CA-96F1-2680026DAFB1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +34,10 @@ Global
 		{A3E6B76A-35AC-415A-BCED-971223D63BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3E6B76A-35AC-415A-BCED-971223D63BAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3E6B76A-35AC-415A-BCED-971223D63BAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB4825F3-92CB-44CA-96F1-2680026DAFB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB4825F3-92CB-44CA-96F1-2680026DAFB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB4825F3-92CB-44CA-96F1-2680026DAFB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB4825F3-92CB-44CA-96F1-2680026DAFB1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -38,4 +45,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{AE05CC62-1E54-4E24-AA99-B7EED3CFFA3C} = {E155CD07-7718-4EE8-B51E-FECABE034A33}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A3114DD6-96F4-4EB1-B6DA-0811E052F9F9}
+	EndGlobalSection
 EndGlobal
diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 6014879..0acd606 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -267,6 +267,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <!--<PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index 508c3b6..107f743 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -25,6 +25,7 @@ public class UnVersionService : IUnVersionService
         private IUmbracoContextFactory _contextFactory;
         private IContentService _contentService;
 
+        
         public UnVersionService(IUnVersionConfig config, bool catchSqlExceptions)
         {
             _config = config;
@@ -35,9 +36,6 @@ public void FooBarTesting()
         {
             IContent content;
             IContentService cs = null;
-
-            
-
         }
 
         public void UnVersion(IContent content)
@@ -83,35 +81,9 @@ public void UnVersion(IContent content)
                 if(!allVersions.Any())
                     continue;
 
-                List<int> versionIdsToDelete = new List<int>();
-
-                int iterationCount = 0;
-                foreach (var version in allVersions)
-                {
-                    iterationCount++;
-
-                    // If we have a maxCount and the current iteration is above that max-count
-                    if (configEntry.MaxCount > 0 && iterationCount > configEntry.MaxCount)
-                    {
-                        versionIdsToDelete.Add(version.VersionId);
-                        // no need to compare dates since we've already added this version for deletion
-                        continue;
-                    }
-                    
-                    // If we have a max days and the current version is older
-                    if (configEntry.MaxDays > 0)
-                    {
-                        var dateRemoveBefore = DateTime.Now.AddDays(0 - configEntry.MaxDays);
-                        if (version.UpdateDate < dateRemoveBefore)
-                        {
-                            versionIdsToDelete.Add(version.VersionId);
-                        }
-                    }
-
-                    // remove all version with count above the limit and with date older than the limit.
-
-                }
+                var versionIdsToDelete = GetVersionsToDelete(allVersions, configEntry, DateTime.Now);
 
+                //TODO: Remove more stuff
 
                 /*
                     readerIndex++;
@@ -181,6 +153,48 @@ public void UnVersion(IContent content)
             }
         }
 
+        /// <summary>
+        /// Iterates a list of IContent versions and returns items to be removed based on a configEntry.
+        /// </summary>
+        /// <param name="versions"></param>
+        /// <param name="configEntry"></param>
+        /// <param name="currentDateTime"></param>
+        /// <returns></returns>
+        public List<int> GetVersionsToDelete(List<IContent> versions, UnVersionConfigEntry configEntry, DateTime currentDateTime)
+        {
+            List<int> versionIdsToDelete = new List<int>();
+
+            int iterationCount = 0;
+
+            foreach (var version in versions)
+            {
+                iterationCount++;
+
+                // If we have a maxCount and the current iteration is above that max-count
+                if (configEntry.MaxCount > 0 && iterationCount > configEntry.MaxCount)
+                {
+                    versionIdsToDelete.Add(version.VersionId);
+                    // no need to compare dates since we've already added this version for deletion
+                    continue;
+                }
+
+                // If we have a max days and the current version is older
+                if (configEntry.MaxDays > 0 && configEntry.MaxDays != int.MaxValue)
+                {
+                    // TODO: Mock out DateTime now.
+                    var dateRemoveBefore = currentDateTime.AddDays(0 - configEntry.MaxDays);
+                    if (version.UpdateDate < dateRemoveBefore)
+                    {
+                        versionIdsToDelete.Add(version.VersionId);
+                    }
+                }
+
+            }
+
+            return versionIdsToDelete;
+
+        }
+
         //void ExecuteSql(string sql, IDbConnection connection)
         //{
         //    //if (Logger.IsDebugEnabled)
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index 51ed307..d858e70 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -40,7 +40,7 @@ private void LoadXmlConfig(string configPath)
                     {
                         DocTypeAlias = xmlConfigEntry.Attributes["docTypeAlias"] != null
                             ? xmlConfigEntry.Attributes["docTypeAlias"].Value
-                            : "$_ALL"
+                            : "$_ALL" //TODO: Move to constant
                     };
 
                     if (xmlConfigEntry.Attributes["rootXpath"] != null)

From 5bbbeeb5ca116e730c35d456067a7d8ceac4f11e Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 14:10:33 +0100
Subject: [PATCH 07/14] Worked on bootstraping

---
 .../Our.Umbraco.UnVersion.Tests.csproj        |  91 +++++++++++
 .../Services/UnVersionServiceTests.cs         |   7 +-
 .../packages.config                           |  26 +++
 .../Services/UnVersionService.cs              | 152 ++++--------------
 .../UnVersionComponent.cs                     |  21 +--
 .../UnVersionComposer.cs                      |   2 +
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  |   5 +-
 7 files changed, 164 insertions(+), 140 deletions(-)

diff --git a/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj b/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
index c4f0f75..2858bf9 100644
--- a/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
+++ b/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
@@ -45,18 +45,57 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
+    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
+    </Reference>
     <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
     </Reference>
     <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
     </Reference>
+    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
+    </Reference>
     <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
     </Reference>
+    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -64,12 +103,27 @@
     <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
     <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
       <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
     </Reference>
@@ -145,7 +199,11 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
     <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
@@ -155,10 +213,43 @@
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Services\UnVersionServiceTests.cs" />
diff --git a/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs b/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
index 02b0cf7..4e23612 100644
--- a/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
+++ b/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
 using Our.Umbraco.UnVersion.Services;
 using Umbraco.Core.Models;
 
-namespace Our.Umbraco.UnVersion.Tests
+namespace Our.Umbraco.UnVersion.Tests.Services
 {
     [TestClass]
     public class ServiceTests
@@ -23,7 +22,7 @@ public void GetVersions_Returns_Right_Based_On_Date()
                 TestHelper.GetVersionMock(3, new DateTime(2019, 12, 20)).Object // should be kept
             };
             
-            var service = new UnVersionService(null,false);
+            var service = new UnVersionService(null,null,null);
 
             var res = service.GetVersionsToDelete(versions, config, new DateTime(2019, 12, 30));
 
@@ -51,7 +50,7 @@ public void GetVersions_Returns_Right_Based_Max_Count()
                 TestHelper.GetVersionMock(90, new DateTime(2019, 12, 20)).Object, // should be deleted
             };
 
-            var service = new UnVersionService(null, false);
+            var service = new UnVersionService(null, null,null);
 
             var res = service.GetVersionsToDelete(versions, config, new DateTime(2019, 12, 30));
 
diff --git a/src/Our.Umbraco.UnVersion.Tests/packages.config b/src/Our.Umbraco.UnVersion.Tests/packages.config
index 3a5f343..0cd7537 100644
--- a/src/Our.Umbraco.UnVersion.Tests/packages.config
+++ b/src/Our.Umbraco.UnVersion.Tests/packages.config
@@ -2,13 +2,36 @@
 <packages>
   <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
+  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
+  <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="LightInject" version="5.4.0" targetFramework="net472" />
   <package id="LightInject.Annotation" version="1.1.0" targetFramework="net472" />
+  <package id="LightInject.Mvc" version="2.0.0" targetFramework="net472" />
   <package id="LightInject.Web" version="2.0.0" targetFramework="net472" />
+  <package id="LightInject.WebApi" version="2.0.0" targetFramework="net472" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net472" />
+  <package id="Markdown" version="2.2.1" targetFramework="net472" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.SignalR.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
   <package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.Cookies" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
   <package id="MiniProfiler" version="4.0.138" targetFramework="net472" />
   <package id="MiniProfiler.Shared" version="4.0.138" targetFramework="net472" />
   <package id="Moq" version="4.13.1" targetFramework="net472" />
@@ -26,11 +49,14 @@
   <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
   <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
   <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
   <package id="Superpower" version="2.0.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
   <package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.0.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index 107f743..6861266 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -1,14 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Data.SqlClient;
-using System.Data.SqlServerCe;
+using System.IO;
 using System.Linq;
-using System.Reflection;
-using NPoco;
-//using log4net;
-//using umbraco;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web;
@@ -17,43 +12,34 @@ namespace Our.Umbraco.UnVersion.Services
 {
     public class UnVersionService : IUnVersionService
     {
-        //private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private readonly IUnVersionConfig _config;
-        private readonly bool _catchSqlExceptions;
-
+        private IUnVersionConfig _unVersionConfig;
         private IUmbracoContextFactory _contextFactory;
         private IContentService _contentService;
+        private ILogger _logger;
 
         
-        public UnVersionService(IUnVersionConfig config, bool catchSqlExceptions)
-        {
-            _config = config;
-            _catchSqlExceptions = catchSqlExceptions;
-        }
-
-        public void FooBarTesting()
+        public UnVersionService(IUmbracoContextFactory contextFactory, IContentService contentService, ILogger logger)
         {
-            IContent content;
-            IContentService cs = null;
+            _contextFactory = contextFactory;
+            _contentService = contentService;
+            _logger = logger;
         }
 
         public void UnVersion(IContent content)
         {
 
             var configEntries = new List<UnVersionConfigEntry>();
+            var config = GetUnVersionConfig();
 
-            if (_config.ConfigEntries.ContainsKey(content.ContentType.Alias))
-                configEntries.AddRange(_config.ConfigEntries[content.ContentType.Alias]);
+            if (config.ConfigEntries.ContainsKey(content.ContentType.Alias))
+                configEntries.AddRange(config.ConfigEntries[content.ContentType.Alias]);
 
-            if (_config.ConfigEntries.ContainsKey("$_ALL"))
-                configEntries.AddRange(_config.ConfigEntries["$_ALL"]);
+            if (config.ConfigEntries.ContainsKey(UnVersionConfig.AllDocumentTypesKey))
+                configEntries.AddRange(config.ConfigEntries[UnVersionConfig.AllDocumentTypesKey]);
 
             if (configEntries.Count <= 0)
             {
-                //if (Logger.IsDebugEnabled)
-                //    Logger.Debug("No unversion configuration found for type " + content.ContentType.Alias);
-
+                _logger.Debug<UnVersionService>("No UnVersion configuration found for type " + content.ContentType.Alias);
                 return;
             }
 
@@ -85,6 +71,11 @@ public void UnVersion(IContent content)
 
                 //TODO: Remove more stuff
 
+                foreach (var vid in versionIdsToDelete)
+                {
+                    _contentService.DeleteVersion(content.Id, vid, false);
+                }
+
                 /*
                     readerIndex++;
                     var daysDiff = (DateTime.Now - versionDate).Days;
@@ -93,10 +84,6 @@ public void UnVersion(IContent content)
 
                 //TODO: Get all version, order by date, remove all version with count above the limit and with date older than the limit.
 
-
-
-
-
                 //var connStr = ConfigurationManager.ConnectionStrings["umbracoDbDSN"];
 
                 //using (var conn = connStr.ProviderName.Contains("SqlServerCe")
@@ -181,7 +168,6 @@ public List<int> GetVersionsToDelete(List<IContent> versions, UnVersionConfigEnt
                 // If we have a max days and the current version is older
                 if (configEntry.MaxDays > 0 && configEntry.MaxDays != int.MaxValue)
                 {
-                    // TODO: Mock out DateTime now.
                     var dateRemoveBefore = currentDateTime.AddDays(0 - configEntry.MaxDays);
                     if (version.UpdateDate < dateRemoveBefore)
                     {
@@ -195,90 +181,6 @@ public List<int> GetVersionsToDelete(List<IContent> versions, UnVersionConfigEnt
 
         }
 
-        //void ExecuteSql(string sql, IDbConnection connection)
-        //{
-        //    //if (Logger.IsDebugEnabled)
-        //    //    Logger.Debug(sql);
-
-        //    var command = connection.CreateCommand();
-        //    command.CommandType = CommandType.Text;
-        //    command.CommandText = sql;
-
-        //    if (_catchSqlExceptions)
-        //    {
-        //        try
-        //        {
-        //            command.ExecuteNonQuery();
-        //        }
-        //        catch (Exception ex)
-        //        {
-        //            //Logger.Warn("Executing " + sql, ex);
-        //        }
-        //    }
-        //    else
-        //    {
-        //        command.ExecuteNonQuery();
-        //    }
-        //}
-
-        private IEnumerable<string> VersionsToKeep(int contentId, UnVersionConfigEntry configEntry, IDbConnection connection)
-        {
-            // Get a list of all versions
-            // TODO: Need to find a better way to do this, but SQL CE 4 doesn't allow sub queries
-            var sql = string.Format(@"SELECT			
-                                    cv.VersionId,
-	                                cv.VersionDate,
-	                                d.published,
-	                                d.newest
-                FROM				cmsContentVersion cv
-                LEFT OUTER JOIN		cmsDocument d ON d.versionId = cv.VersionId
-                WHERE				cv.ContentId = {0}
-                ORDER BY            cv.VersionDate DESC",
-                contentId);
-
-            //if (Logger.IsDebugEnabled)
-            //    Logger.Debug(sql);
-
-            var command = connection.CreateCommand();
-            command.CommandType = CommandType.Text;
-            command.CommandText = sql;
-
-            var versionsToKeep = new List<string>();
-            var readerIndex = 0;
-
-            try
-            {
-                using (var reader = command.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        var versionId = reader.GetGuid(0);
-                        var versionDate = reader.GetDateTime(1);
-                        var published = !reader.IsDBNull(2) && reader.GetBoolean(2);
-                        var newest = !reader.IsDBNull(3) && reader.GetBoolean(3);
-
-                        readerIndex++;
-
-                        var daysDiff = (DateTime.Now - versionDate).Days;
-                        if (published || newest || (daysDiff < configEntry.MaxDays && readerIndex <= configEntry.MaxCount))
-                            versionsToKeep.Add("'" + versionId.ToString("D") + "'");
-                    }
-
-                    reader.Close();
-                    reader.Dispose();
-                }
-            }
-            catch (Exception ex)
-            {
-                //Logger.Warn(ex);
-
-                if (!_catchSqlExceptions)
-                    throw ex;
-            }
-
-            return versionsToKeep;
-        }
-
         private List<int> GetNodeIdsFromXpath(string xpath)
         {
             using (var ctx = _contextFactory.EnsureUmbracoContext())
@@ -292,5 +194,19 @@ private List<int> GetNodeIdsFromXpath(string xpath)
             }
 
         }
+
+        private IUnVersionConfig GetUnVersionConfig()
+        {
+            if (_unVersionConfig == null)
+            {
+                using (var ctx = _contextFactory.EnsureUmbracoContext())
+                {
+                    var configFilePath = ctx.UmbracoContext.HttpContext.Server.MapPath(Path.Combine(SystemDirectories.Config, "\\unVersion.config"));
+                    _unVersionConfig = new UnVersionConfig(configFilePath);
+                }
+            }
+
+            return _unVersionConfig;
+        }
     }
 }
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
index e42433d..69a3ea6 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
@@ -12,27 +12,16 @@ namespace Our.Umbraco.UnVersion
 {
     public class UnVersionComponent : IComponent
     {
-        private readonly IUmbracoContextFactory _contextFactory;
+        private readonly IUnVersionService _unVersionService;
 
-        public UnVersionComponent(IUmbracoContextFactory contextFactory)
+        public UnVersionComponent(IUnVersionService unVersionService)
         {
-            _contextFactory = contextFactory;
+            _unVersionService = unVersionService;
         }
 
         public void Initialize()
         {
-            using (var ctx = _contextFactory.EnsureUmbracoContext())
-            {
-                
-                var configFilePath = ctx.UmbracoContext.HttpContext.Server.MapPath(Path.Combine(SystemDirectories.Config, "\\unVersion.config"));
-                var config = new UnVersionConfig(configFilePath);
-
-                // Init context
-                UnVersionContext.Instance.UnVersionService = new UnVersionService(config, true);
-
-                ContentService.Published += ContentServicePublished;
-            }
-            
+            ContentService.Published += ContentServicePublished;
         }
 
         private void ContentServicePublished(IContentService sender, ContentPublishedEventArgs e)
@@ -42,7 +31,7 @@ private void ContentServicePublished(IContentService sender, ContentPublishedEve
 
             foreach (var entity in e.PublishedEntities)
             {
-                UnVersionContext.Instance.UnVersionService.UnVersion(entity);
+                _unVersionService.UnVersion(entity);
             }
         }
 
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
index ffab6a6..2cbaef1 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Our.Umbraco.UnVersion.Services;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 
@@ -11,6 +12,7 @@ public class UnVersionComposer : IUserComposer
         public void Compose(Composition composition)
         {
             composition.Components().Append<UnVersionComponent>();
+            composition.RegisterUniqueFor<IUnVersionService, UnVersionService>();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index d858e70..bddee1e 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -9,7 +9,8 @@ namespace Our.Umbraco.UnVersion
 {
     public class UnVersionConfig : IUnVersionConfig
     {
-        //private readonly static ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public const string AllDocumentTypesKey = "$_ALL";
 
         public IDictionary<string, List<UnVersionConfigEntry>> ConfigEntries { get; set; }
 
@@ -40,7 +41,7 @@ private void LoadXmlConfig(string configPath)
                     {
                         DocTypeAlias = xmlConfigEntry.Attributes["docTypeAlias"] != null
                             ? xmlConfigEntry.Attributes["docTypeAlias"].Value
-                            : "$_ALL" //TODO: Move to constant
+                            : AllDocumentTypesKey //TODO: Move to constant
                     };
 
                     if (xmlConfigEntry.Attributes["rootXpath"] != null)

From 6c66651cf23471cfa2817790a80d43458d80b27e Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 14:55:31 +0100
Subject: [PATCH 08/14] Worked on unversion service for V8

---
 .../Services/UnVersionService.cs              |  5 +++--
 .../UnVersionComposer.cs                      |  4 +++-
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  | 22 ++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index 6861266..cfcad81 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -201,8 +201,9 @@ private IUnVersionConfig GetUnVersionConfig()
             {
                 using (var ctx = _contextFactory.EnsureUmbracoContext())
                 {
-                    var configFilePath = ctx.UmbracoContext.HttpContext.Server.MapPath(Path.Combine(SystemDirectories.Config, "\\unVersion.config"));
-                    _unVersionConfig = new UnVersionConfig(configFilePath);
+                    var path = string.Concat(SystemDirectories.Config, "/unVersion.config");
+                    var configFilePath = ctx.UmbracoContext.HttpContext.Server.MapPath(path);
+                    _unVersionConfig = new UnVersionConfig(configFilePath, _logger);
                 }
             }
 
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
index 2cbaef1..28259d8 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
@@ -11,8 +11,10 @@ public class UnVersionComposer : IUserComposer
     {
         public void Compose(Composition composition)
         {
+            composition.RegisterUnique<IUnVersionService, UnVersionService>();
+
             composition.Components().Append<UnVersionComponent>();
-            composition.RegisterUniqueFor<IUnVersionService, UnVersionService>();
+            
         }
     }
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index bddee1e..e05e37e 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -3,30 +3,40 @@
 using System.IO;
 using System.Reflection;
 using System.Xml;
+using Umbraco.Core.Logging;
 
 
 namespace Our.Umbraco.UnVersion
 {
     public class UnVersionConfig : IUnVersionConfig
     {
-        
         public const string AllDocumentTypesKey = "$_ALL";
-
         public IDictionary<string, List<UnVersionConfigEntry>> ConfigEntries { get; set; }
 
-        public UnVersionConfig(string configPath)
+        private ILogger _logger;
+
+        public UnVersionConfig(string configPath, ILogger logger)
         {
+            _logger = logger;
+
             ConfigEntries = new Dictionary<string, List<UnVersionConfigEntry>>();
 
-            LoadXmlConfig(configPath);
+            try
+            {
+                LoadXmlConfig(configPath);
+            }
+            catch (Exception e)
+            {
+                _logger.Error<UnVersionConfig>(e, "Error when parsing unVersion.config.");
+            }
+
         }
 
         private void LoadXmlConfig(string configPath)
         {
             if (!File.Exists(configPath))
             {
-                //TODO: Use Umbraco logger
-                //Logger.Warn("Couldn't find config file " + configPath);
+                _logger.Warn<UnVersionConfig>("Couldn't find config file " + configPath);
                 return;
             }
 

From bbbe17676e4b930446561011352f8a7e06ffa686 Mon Sep 17 00:00:00 2001
From: Markus Johansson <markus@obviuse.se>
Date: Thu, 12 Dec 2019 14:56:27 +0100
Subject: [PATCH 09/14] Updated Docs

---
 docs/developers-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developers-guide.md b/docs/developers-guide.md
index 818bf57..0d87fa2 100644
--- a/docs/developers-guide.md
+++ b/docs/developers-guide.md
@@ -13,7 +13,7 @@ To define a new unversion rule, create an `<add>` element with the following att
 ```xml
 <?xml version="1.0"?>
 <unVersionConfig>
-  <add docTypeAlias="newsPage" rootXpath="//node[@nodeTypeAlias='newsIndex']" maxDays="2" maxCount="10" />
+  <add docTypeAlias="newsPage" rootXpath="//blog[@isDoc]" maxDays="2" maxCount="10" />
 </unVersionConfig>
 ```
 

From 7f4782855a1edc6647185255d51ac9c22fbe98e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <sk@ecreo.dk>
Date: Mon, 2 Mar 2020 15:10:44 +0100
Subject: [PATCH 10/14] Update to Umbraco 8.4 (includes bugfixes around
 DeleteVersion methods, which UnVersion relies on)

---
 .../Our.Umbraco.UnVersion.Tests.csproj        | 27 +++++++-----
 .../packages.config                           | 12 +++---
 .../Our.Umbraco.UnVersion.csproj              | 43 +++++--------------
 src/Our.Umbraco.UnVersion/packages.config     | 12 +++---
 4 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj b/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
index 2858bf9..ea41b88 100644
--- a/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
+++ b/src/Our.Umbraco.UnVersion.Tests/Our.Umbraco.UnVersion.Tests.csproj
@@ -45,17 +45,17 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
       <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -166,9 +166,15 @@
     <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
     </Reference>
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
+    </Reference>
     <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
     </Reference>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
+    </Reference>
     <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
       <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
     </Reference>
@@ -239,16 +245,16 @@
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.8.4.0\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Examine.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Examine.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -266,7 +272,6 @@
       <Name>Our.Umbraco.UnVersion</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/src/Our.Umbraco.UnVersion.Tests/packages.config b/src/Our.Umbraco.UnVersion.Tests/packages.config
index 0cd7537..d01829b 100644
--- a/src/Our.Umbraco.UnVersion.Tests/packages.config
+++ b/src/Our.Umbraco.UnVersion.Tests/packages.config
@@ -2,10 +2,10 @@
 <packages>
   <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net472" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
-  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.8" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
-  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="Examine" version="1.0.1" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="LightInject" version="5.4.0" targetFramework="net472" />
@@ -48,7 +48,9 @@
   <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
   <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
   <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
   <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
   <package id="Superpower" version="2.0.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
@@ -57,6 +59,6 @@
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
-  <package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
-  <package id="UmbracoCms.Web" version="8.0.0" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.4.0" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.4.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 5483e59..eae1970 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -52,17 +52,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
       <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -175,10 +175,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
-<<<<<<< HEAD
-=======
     <Reference Include="System.Data.DataSetExtensions" />
->>>>>>> obviuse/v8
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
@@ -240,29 +237,16 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-<<<<<<< HEAD
-      <HintPath>..\packages\UmbracoCms.Core.8.1.0\lib\net472\Umbraco.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.1.0\lib\net472\Umbraco.Examine.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.1.0\lib\net472\Umbraco.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.1.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
-=======
-      <HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.8.4.0\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Examine.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Examine.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
->>>>>>> obviuse/v8
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -286,13 +270,6 @@
   </ItemGroup>
 <<<<<<< HEAD
   <ItemGroup>
-    <Content Include="web.config" />
-    <None Include="web.Debug.config">
-      <DependentUpon>web.config</DependentUpon>
-    </None>
-    <None Include="web.Release.config">
-      <DependentUpon>web.config</DependentUpon>
-    </None>
   </ItemGroup>
 =======
   <ItemGroup />
diff --git a/src/Our.Umbraco.UnVersion/packages.config b/src/Our.Umbraco.UnVersion/packages.config
index a2b2aa3..43fba45 100644
--- a/src/Our.Umbraco.UnVersion/packages.config
+++ b/src/Our.Umbraco.UnVersion/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
-  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.8" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
-  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="Examine" version="1.0.1" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="LightInject" version="5.4.0" targetFramework="net472" />
@@ -44,14 +44,16 @@
   <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
   <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
   <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
   <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
   <package id="Superpower" version="2.0.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
   <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
-  <package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
-  <package id="UmbracoCms.Web" version="8.1.0" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.4.0" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.4.0" targetFramework="net472" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 4a21956ca1eb02dc67fb22d35ba5312103c4f86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <sk@ecreo.dk>
Date: Mon, 2 Mar 2020 15:12:04 +0100
Subject: [PATCH 11/14] Fix merge errors, and register IUnVersionConfig for DI

---
 .../Services/UnVersionServiceTests.cs         |  8 +-
 src/Our.Umbraco.UnVersion/Bootstrap.cs        | 21 -----
 .../Our.Umbraco.UnVersion.csproj              |  8 --
 .../Services/UnVersionService.cs              | 84 ++++++++++++-------
 .../UnVersionComponent.cs                     |  4 +-
 .../UnVersionComposer.cs                      |  5 +-
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  |  9 +-
 7 files changed, 66 insertions(+), 73 deletions(-)
 delete mode 100644 src/Our.Umbraco.UnVersion/Bootstrap.cs

diff --git a/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs b/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
index 4e23612..a240640 100644
--- a/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
+++ b/src/Our.Umbraco.UnVersion.Tests/Services/UnVersionServiceTests.cs
@@ -12,7 +12,7 @@ public class ServiceTests
         [TestMethod]
         public void GetVersions_Returns_Right_Based_On_Date()
         {
-            
+
             var config = new UnVersionConfigEntry() {MaxDays = 10};
 
             List<IContent> versions = new List<IContent>()
@@ -21,8 +21,8 @@ public void GetVersions_Returns_Right_Based_On_Date()
                 TestHelper.GetVersionMock(2, new DateTime(2019, 12, 19)).Object, // should be deleted
                 TestHelper.GetVersionMock(3, new DateTime(2019, 12, 20)).Object // should be kept
             };
-            
-            var service = new UnVersionService(null,null,null);
+
+            var service = new UnVersionService(null,null,null,null);
 
             var res = service.GetVersionsToDelete(versions, config, new DateTime(2019, 12, 30));
 
@@ -50,7 +50,7 @@ public void GetVersions_Returns_Right_Based_Max_Count()
                 TestHelper.GetVersionMock(90, new DateTime(2019, 12, 20)).Object, // should be deleted
             };
 
-            var service = new UnVersionService(null, null,null);
+            var service = new UnVersionService(null,null, null,null);
 
             var res = service.GetVersionsToDelete(versions, config, new DateTime(2019, 12, 30));
 
diff --git a/src/Our.Umbraco.UnVersion/Bootstrap.cs b/src/Our.Umbraco.UnVersion/Bootstrap.cs
deleted file mode 100644
index 59409fc..0000000
--- a/src/Our.Umbraco.UnVersion/Bootstrap.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.IO;
-using System.Web;
-using Our.Umbraco.UnVersion.Services;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Publishing;
-using Umbraco.Core.Services;
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-
-namespace Our.Umbraco.UnVersion
-{
-    public class Bootstrap : IUserComposer
-    {
-        public void Compose(Composition composition)
-        {
-            composition.Register<IUnVersionConfig, UnVersionConfig>(Lifetime.Singleton);
-            composition.Register<IUnVersionService, UnVersionService>(Lifetime.Singleton);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index eae1970..f7c7155 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -250,16 +250,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Bootstrap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="Services\IUnVersionService.cs" />
     <Compile Include="Services\UnVersionService.cs" />
     <Compile Include="UnVersionComponent.cs" />
-<<<<<<< HEAD
-=======
     <Compile Include="UnVersionComposer.cs" />
->>>>>>> obviuse/v8
     <Compile Include="UnVersionConfig.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -268,12 +264,8 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-<<<<<<< HEAD
   <ItemGroup>
   </ItemGroup>
-=======
-  <ItemGroup />
->>>>>>> obviuse/v8
   <!--<PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index 0a481ab..c13470c 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -9,6 +9,7 @@
 using Umbraco.Web;
 using System.Linq;
 using Umbraco.Core.Services;
+using Umbraco.Core.IO;
 
 namespace Our.Umbraco.UnVersion.Services
 {
@@ -17,7 +18,7 @@ public class UnVersionService : IUnVersionService
         private readonly ILogger _logger;
         private readonly IUmbracoContextFactory _context;
         private readonly IContentService _contentService;
-        private readonly IUnVersionConfig _config;
+        private IUnVersionConfig _config;
 
         public UnVersionService(IUnVersionConfig config, ILogger logger, IUmbracoContextFactory context, IContentService contentService)
         {
@@ -31,13 +32,12 @@ public void UnVersion(IContent content)
         {
 
             var configEntries = new List<UnVersionConfigEntry>();
-            var config = GetUnVersionConfig();
 
-            if (config.ConfigEntries.ContainsKey(content.ContentType.Alias))
-                configEntries.AddRange(config.ConfigEntries[content.ContentType.Alias]);
+            if (_config.ConfigEntries.ContainsKey(content.ContentType.Alias))
+                configEntries.AddRange(_config.ConfigEntries[content.ContentType.Alias]);
 
-            if (config.ConfigEntries.ContainsKey(UnVersionConfig.AllDocumentTypesKey))
-                configEntries.AddRange(config.ConfigEntries[UnVersionConfig.AllDocumentTypesKey]);
+            if (_config.ConfigEntries.ContainsKey(UnVersionConfig.AllDocumentTypesKey))
+                configEntries.AddRange(_config.ConfigEntries[UnVersionConfig.AllDocumentTypesKey]);
 
             if (configEntries.Count <= 0)
             {
@@ -52,6 +52,7 @@ public void UnVersion(IContent content)
                 // Check the RootXPath if configured
                 if (!String.IsNullOrEmpty(configEntry.RootXPath))
                 {
+                    // TODO: Fix in some otherway
                     if (content.Level > 1 && content.ParentId > 0)
                     {
                         var ids = GetNodeIdsFromXpath(configEntry.RootXPath);
@@ -62,17 +63,54 @@ public void UnVersion(IContent content)
                 if (!isValid)
                     continue;
 
-                if (configEntry.MaxDays < int.MaxValue)
+                var allVersions = _contentService.GetVersionsSlim(content.Id, 0, int.MaxValue).ToList();
+
+                if (!allVersions.Any())
+                    continue;
+
+                var versionIdsToDelete = GetVersionsToDelete(allVersions, configEntry, DateTime.Now);
+
+                foreach (var vid in versionIdsToDelete)
+                {
+                    _contentService.DeleteVersion(content.Id, vid, false);
+                }
+
+            }
+
+        }
+
+        /// <summary>
+        /// Iterates a list of IContent versions and returns items to be removed based on a configEntry.
+        /// </summary>
+        /// <param name="versions"></param>
+        /// <param name="configEntry"></param>
+        /// <param name="currentDateTime"></param>
+        /// <returns></returns>
+        public List<int> GetVersionsToDelete(List<IContent> versions, UnVersionConfigEntry configEntry, DateTime currentDateTime)
+        {
+            List<int> versionIdsToDelete = new List<int>();
+
+            int iterationCount = 0;
+
+            foreach (var version in versions)
+            {
+                iterationCount++;
+
+                // If we have a maxCount and the current iteration is above that max-count
+                if (configEntry.MaxCount > 0 && iterationCount > configEntry.MaxCount)
                 {
-                    _contentService.DeleteVersions(content.Id, DateTime.Now.AddDays(-configEntry.MaxDays));
+                    versionIdsToDelete.Add(version.VersionId);
+                    // no need to compare dates since we've already added this version for deletion
+                    continue;
                 }
 
-                if (configEntry.MaxCount < int.MaxValue)
+                // If we have a max days and the current version is older
+                if (configEntry.MaxDays > 0 && configEntry.MaxDays != int.MaxValue)
                 {
-                    var versionIds = _contentService.GetVersionIds(content.Id, configEntry.MaxCount + 1);
-                    if (versionIds.Count() > configEntry.MaxCount)
+                    var dateRemoveBefore = currentDateTime.AddDays(0 - configEntry.MaxDays);
+                    if (version.UpdateDate < dateRemoveBefore)
                     {
-                        _contentService.DeleteVersion(content.Id, versionIds.Last(), true);
+                        versionIdsToDelete.Add(version.VersionId);
                     }
                 }
 
@@ -84,31 +122,15 @@ public void UnVersion(IContent content)
 
         private List<int> GetNodeIdsFromXpath(string xpath)
         {
-            using (var ctx = _contextFactory.EnsureUmbracoContext())
+            using (var ctx = _context.EnsureUmbracoContext())
             {
-                var nodes = ctx.UmbracoContext.ContentCache.GetByXPath(xpath);
+                var nodes = ctx.UmbracoContext.Content.GetByXPath(xpath);
 
-                if(nodes == null)
+                if (nodes == null)
                     return new List<int>();
 
                 return nodes.Select(x => x.Id).ToList();
             }
-
-        }
-
-        private IUnVersionConfig GetUnVersionConfig()
-        {
-            if (_unVersionConfig == null)
-            {
-                using (var ctx = _contextFactory.EnsureUmbracoContext())
-                {
-                    var path = string.Concat(SystemDirectories.Config, "/unVersion.config");
-                    var configFilePath = ctx.UmbracoContext.HttpContext.Server.MapPath(path);
-                    _unVersionConfig = new UnVersionConfig(configFilePath, _logger);
-                }
-            }
-
-            return _unVersionConfig;
         }
     }
 }
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
index 6c0c3a4..856a235 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
@@ -4,14 +4,12 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Services.Implement;
 
 namespace Our.Umbraco.UnVersion
 {
-    public class UnVersionComposer : ComponentComposer<UnVersionComponent>
-    {
-    }
     public class UnVersionComponent : IComponent
     {
         private readonly IUnVersionService unVersionService;
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
index 28259d8..40e6779 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
@@ -11,10 +11,9 @@ public class UnVersionComposer : IUserComposer
     {
         public void Compose(Composition composition)
         {
-            composition.RegisterUnique<IUnVersionService, UnVersionService>();
-
+            composition.Register<IUnVersionConfig, UnVersionConfig>();
+            composition.Register<IUnVersionService, UnVersionService>();
             composition.Components().Append<UnVersionComponent>();
-            
         }
     }
 }
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index 549d523..a8ee82e 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Web;
 using System.Xml;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace Our.Umbraco.UnVersion
@@ -15,7 +16,7 @@ public class UnVersionConfig : IUnVersionConfig
 
         private ILogger _logger;
 
-        public UnVersionConfig(string configPath, ILogger logger)
+        public UnVersionConfig(ILogger logger)
         {
             _logger = logger;
 
@@ -23,7 +24,9 @@ public UnVersionConfig(string configPath, ILogger logger)
 
             try
             {
-                LoadXmlConfig(configPath);
+                var appPath = HttpRuntime.AppDomainAppPath;
+                var configFilePath = Path.Combine(appPath, @"config\unVersion.config");
+                LoadXmlConfig(string.Concat(configFilePath));
             }
             catch (Exception e)
             {
@@ -51,7 +54,7 @@ private void LoadXmlConfig(string configPath)
                     {
                         DocTypeAlias = xmlConfigEntry.Attributes["docTypeAlias"] != null
                             ? xmlConfigEntry.Attributes["docTypeAlias"].Value
-                            : AllDocumentTypesKey //TODO: Move to constant
+                            : AllDocumentTypesKey
                     };
 
                     if (xmlConfigEntry.Attributes["rootXpath"] != null)

From b51a211a36f954c86b9d703fef124b41e02a996c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <sk@ecreo.dk>
Date: Mon, 2 Mar 2020 15:55:27 +0100
Subject: [PATCH 12/14] cleanup

---
 .../Our.Umbraco.UnVersion.csproj              | 185 ------------------
 .../Services/UnVersionService.cs              |   5 -
 .../UnVersionComponent.cs                     |   6 -
 .../UnVersionComposer.cs                      |   5 +-
 src/Our.Umbraco.UnVersion/UnVersionConfig.cs  |   2 -
 5 files changed, 1 insertion(+), 202 deletions(-)

diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index f7c7155..9e2efb7 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -52,202 +52,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
-      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
-    </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
-    </Reference>
-    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
-    </Reference>
-    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
-    </Reference>
-    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
-    </Reference>
-    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
-    </Reference>
-    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
-    </Reference>
-    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
-    </Reference>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
-    </Reference>
-    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data.Linq" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
     <Reference Include="System.IO" />
-    <Reference Include="System.Linq.Expressions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Threading.Tasks" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.8.4.0\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Examine.dll</HintPath>
-    </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
index c13470c..b67e7ba 100644
--- a/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
+++ b/src/Our.Umbraco.UnVersion/Services/UnVersionService.cs
@@ -1,15 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Data.SqlClient;
-using System.Data.SqlServerCe;
 using Umbraco.Core.Models;
 using Umbraco.Core.Logging;
 using Umbraco.Web;
 using System.Linq;
 using Umbraco.Core.Services;
-using Umbraco.Core.IO;
 
 namespace Our.Umbraco.UnVersion.Services
 {
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
index 856a235..ad662e1 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComponent.cs
@@ -1,10 +1,4 @@
 using Our.Umbraco.UnVersion.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Services.Implement;
 
diff --git a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
index 40e6779..fd2165c 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionComposer.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Our.Umbraco.UnVersion.Services;
+using Our.Umbraco.UnVersion.Services;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 
diff --git a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
index a8ee82e..eeb1624 100644
--- a/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
+++ b/src/Our.Umbraco.UnVersion/UnVersionConfig.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Web;
 using System.Xml;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace Our.Umbraco.UnVersion

From dc147541a4f3607b162cd26afa9163762caf75d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <sk@ecreo.dk>
Date: Mon, 2 Mar 2020 16:11:16 +0100
Subject: [PATCH 13/14] recreate project as class library

---
 .../Our.Umbraco.UnVersion.csproj              | 258 +++++++++++++-----
 src/Our.Umbraco.UnVersion/app.config          |  35 +++
 src/Our.Umbraco.UnVersion/packages.config     |   2 -
 3 files changed, 230 insertions(+), 65 deletions(-)
 create mode 100644 src/Our.Umbraco.UnVersion/app.config

diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 9e2efb7..68c3ad5 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -1,34 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A3E6B76A-35AC-415A-BCED-971223D63BAC}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <ProjectGuid>{9C419222-B1A9-42F5-850F-6D5804E585D9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Our.Umbraco.UnVersion</RootNamespace>
     <AssemblyName>Our.Umbraco.UnVersion</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UseIISExpress>false</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,7 +23,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -49,24 +31,209 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="ImageProcessor, Version=2.7.0.100, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.5.4.0\lib\net46\LightInject.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Mvc, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.Web, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="LightInject.WebApi, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Markdown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1b320cc08ad5aa89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Markdown.2.2.1\lib\net451\Markdown.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll</HintPath>
+    </Reference>
+    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
+      <HintPath>..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NPoco, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPoco.3.9.4\lib\net45\NPoco.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
+    </Reference>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
+    </Reference>
+    <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Threading.Tasks" />
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.8.4.0\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
+    <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Examine.dll</HintPath>
+    </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
+    <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.4.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="Services\IUnVersionService.cs" />
     <Compile Include="Services\UnVersionService.cs" />
     <Compile Include="UnVersionComponent.cs" />
@@ -74,39 +241,11 @@
     <Compile Include="UnVersionConfig.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Web\UI\Config\UnVersion.config" />
-  </ItemGroup>
-  <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
+    <Content Include="Web\UI\Config\unVersion.config" />
   </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <!--<PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>-->
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>50320</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -114,11 +253,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/app.config b/src/Our.Umbraco.UnVersion/app.config
new file mode 100644
index 0000000..430296e
--- /dev/null
+++ b/src/Our.Umbraco.UnVersion/app.config
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Our.Umbraco.UnVersion/packages.config b/src/Our.Umbraco.UnVersion/packages.config
index 43fba45..e4a9699 100644
--- a/src/Our.Umbraco.UnVersion/packages.config
+++ b/src/Our.Umbraco.UnVersion/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
   <package id="ClientDependency" version="1.9.8" targetFramework="net472" />
   <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
@@ -55,5 +54,4 @@
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
   <package id="UmbracoCms.Core" version="8.4.0" targetFramework="net472" />
   <package id="UmbracoCms.Web" version="8.4.0" targetFramework="net472" />
-  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 020cb1b6a1d5466a2cd37865c32352df6d85f5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <sk@ecreo.dk>
Date: Mon, 2 Mar 2020 16:16:39 +0100
Subject: [PATCH 14/14] dont import sqlserverce

---
 src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
index 68c3ad5..c8e334c 100644
--- a/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
+++ b/src/Our.Umbraco.UnVersion/Our.Umbraco.UnVersion.csproj
@@ -246,7 +246,6 @@
     <Content Include="Web\UI\Config\unVersion.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>