Skip to content

Commit

Permalink
Upgraded SimpleContentBlock
Browse files Browse the repository at this point in the history
  • Loading branch information
@dzhenko
dzhenko committed Mar 22, 2016
1 parent 4773f13 commit 3b1adb2
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 83 deletions.
6 changes: 0 additions & 6 deletions AuthorWidget/AuthorWidget.sln.GhostDoc.xml
View file

This file was deleted.

6 changes: 0 additions & 6 deletions DevMagazineSite/DevMagazine.sln.GhostDoc.xml
View file

This file was deleted.

6 changes: 0 additions & 6 deletions ReCaptcha/ReCaptcha.sln.GhostDoc.xml
View file

This file was deleted.

21 changes: 21 additions & 0 deletions SimpleContentBlock/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(SimpleContentBlock.RazorGeneratorMvcStart), "Start")]

namespace SimpleContentBlock {
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);
}
}
}
7 changes: 5 additions & 2 deletions SimpleContentBlock/OpenAccessNuGet.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Copyright (C) 2007-2015 Telerik AD. All rights reserved.
<EnhancerVerboseMode Condition="'$(EnhancerVerboseMode)'==''">3</EnhancerVerboseMode>
<Use64BitEnhancer Condition="'$(Use64BitEnhancer)'=='' And '$(PlatformTarget)'=='x64'">true</Use64BitEnhancer>
<ValidateMapping Condition="'$(ValidateMapping)'==''">false</ValidateMapping>
<EnhancerDoNotCheckVersionOfReferencedAssemblies Condition="'$(EnhancerDoNotCheckVersionOfReferencedAssemblies)'==''">false</EnhancerDoNotCheckVersionOfReferencedAssemblies>
</PropertyGroup>

<!-- Register the enhancement tasks from the enhancer assembly -->
Expand Down Expand Up @@ -99,7 +100,8 @@ Copyright (C) 2007-2015 Telerik AD. All rights reserved.
<KeyFileArg Condition="'$(AssemblyOriginatorKeyFile)'!=''"> -keyFile:"$(AssemblyOriginatorKeyFile)"</KeyFileArg>
<KeyContainerArg Condition="'$(KeyContainerName)'!=''"> -keyContainer:"$(KeyContainerName)"</KeyContainerArg>
<ReferencesArgs Condition="'$(ReferencesArgs)'==''"> -reference:"@(ReferencePath,'" -reference:"')"</ReferencesArgs>
<AdditionalEnhancerArgs Condition="'$(AdditionalEnhancerArgs)'==''">$(EnhancerMappingArgs)$(KeyFileArg)$(KeyContainerArg)$(ReferencesArgs)</AdditionalEnhancerArgs>
<DoNotCheckVersionOfReferencedAssembliesArgs Condition="'$(EnhancerDoNotCheckVersionOfReferencedAssembliesArgs)'=='true'"> -DoNotCheckVersionOfReferencedAssembliesArgs+</DoNotCheckVersionOfReferencedAssembliesArgs>
<AdditionalEnhancerArgs Condition="'$(AdditionalEnhancerArgs)'==''">$(EnhancerMappingArgs)$(KeyFileArg)$(KeyContainerArg)$(ReferencesArgs)$(DoNotCheckVersionOfReferencedAssembliesArgs)</AdditionalEnhancerArgs>
</PropertyGroup>

<!-- The OpenAccessEnhancer task enhances the project assembly with the OpenAccess ORM specific code -->
Expand All @@ -115,7 +117,8 @@ Copyright (C) 2007-2015 Telerik AD. All rights reserved.
KeyFile="$(AssemblyOriginatorKeyFile)"
KeyContainer="$(KeyContainerName)"
References="@(ReferencePath)"
TargetFramework="$(TargetFrameworkVersion)" >
TargetFramework="$(TargetFrameworkVersion)"
DoNotCheckVersionOfReferencedAssemblies="$(EnhancerDoNotCheckVersionOfReferencedAssemblies)">
<Output TaskParameter="Version" ItemName="EnhancerVersion" />
</OpenAccessEnhancer>
<Touch AlwaysCreate="true" Files="@(EnhancementFlagFile)" Time="%(IntermediateAssembly.ModifiedTime)" />
Expand Down
107 changes: 61 additions & 46 deletions SimpleContentBlock/SimpleContentBlock.csproj
View file

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions SimpleContentBlock/SimpleContentBlock.csproj.GhostDoc.xml
View file

This file was deleted.

8 changes: 8 additions & 0 deletions SimpleContentBlock/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<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" />
</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>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
25 changes: 14 additions & 11 deletions SimpleContentBlock/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@
<package id="Microsoft.IdentityModel" version="6.1.7600.16394" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Ninject" version="3.2.2.0" targetFramework="net40" requireReinstallation="True" />
<package id="ServiceStack.Client.Signed" version="4.0.44" targetFramework="net45" />
<package id="ServiceStack.Common.Signed" version="4.0.44" targetFramework="net45" />
<package id="ServiceStack.Interfaces" version="4.0.44" targetFramework="net45" />
<package id="ServiceStack.Signed" version="4.0.44" targetFramework="net45" />
<package id="ServiceStack.Text.Signed" version="4.0.44" targetFramework="net45" />
<package id="Ninject.Web.Common" version="3.2.3.0" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="2.3.12" targetFramework="net45" />
<package id="ServiceStack.Client.Signed" version="4.0.52" targetFramework="net45" />
<package id="ServiceStack.Common.Signed" version="4.0.52" targetFramework="net45" />
<package id="ServiceStack.Interfaces" version="4.0.52" targetFramework="net45" />
<package id="ServiceStack.Signed" version="4.0.52" targetFramework="net45" />
<package id="ServiceStack.Text.Signed" version="4.0.52" targetFramework="net45" />
<package id="Sitefinity.RazorEngine" version="3.0.8.0" targetFramework="net45" />
<package id="Telerik.DataAccess.Core" version="2015.3.926.1" targetFramework="net45" />
<package id="Telerik.DataAccess.Fluent" version="2015.3.926.1" targetFramework="net45" developmentDependency="true" />
<package id="Telerik.Sitefinity.Core" version="8.2.5900.0" targetFramework="net45" />
<package id="Telerik.Sitefinity.Feather.Core.StandAlone" version="1.4.360.0" targetFramework="net45" />
<package id="Telerik.Sitefinity.Mvc" version="1.4.360.0" targetFramework="net45" />
<package id="Telerik.Web.UI" version="2015.3.930.40" targetFramework="net45" />
<package id="Telerik.DataAccess.Core" version="2016.1.224.1" targetFramework="net45" />
<package id="Telerik.DataAccess.Fluent" version="2016.1.224.1" targetFramework="net45" developmentDependency="true" />
<package id="Telerik.Sitefinity.Core" version="9.0.6000.0" targetFramework="net45" />
<package id="Telerik.Sitefinity.Feather.Core.StandAlone" version="1.5.470.0" targetFramework="net45" />
<package id="Telerik.Sitefinity.Mvc" version="1.5.470.0" targetFramework="net45" />
<package id="Telerik.Web.UI" version="2016.1.225.40" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.3" targetFramework="net45" />
</packages>

0 comments on commit 3b1adb2

Please sign in to comment.