Skip to content

Commit

Permalink
Upgraded to .Net 4.7.1 and Sitecore 9.1 and Elision Foundation 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@crashdavis23
crashdavis23 committed Jan 30, 2019
1 parent bd3b325 commit 694870e
Show file tree
Hide file tree
Showing 8 changed files with 793 additions and 552 deletions.
21 changes: 21 additions & 0 deletions src/Elision.Feature.Template.Navigation.SC.Integration/App_Start/RazorGeneratorMvcStart.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System.Web;
using System.Web.Mvc;
using System.Web.WebPages;
using RazorGenerator.Mvc;

[assembly: WebActivatorEx.PostApplicationStartMethod(typeof(Elision.Feature.Template.Navigation.SC.Integration.RazorGeneratorMvcStart), "Start")]

namespace Elision.Feature.Template.Navigation.SC.Integration {
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);
}
}
}
358 changes: 248 additions & 110 deletions ...plate.Navigation.SC.Integration/Elision.Feature.Template.Navigation.SC.Integration.csproj
View file

Large diffs are not rendered by default.

535 changes: 228 additions & 307 deletions src/Elision.Feature.Template.Navigation.SC.Integration/Templates.cs
View file

Large diffs are not rendered by default.

18 changes: 15 additions & 3 deletions src/Elision.Feature.Template.Navigation.SC.Integration/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All @@ -22,6 +22,18 @@
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
93 changes: 65 additions & 28 deletions src/Elision.Feature.Template.Navigation.SC.Integration/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Elision.Foundation-redist" version="1.0.0" targetFramework="net452" />
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net471" />
<package id="EcmaScript.Net" version="1.0.1.0" targetFramework="net471" />
<package id="Elision.Foundation-redist" version="3.0.0-pre" targetFramework="net471" />
<package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net462" />
<package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net462" />
<package id="EnterpriseLibrary.TransientFaultHandling.Caching" version="6.0.1304.0" targetFramework="net462" />
Expand All @@ -9,37 +11,72 @@
<package id="EnterpriseLibrary.TransientFaultHandling.ServiceBus" version="6.0.1304.0" targetFramework="net462" />
<package id="EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage" version="6.0.1304.0" targetFramework="net462" />
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net462" />
<package id="Iesi.Collections" version="4.0.4" targetFramework="net471" />
<package id="Lucene.Net" version="3.0.3" targetFramework="net452" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
<package id="Lucene.Net.Contrib" version="3.0.3" targetFramework="net471" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net471" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net471" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net471" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net471" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
<package id="Mvp.Xml" version="2.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
<package id="RazorGenerator.Mvc" version="2.4.2" targetFramework="net452" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
<package id="PDFsharp" version="1.50.4740-beta5" targetFramework="net471" />
<package id="RazorGenerator.MsBuild" version="2.5.0" targetFramework="net471" developmentDependency="true" />
<package id="RazorGenerator.Mvc" version="2.4.9" targetFramework="net471" />
<package id="secure-file" version="1.0.31" targetFramework="net452" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
<package id="Sitecore.Kernel" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Logging" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Logging.Client" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.NVelocity" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
<package id="Sitecore.Zip" version="9.0.180604" targetFramework="net462" developmentDependency="true" />
<package id="System.Collections" version="4.0.11" targetFramework="net452" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
<package id="System.Globalization" version="4.0.11" targetFramework="net452" />
<package id="System.Linq" version="4.1.0" targetFramework="net452" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
<package id="SharpZipLib" version="1.1.0" targetFramework="net471" />
<package id="Sitecore.Abstractions" version="12.0.0" targetFramework="net471" />
<package id="Sitecore.Buckets" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.Client" version="12.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch.Client" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch.ContentExtraction" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch.Data" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch.Linq" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch.Linq.Lucene" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ContentSearch.LuceneProvider" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.ExperienceEditor" version="5.0.0" targetFramework="net471" />
<package id="Sitecore.ExperienceEditor.Speak" version="5.0.0" targetFramework="net471" />
<package id="Sitecore.ItemWebApi" version="3.0.0" targetFramework="net471" />
<package id="Sitecore.Kernel" version="12.0.0" targetFramework="net471" />
<package id="Sitecore.Logging" version="12.0.0" targetFramework="net471" />
<package id="Sitecore.Logging.Client" version="12.0.0" targetFramework="net471" />
<package id="Sitecore.Mvc" version="3.0.0" targetFramework="net471" />
<package id="Sitecore.Nexus" version="3.0.0" targetFramework="net471" />
<package id="Sitecore.Nexus.Consumption" version="1.0.0" targetFramework="net471" />
<package id="Sitecore.Nexus.Licensing" version="2.0.5" targetFramework="net471" />
<package id="Sitecore.NVelocity" version="9.0.0" targetFramework="net471" />
<package id="Sitecore.Publishing.WebDeploy" version="12.0.0" targetFramework="net471" />
<package id="Sitecore.Speak.Client" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.Speak.ItemWebApi" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.Speak.Web" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.Update" version="4.0.0" targetFramework="net471" />
<package id="Sitecore.Web" version="3.0.0" targetFramework="net471" />
<package id="Sitecore.Zip" version="12.0.0" targetFramework="net471" />
<package id="System.Collections" version="4.3.0" targetFramework="net471" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net471" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="net471" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net471" />
<package id="System.Globalization" version="4.3.0" targetFramework="net471" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net471" />
<package id="System.IO.Packaging" version="4.5.0" targetFramework="net471" />
<package id="System.Linq" version="4.3.0" targetFramework="net471" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net471" />
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net471" />
<package id="System.Reflection" version="4.3.0" targetFramework="net462" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net471" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
<package id="System.Threading" version="4.0.11" targetFramework="net452" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
<package id="WebActivatorEx" version="2.0.3" targetFramework="net452" />
<package id="YUICompressor.NET" version="2.1.1.0" targetFramework="net452" />
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net471" />
<package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net471" />
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net471" />
<package id="System.Security.Principal.Windows" version="4.6.0-preview.19073.11" targetFramework="net471" />
<package id="System.Threading" version="4.3.0" targetFramework="net471" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net471" />
<package id="WebActivatorEx" version="2.2.0" targetFramework="net471" />
<package id="YUICompressor.NET" version="2.7.0.0" targetFramework="net471" />
</packages>
Loading

0 comments on commit 694870e

Please sign in to comment.