fix 7.6-rc1 port

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -6,6 +6,7 @@
     <ProjectGuid>{5BA5425F-27A7-4677-865E-82246498AA2E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>SQLCE4Umbraco</AssemblyName>
+    <RootNamespace>SQLCE4Umbraco</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>

src/Umbraco.Compat7/Core/ApplicationContext.cs

@@ -3,6 +3,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core

src/Umbraco.Compat7/Core/Cache/CacheRefreshersResolver.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Cache

src/Umbraco.Compat7/Core/Persistence/Migrations/MigrationResolver.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Persistence.Migrations

src/Umbraco.Compat7/Core/PropertyEditors/PropertyEditorResolver.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
+using LightInject;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.PropertyEditors

src/Umbraco.Compat7/Core/PropertyEditors/PropertyValueConvertersResolver.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.PropertyEditors

src/Umbraco.Compat7/Core/Strings/UrlSegmentProviderResolver.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Core.Strings

src/Umbraco.Compat7/Umbraco.Compat7.csproj

@@ -6,6 +6,7 @@
     <ProjectGuid>{185E098F-5706-4B97-B404-EB974F05F633}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Umbraco.Compat7</AssemblyName>
+    <RootNamespace>Umbraco.Compat7</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -41,7 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="LightInject" Version="4.1.3" />
+    <PackageReference Include="LightInject" Version="5.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">

src/Umbraco.Compat7/Web/HealthCheck/HealthCheckResolver.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Web.HealthCheck

src/Umbraco.Compat7/Web/Media/ThumbnailProvidersResolver.cs

@@ -4,6 +4,7 @@ using Umbraco.Core.ObjectResolution;
 using Umbraco.Web.Media.ThumbnailProviders;
 using CoreCurrent = Umbraco.Core.DI.Current;
 using WebCurrent = Umbraco.Web.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Web.Media

src/Umbraco.Compat7/Web/Mvc/FilteredControllerFactoriesResolver.cs

@@ -2,6 +2,7 @@
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
 using WebCurrent = Umbraco.Web.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Web.Mvc

src/Umbraco.Compat7/Web/Routing/ContentFinderResolver.cs

@@ -2,6 +2,7 @@
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
 using WebCurrent = Umbraco.Web.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Web.Routing

src/Umbraco.Compat7/Web/Routing/UrlProviderResolver.cs

@@ -2,6 +2,7 @@
 using Umbraco.Core.ObjectResolution;
 using CoreCurrent = Umbraco.Core.DI.Current;
 using WebCurrent = Umbraco.Web.Current;
+using LightInject;
 
 // ReSharper disable once CheckNamespace
 namespace Umbraco.Web.Routing

src/Umbraco.Core/CoreRuntime.cs

@@ -227,6 +227,7 @@ namespace Umbraco.Core
             // from the default connection string name, if possible, else will remain non-configured
             // until properly configured (eg when installing)
             container.RegisterSingleton<IUmbracoDatabaseFactory, UmbracoDatabaseFactory>();
+            container.RegisterSingleton<IDatabaseContext>(f => f.GetInstance<IUmbracoDatabaseFactory>());
 
             // register the scope provider
             container.RegisterSingleton<IScopeProviderInternal, ScopeProvider>();

src/Umbraco.Core/DI/CollectionBuilderBase.cs

@@ -140,7 +140,7 @@ namespace Umbraco.Core.DI
 
             var type = typeof (TItem);
             return _registrations
-                .Select(x => (TItem) Container.GetInstance(type, x.ServiceName, args))
+                .Select(x => (TItem) Container.GetInstanceOrThrow(type, x.ServiceName, x.ImplementingType, args))
                 .ToArray(); // safe
         }
 

src/Umbraco.Core/DI/LightInjectExtensions.cs

@@ -289,7 +289,32 @@ namespace Umbraco.Core.DI
                 throw;
             }
         }
-        
+
+        /// <summary>
+        /// Gets an instance of a TService or throws a meaningful exception.
+        /// </summary>
+        /// <param name="factory">The container.</param>
+        /// <param name="tService">The type of the service.</param>
+        /// <param name="serviceName">The name of the service.</param>
+        /// <param name="implementingType">The implementing type.</param>
+        /// <param name="args">Arguments.</param>
+        /// <returns>The instance.</returns>
+        internal static object GetInstanceOrThrow(this IServiceFactory factory, Type tService, string serviceName, Type implementingType, object[] args)
+        {
+            if (factory == null)
+                throw new ArgumentNullException(nameof(factory));
+
+            try
+            {
+                return factory.GetInstance(tService, serviceName, args);
+            }
+            catch (Exception e)
+            {
+                LightInjectException.TryThrow(e, implementingType);
+                throw;
+            }
+        }
+
         // FIXME or just use names?!
         // this is what RegisterMany does => kill RegisterCollection!
 

src/Umbraco.Core/DI/MixedLightInjectScopeManagerProvider.cs

@@ -32,9 +32,9 @@ namespace Umbraco.Core.DI
             _provider = new PerWebRequestScopeManagerProvider();
         }
 
-        public ScopeManager GetScopeManager()
+        public IScopeManager GetScopeManager(IServiceFactory factory)
         {
-            return _provider.GetScopeManager();
+            return _provider.GetScopeManager(factory);
         }
     }
 }

src/Umbraco.Core/DI/RepositoryCompositionRoot.cs

@@ -31,10 +31,10 @@ namespace Umbraco.Core.DI
             // the container, 'info' describes the ctor argument, and 'args' contains the args that
             // were passed to GetInstance() - use first arg if it is the right type,
             //
-            // for IDatabaseUnitOfWork
-            container.RegisterConstructorDependency((factory, info, args) => args.Length > 0 ? args[0] as IDatabaseUnitOfWork : null);
+            // for IScopeUnitOfWork
+            container.RegisterConstructorDependency((factory, info, args) => args.Length > 0 ? args[0] as IScopeUnitOfWork : null);
             // for IUnitOfWork
-            container.RegisterConstructorDependency((factory, info, args) => args.Length > 0 ? args[0] as IUnitOfWork : null);
+            //container.RegisterConstructorDependency((factory, info, args) => args.Length > 0 ? args[0] as IUnitOfWork : null);
 
             // register repositories
             // repos depend on various things, and a IDatabaseUnitOfWork (registered above)

src/Umbraco.Core/DI/ServicesCompositionRoot.cs

@@ -16,7 +16,7 @@ namespace Umbraco.Core.DI
         {
             // register a transient messages factory, which will be replaced by the web
             // boot manager when running in a web context
-            container.Register<IEventMessagesFactory, TransientEventMessagesFactory>();
+            container.RegisterSingleton<IEventMessagesFactory, TransientEventMessagesFactory>();
 
             // register the service context
             container.RegisterSingleton<ServiceContext>();

src/Umbraco.Core/Exceptions/LightInjectException.cs

@@ -28,30 +28,44 @@ namespace Umbraco.Core.Exceptions
             if (ex == null || ex.Message.StartsWith(LightInjectUnableToResolveType) == false)
                 return;
 
-            var messages = new List<string> { ex.Message };
+            var sb = new StringBuilder();
+            sb.AppendLine("Unresolved type: " + ex.Message.Substring(LightInjectUnableToResolveType.Length));
+            WriteDetails(ex, sb);
+            throw new LightInjectException(sb.ToString(), e);
+        }
 
