Migrate nuPickers to v8

.gitignore

@@ -173,3 +173,4 @@ package/nuPickers*.zip
 # Exclude local test sites
 www*/
 source/nuWebTestSite/
+source/.idea/

build-appveyor.cmd

@@ -16,10 +16,11 @@ IF NOT EXIST "%toolsFolder%" (
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
 	nuget install vswhere -Version 2.3.2 -Source nuget.org -OutputDirectory tools
+	FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A"
+  MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
 )
 
-FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
-MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
+
 
 for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
 	if /i "%%i"=="installationPath" set InstallDir=%%j
@@ -31,7 +32,7 @@ ECHO.
 ECHO Visual Studio is installed in: %InstallDir%
 
 CALL "%InstallDir%\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
-
+//CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\amd64\MsBuild.exe" nupickers.proj %~1
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @EXIT /B 0
 :err

build/nuPickers.proj

@@ -15,8 +15,8 @@
   <!-- SHARED PROPERTIES -->
   <PropertyGroup>
     <PackageName>nuPickers</PackageName>
-    <MinUmbracoVersion>7.2.3</MinUmbracoVersion>
-    <Readme>nuPickers is a collection of Umbraco v7 Property Editors</Readme>
+    <MinUmbracoVersion>8.1.1</MinUmbracoVersion>
+    <Readme>nuPickers is a collection of Umbraco v8 Property Editors</Readme>
     <AuthorName>The nuPickers Team</AuthorName>
     <AuthorUrl>https://github.com/uComponents/nuPickers/graphs/contributors</AuthorUrl>
     <PackageLicenseName>MIT license</PackageLicenseName>

source/nuPickers.Tests/EmbeddedResource/EmbeddedResourceHelperTests.cs

@@ -1,77 +1,76 @@
-namespace nuPickers.Tests.EmbeddedResource
-{
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using nuPickers.EmbeddedResource;
+using nuPickers.EmbeddedResource;
 
-    [TestClass]
+namespace nuPickers.Tests.EmbeddedResource
+{
+    using NUnit.Framework;
     public class HelperEmbeddedResourceHelperTests
     {
         // reference to known embedded resources (picked first folder in shared)
-        private const string HTML_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.html";
-        private const string CSS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditor.css";
-        private const string JS_RESOURCE = "CheckBoxPicker.CheckBoxPickerEditorController.js";
+        private const string HtmlResource = "CheckBoxPicker.CheckBoxPickerEditor.html";
+        private const string CssResource = "CheckBoxPicker.CheckBoxPickerEditor.css";
+        private const string JsResource = "CheckBoxPicker.CheckBoxPickerEditorController.js";
 
-        [TestMethod]
+        [Test]
         public void ResourceNamesThatDoNotExist()
         {
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(null));
             Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(string.Empty));
             // file extension is for client dependency framework, so used not needed for html files
-            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
-            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
+            Assert.IsFalse(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void ResourceNamesThatExist()
         {
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE));
-            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + HtmlResource));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource));
+            Assert.IsTrue(EmbeddedResourceHelper.ResourceExists(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourcesThatDoNotExist()
         {
             Assert.IsNull(EmbeddedResourceHelper.GetResource(null));
             Assert.IsNull(EmbeddedResourceHelper.GetResource(string.Empty));
             // file extension is for client dependency framework, so used not needed for html files
-            Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
-            Assert.IsNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourcesThatExist()
         {
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + HTML_RESOURCE));
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + CSS_RESOURCE));
-            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(EmbeddedResource.RESOURCE_PREFIX + JS_RESOURCE));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + HtmlResource));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + CssResource));
+            Assert.IsNotNull(EmbeddedResourceHelper.GetResource(nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + JsResource));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourceNameFromValidPath()
         {
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX,
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX,
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL));
 
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext"));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL + "folder/file.ext"));
 
             Assert.AreEqual(
-                    EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
-                    EmbeddedResourceHelper.GetResourceNameFromPath(EmbeddedResource.ROOT_URL + "folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
+                    nuPickers.EmbeddedResource.EmbeddedResource.RESOURCE_PREFIX + "folder.file.ext",
+                    EmbeddedResourceHelper.GetResourceNameFromPath(nuPickers.EmbeddedResource.EmbeddedResource.ROOT_URL + "folder/file.ext" + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
 
-        [TestMethod]
+        [Test]
         public void GetResourceNameFromInvalidPath()
         {
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath(null));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath(string.Empty));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("folder/file.ext"));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("/folder/file.ext"));
             Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext"));
