From f2e5b83795547d19ca2ff1c077bb2bb1c5bee153 Mon Sep 17 00:00:00 2001 From: cankoluman Date: Fri, 27 Jun 2014 14:16:54 +0100 Subject: [PATCH] Issue #AR-8_line_endings: fix line endings so we match the upstream --- .../Archetype.Tests/Archetype.Tests.csproj | 544 +++++++++--------- app/Umbraco/Umbraco.Archetype.sln | 78 +-- .../Archetype.Umbraco.csproj | 530 ++++++++--------- .../Extensions/Extensions.cs | 164 +++--- .../Properties/VersionInfo.cs | 2 +- .../Serialization/AsArchetypeAttribute.cs | 28 +- .../Serialization/AsFieldsetAttribute.cs | 16 +- .../Serialization/SerializationExtensions.cs | 104 ++-- 8 files changed, 736 insertions(+), 730 deletions(-) diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj index 0f7df1c..d021378 100644 --- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj +++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj @@ -1,273 +1,273 @@ - - - - - Debug - AnyCPU - {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B} - Library - Properties - Archetype.Tests - Archetype.Tests - v4.5 - 512 - ..\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - - False - ..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll - - - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll - - - ..\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 - - - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - - False - ..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll - - - ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll - - - ..\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 - - - ..\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 - - - True - ..\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 - - - ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - - ..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll - - - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll - - - False - ..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - False - ..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll - - - - - True - ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll - - - True - ..\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 - - - - True - ..\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 - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - - - True - ..\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 - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll - - - - - - - - False - ..\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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {7D185D41-4228-4978-ACB8-83F9A48AD94F} - Archetype.Umbraco - - - - - - - - - - - xcopy $(ProjectDir)SupportingFiles\config\* $(TargetDir)config /I /O /X /E /K /D /Y - - + + + + + Debug + AnyCPU + {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B} + Library + Properties + Archetype.Tests + Archetype.Tests + v4.5 + 512 + ..\ + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + + False + ..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll + + + ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + + + ..\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 + + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + + False + ..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll + + + ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + + ..\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 + + + ..\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 + + + True + ..\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 + + + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + + + ..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll + + + ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + + False + ..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + + False + ..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll + + + + + True + ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll + + + True + ..\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 + + + + True + ..\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 + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + + + True + ..\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 + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + + + + + + + + False + ..\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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {7D185D41-4228-4978-ACB8-83F9A48AD94F} + Archetype.Umbraco + + + + + + + + + + + xcopy $(ProjectDir)SupportingFiles\config\* $(TargetDir)config /I /O /X /E /K /D /Y + + \ No newline at end of file diff --git a/app/Umbraco/Umbraco.Archetype.sln b/app/Umbraco/Umbraco.Archetype.sln index 03c1b73..bb5fa55 100644 --- a/app/Umbraco/Umbraco.Archetype.sln +++ b/app/Umbraco/Umbraco.Archetype.sln @@ -1,39 +1,39 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Umbraco", "Umbraco.Archetype\Archetype.Umbraco.csproj", "{7D185D41-4228-4978-ACB8-83F9A48AD94F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4ED-85A6-484F-9E72-BE7AC9835821}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetype.Tests\Archetype.Tests.csproj", "{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseSizer", "DatabaseSizer\DatabaseSizer.csproj", "{0114C963-C514-49C1-B7AB-DCB1825F498C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.Build.0 = Release|Any CPU - {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.Build.0 = Release|Any CPU - {0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Umbraco", "Umbraco.Archetype\Archetype.Umbraco.csproj", "{7D185D41-4228-4978-ACB8-83F9A48AD94F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D84AA4ED-85A6-484F-9E72-BE7AC9835821}" + ProjectSection(SolutionItems) = preProject + .nuget\NuGet.Config = .nuget\NuGet.Config + .nuget\NuGet.exe = .nuget\NuGet.exe + .nuget\NuGet.targets = .nuget\NuGet.targets + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetype.Tests\Archetype.Tests.csproj", "{21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseSizer", "DatabaseSizer\DatabaseSizer.csproj", "{0114C963-C514-49C1-B7AB-DCB1825F498C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D185D41-4228-4978-ACB8-83F9A48AD94F}.Release|Any CPU.Build.0 = Release|Any CPU + {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21F3E6CF-B76F-4059-9474-1AF1CE63CD6B}.Release|Any CPU.Build.0 = Release|Any CPU + {0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj index a038f86..c7b0696 100644 --- a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj +++ b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj @@ -1,266 +1,266 @@ - - - - - Debug - AnyCPU - {7D185D41-4228-4978-ACB8-83F9A48AD94F} - Library - Properties - Archetype - Archetype - v4.5 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\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 - - - 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\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 - - - - - False - ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll - - - 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 - - - - - 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 - - - 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 - - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll - - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll - - - False - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll - - - - - - - - ..\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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {7D185D41-4228-4978-ACB8-83F9A48AD94F} + Library + Properties + Archetype + Archetype + v4.5 + 512 + ..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\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 + + + 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\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 + + + + + False + ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll + + + 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 + + + + + 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 + + + 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 + + + False + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + + + False + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + + + False + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + + + + + + + + ..\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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs b/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs index 8d1416b..7206088 100644 --- a/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs +++ b/app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs @@ -1,80 +1,84 @@ -using System.Web.Mvc; -using System.Web.Mvc.Html; -using System.Text.RegularExpressions; -using System.Collections.Generic; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Archetype.Models; - -namespace Archetype.Extensions -{ - public static class Extensions - { - //lifted from the core as it is marked 'internal' - public static bool DetectIsJson(this string input) - { - input = input.Trim(); - return input.StartsWith("{") && input.EndsWith("}") - || input.StartsWith("[") && input.EndsWith("]"); - } - - public static bool IsArchetype(this ArchetypePropertyModel prop) - { - return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias); - } - - public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel) - { - return RenderPartials(htmlHelper, archetypeModel, null, null); - } - - public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath) - { - return RenderPartials(htmlHelper, archetypeModel, partialPath, null); - } - - public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, ViewDataDictionary viewDataDictionary) - { - return RenderPartials(htmlHelper, archetypeModel, null, viewDataDictionary); - } - - public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary) - { - return RenderPartials(htmlHelper, archetypeModel, partialPath, viewDataDictionary); - } - - private static IHtmlString RenderPartials(HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary) - { - var context = HttpContext.Current; - - if (archetypeModel == null || context == null) - { - return new HtmlString(""); - } - - var sb = new StringBuilder(); - - var pathToPartials = "~/Views/Partials/Archetype/"; - if (!string.IsNullOrEmpty(partialPath)) - { - pathToPartials = partialPath; - } - - foreach (var fieldsetModel in archetypeModel) - { - var partial = pathToPartials + fieldsetModel.Alias + ".cshtml"; - - if (System.IO.File.Exists(context.Server.MapPath(partial))) - { - sb.AppendLine(htmlHelper.Partial(partial, fieldsetModel, viewDataDictionary).ToString()); - } - else - { - LogHelper.Info(string.Format("The partial for {0} could not be found. Please create a partial with that name or rename your alias.", context.Server.MapPath(partial))); - } - } - - return new HtmlString(sb.ToString()); - } - } -} +using System; +using System.Web; +using System.Web.Mvc; +using System.Web.Mvc.Html; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections.Generic; +using Umbraco.Core; +using Umbraco.Core.Logging; +using Umbraco.Web; +using Archetype.Models; + +namespace Archetype.Extensions +{ + public static class Extensions + { + //lifted from the core as it is marked 'internal' + public static bool DetectIsJson(this string input) + { + input = input.Trim(); + return input.StartsWith("{") && input.EndsWith("}") + || input.StartsWith("[") && input.EndsWith("]"); + } + + public static bool IsArchetype(this ArchetypePropertyModel prop) + { + return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias); + } + + public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel) + { + return RenderPartials(htmlHelper, archetypeModel, null, null); + } + + public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath) + { + return RenderPartials(htmlHelper, archetypeModel, partialPath, null); + } + + public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, ViewDataDictionary viewDataDictionary) + { + return RenderPartials(htmlHelper, archetypeModel, null, viewDataDictionary); + } + + public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary) + { + return RenderPartials(htmlHelper, archetypeModel, partialPath, viewDataDictionary); + } + + private static IHtmlString RenderPartials(HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary) + { + var context = HttpContext.Current; + + if (archetypeModel == null || context == null) + { + return new HtmlString(""); + } + + var sb = new StringBuilder(); + + var pathToPartials = "~/Views/Partials/Archetype/"; + if (!string.IsNullOrEmpty(partialPath)) + { + pathToPartials = partialPath; + } + + foreach (var fieldsetModel in archetypeModel) + { + var partial = pathToPartials + fieldsetModel.Alias + ".cshtml"; + + if (System.IO.File.Exists(context.Server.MapPath(partial))) + { + sb.AppendLine(htmlHelper.Partial(partial, fieldsetModel, viewDataDictionary).ToString()); + } + else + { + LogHelper.Info(string.Format("The partial for {0} could not be found. Please create a partial with that name or rename your alias.", context.Server.MapPath(partial))); + } + } + + return new HtmlString(sb.ToString()); + } + } +} diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs index 80f0895..9164a1f 100644 --- a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs +++ b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.2.1")] -[assembly: AssemblyFileVersion("1.2.1-beta")] \ No newline at end of file +[assembly: AssemblyFileVersion("1.2.1-beta")] diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs index 6a14035..b450a20 100644 --- a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs +++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs @@ -1,14 +1,14 @@ -using System; - -namespace Archetype.Serialization -{ - public class AsArchetypeAttribute : Attribute - { - public string FieldsetName { get; set; } - - public AsArchetypeAttribute(string fieldsetname) - { - FieldsetName = fieldsetname; - } - } -} +using System; + +namespace Archetype.Serialization +{ + public class AsArchetypeAttribute : Attribute + { + public string FieldsetName { get; set; } + + public AsArchetypeAttribute(string fieldsetname) + { + FieldsetName = fieldsetname; + } + } +} diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs index d6922c1..60c4c08 100644 --- a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs +++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs @@ -1,8 +1,8 @@ -using System; - -namespace Archetype.Serialization -{ - public class AsFieldsetAttribute : Attribute - { - } -} +using System; + +namespace Archetype.Serialization +{ + public class AsFieldsetAttribute : Attribute + { + } +} diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs index 9bd22eb..981c6f0 100644 --- a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs +++ b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs @@ -1,51 +1,53 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Archetype.Extensions; -using Newtonsoft.Json; -using Umbraco.Core.Models; -using Umbraco.Web; - -namespace Archetype.Serialization -{ - public static class SerializationExtensions - { - //temporary - public static string GetPropertyDataValue(this IPublishedContent contentPage, string propertyAlias) - { - if (contentPage == null || !contentPage.HasProperty(propertyAlias)) - return null; - - return (string)contentPage.Properties.Single(p => p.PropertyTypeAlias == propertyAlias).DataValue; - } - - public static IEnumerable GetSerialiazableProperties(this object obj) - { - if (obj == null) - return new List(); - - return obj.GetType() - .GetProperties(BindingFlags.Instance | BindingFlags.Public) - .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute))); - } - - public static T GetModelFromArchetype(this IPublishedContent content, - string cmsFieldAlias, bool returnInstanceIfNull = false) - where T : class, new() - { - var archetypeJson = content.GetPropertyDataValue(cmsFieldAlias); - return JsonConvert.DeserializeObject(archetypeJson) ?? - (returnInstanceIfNull ? Activator.CreateInstance() : default(T)); - } - - public static string DelintArchetypeJson(this string input) - { - if (!input.DetectIsJson()) - return String.Empty; - - var delinter = new ArchetypeJsonDelinter(); - return delinter.Execute(input); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Reflection; +using Archetype.Extensions; +using Newtonsoft.Json; +using Umbraco.Core.Models; +using Umbraco.Web; + +namespace Archetype.Serialization +{ + public static class SerializationExtensions + { + //temporary + public static string GetPropertyDataValue(this IPublishedContent contentPage, string propertyAlias) + { + if (contentPage == null || !contentPage.HasProperty(propertyAlias)) + return null; + + return (string)contentPage.Properties.Single(p => p.PropertyTypeAlias == propertyAlias).DataValue; + } + + public static IEnumerable GetSerialiazableProperties(this object obj) + { + if (obj == null) + return new List(); + + return obj.GetType() + .GetProperties(BindingFlags.Instance | BindingFlags.Public) + .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute))); + } + + public static T GetModelFromArchetype(this IPublishedContent content, + string cmsFieldAlias, bool returnInstanceIfNull = false) + where T : class, new() + { + var archetypeJson = content.GetPropertyDataValue(cmsFieldAlias); + return JsonConvert.DeserializeObject(archetypeJson) ?? + (returnInstanceIfNull ? Activator.CreateInstance() : default(T)); + } + + public static string DelintArchetypeJson(this string input) + { + if (!input.DetectIsJson()) + return String.Empty; + + var delinter = new ArchetypeJsonDelinter(); + return delinter.Execute(input); + } + } +}