+        public static void TryThrow(Exception e, Type implementingType)
+        {
+            var ex = e as InvalidOperationException;
+            if (ex == null || ex.Message.StartsWith(LightInjectUnableToResolveType) == false)
+                return;
+
+            var sb = new StringBuilder();
+            sb.AppendLine("Unresolved type: " + ex.Message.Substring(LightInjectUnableToResolveType.Length));
+            sb.AppendLine("Implementing type: " + implementingType);
+            WriteDetails(ex, sb);
+            throw new LightInjectException(sb.ToString(), e);
+        }
+
+        private static void WriteDetails(InvalidOperationException ex, StringBuilder sb)
+        {
             ex = ex.InnerException as InvalidOperationException;
             while (ex != null)
             {
-                messages.Add(ex.Message);
+                var message = ex.Message;
+
+                if (message.StartsWith(LightInjectUnableToResolveType))
+                {
+                    sb.AppendLine("-> Unresolved type: " + message.Substring(LightInjectUnableToResolveType.Length));
+                }
+                else if (message.StartsWith(LightInjectUnresolvedDependency))
+                {
+                    var pos = message.InvariantIndexOf(LightInjectRequestedDependency);
+                    sb.AppendLine("-> Unresolved dependency: " + message.Substring(pos + LightInjectRequestedDependency.Length + 1).TrimEnd(']'));
+                }
+
                 ex = ex.InnerException as InvalidOperationException;
             }
-
-            var sb = new StringBuilder();
-            var last = messages.Last();
-            if (last.StartsWith(LightInjectUnableToResolveType))
-            {
-                sb.AppendLine("Unresolved type: " + last.Substring(LightInjectUnableToResolveType.Length));
-            }
-            else if (last.StartsWith(LightInjectUnresolvedDependency))
-            {
-                var pos = last.InvariantIndexOf(LightInjectRequestedDependency);
-                sb.AppendLine("Unresolved dependency: " + last.Substring(pos + LightInjectRequestedDependency.Length + 1).TrimEnd(']'));
-                sb.AppendLine(" (see inner exceptions for the entire dependencies chain).");
-            }
-            else return; // wtf?
-
-            throw new LightInjectException(sb.ToString(), e);
         }
     }
 }

src/Umbraco.Core/IO/FileSystems.cs

@@ -32,11 +32,19 @@ namespace Umbraco.Core.IO
 
         #region Constructor
 
-        // fixme - circular dependency on scope provider, refactor!
+        // fixme - circular dependency on scope provider
+        // managed via lazy-injecting FileSystems into ScopeProvider for now,
+        // but we must refactor this somehow!
+
+        // DI wants a public ctor
+        // but IScopeProviderInternal is not public
+        public FileSystems(/*IScopeProviderInternal scopeProvider,*/ ILogger logger)
+            : this(DI.Current.ScopeProvider as IScopeProviderInternal, logger)
+        { }
 
         internal FileSystems(IScopeProviderInternal scopeProvider, ILogger logger)
         {
-            _config = (FileSystemProvidersSection) ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
+            _config = (FileSystemProvidersSection)ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
             _scopeProvider = scopeProvider;
             _logger = logger;
             CreateWellKnownFileSystems();

src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs

@@ -21,7 +21,7 @@ namespace Umbraco.Core.Persistence.Repositories
     /// </remarks>
     internal class EntityRepository : DisposableObject, IEntityRepository
     {
-        public EntityRepository(IDatabaseUnitOfWork work)
+        public EntityRepository(IScopeUnitOfWork work)
         {
             UnitOfWork = work;
         }

src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Repositories
     {
         private readonly IDatabaseUnitOfWork _unitOfWork;
 
-        public NotificationsRepository(IDatabaseUnitOfWork unitOfWork)
+        public NotificationsRepository(IScopeUnitOfWork unitOfWork)
         {
             _unitOfWork = unitOfWork;
         }

src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs

@@ -454,6 +454,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var allPropertyDataDtos = Database.FetchByGroups<PropertyDataDto, Guid>(versions, 2000, batch =>
                 Sql()
                     .Select<PropertyDataDto>()
+                    .From<PropertyDataDto>()
                     .WhereIn<PropertyDataDto>(x => x.VersionId, batch))
                 .ToList();
 
@@ -462,6 +463,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var allPropertyTypeDtos = Database.FetchByGroups<PropertyTypeDto, int>(allPropertyTypeIds, 2000, batch => 
                 Sql()
                     .Select<PropertyTypeDto>()
+                    .From<PropertyTypeDto>()
                     .WhereIn<PropertyTypeDto>(x => x.Id, batch));
 
             // index the types for perfs, and assign to PropertyDataDto

src/Umbraco.Core/Persistence/UmbracoDatabase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Data.SqlClient;
 using System.Text;
 using NPoco;
 using StackExchange.Profiling;
@@ -24,7 +25,7 @@ namespace Umbraco.Core.Persistence
         // Umbraco's default isolation level is RepeatableRead
         private const IsolationLevel DefaultIsolationLevel = IsolationLevel.RepeatableRead;
 
-        private readonly ILogger _logger;        
+        private readonly ILogger _logger;
         private readonly RetryPolicy _connectionRetryPolicy;
         private readonly RetryPolicy _commandRetryPolicy;
         private readonly Guid _instanceGuid = Guid.NewGuid();
@@ -70,7 +71,7 @@ namespace Umbraco.Core.Persistence
 
         /// <inheritdoc />
         public ISqlSyntaxProvider SqlSyntax => SqlContext.SqlSyntax;
-        
+
         public Sql<SqlContext> Sql() => new Sql<SqlContext>(SqlContext);
 
         public Sql<SqlContext> Sql(string sql, params object[] args) => Sql().Append(sql, args);
@@ -203,9 +204,14 @@ namespace Umbraco.Core.Persistence
         protected override void OnException(Exception x)
         {
             _logger.Error<UmbracoDatabase>("Exception (" + InstanceId + ").", x);
+            _logger.Debug<UmbracoDatabase>("At:\r\n" + Environment.StackTrace);
+            if (EnableSqlTrace == false)
+                _logger.Debug<UmbracoDatabase>("Sql:\r\n" + CommandToString(_cmd));
             base.OnException(x);
         }
 
+        private DbCommand _cmd;
+
         protected override void OnExecutingCommand(DbCommand cmd)
         {
             // if no timeout is specified, and the connection has a longer timeout, use it
@@ -213,21 +219,7 @@ namespace Umbraco.Core.Persistence
                 cmd.CommandTimeout = cmd.Connection.ConnectionTimeout;
 
             if (EnableSqlTrace)
-            {
-                var sb = new StringBuilder();
-#if DEBUG_DATABASES
-                sb.Append(InstanceId);
-                sb.Append(": ");
-#endif
-                sb.Append(cmd.CommandText);
-                foreach (DbParameter p in cmd.Parameters)
-                {
-                    sb.Append(" - ");
-                    sb.Append(p.Value);
-                }
-
-                _logger.Debug<UmbracoDatabase>(sb.ToString().Replace("{", "{{").Replace("}", "}}"));
-            }
+                _logger.Debug<UmbracoDatabase>(CommandToString(cmd).Replace("{", "{{").Replace("}", "}}")); // fixme these escapes should be builtin
 
 #if DEBUG_DATABASES
             // detects whether the command is already in use (eg still has an open reader...)
@@ -236,9 +228,32 @@ namespace Umbraco.Core.Persistence
             if (refsobj != null) _logger.Debug<UmbracoDatabase>("Oops!" + Environment.NewLine + refsobj);
 #endif
 
+            _cmd = cmd;
             base.OnExecutingCommand(cmd);
         }
 
+        private static string CommandToString(DbCommand cmd)
+        {
+            var sb = new StringBuilder();
+#if DEBUG_DATABASES
+                sb.Append(InstanceId);
+                sb.Append(": ");
+#endif
+            sb.Append(cmd.CommandText);
+            if (cmd.Parameters.Count > 0)
+                sb.Append(" --");
+            var i = 0;
+            foreach (DbParameter p in cmd.Parameters)
+            {
+                sb.Append(" @");
+                sb.Append(i++);
+                sb.Append(":");
+                sb.Append(p.Value);
+            }
+
+            return sb.ToString();
+        }
+
         protected override void OnExecutedCommand(DbCommand cmd)
         {
             if (_enableCount)

src/Umbraco.Core/Services/ContentService.cs

@@ -1263,7 +1263,7 @@ namespace Umbraco.Core.Services
                 // but... UnPublishing event makes no sense (not going to cancel?) and no need to save
                 // just raise the event
                 if (content.Trashed == false && content.HasPublishedVersion)
-                    uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false));
+                    uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false), "UnPublished");
 
                 DeleteLocked(uow, repository, content);
 
