From 163e7d378ee544a79a93a394d61666a67d92af2f Mon Sep 17 00:00:00 2001 From: lacarl Date: Thu, 28 Mar 2019 12:10:29 +1000 Subject: [PATCH 1/2] Updated for release 2.0.2 with support for Sitecore XP 9.0 Update 2 .NET Framework upgraded to 4.6.2 Updated Sitecore references to 9.0.180604 Removed unused packages and references from the Test Project --- Build/DeloitteDigital.Atlas.nuspec | 2 +- DeloitteDigital.Atlas.sln | 8 +- .../DeloitteDigital.Atlas.Tests.csproj | 119 +++++++----------- .../Properties/AssemblyInfo.cs | 6 +- src/DeloitteDigital.Atlas.Tests/app.config | 38 +++--- .../packages.config | 78 ++++++------ .../App_Start/RazorGeneratorMvcStart.cs | 21 ++++ .../DeloitteDigital.Atlas.csproj | 12 +- .../Properties/AssemblyInfo.cs | 6 +- src/DeloitteDigital.Atlas/app.config | 18 ++- src/DeloitteDigital.Atlas/packages.config | 16 +-- 11 files changed, 167 insertions(+), 157 deletions(-) create mode 100644 src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs diff --git a/Build/DeloitteDigital.Atlas.nuspec b/Build/DeloitteDigital.Atlas.nuspec index 717a6c0..acf658c 100644 --- a/Build/DeloitteDigital.Atlas.nuspec +++ b/Build/DeloitteDigital.Atlas.nuspec @@ -2,7 +2,7 @@ DeloitteDigital.Atlas - 1.1.0 + 2.0.2 Deloitte Digital Deloitte Digital https://github.com/DeloitteDigitalAPAC/Atlas/blob/master/LICENSE diff --git a/DeloitteDigital.Atlas.sln b/DeloitteDigital.Atlas.sln index ace31fb..268ff30 100644 --- a/DeloitteDigital.Atlas.sln +++ b/DeloitteDigital.Atlas.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.539 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeloitteDigital.Atlas", "src\DeloitteDigital.Atlas\DeloitteDigital.Atlas.csproj", "{601B96BD-D95F-4281-9A1B-7D99374DD869}" EndProject @@ -31,4 +31,8 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8;packages\EnterpriseLibrary.TransientFaultHandling.Caching.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.ServiceBus.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Configuration.6.0.1304.0\lib\NET45 + SolutionGuid = {C4120DCF-283D-4C71-A165-A67041EBB723} + EndGlobalSection EndGlobal diff --git a/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj b/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj index 617a180..76676bb 100644 --- a/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj +++ b/src/DeloitteDigital.Atlas.Tests/DeloitteDigital.Atlas.Tests.csproj @@ -8,7 +8,7 @@ Properties DeloitteDigital.Atlas.Tests DeloitteDigital.Atlas.Tests - v4.5.2 + v4.6.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -36,131 +36,100 @@ 4 - - ..\..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll - True + + ..\..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - True ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True + + ..\..\packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.Common.dll - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - True + + ..\..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll - - ..\..\packages\Sitecore.Abstractions.8.2.160729\lib\NET452\Sitecore.Abstractions.dll - True + + ..\..\packages\EnterpriseLibrary.TransientFaultHandling.Caching.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Caching.dll - - ..\..\packages\Sitecore.Analytics.8.2.160729\lib\NET452\Sitecore.Analytics.dll - True + + ..\..\packages\EnterpriseLibrary.TransientFaultHandling.Configuration.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Configuration.dll - - ..\..\packages\Sitecore.Analytics.Core.8.2.160729\lib\NET452\Sitecore.Analytics.Core.dll - True + + ..\..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll - - ..\..\packages\Sitecore.Analytics.DataAccess.8.2.160729\lib\NET452\Sitecore.Analytics.DataAccess.dll - True + + ..\..\packages\EnterpriseLibrary.TransientFaultHandling.ServiceBus.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.ServiceBus.dll - - ..\..\packages\Sitecore.Analytics.Model.8.2.160729\lib\NET452\Sitecore.Analytics.Model.dll - True + + ..\..\packages\EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.dll - - ..\..\packages\Sitecore.Analytics.Processing.8.2.160729\lib\NET452\Sitecore.Analytics.Processing.dll - True + + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\Sitecore.FakeDb.1.3.1\lib\net45\Sitecore.FakeDb.dll - True + + ..\..\packages\Mvp.Xml.2.3.0\lib\net20\Mvp.Xml.dll - - ..\..\packages\Sitecore.FakeDb.Serialization.1.3.1\lib\net45\Sitecore.FakeDb.Serialization.dll - True + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\Sitecore.Kernel.8.2.160729\lib\NET452\Sitecore.Kernel.dll - True + + ..\..\packages\Sitecore.FakeDb.1.7.4\lib\net45\Sitecore.FakeDb.dll - - ..\..\packages\Sitecore.Logging.8.2.160729\lib\NET452\Sitecore.Logging.dll - True + + ..\..\packages\Sitecore.FakeDb.Serialization.1.7.4\lib\net45\Sitecore.FakeDb.Serialization.dll - - ..\..\packages\Sitecore.Logging.Client.8.2.160729\lib\NET452\Sitecore.Logging.Client.dll - True + + ..\..\packages\Sitecore.Kernel.9.0.180604\lib\NET462\Sitecore.Kernel.dll - - ..\..\packages\Sitecore.Marketing.8.2.160729\lib\NET452\Sitecore.Marketing.dll - True + + ..\..\packages\Sitecore.Logging.9.0.180604\lib\NET462\Sitecore.Logging.dll - - ..\..\packages\Sitecore.Marketing.Core.8.2.160729\lib\NET452\Sitecore.Marketing.Core.dll - True + + ..\..\packages\Sitecore.Logging.Client.9.0.180604\lib\NET462\Sitecore.Logging.Client.dll - - ..\..\packages\Sitecore.Marketing.Taxonomy.8.2.160729\lib\NET452\Sitecore.Marketing.Taxonomy.dll - True + + ..\..\packages\Sitecore.Nexus.9.0.180604\lib\NET462\Sitecore.Nexus.dll - - ..\..\packages\Sitecore.Nexus.8.2.160729\lib\NET452\Sitecore.Nexus.dll - True + + ..\..\packages\Sitecore.NVelocity.9.0.180604\lib\NET462\Sitecore.NVelocity.dll - - ..\..\packages\Sitecore.NVelocity.8.2.160729\lib\NET452\Sitecore.NVelocity.dll - True + + ..\..\packages\Sitecore.Zip.9.0.180604\lib\NET462\Sitecore.Zip.dll - - ..\..\packages\Sitecore.Xdb.Configuration.8.2.160729\lib\NET452\Sitecore.Xdb.Configuration.dll - True + + + ..\..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll - - ..\..\packages\Sitecore.Zip.8.2.160729\lib\NET452\Sitecore.Zip.dll - True + + ..\..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True diff --git a/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs b/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs index e7c8fcf..15a98de 100644 --- a/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs +++ b/src/DeloitteDigital.Atlas.Tests/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("DeloitteDigital.Atlas.Tests")] -[assembly: AssemblyCopyright("Copyright © 2014")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] diff --git a/src/DeloitteDigital.Atlas.Tests/app.config b/src/DeloitteDigital.Atlas.Tests/app.config index e47eedb..ff6b0f7 100644 --- a/src/DeloitteDigital.Atlas.Tests/app.config +++ b/src/DeloitteDigital.Atlas.Tests/app.config @@ -15,11 +15,14 @@ For Sitecore versions prior to 8.2 should be 'Sitecore.Data.Database, Sitecore.Kernel'. For Sitecore 8.2 and later should be 'Sitecore.Data.DefaultDatabase, Sitecore.Kernel'. --> - + + - + + + @@ -30,7 +33,8 @@ - + + @@ -56,20 +60,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/DeloitteDigital.Atlas.Tests/packages.config b/src/DeloitteDigital.Atlas.Tests/packages.config index 29df5eb..d5eff9e 100644 --- a/src/DeloitteDigital.Atlas.Tests/packages.config +++ b/src/DeloitteDigital.Atlas.Tests/packages.config @@ -1,43 +1,41 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs b/src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs new file mode 100644 index 0000000..d342316 --- /dev/null +++ b/src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs @@ -0,0 +1,21 @@ +using System.Web; +using System.Web.Mvc; +using System.Web.WebPages; +using RazorGenerator.Mvc; + +[assembly: WebActivatorEx.PostApplicationStartMethod(typeof(DeloitteDigital.Atlas.RazorGeneratorMvcStart), "Start")] + +namespace DeloitteDigital.Atlas { + public static class RazorGeneratorMvcStart { + public static void Start() { + var engine = new PrecompiledMvcEngine(typeof(RazorGeneratorMvcStart).Assembly) { + UsePhysicalViewsIfNewer = HttpContext.Current.Request.IsLocal + }; + + ViewEngines.Engines.Insert(0, engine); + + // StartPage lookups are done by WebPages. + VirtualPathFactoryManager.RegisterVirtualPathFactory(engine); + } + } +} diff --git a/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj b/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj index 182ec8c..f2e2cb4 100644 --- a/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj +++ b/src/DeloitteDigital.Atlas/DeloitteDigital.Atlas.csproj @@ -11,7 +11,7 @@ Properties DeloitteDigital.Atlas DeloitteDigital.Atlas - v4.5.2 + v4.6.2 512 @@ -47,13 +47,11 @@ True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\Sitecore.Kernel.NoReferences.8.2.160729\lib\NET452\Sitecore.Kernel.dll - True + + ..\..\packages\Sitecore.Kernel.NoReferences.9.0.180604\lib\NET462\Sitecore.Kernel.dll - - ..\..\packages\Sitecore.Mvc.NoReferences.8.2.160729\lib\NET452\Sitecore.Mvc.dll - True + + ..\..\packages\Sitecore.Mvc.NoReferences.9.0.180604\lib\NET462\Sitecore.Mvc.dll diff --git a/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs b/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs index 6251488..0dc5b14 100644 --- a/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs +++ b/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Deloitte Digital")] [assembly: AssemblyProduct("DeloitteDigital.Atlas")] -[assembly: AssemblyCopyright("Copyright © Deloitte Digital 2016")] +[assembly: AssemblyCopyright("Copyright © Deloitte Digital 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,6 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.2.0")] +[assembly: AssemblyFileVersion("2.0.2.0")] [assembly: AssemblyInformationalVersion("1.0.0")] \ No newline at end of file diff --git a/src/DeloitteDigital.Atlas/app.config b/src/DeloitteDigital.Atlas/app.config index 1cd6675..e3fe633 100644 --- a/src/DeloitteDigital.Atlas/app.config +++ b/src/DeloitteDigital.Atlas/app.config @@ -6,6 +6,22 @@ + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/src/DeloitteDigital.Atlas/packages.config b/src/DeloitteDigital.Atlas/packages.config index 79299ad..f468a20 100644 --- a/src/DeloitteDigital.Atlas/packages.config +++ b/src/DeloitteDigital.Atlas/packages.config @@ -1,11 +1,11 @@  - - - - - - - - + + + + + + + + \ No newline at end of file From ce7bbf24fc3918577afc8f0201c97683b0a1f0f6 Mon Sep 17 00:00:00 2001 From: lacarl Date: Thu, 28 Mar 2019 12:15:04 +1000 Subject: [PATCH 2/2] Removed unused app_start Fixed version number --- .../App_Start/RazorGeneratorMvcStart.cs | 21 ------------------- .../Properties/AssemblyInfo.cs | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs diff --git a/src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs b/src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs deleted file mode 100644 index d342316..0000000 --- a/src/DeloitteDigital.Atlas/App_Start/RazorGeneratorMvcStart.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Web; -using System.Web.Mvc; -using System.Web.WebPages; -using RazorGenerator.Mvc; - -[assembly: WebActivatorEx.PostApplicationStartMethod(typeof(DeloitteDigital.Atlas.RazorGeneratorMvcStart), "Start")] - -namespace DeloitteDigital.Atlas { - public static class RazorGeneratorMvcStart { - public static void Start() { - var engine = new PrecompiledMvcEngine(typeof(RazorGeneratorMvcStart).Assembly) { - UsePhysicalViewsIfNewer = HttpContext.Current.Request.IsLocal - }; - - ViewEngines.Engines.Insert(0, engine); - - // StartPage lookups are done by WebPages. - VirtualPathFactoryManager.RegisterVirtualPathFactory(engine); - } - } -} diff --git a/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs b/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs index 0dc5b14..2243d5b 100644 --- a/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs +++ b/src/DeloitteDigital.Atlas/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.2.0")] [assembly: AssemblyFileVersion("2.0.2.0")] -[assembly: AssemblyInformationalVersion("1.0.0")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("2.0.2")] \ No newline at end of file