Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Sync with bitbucket repo

  • Loading branch information...
DavidZidar committed Feb 23, 2013
1 parent 1352c58 commit d6f020d2f2399711c08d0ae0a23f78df27fb4eea
@@ -2,18 +2,18 @@
<package >
<metadata>
<id>CacheTag</id>
<version>1.0.0-beta5</version>
<version>1.0.0-beta8</version>
<authors>Steamcore</authors>
<owners>Steamcore</owners>
<projectUrl>http://cachetag.net/</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Simple and efficient JavaScript and CSS minification for ASP.NET MVC</description>
<releaseNotes>Updated AjaxMin to v4.62, behavioural changes regarding file extensions and hashes in debug mode</releaseNotes>
<releaseNotes>Updated NuGet dependencies</releaseNotes>
<dependencies>
<dependency id="AjaxMin" version="4.62.4618.15628" />
<dependency id="dotless" version="1.3.0.5" />
<dependency id="AjaxMin" version="4.84.4790.14417" />
<dependency id="dotless" version="1.3.1.0" />
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<dependency id="WebActivator" version="1.5.1" />
<dependency id="WebActivator" version="1.5.2" />
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.Web" />
BIN +81 KB (110%) Source/.nuget/NuGet.exe
Binary file not shown.
@@ -47,9 +47,9 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebActivator, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="WebActivator, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WebActivator.1.5.1\lib\net40\WebActivator.dll</HintPath>
<HintPath>..\packages\WebActivator.1.5.2\lib\net40\WebActivator.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="WebActivator" version="1.5.1" />
<package id="WebActivator" version="1.5.2" targetFramework="net40" />
</packages>
@@ -16,6 +16,16 @@ namespace CacheTag.Module.AjaxMin
{
public class AjaxMinResourceCompiler : IResourceCompiler<IScriptResource>, IResourceCompiler<IStyleResource>
{
private static readonly CodeSettings DefaultCodeSettings = new CodeSettings
{
KillSwitch = 0x40000000000 // Workaround for Opera issues https://github.com/andrewdavey/cassette/issues/157
};

private static readonly CssSettings DefaultCssSettings = new CssSettings
{
CommentMode = CssComment.All // Workaround for some Twitter Bootstrap problems
};

private readonly CodeSettings codeSettings;
private readonly CssSettings cssSettings;
private readonly Minifier minifier = new Minifier();
@@ -24,15 +34,14 @@ public class AjaxMinResourceCompiler : IResourceCompiler<IScriptResource>, IReso

public AjaxMinResourceCompiler()
{
codeSettings = new CodeSettings();
cssSettings = new CssSettings();
codeSettings = DefaultCodeSettings;
cssSettings = DefaultCssSettings;
}

public AjaxMinResourceCompiler(CodeSettings codeSettings, CssSettings cssSettings)
{
// https://github.com/andrewdavey/cassette/issues/157
this.codeSettings = codeSettings ?? new CodeSettings { KillSwitch = 0x40000000000 };
this.cssSettings = cssSettings ?? new CssSettings();
this.codeSettings = codeSettings ?? DefaultCodeSettings;
this.cssSettings = cssSettings ?? DefaultCssSettings;
}

public IEnumerable<IScriptResource> Compile(IEnumerable<IScriptResource> resources)
@@ -61,7 +70,7 @@ public IEnumerable<IStyleResource> Compile(IEnumerable<IStyleResource> resources
{
var combinedContent = internalStyleCompiler.Compile(items).First().Content;
var minifiedContent = minifier.MinifyStyleSheet(combinedContent, cssSettings);
return new StyleSnippet(minifiedContent);
return new StyleSnippet(combinedContent);
});
}

@@ -33,8 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AjaxMinLibrary">
<HintPath>..\packages\AjaxMin.4.62.4618.15628\lib\net40\AjaxMinLibrary.dll</HintPath>
<Reference Include="AjaxMin, Version=4.84.4790.14405, Culture=neutral, PublicKeyToken=21ef50ce11b5d80f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AjaxMin.4.84.4790.14417\lib\net40\AjaxMin.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AjaxMin" version="4.62.4618.15628" targetFramework="net40" />
<package id="AjaxMin" version="4.84.4790.14417" targetFramework="net40" />
</packages>
@@ -33,9 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="dotless.Core, Version=1.3.0.5, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<Reference Include="dotless.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\dotless.1.3.0.5\lib\dotless.Core.dll</HintPath>
<HintPath>..\packages\dotless.1.3.1.0\lib\dotless.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="dotless" version="1.3.0.5" targetFramework="net40" />
<package id="dotless" version="1.3.1.0" targetFramework="net40" />
</packages>
@@ -36,9 +36,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.6.1.12217, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.1" targetFramework="net40" />
<package id="NUnit" version="2.6.2" targetFramework="net40" />
</packages>
@@ -42,9 +42,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="dotless.Core, Version=1.3.0.5, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<Reference Include="dotless.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\dotless.1.3.0.5\lib\dotless.Core.dll</HintPath>
<HintPath>..\packages\dotless.1.3.1.0\lib\dotless.Core.dll</HintPath>
</Reference>
<Reference Include="System.Data.Entity" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="dotless" version="1.3.0.5" targetFramework="net40" />
<package id="dotless" version="1.3.1.0" targetFramework="net40" />
</packages>

0 comments on commit d6f020d

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