@@ -1841,7 +1841,7 @@ namespace Umbraco.Core.Services
                     uow.Events.Dispatch(Saved, this, new SaveEventArgs<IContent>(saved, false));
 
                 if (raiseEvents && published.Any())
-                    uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(published, false, false));
+                    uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(published, false, false), "Published");
 
                 uow.Events.Dispatch(TreeChanged, this, saved.Select(x => new TreeChange<IContent>(x, TreeChangeTypes.RefreshNode)).ToEventArgs());
 
@@ -1952,7 +1952,7 @@ namespace Umbraco.Core.Services
                     publishedItems.Add(publishedItem);
                 }
 
-                uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(publishedItems, false, false));
+                uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(publishedItems, false, false), "Published");
                 uow.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, TreeChangeTypes.RefreshBranch).ToEventArgs());
                 Audit(uow, AuditType.Publish, "Publish with Children performed by user", userId, content.Id);
 
@@ -1997,7 +1997,7 @@ namespace Umbraco.Core.Services
                 content.WriterId = userId;
                 repository.AddOrUpdate(content);
 
-                uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false));
+                uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false), "UnPublished");
                 uow.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, TreeChangeTypes.RefreshBranch).ToEventArgs());
                 Audit(uow, AuditType.UnPublish, "UnPublish performed by user", userId, content.Id);
 
@@ -2058,7 +2058,7 @@ namespace Umbraco.Core.Services
                     return status;
                 }
 
-                uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(content, false, false));
+                uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(content, false, false), "Published");
 
                 // if was not published and now is... descendants that were 'published' (but
                 // had an unpublished ancestor) are 're-published' ie not explicitely published
@@ -2068,7 +2068,7 @@ namespace Umbraco.Core.Services
                     if (HasChildren(content.Id))
                     {
                         var descendants = GetPublishedDescendants(content).ToArray();
-                        uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(descendants, false, false));
+                        uow.Events.Dispatch(Published, this, new PublishEventArgs<IContent>(descendants, false, false), "Published");
                     }
                     changeType = TreeChangeTypes.RefreshBranch; // whole branch
                 }
@@ -2511,7 +2511,7 @@ namespace Umbraco.Core.Services
                     // but... UnPublishing event makes no sense (not going to cancel?) and no need to save
                     // just raise the event
                     if (content.Trashed == false && content.HasPublishedVersion)
-                        uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false));
+                        uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false), "UnPublished");
 
                     // if current content has children, move them to trash
                     var c = content;

src/Umbraco.Core/Umbraco.Core.csproj

@@ -6,6 +6,7 @@
     <ProjectGuid>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Umbraco.Core</AssemblyName>
+    <RootNamespace>Umbraco.Core</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -53,18 +54,18 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="AutoMapper" Version="4.2.1" />
+    <PackageReference Include="AutoMapper" Version="4.2.1" /> <!-- do not update -->
     <PackageReference Include="HtmlAgilityPack" Version="1.4.9.5" />
-    <PackageReference Include="ImageProcessor" Version="2.5.3" />
-    <PackageReference Include="LightInject" Version="4.1.3" />
+    <PackageReference Include="ImageProcessor" Version="2.5.4" />
+    <PackageReference Include="LightInject" Version="5.0.3" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
-    <PackageReference Include="LightInject.Web" Version="1.1.0" />
+    <PackageReference Include="LightInject.Web" Version="2.0.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Log4Net.Async" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.1" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.1" />
-    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.1.0" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="MySql.Data" Version="6.9.9" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />

src/Umbraco.Tests.Benchmarks/App.config

@@ -53,7 +53,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -65,7 +65,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj

@@ -40,66 +40,93 @@
   <ItemGroup>
     <Reference Include="BenchmarkDotNet, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.0.9.9\lib\net45\BenchmarkDotNet.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="BenchmarkDotNet.Core, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Core.0.9.9\lib\net45\BenchmarkDotNet.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="BenchmarkDotNet.Diagnostics.Windows, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.9\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.9.9\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.1.1309.919, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.1.1309.1617, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.1.1309.1617\lib\net40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="NPoco, Version=3.5.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NPoco.3.5.1\lib\net45\NPoco.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.StackTrace, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Reflection.Metadata, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.4.1\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.0.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Threading.Thread, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -107,6 +134,15 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="LinqCastBenchmarks.cs" />
@@ -148,9 +184,9 @@
   <PropertyGroup>
     <PostBuildEvent>
     if not exist "$(TargetDir)x86" md "$(TargetDir)x86"
-    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.1\NativeBinaries\x86\*.*" "$(TargetDir)x86"
+    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.2\NativeBinaries\x86\*.*" "$(TargetDir)x86"
     if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
-    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"</PostBuildEvent>
+    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.2\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D

src/Umbraco.Tests.Benchmarks/packages.config

@@ -1,40 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BenchmarkDotNet" version="0.9.9" targetFramework="net45" />
-  <package id="BenchmarkDotNet.Core" version="0.9.9" targetFramework="net45" />
-  <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.9" targetFramework="net45" />
-  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.9.9" targetFramework="net45" />
-  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
-  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net45" />
-  <package id="Microsoft.SqlServer.Compact" version="4.0.8854.1" targetFramework="net45" />
+  <package id="BenchmarkDotNet" version="0.9.9" targetFramework="net461" />
+  <package id="BenchmarkDotNet.Core" version="0.9.9" targetFramework="net461" />
+  <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.9" targetFramework="net461" />
+  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.9.9" targetFramework="net461" />
+  <package id="Castle.Core" version="4.0.0" targetFramework="net461" />
+  <package id="Moq" version="4.1.1309.1617" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net461" />
+  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net461" />
+  <package id="Microsoft.SqlServer.Compact" version="4.0.8854.2" targetFramework="net461" />
   <package id="NPoco" version="3.5.1" targetFramework="net461" />
