Skip to content

Commit 4e313e4

Browse files
committed
Install-Package Microsoft.AspNet.Web.Optimization
1 parent d01f2ec commit 4e313e4

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

HTML5/HTML5.Tests/App.config

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
Note: Add entries to the App.config file for configuration settings
44
that apply only to the Test project.
@@ -11,4 +11,12 @@
1111
<connectionStrings>
1212

1313
</connectionStrings>
14+
<runtime>
15+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
16+
<dependentAssembly>
17+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
19+
</dependentAssembly>
20+
</assemblyBinding>
21+
</runtime>
1422
</configuration>

HTML5/HTML5/HTML5.csproj

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<SccLocalPath>SAK</SccLocalPath>
2525
<SccAuxPath>SAK</SccAuxPath>
2626
<SccProvider>SAK</SccProvider>
27+
<WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -43,7 +44,13 @@
4344
<WarningLevel>4</WarningLevel>
4445
</PropertyGroup>
4546
<ItemGroup>
47+
<Reference Include="Antlr3.Runtime">
48+
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
49+
</Reference>
4650
<Reference Include="Microsoft.CSharp" />
51+
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
53+
</Reference>
4754
<Reference Include="System" />
4855
<Reference Include="System.Data" />
4956
<Reference Include="System.Data.Entity" />
@@ -55,6 +62,9 @@
5562
<Reference Include="System.ComponentModel.DataAnnotations" />
5663
<Reference Include="System.Core" />
5764
<Reference Include="System.Data.DataSetExtensions" />
65+
<Reference Include="System.Web.Optimization">
66+
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.2\lib\net40\System.Web.Optimization.dll</HintPath>
67+
</Reference>
5868
<Reference Include="System.Xml.Linq" />
5969
<Reference Include="System.Web" />
6070
<Reference Include="System.Web.Extensions" />
@@ -75,9 +85,6 @@
7585
<Private>True</Private>
7686
<HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
7787
</Reference>
78-
<Reference Include="Newtonsoft.Json">
79-
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
80-
</Reference>
8188
<Reference Include="System.Net.Http">
8289
</Reference>
8390
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -95,9 +102,6 @@
95102
<Private>True</Private>
96103
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
97104
</Reference>
98-
<Reference Include="System.Web.Optimization">
99-
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.0.0\lib\net40\System.Web.Optimization.dll</HintPath>
100-
</Reference>
101105
<Reference Include="System.Web.Providers">
102106
<HintPath>..\packages\Microsoft.AspNet.Providers.Core.1.2\lib\net40\System.Web.Providers.dll</HintPath>
103107
</Reference>
@@ -118,12 +122,7 @@
118122
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
119123
</Reference>
120124
<Reference Include="WebGrease">
121-
<Private>True</Private>
122-
<HintPath>..\packages\WebGrease.1.3.0\lib\WebGrease.dll</HintPath>
123-
</Reference>
124-
<Reference Include="Antlr3.Runtime">
125-
<Private>True</Private>
126-
<HintPath>..\packages\WebGrease.1.3.0\lib\Antlr3.Runtime.dll</HintPath>
125+
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
127126
</Reference>
128127
</ItemGroup>
129128
<ItemGroup>

HTML5/HTML5/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</dependentAssembly>
9292
<dependentAssembly>
9393
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
94-
<bindingRedirect oldVersion="1.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
94+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
9595
</dependentAssembly>
9696
</assemblyBinding>
9797
</runtime>

HTML5/HTML5/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
34
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
45
<package id="jQuery" version="1.8.2" targetFramework="net45" />
56
<package id="jQuery.UI.Combined" version="1.8.24" targetFramework="net45" />
@@ -11,6 +12,7 @@
1112
<package id="Microsoft.AspNet.Providers.LocalDB" version="1.1" targetFramework="net45" />
1213
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
1314
<package id="Microsoft.AspNet.Web.Optimization" version="1.0.0" targetFramework="net45" />
15+
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.2" targetFramework="net45" />
1416
<package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net45" />
1517
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
1618
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
@@ -22,5 +24,7 @@
2224
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2325
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
2426
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
27+
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
2528
<package id="WebGrease" version="1.3.0" targetFramework="net45" />
29+
<package id="WebGrease" version="1.5.2" targetFramework="net45" />
2630
</packages>

0 commit comments

Comments
 (0)