Merge pull request #220 from leekelleher/develop

Preparing Ditto 0.11.0 release

.gitignore

@@ -1,6 +1,7 @@
 _ReSharper.*
 [Bb]in/
 [Oo]bj/
+[Nn]u[Gg]et[Bb]ackup/
 *.suo
 *.user
 *.userprefs

appveyor.yml

@@ -1,5 +1,7 @@
+os: Visual Studio 2015
+
 # version format
-version: 0.10.0.{build}
+version: 0.11.0.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
@@ -10,11 +12,11 @@ cache:
   - src\packages -> **\packages.config  # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
 
 build_script:
-- build-appveyor.cmd
+- build\build-appveyor.cmd
 
 test:
   assemblies:
-    - 'Our.Umbraco.Ditto.Tests.dll'
+    - 'Umbraco.Tests.dll'
 
 artifacts:
   - path: artifacts\*.nupkg

build.cmd

@@ -15,7 +15,7 @@ if "%PACKAGE_VERISON%" == "" (
 
 SET APPVEYOR_BUILD_VERSION=%PACKAGE_VERISON%.%APPVEYOR_BUILD_NUMBER%
 
-build-appveyor.cmd
+build\build-appveyor.cmd
 
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0

build-appveyor.cmd → build/build-appveyor.cmd

@@ -3,5 +3,5 @@ ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
 ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
 ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
 
-CALL src\.nuget\NuGet.exe restore src\Our.Umbraco.Ditto.sln
-CALL "%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe" build\package.proj
+CALL build\tools\NuGet.exe restore src\Our.Umbraco.Ditto.sln
+CALL "%programfiles(x86)%\MSBuild\14.0\Bin\amd64\MsBuild.exe" build\package.proj

build/package.proj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package" ToolsVersion="4.0">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package" ToolsVersion="14.0">
 
 	<!-- IMPORTS -->
 	<PropertyGroup>
@@ -29,6 +29,7 @@
 	<!-- NUGET ONLY PROPERTIES -->
 	<PropertyGroup>
 		<PackageId>Our.Umbraco.Ditto</PackageId>
+		<NuGetPackageName>Ditto for Umbraco</NuGetPackageName>
 		<Copyright>Copyright &#169; 2014 Umbrella Inc Ltd, Our Umbraco and other contributors</Copyright>
 		<Owners>Umbrella Inc Ltd</Owners>
 		<IconUrl>https://raw.githubusercontent.com/leekelleher/umbraco-ditto/master/docs/assets/img/logo.png</IconUrl>
@@ -159,7 +160,7 @@
 		<MSBuild.NuGet.Tasks.ManifestUpdate
 			ManifestFile="$(BuildNuGetDir)\package.nuspec"
 			WorkingDirectory="$(BuildNuGetDir)"
-			Title="$(PackageName)"
+			Title="$(NuGetPackageName)"
 			Description="$(Readme)"
 			Summary="$(Readme)"
 			Version="$(ProductVersion)"
@@ -188,7 +189,7 @@
 			OutputDirectory="$(ArtifactsDir)"
 			Files="@(PackageFiles)" />
 
-		<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\src\.nuget\NuGet.exe"
+		<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\build\tools\NuGet.exe"
 			ManifestFile="$(BuildNuGetDir)\package.nuspec"
 			BasePath="$(BuildNuGetDir)"
 			Version="$(ProductVersion)"

build/tools/AppVeyorUmbraco/AppVeyorUmbraco.Targets

@@ -1,8 +1,8 @@
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask
     TaskName="GetProductVersion"
     TaskFactory="CodeTaskFactory"
-    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
+    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
 	<ParameterGroup>
     <BuildVersion ParameterType="System.String" Required="true" />
 	  <BuildSuffix ParameterType="System.String" Required="false" />

src/Our.Umbraco.Ditto.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -15,8 +14,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Package", "Build Package", "{302C02F0-CA95-430F-BD43-82D0CCEC08A3}"
 	ProjectSection(SolutionItems) = preProject
 		..\appveyor.yml = ..\appveyor.yml
-		..\build-appveyor.cmd = ..\build-appveyor.cmd
 		..\build.cmd = ..\build.cmd
+		..\build\build-appveyor.cmd = ..\build\build-appveyor.cmd
 		..\build\package.nuspec = ..\build\package.nuspec
 		..\build\package.proj = ..\build\package.proj
 		..\build\package.xml = ..\build\package.xml

src/Our.Umbraco.Ditto/Common/CachedInvocations.cs

@@ -33,9 +33,10 @@ protected static readonly ConcurrentDictionary<MethodBaseCacheItem, Action<objec
         /// <returns>
         /// The <see cref="MethodBaseCacheItem"/> for the given method and type.
         /// </returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected static MethodBaseCacheItem GetMethodCacheKey(object type, [CallerMemberName] string memberName = null)
         {
             return new MethodBaseCacheItem(memberName, type);
         }
     }
-}
+}

src/Our.Umbraco.Ditto/Common/DittoContextAccessor.cs

@@ -0,0 +1,40 @@
+using Umbraco.Core;
+using Umbraco.Web;
+
+namespace Our.Umbraco.Ditto
+{
+    /// <summary>
+    /// An interface allowing access to context objects without resulting to using the singletons directly.
+    /// </summary>
+    public interface IDittoContextAccessor
+    {
+        /// <summary>
+        /// The UmbracoContext instance.
+        /// </summary>
+        UmbracoContext UmbracoContext { get; }
+
+        /// <summary>
+        /// The ApplicationContext instance.
+        /// </summary>
+        ApplicationContext ApplicationContext { get; }
+    }
+
+    internal class DefaultDittoContextAccessor : IDittoContextAccessor
+    {
+        public UmbracoContext UmbracoContext
+        {
+            get
+            {
+                return UmbracoContext.Current;
+            }
+        }
+
+        public ApplicationContext ApplicationContext
+        {
+            get
+            {
+                return ApplicationContext.Current;
+            }
+        }
+    }
+}

src/Our.Umbraco.Ditto/Common/EnumerableInvocations.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 namespace Our.Umbraco.Ditto
 {
@@ -163,4 +162,4 @@ private static Func<T, object> StaticMethodSingleParameter<T>(MethodInfo method)
                    argument).Compile();
         }
     }
-}
+}