-  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
+  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net461" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="net461" />
   <package id="System.Collections" version="4.0.11" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net461" />
+  <package id="System.Console" version="4.0.0" targetFramework="net461" />
   <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.0.0" targetFramework="net461" />
+  <package id="System.Diagnostics.StackTrace" version="4.0.1" targetFramework="net461" />
   <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net461" />
   <package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="net461" />
   <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="net461" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
   <package id="System.Linq" version="4.1.0" targetFramework="net461" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
   <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
-  <package id="System.Reflection.Metadata" version="1.3.0" targetFramework="net461" />
+  <package id="System.Reflection.Metadata" version="1.4.1" targetFramework="net461" />
   <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net461" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
   <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
   <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" />
   <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
   <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
   <package id="System.Text.Encoding" version="4.0.11" targetFramework="net461" />
+  <package id="System.Text.Encoding.CodePages" version="4.0.1" targetFramework="net461" />
   <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net461" />
   <package id="System.Threading" version="4.0.11" targetFramework="net461" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.0.0" targetFramework="net45" />
+  <package id="System.Threading.Tasks.Extensions" version="4.0.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net461" />
+  <package id="System.Threading.Thread" version="4.0.0" targetFramework="net461" />
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net461" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net461" />
+  <package id="System.Xml.XmlDocument" version="4.0.1" targetFramework="net461" />
+  <package id="System.Xml.XPath" version="4.0.1" targetFramework="net461" />
+  <package id="System.Xml.XPath.XDocument" version="4.0.1" targetFramework="net461" />
 </packages>

src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs

@@ -12,6 +12,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Tests.Testing;
 using Current = Umbraco.Web.Current;
+using LightInject;
 
 namespace Umbraco.Tests.Cache.PublishedCache
 {

src/Umbraco.Tests/DependencyInjection/CollectionBuildersTests.cs

@@ -418,7 +418,7 @@ namespace Umbraco.Tests.DI
 
             AssertSameCollection(col1A, col1B);
 
-            _container.EndCurrentScope();
+            _container.ScopeManagerProvider.GetScopeManager(_container).CurrentScope.Dispose();
             var scope2 = _container.BeginScope();
 
             var col2 = _container.GetInstance<TestCollection>();
@@ -426,7 +426,7 @@ namespace Umbraco.Tests.DI
 
             AssertNotSameCollection(col1A, col2);
 
-            _container.EndCurrentScope();
+            _container.ScopeManagerProvider.GetScopeManager(_container).CurrentScope.Dispose();
         }
 
         [Test]

src/Umbraco.Tests/Issues/U9560.cs

@@ -3,6 +3,7 @@ using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Tests.Testing;
+using LightInject;
 
 namespace Umbraco.Tests.Issues
 {

src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
+using LightInject;
 
 namespace Umbraco.Tests.Models.Mapping
 {

src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs

@@ -1,17 +1,16 @@
 using System;
 using System.Linq;
-using System.Text.RegularExpressions;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Core.DI;
 using Umbraco.Tests.Testing;
+using LightInject;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {

src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs

@@ -6,6 +6,7 @@ using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
+using LightInject;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {

src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs

@@ -3,19 +3,16 @@ using System.Collections.ObjectModel;
 using System.Web.Routing;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
 using Umbraco.Web;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Plugins;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 using Umbraco.Core.DI;
-using Umbraco.Tests.TestHelpers;
 using Current = Umbraco.Core.DI.Current;
+using LightInject;
 
 namespace Umbraco.Tests.PublishedContent
 {

src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs

@@ -11,6 +11,7 @@ using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Core.DI;
 using Current = Umbraco.Core.DI.Current;
+using LightInject;
 
 namespace Umbraco.Tests.PublishedContent
 {

src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs

@@ -18,8 +18,8 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Strings;
 using UmbracoExamine;
 using Current = Umbraco.Web.Current;
-using Umbraco.Core.DI;
 using Umbraco.Tests.Testing;
+using LightInject;
 
 namespace Umbraco.Tests.PublishedContent
 {

src/Umbraco.Tests/Services/ContentServiceTests.cs

@@ -11,7 +11,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
+using LightInject;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Services;

src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs

@@ -30,6 +30,7 @@ using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Scoping;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
+using LightInject;
 
 namespace Umbraco.Tests.TestHelpers
 {

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -54,23 +54,21 @@
   <ItemGroup>
     <Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Examine, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.2.0.0-Beta2\lib\net45\Examine.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Examine.2.0.0-beta2\lib\net45\Examine.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>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="LightInject, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.4.1.3\lib\net46\LightInject.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="LightInject, Version=5.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.5.0.3\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>
-      <Private>True</Private>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -80,62 +78,48 @@
     </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>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Analyzers, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Core, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.FastVectorHighlighter, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Highlighter, Version=2.3.2.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Memory, Version=1.0.0.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Queries, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Regex, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.SimpleFacetedSearch, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.Snowball, Version=2.0.0.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Lucene.Net.Contrib.SpellChecker, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="MiniProfiler, Version=3.2.0.157, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
       <HintPath>..\packages\MiniProfiler.3.2.0.157\lib\net40\MiniProfiler.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.1.1309.1617, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.1.1309.1617\lib\net40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -144,12 +128,10 @@
       <HintPath>..\packages\NPoco.3.5.1\lib\net45\NPoco.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.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>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Semver, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
@@ -160,18 +142,15 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Entity.Design" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
@@ -182,46 +161,39 @@
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Http.SelfHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.SelfHost.4.0.30506.0\lib\net40\System.Web.Http.SelfHost.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>True</Private>
     </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.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>True</Private>
     </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.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebDriver">
+    <Reference Include="WebDriver, Version=2.32.0.0, Culture=neutral, PublicKeyToken=1c2bd1631853048f, processorArchitecture=MSIL">
       <HintPath>..\packages\Selenium.WebDriver.2.32.0\lib\net40\WebDriver.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -615,9 +587,9 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
     <EmbeddedResource Include="TreesAndSections\applications.config" />
     <EmbeddedResource Include="TreesAndSections\trees.config" />
+    <None Include="packages.config" />
     <None Include="Packaging\Packages\Document_Type_Picker_1.1.umb" />
     <None Include="UmbracoExamine\TestFiles\umbraco-sort.config">
       <SubType>Designer</SubType>

src/Umbraco.Tests/packages.config

@@ -4,7 +4,7 @@
   <package id="AutoMapper" version="4.2.1" targetFramework="net461" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net461" />
   <package id="Examine" version="2.0.0-beta2" targetFramework="net461" />
-  <package id="LightInject" version="4.1.3" targetFramework="net461" />
+  <package id="LightInject" version="5.0.3" targetFramework="net461" />
   <package id="LightInject.Annotation" version="1.1.0" targetFramework="net461" />
   <package id="log4net" version="2.0.8" targetFramework="net461" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net461" />
@@ -18,10 +18,10 @@
   <package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.30506.0" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
-  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
-  <package id="Moq" version="4.1.1309.0919" targetFramework="net461" />
+  <package id="Moq" version="4.1.1309.1617" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
   <package id="NPoco" version="3.5.1" targetFramework="net461" />
   <package id="NUnit" version="2.6.2" targetFramework="net461" />

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0">
-  <Import Project="..\packages\Microsoft.Net.Compilers.1.3.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.3.0\build\Microsoft.Net.Compilers.props')" />
-  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.4\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.4\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+  <Import Project="..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-
   <PropertyGroup>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -13,16 +12,15 @@
     <RootNamespace>Umbraco.Web.UI</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort>44319</IISExpressSSLPort>
     <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
     <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
     <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
-  </PropertyGroup>  
+    <UseGlobalApplicationHostFile />
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -32,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-
     <IntermediateOutputPath>..\bin\Debug\</IntermediateOutputPath>
     <PackageAsSingleFile>true</PackageAsSingleFile>
     <DesktopBuildPackageLocation>..\Package\Umbraco.Web.UI.zip</DesktopBuildPackageLocation>
@@ -47,7 +44,6 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Umbraco.Web.UI.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
-
     <IntermediateOutputPath>..\bin\Release\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
@@ -59,6 +55,10 @@
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.Net" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\packages\System.Reflection.Metadata.1.4.1\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -79,6 +79,13 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <!--
+    
+        problem: the imports at the top of this file require the packages to be
+        present in ../packages which only package.config does, <PackageReference />
+        uses global cache - we could try to rebing to imports to $(USERPROFILE)/.nuget
+        but then there is a timing issue? so it's all package.config for now ;(
+    
     <PackageReference Include="AutoMapper" Version="4.2.1" />
     <PackageReference Include="ClientDependency" Version="1.9.2" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
@@ -157,10 +164,292 @@
     <PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" />
     <PackageReference Include="System.Xml.XPath" Version="4.0.1" />
     <PackageReference Include="System.Xml.XPath.XDocument" Version="4.0.1" />
-    <PackageReference Include="Umbraco.ModelsBuilder" Version="8.0.0-alpha0005" />   
+    <PackageReference Include="Umbraco.ModelsBuilder" Version="8.0.0-alpha0005" />
+    
+    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="1.0.4" />
     <PackageReference Include="Microsoft.Net.Compilers" Version="1.3.0">
-        <PrivateAssets>All</PrivateAssets> <!-- development dependency -->
+        <PrivateAssets>All</PrivateAssets> <!-/- development dependency -/->
     </PackageReference>
+    -->
+  </ItemGroup>
+  <ItemGroup>
+  
+    <!--
+        Which means we also have to have explicit references here ;(
+    -->
+  
+    <Reference Include="System.Security.Cryptography.Algorithms">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Text.Encoding.CodePages">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Threading.Thread">
+      <HintPath>..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.XmlDocument">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.XPath">
+      <HintPath>..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument">
+      <HintPath>..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Umbraco.ModelsBuilder">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.8.0.0-alpha0005\lib\Umbraco.ModelsBuilder.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ClientDependency.Core">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>../packages/log4net.2.0.8/lib/net45-full/log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Mvc">
+      <HintPath>../packages/Microsoft.AspNet.Mvc.5.2.3/lib/net45/System.Web.Mvc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Http">
+      <HintPath>../packages/Microsoft.AspNet.WebApi.Core.5.2.3/lib/net45/System.Web.Http.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="AutoMapper">
+      <HintPath>../packages/AutoMapper.4.2.1/lib/net45/AutoMapper.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc">
+      <HintPath>../packages/ClientDependency-Mvc5.1.8.0.0/lib/net45/ClientDependency.Core.Mvc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Examine">
+      <HintPath>../packages/Examine.2.0.0-beta2/lib/net45/Examine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>../packages/SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ImageProcessor">
+      <HintPath>../packages/ImageProcessor.2.5.4/lib/net45/ImageProcessor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ImageProcessor.Web">
+      <HintPath>../packages/ImageProcessor.Web.4.8.3/lib/net45/ImageProcessor.Web.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net">
+      <HintPath>..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Analyzers">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Core">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.FastVectorHighlighter">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Highlighter">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Memory">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Queries">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Regex">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.SimpleFacetedSearch">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.Snowball">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Lucene.Net.Contrib.SpellChecker, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core">
+      <HintPath>../packages/Microsoft.AspNet.Identity.Core.2.2.1/lib/net45/Microsoft.AspNet.Identity.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin">
+      <HintPath>../packages/Microsoft.AspNet.Identity.Owin.2.2.1/lib/net45/Microsoft.AspNet.Identity.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>../packages/Microsoft.CodeAnalysis.Common.1.3.2/lib/net45/Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>../packages/Microsoft.CodeAnalysis.CSharp.1.3.2/lib/net45/Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
+      <HintPath>../packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.4/lib/net45/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin">
+      <HintPath>../packages/Microsoft.Owin.3.1.0/lib/net45/Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb">
+      <HintPath>../packages/Microsoft.Owin.Host.SystemWeb.3.1.0/lib/net45/Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security">
+      <HintPath>../packages/Microsoft.Owin.Security.3.1.0/lib/net45/Microsoft.Owin.Security.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies">
+      <HintPath>../packages/Microsoft.Owin.Security.Cookies.3.1.0/lib/net45/Microsoft.Owin.Security.Cookies.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth">
+      <HintPath>../packages/Microsoft.Owin.Security.OAuth.3.1.0/lib/net45/Microsoft.Owin.Security.OAuth.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure">
+      <HintPath>../packages/Microsoft.Web.Infrastructure.1.0.0.0/lib/net40/Microsoft.Web.Infrastructure.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="MiniProfiler">
+      <HintPath>../packages/MiniProfiler.3.2.0.157/lib/net40/MiniProfiler.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>../packages/Newtonsoft.Json.10.0.2/lib/net45/Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Owin">
+      <HintPath>../packages/Owin.1.0/lib/net40/Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.AppContext">
+      <HintPath>../packages/System.AppContext.4.1.0/lib/net46/System.AppContext.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>../packages/System.Collections.Immutable.1.3.1/lib/netstandard1.0/System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Console">
+      <HintPath>../packages/System.Console.4.0.0/lib/net46/System.Console.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe">
+      <HintPath>../packages/SqlServerCE.4.0.0.1/lib/System.Data.SqlServerCe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Data.SqlServerCe.Entity">
+      <HintPath>../packages/SqlServerCE.4.0.0.1/lib/System.Data.SqlServerCe.Entity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Diagnostics.FileVersionInfo">
+      <HintPath>../packages/System.Diagnostics.FileVersionInfo.4.0.0/lib/net46/System.Diagnostics.FileVersionInfo.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Diagnostics.StackTrace">
+      <HintPath>../packages/System.Diagnostics.StackTrace.4.0.1/lib/net46/System.Diagnostics.StackTrace.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem">
+      <HintPath>../packages/System.IO.FileSystem.4.0.1/lib/net46/System.IO.FileSystem.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives">
+      <HintPath>../packages/ystem.IO.FileSystem.Primitives.4.0.1/lib/net46/System.IO.FileSystem.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting">
+      <HintPath>../packages/Microsoft.AspNet.WebApi.Client.5.2.3/lib/net45/System.Net.Http.Formatting.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>../packages/System.Reflection.Metadata.1.4.1/lib/portable-net45+win8/System.Reflection.Metadata.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Helpers">
+      <HintPath>../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.Helpers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Http.WebHost">
+      <HintPath>../packages/Microsoft.AspNet.WebApi.WebHost.5.2.3/lib/net45/System.Web.Http.WebHost.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Razor">
+      <HintPath>../packages/Microsoft.AspNet.Razor.3.2.3/lib/net45/System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages">
+      <HintPath>../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.WebPages.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.Infrastructure">
+      <HintPath>../packages/Microsoft.Web.Infrastructure.1.0.0.0/lib/net40/Microsoft.Web.Infrastructure.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment">
+      <HintPath>../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.WebPages.Deployment.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor">
+      <HintPath>../packages/Microsoft.AspNet.WebPages.3.2.3/lib/net45/System.Web.WebPages.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.XmlDocument">
+      <HintPath>../packages/System.Xml.XmlDocument.4.0.1/lib/net46/System.Xml.XmlDocument.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.XPath">
+      <HintPath>../packages/System.Xml.XPath.4.0.1/lib/net46/System.Xml.XPath.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument">
+      <HintPath>../packages/System.Xml.XPath.XDocument.4.0.1/lib/net46/System.Xml.XPath.XDocument.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.IO.RecyclableMemoryStream">
+      <HintPath>../packages/Microsoft.IO.RecyclableMemoryStream.1.2.1/lib/net45/Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">
@@ -185,6 +474,10 @@
       <Name>Umbraco.Web</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+    <Folder Include="Views\MacroPartials\" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
@@ -458,13 +751,11 @@
     </None>
     <Content Include="Umbraco\Install\Views\Index.cshtml" />
     <Content Include="Media\Web.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <Content Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </Content>
+    <Content Include="packages.config" />
     <None Include="Umbraco\Config\Create\UI.Release.xml">
       <DependentUpon>UI.xml</DependentUpon>
     </None>
@@ -799,15 +1090,11 @@
     <Content Include="Config\FileSystemProviders.config" />
     <Content Include="Config\EmbeddedMedia.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Views\MacroPartials\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
-
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0</VSToolsPath>
@@ -815,7 +1102,6 @@
     <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0</VSToolsPath>
     <VSToolsPath Condition="exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets')">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
@@ -823,10 +1109,8 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-
   <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}">
@@ -845,10 +1129,8 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-
   <Import Project="$(MSBuildProjectDirectory)\..\umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) != true" />
   <Import Project="$(SolutionDir)umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) == true" />
-  
   <Target Name="BeforeBuild">
     <!-- Create web.config file from Template if it doesn't exist -->
     <Copy SourceFiles="$(ProjectDir)web.Template.config" DestinationFiles="$(ProjectDir)Web.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Web.config')" />
@@ -875,7 +1157,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <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\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.3.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.3.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.4\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.4\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
   </Target>
 </Project>

src/Umbraco.Web.UI/config/imageprocessor/cache.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <caching currentCache="DiskCache">
   <caches>
-    <cache name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" browserMaxDays="7" trimCache="false">
-      <settings>
+    <cache trimCache="false" name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" browserMaxDays="7">
+      
+    <settings>
         <setting key="VirtualCachePath" value="~/app_data/cache" />
-      </settings>
-    </cache>
+      </settings></cache>
   </caches>
 </caching>

src/Umbraco.Web.UI/config/imageprocessor/processing.config

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
-  <presets>
-  </presets>
-  <plugins>
+  
+  
+<presets>
+  </presets><plugins>
     <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" />
     <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" />
     <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true" />
@@ -57,5 +58,4 @@
     <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" />
     <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" />
     <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" />
-  </plugins>
-</processing>
+  </plugins></processing>

src/Umbraco.Web.UI/config/imageprocessor/security.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <security>
-  <services>
+  
+<services>
     <service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
     <!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
     <!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
@@ -20,5 +21,4 @@
       <whitelist>
       </whitelist>
     </service>
-  </services>
-</security>
+  </services></security>

src/Umbraco.Web.UI/packages.config

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="4.2.1" targetFramework="net461" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net461" />
+  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net461" />
+  <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net461" />
+  <package id="Examine" version="2.0.0-beta2" targetFramework="net461" />
+  <package id="ImageProcessor" version="2.5.4" targetFramework="net461" />
+  <package id="ImageProcessor.Web" version="4.8.3" targetFramework="net461" />
+  <package id="ImageProcessor.Web.Config" version="2.3.0.0" targetFramework="net461" />
+  <package id="jQuery" version="1.6.4" targetFramework="net461" />
+  <package id="log4net" version="2.0.8" targetFramework="net461" />
+  <package id="Lucene.Net" version="3.0.3" targetFramework="net461" />
+  <package id="Lucene.Net.Contrib" version="3.0.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net461" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.4" targetFramework="net461" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net461" />
+  <package id="Microsoft.Net.Compilers" version="2.1.0" targetFramework="net461" developmentDependency="true" />
+  <package id="Microsoft.Owin" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net461" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
+  <package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
+  <package id="MySql.Data" version="6.9.9" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
+  <package id="Owin" version="1.0" targetFramework="net461" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
+  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net461" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="net461" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net461" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net461" />
+  <package id="System.Console" version="4.0.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.0.0" targetFramework="net461" />
+  <package id="System.Diagnostics.StackTrace" version="4.0.1" targetFramework="net461" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net461" />
+  <package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="net461" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="net461" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
+  <package id="System.Reflection.Metadata" version="1.4.1" targetFramework="net461" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net461" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net461" />
+  <package id="System.Text.Encoding.CodePages" version="4.0.1" targetFramework="net461" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net461" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net461" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net461" />
+  <package id="System.Threading.Thread" version="4.0.0" targetFramework="net461" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net461" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net461" />
+  <package id="System.Xml.XmlDocument" version="4.0.1" targetFramework="net461" />
+  <package id="System.Xml.XPath" version="4.0.1" targetFramework="net461" />
+  <package id="System.Xml.XPath.XDocument" version="4.0.1" targetFramework="net461" />
+  <package id="Umbraco.ModelsBuilder" version="8.0.0-alpha0005" targetFramework="net461" />
+</packages>

src/Umbraco.Web.UI/web.Template.Debug.config

@@ -1,43 +1,43 @@
 <?xml version="1.0"?>
-
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+
   <!--
-    CAREFUL!
-    ========
+    Defines transforms that apply to web.Template.config when creating the Debug web.config.
 
-    ONLY edit this if a certain change NEEDS to go into the config file of EVERYBODY contributing to the project.
-
-    After first build you will get your own web.config, which is no included in source control.
-
-    In the web.config you can edit all you want, it won't be overwritten, but it WILL be altered by this transform file.
-
-    The transforms in this file only apply to debugging, not to the web.config that will be released, see web.Template.Release.config for that
+    This file should contain changes that need to go into the Debug config (the one that everybody
+    contributing to the project is going to use). After the first build, the actual web.config file
+    is created and is ignored by source control.
 
+    One can edit web.config, it will not be overritten, but it WILL be altered by this transform
+    file everytime Umbraco builds.
   -->
 
 
+  <!-- ensure sections and groups -->
   <configSections>
     <section name="urlrewritingnet" xdt:Locator="Match(name)" xdt:Transform="Remove"  />
-    
+    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+
     <section name="Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
     <section name="ExamineLuceneIndexSets" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
 
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Transform="Insert">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
       <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
       <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
     </sectionGroup>
-
   </configSections>
 
+  <!-- remove sections -->
   <urlrewritingnet xdt:Transform="Remove" />
-
   <FileSystemProviders xdt:Transform="Remove" />
+  <system.web.webPages.razor xdt:Transform="Remove" />
+  <system.web.extensions xdt:Transform="Remove" />
+  <system.codedom xdt:Transform="Remove" />
+
+  <!-- prepare umbracoConfiguration section -->
   <umbracoConfiguration xdt:Transform="Remove" />
   <umbracoConfiguration xdt:Transform="InsertBefore(/configuration/appSettings)">
     <settings configSource="config\umbracoSettings.config" />
@@ -45,6 +45,7 @@
     <dashBoard configSource="config\Dashboard.config" />
   </umbracoConfiguration>
 
+  <!-- prepare appSettings -->
   <appSettings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
   <appSettings xdt:Transform="InsertIfMissing">
     <add key="umbracoConfigurationStatus" value="" />
@@ -64,12 +65,14 @@
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)"  />
   </appSettings>
 
+  <!-- prepare connectionStrings -->
   <connectionStrings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
   <connectionStrings xdt:Transform="InsertIfMissing">
     <remove name="umbracoDbDSN" />
     <add name="umbracoDbDSN" connectionString="" providerName="" />
   </connectionStrings>
 
+  <!-- prepare system.data -->
   <system.data>
     <DbProviderFactories>
       <add name="Microsoft SQL Server Compact Data Provider 4.0" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"
@@ -301,178 +304,150 @@
       <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+
+      <add name="UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </httpModules>
 
   </system.web>
 
-
-  <system.web.extensions xdt:Transform="Remove" />
-
-  <system.codedom xdt:Transform="Remove" />
-
+  <!-- prepare system.webServer -->
   <system.webServer>
-    <modules runAllManagedModulesForAllRequests="true">      
+    <modules runAllManagedModulesForAllRequests="true">
       <remove name="UrlRewriteModule" xdt:Transform="Remove" xdt:Locator="Match(name)" />
-      <add name="UrlRewriteModule" xdt:Transform="Remove" xdt:Locator="Match(name)" />      
+      <add name="UrlRewriteModule" xdt:Transform="Remove" xdt:Locator="Match(name)" />
     </modules>
     <handlers>
       <remove name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
       <add name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
     </handlers>
 
-    <!-- Increase the default upload file size limit -->
+    <!-- increase default upload file size limit -->
     <security xdt:Transform="InsertIfMissing">
       <requestFiltering xdt:Transform="InsertIfMissing">
         <requestLimits maxAllowedContentLength="1073741824" xdt:Transform="InsertIfMissing" />
       </requestFiltering>
     </security>
-
   </system.webServer>
 
+  <!-- prepare runtime -->
   <runtime>
+
+    <!-- ensure proper assembly bindings -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 
-      <!-- Ensure correct version of MVC -->
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Helpers']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Helpers']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-                        xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Net.Http']])"/>
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Net.Http']])"/>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-                        xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Http']])"/>
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Http']])"/>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages.Razor']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages.Razor']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
 
-
-      <dependentAssembly  xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
+      <dependentAssembly  xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
       </dependentAssembly>
 
-      <dependentAssembly  xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
+      <dependentAssembly  xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
-
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
-
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.Cookies']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.Cookies']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
-
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.OAuth']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.Owin.Security.OAuth']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-31.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='log4net']])" />
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='log4net']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
       </dependentAssembly>
