Skip to content
Permalink
Browse files

update nancy version to 0.22.2

- this required updating SquishIt to 0.9.5.1-alpha1
- 0.9.5.1 will be first version supporting pluggable path translators,
  which allow path resolution without HttpContext (which is not available
  in newer versions of nancy)
  • Loading branch information...
AlexCuse committed Feb 21, 2014
1 parent 6c9c0bc commit 7338026d4d425960151978171596749066b460bc
Showing with 12,920 additions and 32 deletions.
  1. +33 −0 SquishIt.NancySample/NancyPathTranslator.cs
  2. +9 −9 SquishIt.NancySample/SquishIt.NancySample.csproj
  3. +4 −0 SquishIt.NancySample/SquishItBootstrapper.cs
  4. +11 −0 SquishIt.NancySample/Web.config
  5. +5 −4 SquishIt.NancySample/packages.config
  6. BIN packages/Nancy.0.15.0/Nancy.0.15.0.nupkg
  7. BIN packages/Nancy.0.15.0/lib/net40/Nancy.dll
  8. BIN packages/Nancy.0.22.2/Nancy.0.22.2.nupkg
  9. +11,918 −0 packages/Nancy.0.22.2/lib/net40/Nancy.XML
  10. BIN packages/Nancy.0.22.2/lib/net40/Nancy.dll
  11. BIN packages/Nancy.Hosting.Aspnet.0.15.0/Nancy.Hosting.Aspnet.0.15.0.nupkg
  12. BIN packages/Nancy.Hosting.Aspnet.0.15.0/lib/net40/Nancy.Hosting.Aspnet.dll
  13. BIN packages/Nancy.Hosting.Aspnet.0.22.2/Nancy.Hosting.Aspnet.0.22.2.nupkg
  14. +2 −1 packages/{Nancy.Hosting.Aspnet.0.15.0 → Nancy.Hosting.Aspnet.0.22.2}/content/web.config.transform
  15. BIN packages/Nancy.Hosting.Aspnet.0.22.2/lib/net40/Nancy.Hosting.Aspnet.dll
  16. +129 −0 packages/Nancy.Hosting.Aspnet.0.22.2/lib/net40/Nancy.Hosting.Aspnet.xml
  17. BIN packages/Nancy.Viewengines.Razor.0.15.0/BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.dll
  18. BIN packages/Nancy.Viewengines.Razor.0.15.0/Nancy.Viewengines.Razor.0.15.0.nupkg
  19. +0 −5 packages/Nancy.Viewengines.Razor.0.15.0/content/app.config.transform
  20. +0 −13 packages/Nancy.Viewengines.Razor.0.15.0/content/web.config.transform
  21. BIN packages/Nancy.Viewengines.Razor.0.15.0/lib/net40/Nancy.ViewEngines.Razor.dll
  22. BIN packages/Nancy.Viewengines.Razor.0.15.0/lib/net40/System.Web.Razor.dll
  23. +56 −0 packages/Nancy.Viewengines.Razor.0.22.2/BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.XML
  24. BIN packages/Nancy.Viewengines.Razor.0.22.2/BuildProviders/Nancy.ViewEngines.Razor.BuildProviders.dll
  25. BIN packages/Nancy.Viewengines.Razor.0.22.2/Nancy.Viewengines.Razor.0.22.2.nupkg
  26. 0 ...s.Razor.0.15.0 → Nancy.Viewengines.Razor.0.22.2}/Tools/GetNancyRazorBuildProviderPostBuildCmd.ps1
  27. 0 packages/{Nancy.Viewengines.Razor.0.15.0 → Nancy.Viewengines.Razor.0.22.2}/Tools/install.ps1
  28. 0 packages/{Nancy.Viewengines.Razor.0.15.0 → Nancy.Viewengines.Razor.0.22.2}/Tools/uninstall.ps1
  29. +17 −0 packages/Nancy.Viewengines.Razor.0.22.2/content/app.config.transform
  30. +25 −0 packages/Nancy.Viewengines.Razor.0.22.2/content/web.config.transform
  31. BIN packages/Nancy.Viewengines.Razor.0.22.2/lib/net40/Nancy.ViewEngines.Razor.dll
  32. +711 −0 packages/Nancy.Viewengines.Razor.0.22.2/lib/net40/Nancy.ViewEngines.Razor.xml
  33. BIN packages/SquishIt.0.9.1/SquishIt.0.9.1.nupkg
  34. BIN packages/SquishIt.0.9.1/lib/SquishIt.Framework.dll
  35. BIN packages/SquishIt.0.9.1/optional/SquishIt.Mvc.dll
  36. BIN packages/SquishIt.0.9.5.1-alpha1/SquishIt.0.9.5.1-alpha1.nupkg
  37. BIN packages/SquishIt.0.9.5.1-alpha1/lib/SquishIt.Framework.dll
  38. BIN packages/SquishIt.0.9.5.1-alpha1/lib/SquishIt.Framework.pdb
  39. BIN packages/SquishIt.0.9.5.1-alpha1/optional/SquishIt.Mvc.dll
  40. BIN packages/SquishIt.0.9.5.1-alpha1/optional/SquishIt.Mvc.pdb
  41. BIN packages/System.Web.Razor.Unofficial.2.0.2/System.Web.Razor.Unofficial.2.0.2.nupkg
  42. BIN packages/System.Web.Razor.Unofficial.2.0.2/lib/net40/System.Web.Razor.Unofficial.dll
  43. BIN packages/System.Web.Razor.Unofficial.2.0.2/lib/net40/System.Web.Razor.Unofficial.pdb
