diff --git a/.gitignore b/.gitignore index 343f5ba..337dac1 100644 --- a/.gitignore +++ b/.gitignore @@ -188,4 +188,5 @@ TestSite/App_Data/NuGetBackup/* # ImageProcessor DiskCache # ========================= TestSite/App_Data/cache/* -TestSite/Media/***/Cached/* \ No newline at end of file +TestSite/Media/***/Cached/* +/.vs diff --git a/Our.Umbraco.PropertyEditors/Our.Umbraco.PropertyEditorConverters.csproj b/Our.Umbraco.PropertyEditors/Our.Umbraco.PropertyEditorConverters.csproj index 99d107e..4a0c8a8 100644 --- a/Our.Umbraco.PropertyEditors/Our.Umbraco.PropertyEditorConverters.csproj +++ b/Our.Umbraco.PropertyEditors/Our.Umbraco.PropertyEditorConverters.csproj @@ -35,7 +35,6 @@ - @@ -45,26 +44,26 @@ - - ..\packages\UmbracoCms.Core.6.2.0\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\businesslogic.dll - - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.2.1\lib\net40\ClientDependency.Core.dll ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\cms.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\cms.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\controls.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\controls.dll ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Examine.dll + + ..\packages\Examine.0.1.57.2941\lib\Examine.dll ..\packages\HtmlAgilityPack.1.4.6\lib\Net40\HtmlAgilityPack.dll @@ -72,27 +71,27 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\interfaces.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\log4net.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\log4net.dll ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Microsoft.ApplicationBlocks.Data.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Microsoft.ApplicationBlocks.Data.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Microsoft.Web.Helpers.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Microsoft.Web.Helpers.dll True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -103,29 +102,35 @@ ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Our.Umbraco.uGoLive.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Our.Umbraco.uGoLive.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Our.Umbraco.uGoLive.47x.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Our.Umbraco.uGoLive.47x.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Our.Umbraco.uGoLive.Checks.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Our.Umbraco.uGoLive.Checks.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\SQLCE4Umbraco.dll - True - ..\packages\UmbracoCms.Core.6.2.0\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.6.2.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.6.2.6\lib\System.Data.SqlServerCe.Entity.dll + + + ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll True - ..\packages\UmbracoCms.Core.6.2.0\lib\System.Data.SqlServerCe.Entity.dll ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll + True + @@ -133,14 +138,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True - ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + True - True - ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll True @@ -159,41 +165,41 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\TidyNet.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\TidyNet.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Umbraco.Core.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.DataLayer.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.editorControls.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.MacroEngines.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.macroRenderings.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.macroRenderings.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.providers.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\Umbraco.Web.UI.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\umbraco.XmlSerializers.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\umbraco.XmlSerializers.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\UmbracoExamine.dll - - ..\packages\UmbracoCms.Core.6.2.0\lib\UrlRewritingNet.UrlRewriter.dll + + ..\packages\UmbracoCms.Core.6.2.6\lib\UrlRewritingNet.UrlRewriter.dll diff --git a/Our.Umbraco.PropertyEditors/packages.config b/Our.Umbraco.PropertyEditors/packages.config index d853748..c514bf3 100644 --- a/Our.Umbraco.PropertyEditors/packages.config +++ b/Our.Umbraco.PropertyEditors/packages.config @@ -1,22 +1,24 @@  - + + - - + + - - + + + - + \ No newline at end of file diff --git a/Package.build.xml b/Package.build.xml index 7dde4d0..6d6c0c6 100644 --- a/Package.build.xml +++ b/Package.build.xml @@ -16,9 +16,9 @@ 1 1 - 0 + 1 - 6.2.0 + 6.2.6