+
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
       </dependentAssembly>
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis.Common']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis.Common']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.CodeAnalysis.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
       </dependentAssembly>
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis.CSharp']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis.CSharp']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
       </dependentAssembly>
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis.Analyzers']])" />
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis.Analyzers']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.CodeAnalysis.Analyzers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
       </dependentAssembly>
 
       <!-- below is temp, see https://github.com/dotnet/roslyn/issues/12255 -->
+      <!-- was just removing, but uh why?! -->
 
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Collections.Immutable']])" />
-      <!--
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Collections.Immutable']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
       </dependentAssembly>
-      -->
-      <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Reflection.Metadata']])" />
-      <!--
+
+      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Reflection.Metadata']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
       </dependentAssembly>
-      -->
-    </assemblyBinding>
 
+    </assemblyBinding>
   </runtime>
 
-  <system.web.webPages.razor xdt:Transform="Remove" />
-
 </configuration>

src/Umbraco.Web.UI/web.Template.Release.config

@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
-
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-	<!--
-    CAREFUL!
-    ========
-    
-    ONLY edit this if a certain change NEEDS to go into the config of the 
-	Umbraco RELEASE version - The version that everybody will download and use    
+
+  <!--
+    Defines transforms that apply to web.Template.config when creating the Release web.config.
+
+    This file should ONLY contain changes that need to go into the Release config (the one that ships).
   -->
 
 	<system.web>