@@ -0,0 +1,33 @@
using System;
using Nancy;
using SquishIt.Framework;

namespace SquishIt.NancySample
{
public class NancyPathTranslator : IPathTranslator
{
private readonly IRootPathProvider _rootPathProvider;

public NancyPathTranslator(IRootPathProvider rootPathProvider)
{
_rootPathProvider = rootPathProvider;
}

public string ResolveAppRelativePathToFileSystem(string file)
{
// Remove query string
if(file.IndexOf('?') != -1)
{
file = file.Substring(0, file.IndexOf('?'));
}

return _rootPathProvider.GetRootPath() + "/" + file.TrimStart('~').TrimStart('/');
}

public string ResolveFileSystemPathToAppRelative(string file)
{
var root = new Uri(_rootPathProvider.GetRootPath());
return root.MakeRelativeUri(new Uri(file, UriKind.RelativeOrAbsolute)).ToString();
}
}
}
@@ -44,16 +44,16 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Nancy">
<HintPath>..\packages\Nancy.0.15.0\lib\net40\Nancy.dll</HintPath>
<HintPath>..\packages\Nancy.0.22.2\lib\net40\Nancy.dll</HintPath>
</Reference>
<Reference Include="Nancy.Hosting.Aspnet">
<HintPath>..\packages\Nancy.Hosting.Aspnet.0.15.0\lib\net40\Nancy.Hosting.Aspnet.dll</HintPath>
<HintPath>..\packages\Nancy.Hosting.Aspnet.0.22.2\lib\net40\Nancy.Hosting.Aspnet.dll</HintPath>
</Reference>
<Reference Include="Nancy.ViewEngines.Razor">
<HintPath>..\packages\Nancy.Viewengines.Razor.0.15.0\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
<HintPath>..\packages\Nancy.Viewengines.Razor.0.22.2\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
</Reference>
<Reference Include="SquishIt.Framework">
<HintPath>..\packages\SquishIt.0.9.1\lib\SquishIt.Framework.dll</HintPath>
<HintPath>..\packages\SquishIt.0.9.5.1-alpha1\lib\SquishIt.Framework.dll</HintPath>
</Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
@@ -63,9 +63,8 @@
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Nancy.Viewengines.Razor.0.15.0\lib\net40\System.Web.Razor.dll</HintPath>
<Reference Include="System.Web.Razor.Unofficial">
<HintPath>..\packages\System.Web.Razor.Unofficial.2.0.2\lib\net40\System.Web.Razor.Unofficial.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
@@ -92,6 +91,7 @@
</Compile>
<Compile Include="Modules\HomeModule.cs" />
<Compile Include="Modules\AssetsModule.cs" />
<Compile Include="NancyPathTranslator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SquishItBootstrapper.cs" />
</ItemGroup>
@@ -131,8 +131,8 @@
<PropertyGroup>
<PostBuildEvent>
if $(ConfigurationName) == Debug (
xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.15.0\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\"
xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.15.0\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\"
xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.22.2\BuildProviders\Nancy.ViewEngines.Razor.BuildProviders.dll" "$(ProjectDir)bin\"
xcopy /s /y /R "$(SolutionDir)packages\Nancy.Viewengines.Razor.0.22.2\lib\Net40\Nancy.ViewEngines.Razor.dll" "$(ProjectDir)bin\"
)</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -1,4 +1,5 @@
using Nancy;
using Nancy.Hosting.Aspnet;
using SquishIt.Framework;

