Merge pull request #1 from Shandem/master

Merge changes.

.gitignore

@@ -11,3 +11,5 @@ TestResults/*
 */App_Data/ClientDependency/*
 packages/*
 ClientDependency.sln.DotSettings.user
+ClientDependency.Web.Test/Css/Inuit/*
+*.orig

Build-Release.ps1

@@ -1,8 +1,12 @@
 param (
 	[Parameter(Mandatory=$true)]
-	[ValidatePattern("\d\.\d\.\d\.\d")]
+	[ValidatePattern("^\d\.\d\.(?:\d\.\d$|\d$)")]
 	[string]
-	$ReleaseVersionNumber
+	$ReleaseVersionNumber,
+	[Parameter(Mandatory=$true)]
+	[string]
+	[AllowEmptyString()]
+	$PreReleaseName
 )
 
 $PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path).FullName
@@ -13,7 +17,7 @@ $MSBuild = "$Env:SYSTEMROOT\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 
 # Make sure we don't have a release folder for this version already
 $BuildFolder = Join-Path -Path $SolutionRoot -ChildPath "build";
-$ReleaseFolder = Join-Path -Path $BuildFolder -ChildPath "Releases\v$ReleaseVersionNumber";
+$ReleaseFolder = Join-Path -Path $BuildFolder -ChildPath "Releases\v$ReleaseVersionNumber$PreReleaseName";
 if ((Get-Item $ReleaseFolder -ErrorAction SilentlyContinue) -ne $null)
 {
 	Write-Warning "$ReleaseFolder already exists on your local machine. It will now be deleted."
@@ -25,41 +29,94 @@ $SolutionInfoPath = Join-Path -Path $SolutionRoot -ChildPath "SolutionInfo.cs"
 (gc -Path $SolutionInfoPath) `
 	-replace "(?<=Version\(`")[.\d]*(?=`"\))", $ReleaseVersionNumber |
 	sc -Path $SolutionInfoPath -Encoding UTF8
+(gc -Path $SolutionInfoPath) `
+	-replace "(?<=AssemblyInformationalVersion\(`")[.\w-]*(?=`"\))", "$ReleaseVersionNumber$PreReleaseName" |
+	sc -Path $SolutionInfoPath -Encoding UTF8
 
-# Build the solution in release mode
+# Build the solution in release mode (in both 4.0 and 4.5 and for MVC5)
 $SolutionPath = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.sln"
+
+# clean sln for all deploys
 & $MSBuild "$SolutionPath" /p:Configuration=Release /maxcpucount /t:Clean
 if (-not $?)
 {
 	throw "The MSBuild process returned an error code."
 }
+& $MSBuild "$SolutionPath" /p:Configuration=Release-Net45 /maxcpucount /t:Clean
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+& $MSBuild "$SolutionPath" /p:Configuration=Release-MVC5 /maxcpucount /t:Clean
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+
+#build for all deploys
+
+# for net 4.0
 & $MSBuild "$SolutionPath" /p:Configuration=Release /maxcpucount
 if (-not $?)
 {
 	throw "The MSBuild process returned an error code."
 }
+# for net 4.5
+& $MSBuild "$SolutionPath" /p:Configuration=Release-Net45 /maxcpucount
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+# for MVC 5
+& $MSBuild "$SolutionPath" /p:Configuration=Release-MVC5 /maxcpucount
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+
 
 $CoreFolder = Join-Path -Path $ReleaseFolder -ChildPath "Core";
 $MvcFolder = Join-Path -Path $ReleaseFolder -ChildPath "Mvc";
+$Mvc5Folder = Join-Path -Path $ReleaseFolder -ChildPath "Mvc5";
 $LessFolder = Join-Path -Path $ReleaseFolder -ChildPath "Less";
 $SassFolder = Join-Path -Path $ReleaseFolder -ChildPath "SASS";
 $CoffeeFolder = Join-Path -Path $ReleaseFolder -ChildPath "Coffee";
 $TypeScriptFolder = Join-Path -Path $ReleaseFolder -ChildPath "TypeScript";
 
 New-Item $CoreFolder -Type directory
 New-Item $MvcFolder -Type directory
+New-Item $Mvc5Folder -Type directory
 New-Item $LessFolder -Type directory
 New-Item $SassFolder -Type directory
 New-Item $CoffeeFolder -Type directory
 New-Item $TypeScriptFolder -Type directory
 
 $include = @('ClientDependency.Core.dll','ClientDependency.Core.pdb')
-$CoreBinFolder = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Core\bin\Release";
-Copy-Item "$CoreBinFolder\*.*" -Destination $CoreFolder -Include $include
+# Need to build to specific .Net version folders
+$CoreBinFolderNet40 = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Core\bin\Release";
+$CoreBinFolderNet45 = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Core\bin\Release-Net45";
+$CoreFolderNet40 = Join-Path -Path $CoreFolder -ChildPath "net40";
+$CoreFolderNet45 = Join-Path -Path $CoreFolder -ChildPath "net45";
+New-Item $CoreFolderNet40 -Type directory
+New-Item $CoreFolderNet45 -Type directory
+Copy-Item "$CoreBinFolderNet40\*.*" -Destination $CoreFolderNet40 -Include $include
+Copy-Item "$CoreBinFolderNet45\*.*" -Destination $CoreFolderNet45 -Include $include
 
 $include = @('ClientDependency.Core.Mvc.dll','ClientDependency.Core.Mvc.pdb')
-$MvcBinFolder = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Mvc\bin\Release";
-Copy-Item "$MvcBinFolder\*.*" -Destination $MvcFolder -Include $include
+# Need to build to specific .Net version folders
+$MvcBinFolderNet40 = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Mvc\bin\Release";
+$MvcBinFolderNet45 = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Mvc\bin\Release-Net45";
+$MvcFolderNet40 = Join-Path -Path $MvcFolder -ChildPath "net40";
+$MvcFolderNet45 = Join-Path -Path $MvcFolder -ChildPath "net45";
+New-Item $MvcFolderNet40 -Type directory
+New-Item $MvcFolderNet45 -Type directory
+Copy-Item "$MvcBinFolderNet40\*.*" -Destination $MvcFolderNet40 -Include $include
+Copy-Item "$MvcBinFolderNet45\*.*" -Destination $MvcFolderNet45 -Include $include
+#need to build mvc5 separately
+$Mvc5BinFolderNet45 = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Mvc\bin\Release-MVC5";
+$Mvc5FolderNet45 = Join-Path -Path $Mvc5Folder -ChildPath "net45";
+New-Item $Mvc5FolderNet45 -Type directory
+Copy-Item "$Mvc5BinFolderNet45\*.*" -Destination $Mvc5FolderNet45 -Include $include
 
 $include = @('ClientDependency.Less.dll','ClientDependency.Less.pdb')
 $LessBinFolder = Join-Path -Path $SolutionRoot -ChildPath "ClientDependency.Less\bin\Release";
@@ -80,6 +137,7 @@ Copy-Item "$TypeScriptBinFolder\*.*" -Destination $TypeScriptFolder -Include $in
 # COPY THE TRANSFORMS OVER
 Copy-Item "$BuildFolder\nuget-transforms\Core\web.config.transform" -Destination (New-Item (Join-Path -Path $CoreFolder -ChildPath "nuget-transforms") -Type directory);
 Copy-Item "$BuildFolder\nuget-transforms\Mvc\web.config.transform" -Destination (New-Item (Join-Path -Path $MvcFolder -ChildPath "nuget-transforms") -Type directory);
+Copy-Item "$BuildFolder\nuget-transforms\Mvc\web.config.transform" -Destination (New-Item (Join-Path -Path $Mvc5Folder -ChildPath "nuget-transforms") -Type directory);
 Copy-Item "$BuildFolder\nuget-transforms\Less\web.config.transform" -Destination (New-Item (Join-Path -Path $LessFolder -ChildPath "nuget-transforms") -Type directory);
 Copy-Item "$BuildFolder\nuget-transforms\Coffee\web.config.transform" -Destination (New-Item (Join-Path -Path $CoffeeFolder -ChildPath "nuget-transforms") -Type directory);
 Copy-Item "$BuildFolder\nuget-transforms\Sass\web.config.transform" -Destination (New-Item (Join-Path -Path $SassFolder -ChildPath "nuget-transforms") -Type directory);
@@ -89,51 +147,54 @@ Copy-Item "$BuildFolder\nuget-transforms\TypeScript\web.config.transform" -Desti
 $CoreNuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency.nuspec";
 Copy-Item $CoreNuSpecSource -Destination $CoreFolder
 $CoreNuSpec = Join-Path -Path $CoreFolder -ChildPath "ClientDependency.nuspec";
-$NuGet = Join-Path $SolutionRoot -ChildPath "Dependencies\NuGet.exe" 
-& $NuGet pack $CoreNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+Write-Output "DEBUGGING: " $CoreNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
+& $NuGet pack $CoreNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
 
 # COPY OVER THE MVC NUSPEC AND BUILD THE NUGET PACKAGE
 $MvcNuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency-Mvc.nuspec";
 Copy-Item $MvcNuSpecSource -Destination $MvcFolder
 $MvcNuSpec = Join-Path -Path $MvcFolder -ChildPath "ClientDependency-Mvc.nuspec"
-$NuGet = Join-Path $SolutionRoot -ChildPath "Dependencies\NuGet.exe"
-& $NuGet pack $MvcNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+& $NuGet pack $MvcNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
+
+# COPY OVER THE MVC5 NUSPEC AND BUILD THE NUGET PACKAGE
+$Mvc5NuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency-Mvc5.nuspec";
+Copy-Item $Mvc5NuSpecSource -Destination $Mvc5Folder
+$Mvc5NuSpec = Join-Path -Path $Mvc5Folder -ChildPath "ClientDependency-Mvc5.nuspec"
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+& $NuGet pack $Mvc5NuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
 
 # COPY OVER THE LESS NUSPEC AND BUILD THE NUGET PACKAGE
 $LessNuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency-Less.nuspec";
 Copy-Item $LessNuSpecSource -Destination $LessFolder
 $LessNuSpec = Join-Path -Path $LessFolder -ChildPath "ClientDependency-Less.nuspec"
-$NuGet = Join-Path $SolutionRoot -ChildPath "Dependencies\NuGet.exe"
-& $NuGet pack $LessNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+& $NuGet pack $LessNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
 
 # COPY OVER THE SASS NUSPEC AND BUILD THE NUGET PACKAGE
 $SassNuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency-SASS.nuspec";
 Copy-Item $SassNuSpecSource -Destination $SassFolder
 $SassNuSpec = Join-Path -Path $SassFolder -ChildPath "ClientDependency-SASS.nuspec"
-$NuGet = Join-Path $SolutionRoot -ChildPath "Dependencies\NuGet.exe"
-& $NuGet pack $SassNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+& $NuGet pack $SassNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
 
 # COPY OVER THE COFFEE NUSPEC AND BUILD THE NUGET PACKAGE
 $CoffeeNuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency-Coffee.nuspec";
 Copy-Item $CoffeeNuSpecSource -Destination $CoffeeFolder
 $CoffeeNuSpec = Join-Path -Path $CoffeeFolder -ChildPath "ClientDependency-Coffee.nuspec"
-$NuGet = Join-Path $SolutionRoot -ChildPath "Dependencies\NuGet.exe"
-& $NuGet pack $CoffeeNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+& $NuGet pack $CoffeeNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
 
 # COPY OVER THE TypeScript NUSPEC AND BUILD THE NUGET PACKAGE
 $TypeScriptNuSpecSource = Join-Path -Path $BuildFolder -ChildPath "ClientDependency-TypeScript.nuspec";
 Copy-Item $TypeScriptNuSpecSource -Destination $TypeScriptFolder
 $TypeScriptNuSpec = Join-Path -Path $TypeScriptFolder -ChildPath "ClientDependency-TypeScript.nuspec"
-$NuGet = Join-Path $SolutionRoot -ChildPath "Dependencies\NuGet.exe"
-& $NuGet pack $TypeScriptNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber
-
-# NOT SURE WHAT THIS WAS DOING BUT SEEMS TO BE WORKING WITHOUT IT!
-# (gc -Path (Join-Path -Path $MvcFolder -ChildPath "ClientDependency-Mvc.nuspec")) `
-# 	-replace "(?<=dependency id=`"ClientDependency`" version=`")[.\d]*(?=`")", $ReleaseVersionNumber |
-# 	sc -Path $MvcNuSpec -Encoding UTF8
+$NuGet = Join-Path $SolutionRoot -ChildPath ".nuget\NuGet.exe"
+& $NuGet pack $TypeScriptNuSpec -OutputDirectory $ReleaseFolder -Version $ReleaseVersionNumber$PreReleaseName
 
 ""
-"Build $ReleaseVersionNumber is done!"
+"Build $ReleaseVersionNumber$PreReleaseName is done!"
 "NuGet packages also created, so if you want to push them just run:"
 "  nuget push $CoreNuSpec"
 "  nuget push $MvcNuSpec"

ClientDependency.Core/ClientDependency.Core.csproj

@@ -37,6 +37,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+	<PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -46,13 +48,37 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+	<PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>cdf.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-Net45|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-Net45\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+	<PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-Net45|AnyCPU'">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release-Net45\</OutputPath>
+    <DefineConstants>TRACE;MVC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+	<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+	<PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -131,6 +157,7 @@
     <Compile Include="IRequiresHtmlAttributesParsing.cs" />
     <Compile Include="JavascriptFile.cs" />
     <Compile Include="Logging\TraceLogger.cs" />
+    <Compile Include="Module\ApplyingResponseFilterEventArgs.cs" />
     <Compile Include="Module\ClientDependencyModule.cs" />
     <Compile Include="Config\CompositeFileSection.cs" />
     <Compile Include="Config\FileRegistrationSection.cs" />