@@ -15,5 +13,4 @@
 		</customErrors>
 	</system.web>
 
-
 </configuration>

src/Umbraco.Web.UI/web.Template.config

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+
+  <!--
+    Define the web.config template.
+
+    This file is used when creating the initial web.config. And then transforms from
+    web.Template.[Debug|Release].config are applied.
+  -->
+
 	<configSections>
 		<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
 		<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
@@ -59,7 +67,8 @@
     <add key="Umbraco.ModelsBuilder.ModelsMode" value="PureLive" />
 
 	</appSettings>
-	<connectionStrings>
+
+  <connectionStrings>
 		<remove name="umbracoDbDSN" />
 		<add name="umbracoDbDSN" connectionString="" providerName="" />
 		<!-- Important: If you're upgrading Umbraco, do not clear the connection string / provider name during your web.config merge. -->
@@ -337,9 +346,9 @@
 				<requestLimits maxAllowedContentLength="52428800" />
 			</requestFiltering>
 		</security>
-		
+
 		<!--
-		  If you wish to use IIS rewrite rules, see the documentation here: 
+		  If you wish to use IIS rewrite rules, see the documentation here:
 		  https://our.umbraco.org/documentation/Reference/Routing/IISRewriteRules
 		-->
 		<!--
@@ -347,13 +356,11 @@
 			<rules></rules>
 		 </rewrite>
 		  -->
-		  
+
 	</system.webServer>
 
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
-			<!-- Old asp.net ajax assembly bindings -->
 			<dependentAssembly>
 				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
 				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
@@ -362,8 +369,6 @@
 				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
 				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
 			</dependentAssembly>
-
-			<!-- Ensure correct version of MVC -->
 			<dependentAssembly>
 				<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
 				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -376,24 +381,18 @@
 				<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
 				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
 			</dependentAssembly>
-
-			<!-- Ensure correct version of HtmlAgilityPack -->
 			<dependentAssembly>
 				<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
 			</dependentAssembly>
-
 			<dependentAssembly>
 				<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
 			</dependentAssembly>
-
       <dependentAssembly>
-      
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
-
 			<dependentAssembly>
 				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
@@ -449,5 +448,5 @@
     <caching configSource="config\imageprocessor\cache.config" />
     <processing configSource="config\imageprocessor\processing.config" />
   </imageProcessor>
-  
+
 </configuration>

src/Umbraco.Web/DI/WebModelMappersCompositionRoot.cs

