Merging PR #6.

benmccallum · Jun 8, 2015 · e789e14 · e789e14
2 parents 2259023 + c235b2e
commit e789e14
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/AspNetBundling/AspNetBundling.csproj b/AspNetBundling/AspNetBundling.csproj
@@ -31,6 +31,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AjaxMin, Version=5.14.5506.26196, Culture=neutral, PublicKeyToken=21ef50ce11b5d80f, processorArchitecture=MSIL">
+      <HintPath>..\packages\AjaxMin.5.14.5506.26202\lib\net40\AjaxMin.dll</HintPath>
+      <Private>True</Private>
+      <Aliases>global,AjaxMin</Aliases>
+    </Reference>
     <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
@@ -66,7 +71,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/AspNetBundling/ScriptWithSourceMapBundleBuilder.cs b/AspNetBundling/ScriptWithSourceMapBundleBuilder.cs
@@ -1,11 +1,12 @@
-using System;
+extern alias AjaxMin;
+using AjaxMin::Microsoft.Ajax.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Web;
 using System.Web.Optimization;
-using Microsoft.Ajax.Utilities;
 
 namespace AspNetBundling
 {
@@ -65,12 +66,7 @@ public string BuildBundleContent(Bundle bundle, BundleContext context, IEnumerab
                     }
 
                     contentWriter.Write(contentMinified);
-
-                    sourceMap.EndPackage();
-                    sourceMap.EndFile(contentWriter, "\r\n");
                 }
-
-                contentBuilder.Replace("//@ sourceMappingURL=", "//# sourceMappingURL=");
 
                 //Write the SourceMap to another Bundle
                 AddContentToAdHocBundle(context, mapVirtualPath, mapBuilder.ToString());

diff --git a/AspNetBundling/packages.config b/AspNetBundling/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AjaxMin" version="5.14.5506.26202" targetFramework="net45" />
   <package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />