From 51a27a73d48a22c99e49bc6606c549d4a43f9c68 Mon Sep 17 00:00:00 2001 From: Gerty Engrie Date: Fri, 12 Jul 2019 09:17:03 +0200 Subject: [PATCH 1/2] umbraco v8 changes --- .../TableEditorValueConverter.cs | 29 +- app/Umbraco/TableEditor/TableEditor.csproj | 300 +++++++++--------- app/Umbraco/TableEditor/app.config | 35 ++ app/Umbraco/TableEditor/packages.config | 75 +++-- 4 files changed, 262 insertions(+), 177 deletions(-) create mode 100644 app/Umbraco/TableEditor/app.config diff --git a/app/Umbraco/TableEditor/PropertyConverter/TableEditorValueConverter.cs b/app/Umbraco/TableEditor/PropertyConverter/TableEditorValueConverter.cs index ca1cbb7..b4d3b0e 100644 --- a/app/Umbraco/TableEditor/PropertyConverter/TableEditorValueConverter.cs +++ b/app/Umbraco/TableEditor/PropertyConverter/TableEditorValueConverter.cs @@ -4,27 +4,35 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json; -using Umbraco.Core; -using Umbraco.Web; -using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Logging; using TableEditor.Models; using TableEditor.Extensions; +using Umbraco.Core.Models.PublishedContent; +using Umbraco.Core.PropertyEditors; +using Umbraco.Web.Composing; namespace TableEditor.PropertyConverter { - [PropertyValueType(typeof(TableEditorModel))] - [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)] public class TableEditorValueConverter : PropertyValueConverterBase { public override bool IsConverter(PublishedPropertyType propertyType) { - return propertyType.PropertyEditorAlias.Equals("Imulus.TableEditor"); + return propertyType.EditorAlias.Equals("Imulus.TableEditor"); + } + + public override PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType) + { + return PropertyCacheLevel.Element; + } + + public override Type GetPropertyValueType(PublishedPropertyType propertyType) + { + return typeof(TableEditorModel); } - public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview) + public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, + object source, bool preview) { + if (source == null) { return new TableEditorModel(); @@ -42,12 +50,13 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o } catch (Exception ex) { - LogHelper.Error(ex.Message, ex); + Current.Logger.Error( typeof(TableEditorModel),ex, ex.Message + "{1}", source.ToString()); return new TableEditorModel(); } } return sourceString; } + } } diff --git a/app/Umbraco/TableEditor/TableEditor.csproj b/app/Umbraco/TableEditor/TableEditor.csproj index bcd28ec..7570b8f 100644 --- a/app/Umbraco/TableEditor/TableEditor.csproj +++ b/app/Umbraco/TableEditor/TableEditor.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,13 @@ Properties TableEditor TableEditor - v4.5 + v4.7.2 512 ..\ true + + + true @@ -32,196 +35,200 @@ 4 - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - False + + ..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - False + + ..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\businesslogic.dll - False + + ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll - False + + ..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll - - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - False + + ..\packages\Examine.1.0.0\lib\net452\Examine.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\cms.dll - False + + ..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\controls.dll - False + + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - False + + ..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\Examine.dll - False + + ..\packages\LightInject.5.4.0\lib\net46\LightInject.dll - - ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll - False + + ..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - False + + ..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll + + + ..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll + + + ..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll + + + ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll + + + ..\packages\Markdown.2.2.1\lib\net451\Markdown.dll + + + ..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll - - ..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll - False + + ..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll - - ..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll - False + + ..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\interfaces.dll - False + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\log4net.dll - False + + ..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll - - ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll - False + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\Microsoft.ApplicationBlocks.Data.dll - False + + ..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\Microsoft.Web.Helpers.dll - False + + ..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll + + + ..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll - False ..\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 - False + + ..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll - - ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - False + + ..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll - - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll - False + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll - False + + ..\packages\NPoco.3.9.4\lib\net45\NPoco.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\SQLCE4Umbraco.dll - False + + ..\packages\Owin.1.0\lib\net40\Owin.dll - - - - False - ..\packages\UmbracoCms.Core.7.1.3\lib\System.Data.SqlServerCe.dll + + ..\packages\Semver.2.0.4\lib\net452\Semver.dll - - False - ..\packages\UmbracoCms.Core.7.1.3\lib\System.Data.SqlServerCe.Entity.dll + + ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll - - ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll - False + + ..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + ..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll - False + + ..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll - False + + ..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll - - False - ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + + ..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll - - False - ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll + + ..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll + + ..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll + + ..\packages\Superpower.2.0.0\lib\net45\Superpower.dll - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll + + + + + + + ..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll - - - - - - - ..\packages\UmbracoCms.Core.7.1.3\lib\TidyNet.dll - False + + ..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll + + + ..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + + + + + + + ..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll + + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\umbraco.dll - False + + + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\Umbraco.Core.dll - False + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\umbraco.DataLayer.dll - False + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\umbraco.editorControls.dll - False + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\umbraco.MacroEngines.dll - False + + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\umbraco.providers.dll - False + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\Umbraco.Web.UI.dll - False + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + + + + + + + + ..\packages\UmbracoCms.Core.8.0.2\lib\net472\Umbraco.Core.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\umbraco.XmlSerializers.dll - False + + ..\packages\UmbracoCms.Web.8.0.2\lib\net472\Umbraco.Examine.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\UmbracoExamine.dll - False + + ..\packages\UmbracoCms.Web.8.0.2\lib\net472\Umbraco.Web.dll - - ..\packages\UmbracoCms.Core.7.1.3\lib\UrlRewritingNet.UrlRewriter.dll - False + + ..\packages\UmbracoCms.Web.8.0.2\lib\net472\Umbraco.Web.UI.dll @@ -232,6 +239,7 @@ + @@ -241,7 +249,9 @@ 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}. + +