@@ -20,6 +20,7 @@ namespace Umbraco.Web.DI
             container.Register<TabModelMapper>();
             container.Register<UserModelMapper>();
             container.Register<DashboardModelsMapper>();
+            container.Register<TemplateModelMapper>();
         }
     }
 }

src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs

@@ -3,6 +3,7 @@ using System.Web.Mvc;
 using Umbraco.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
+using LightInject;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/RenderRouteHandler.cs

@@ -11,6 +11,7 @@ using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 using System.Collections.Generic;
 using Umbraco.Core.Plugins;
+using LightInject;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs

@@ -4,6 +4,7 @@ using System.Web.Routing;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
+using LightInject;
 
 namespace Umbraco.Web.Mvc
 {

src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs

@@ -1,6 +1,6 @@
-using MarkdownSharp;
-using System;
+using System;
 using System.Web;
+using HeyRed.MarkdownSharp;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;

src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksValueConverter.cs

@@ -21,16 +21,14 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
     [DefaultPropertyValueConverter(typeof(RelatedLinksLegacyValueConverter), typeof(JsonValueConverter))]
     public class RelatedLinksValueConverter : PropertyValueConverterBase
     {
-        private readonly UrlProvider _urlProvider;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ServiceContext _services;
         private readonly CacheHelper _appCache;
         private readonly ILogger _logger;
 
-        public RelatedLinksValueConverter(IUmbracoContextAccessor umbracoContextAccessor, UrlProvider urlProvider, ServiceContext services, CacheHelper appCache, ILogger logger)
+        public RelatedLinksValueConverter(IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, CacheHelper appCache, ILogger logger)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
-            _urlProvider = urlProvider;
             _logger = logger;
             _services = services;
             _appCache = appCache;
@@ -122,10 +120,10 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
 
             if (link.IsInternal && link.Id != null)
             {
-                if (_urlProvider == null && umbracoContext == null)
+                if (umbracoContext == null)
                     return null;
 
-                var urlProvider = _urlProvider ?? umbracoContext.UrlProvider;
+                var urlProvider = umbracoContext.UrlProvider;
 
                 link.Link = urlProvider.GetUrl((int)link.Id);
                 if (link.Link.Equals("#"))

src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs

@@ -4,6 +4,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
+using LightInject;
 
 namespace Umbraco.Web.PublishedCache.NuCache
 {

src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs

@@ -7,6 +7,7 @@ using Umbraco.Core.Strings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Scoping;
 using Umbraco.Web.HealthCheck.Checks.DataIntegrity;
+using LightInject;
 
 namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 {

src/Umbraco.Web/Routing/UrlProviderExtensions.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Security;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using LightInject;
 
 namespace Umbraco.Web.Routing
 {

src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs

@@ -6,6 +6,7 @@ using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
+using LightInject;
 
 namespace Umbraco.Web.Scheduling
 {

src/Umbraco.Web/Services/SectionService.cs

@@ -31,7 +31,7 @@ namespace Umbraco.Web.Services
         public SectionService(
             IUserService userService,
             IApplicationTreeService applicationTreeService,
-            IDatabaseUnitOfWorkProvider uowProvider,
+            IScopeUnitOfWorkProvider uowProvider,
             CacheHelper cache)
         {
             if (applicationTreeService == null) throw new ArgumentNullException("applicationTreeService");

src/Umbraco.Web/Strategies/DatabaseServerRegistrarAndMessengerComponent.cs

@@ -16,6 +16,7 @@ using Umbraco.Core.Sync;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Scheduling;
+using LightInject;
 
 namespace Umbraco.Web.Strategies
 {

src/Umbraco.Web/Strategies/LegacyServerRegistrarAndMessengerComponent.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Components;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
+using LightInject;
 
 namespace Umbraco.Web.Strategies
 {

src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs

@@ -2,6 +2,7 @@
 using Umbraco.Core.DI;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Plugins;
+using LightInject;
 
 namespace Umbraco.Web.Strategies.Migrations
 {

src/Umbraco.Web/Templates/TemplateRenderer.cs

@@ -13,6 +13,7 @@ using umbraco;
 using umbraco.cms.businesslogic.language;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Services;
+using LightInject;
 
 namespace Umbraco.Web.Templates
 {

src/Umbraco.Web/Umbraco.Web.csproj

@@ -60,35 +60,35 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="AutoMapper" Version="4.2.1" />
+    <PackageReference Include="AutoMapper" Version="4.2.1" /> <!-- do not update -->
     <PackageReference Include="ClientDependency" Version="1.9.2" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="dotless" Version="1.5.2" />
     <PackageReference Include="Examine" Version="2.0.0-beta2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.4.9.5" />
-    <PackageReference Include="LightInject" Version="4.1.3" />
+    <PackageReference Include="LightInject" Version="5.0.3" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
-    <PackageReference Include="LightInject.Mvc" Version="1.1.0" />
-    <PackageReference Include="LightInject.Web" Version="1.1.0" />
-    <PackageReference Include="LightInject.WebApi" Version="1.1.0" />
+    <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
+    <PackageReference Include="LightInject.Web" Version="2.0.0" />
+    <PackageReference Include="LightInject.WebApi" Version="2.0.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Markdown" Version="1.14.7" />
+    <PackageReference Include="Markdown" Version="2.2.1" />
     <PackageReference Include="Lucene.Net" Version="3.0.3" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.1" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.1" />
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.3" />
-    <PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.2.1" />
+    <PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebPages" Version="3.2.3" />
-    <PackageReference Include="Microsoft.Owin" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Owin.Security" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Owin" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Owin.Security" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.1.0" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
     <PackageReference Include="MiniProfiler" Version="3.2.0.157" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
@@ -96,8 +96,8 @@
     <PackageReference Include="Owin" Version="1.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="SharpZipLib" Version="0.86.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
-    <PackageReference Include="xmlrpcnet" Version="2.5.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
+    <PackageReference Include="xmlrpcnet" Version="3.0.0.266" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\UmbracoExamine\UmbracoExamine.csproj">

src/UmbracoExamine/UmbracoExamine.csproj

@@ -6,6 +6,7 @@
     <ProjectGuid>{07FBC26B-2927-4A22-8D96-D644C667FECC}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>UmbracoExamine</AssemblyName>
+    <RootNamespace>UmbracoExamine</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>

src/umbraco.cms/umbraco.cms.csproj

@@ -7,6 +7,7 @@
     <OutputType>Library</OutputType>
     <AssemblyName>cms</AssemblyName>
     <RootNamespace>umbraco.cms</RootNamespace>
+    <RootNamespace>umbraco.cms</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>

src/umbraco.datalayer/umbraco.datalayer.csproj

@@ -6,6 +6,7 @@
     <ProjectGuid>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>umbraco.DataLayer</AssemblyName>
+    <RootNamespace>umbraco.DataLayer</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
@@ -42,7 +43,7 @@
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
     <PackageReference Include="log4net" Version="2.0.8.0" />
-    <PackageReference Include="Microsoft.ApplicationBlocks.Data" Version="1.0.1559.20655" />
+    <PackageReference Include="Microsoft.ApplicationBlocks.Data" Version="2.0.0" />
     <PackageReference Include="MySql.Data" Version="6.9.9.0" />
   </ItemGroup>
   <ItemGroup>