namespace SquishIt.NancySample
@@ -7,6 +8,9 @@ public class SquishItBootstrapper : DefaultNancyBootstrapper
{
protected override void ApplicationStartup(Nancy.TinyIoc.TinyIoCContainer container, Nancy.Bootstrapper.IPipelines pipelines)
{
Bundle.ConfigureDefaults()
.UsePathTranslator(new NancyPathTranslator(new AspNetRootSourceProvider()));

Bundle.JavaScript()
.Add("~/Content/js/js1.js")
.Add("~/Content/js/js2.js")
@@ -6,6 +6,9 @@
<configuration>
<configSections>
<section name="razor" type="Nancy.ViewEngines.Razor.RazorConfigurationSection, Nancy.ViewEngines.Razor" />
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
</sectionGroup>
</configSections>
<razor disableAutoIncludeModelNamespace="false">
<assemblies>
@@ -30,11 +33,19 @@
<system.webServer>
<modules runAllManagedModulesForAllRequests="true" />
<validation validateIntegratedModeConfiguration="false" />
<httpErrors existingResponse="PassThrough" />
<handlers>
<add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
</handlers>
</system.webServer>
<appSettings>
<add key="webPages:Enabled" value="false" />
</appSettings>
<system.web.webPages.razor>
<pages pageBaseType="Nancy.ViewEngines.Razor.NancyRazorViewBase">
<namespaces>
<add namespace="Nancy.ViewEngines.Razor" />
</namespaces>
</pages>
</system.web.webPages.razor>
</configuration>
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AjaxMin" version="4.48.4489.28432" targetFramework="net40" />
<package id="Nancy" version="0.15.0" targetFramework="net40" />
<package id="Nancy.Hosting.Aspnet" version="0.15.0" targetFramework="net40" />
<package id="Nancy.Viewengines.Razor" version="0.15.0" targetFramework="net40" />
<package id="SquishIt" version="0.9.1" targetFramework="net40" />
<package id="Nancy" version="0.22.2" targetFramework="net40" />
<package id="Nancy.Hosting.Aspnet" version="0.22.2" targetFramework="net40" />
<package id="Nancy.Viewengines.Razor" version="0.22.2" targetFramework="net40" />
<package id="SquishIt" version="0.9.5.1-alpha1" targetFramework="net40" />
<package id="System.Web.Razor.Unofficial" version="2.0.2" targetFramework="net40" />
<package id="YUICompressor.NET" version="2.0.0.0" targetFramework="net40" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 7338026

Please sign in to comment.
You can’t perform that action at this time.