-            Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext" + EmbeddedResource.FILE_EXTENSION));
+            Assert.IsNull(EmbeddedResourceHelper.GetResourceNameFromPath("~/folder/file.ext" + nuPickers.EmbeddedResource.EmbeddedResource.FILE_EXTENSION));
         }
     }
 }

source/nuPickers.Tests/nuPickers.Tests.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nuPickers.Tests</RootNamespace>
     <AssemblyName>nuPickers.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -35,6 +36,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <Choose>
@@ -61,6 +66,12 @@
       <Name>nuPickers</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="DataSources" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -81,6 +92,12 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

source/nuPickers.Tests/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+</packages>

source/nuPickers/Components/CacheInvalidationComponent.cs

@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using nuPickers.Caching;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+
+namespace nuPickers.Components
+{
+    public class CacheInvalidationComponent : IComponent, Umbraco.Core.Composing.IComponent
+    {
+        private ContentService _contentService;
+        private DataTypeService _dataTypeService;
+
+        public CacheInvalidationComponent(ContentService contentService, DataTypeService dataTypeService)
+        {
+            _contentService = contentService;
+            _dataTypeService = dataTypeService;
+        }
+
+        public void Dispose()
+        {
+
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
+        {
+            ContentService.Saved += this.ContentService_Saved;
+            ContentService.Deleted += this.ContentService_Deleted;
+
+            DataTypeService.Saved += this.DataTypeService_Saved;
+            DataTypeService.Deleted += this.DataTypeService_Deleted;
+        }
+
+        public void Terminate()
+        {
+
+        }
+
+        private void ContentService_Saved(IContentService sender, SaveEventArgs<IContent> e)
+        {
+            e.SavedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
+        }
+
+        private void ContentService_Deleted(IContentService sender, DeleteEventArgs<IContent> e)
+        {
+            e.DeletedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(y => y.StartsWith(CacheConstants.PickedKeysPrefix + x.Id.ToString())));
+        }
+
+        private void DataTypeService_Saved(IDataTypeService sender, SaveEventArgs<IDataType> e)
+        {
+            e.SavedEntities.ToList().ForEach(
+                x => Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
+        }
+
+        private void DataTypeService_Deleted(IDataTypeService sender, DeleteEventArgs<IDataType> e)
+        {
+            e.DeletedEntities.ToList().ForEach(x =>
+                Cache.Instance.Remove(CacheConstants.DataTypePreValuesPrefix + x.Id.ToString()));
+        }
+    }
+}

source/nuPickers/Components/EmbeddedResourceCompontent.cs

@@ -0,0 +1,52 @@
+using System;
+using System.ComponentModel;
+using System.Web.Mvc;
+using System.Web.Routing;
+using ClientDependency.Core;
+using nuPickers.EmbeddedResource;
+using Umbraco.Core.Logging;
+
+namespace nuPickers.Components
+{
+    public class EmbeddedResourceCompontent : IComponent, Umbraco.Core.Composing.IComponent
+    {
+        private readonly IProfilingLogger _logger;
+
+        public EmbeddedResourceCompontent(IProfilingLogger profilingLogger)
+        {
+            _logger = profilingLogger;
+        }
+
+
+        public void Dispose()
+        {
+
+        }
+
+        public ISite Site { get; set; }
+        public event EventHandler Disposed;
+
+        public void Initialize()
+        {
+            RouteTable
+                .Routes
+                .MapRoute(
+                    name: "nuPickersShared",
+                    url: EmbeddedResource.EmbeddedResource.ROOT_URL.TrimStart("~/".ToCharArray()) + "{folder}/{file}",
+                    defaults: new
+                    {
+                        controller = "EmbeddedResource",
+                        action = "GetSharedResource"
+                    },
+                    namespaces: new[] {"nuPickers.EmbeddedResource"});
+
+            FileWriters.AddWriterForExtension(EmbeddedResource.EmbeddedResource.FILE_EXTENSION,
+                new EmbeddedResourceVirtualFileWriter(_logger));
+        }
+
+        public void Terminate()
+        {
+
+        }
+    }
+}