From e49fe6ee17fcd63e815e2f9e9acdda07e28da7bd Mon Sep 17 00:00:00 2001 From: leekelleher Date: Mon, 14 Jul 2014 18:57:54 +0100 Subject: [PATCH 1/2] Fixed the type-name for the error log messages --- .../PropertyEditors/ArcheTypePropertyEditor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs index 0f7f840..07c23e8 100644 --- a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs +++ b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs @@ -14,7 +14,7 @@ using Umbraco.Web.PropertyEditors; namespace Archetype.PropertyEditors { [PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")] - [PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")] + [PropertyEditor(Constants.PropertyEditorAlias, "Archetype", "/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")] public class ArchetypePropertyEditor : PropertyEditor { #region Pre Value Editor @@ -74,7 +74,7 @@ namespace Archetype.PropertyEditors } catch (Exception ex) { - LogHelper.Error(ex.Message, ex); + LogHelper.Error(ex.Message, ex); } } } @@ -105,7 +105,7 @@ namespace Archetype.PropertyEditors } catch (Exception ex) { - LogHelper.Error(ex.Message, ex); + LogHelper.Error(ex.Message, ex); } } } @@ -135,7 +135,7 @@ namespace Archetype.PropertyEditors } catch (Exception ex) { - LogHelper.Error(ex.Message, ex); + LogHelper.Error(ex.Message, ex); } } } From d8939c59a016ae441394495e374dcb814ceb6800 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 2 Sep 2014 13:30:21 +0100 Subject: [PATCH 2/2] Set the project's assembly references to not "Copy Local". As these pollute the /bin output folder during build. --- .../Archetype.Tests/Archetype.Tests.csproj | 58 ++++++++++++++++--- .../DatabaseSizer/DatabaseSizer.csproj | 55 +++++++++++++++--- 2 files changed, 95 insertions(+), 18 deletions(-) diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj index 597ce56..04efdc1 100644 --- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj +++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj @@ -33,139 +33,167 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll + False ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + False ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll + False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll + False ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + False False ..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll + False False ..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll + False ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll + False - True + False ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + False ..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll + False ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + False False ..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll + False ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll + False - True + False ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll - True + False ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + False - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + False ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + False - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll False ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll - True + False - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll @@ -176,46 +204,57 @@ False ..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll + False False ..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll + False @@ -232,6 +271,7 @@ {7D185D41-4228-4978-ACB8-83F9A48AD94F} Archetype.Umbraco + True diff --git a/app/Umbraco/DatabaseSizer/DatabaseSizer.csproj b/app/Umbraco/DatabaseSizer/DatabaseSizer.csproj index 60c92b8..7337c4d 100644 --- a/app/Umbraco/DatabaseSizer/DatabaseSizer.csproj +++ b/app/Umbraco/DatabaseSizer/DatabaseSizer.csproj @@ -33,119 +33,145 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll + False ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + False ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll + False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll + False ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + False ..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll + False ..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll + False ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll + False - True + 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.2.1.0\lib\net40\MiniProfiler.dll + False ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + False ..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll + False - True + False ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll - True + False ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + False - True + False ..\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 + False ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll + False - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll - True + False ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - True + False ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll @@ -155,36 +181,47 @@ ..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll + False ..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll + False