Skip to content

Commit 8088270

Browse files
committed
Merge pull request #32 from am11/master
Web: Updates and fixes dependencies
2 parents 8322cbd + 0045e2c commit 8088270

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

libsassnet.Tests/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit" version="2.1.0-beta2-build2981" targetFramework="net451" />
3+
<package id="xunit" version="2.1.0-beta4-build3109" targetFramework="net451" />
44
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
5-
<package id="xunit.assert" version="2.1.0-beta2-build2981" targetFramework="net451" />
6-
<package id="xunit.core" version="2.1.0-beta2-build2981" targetFramework="net451" />
7-
<package id="xunit.extensibility.core" version="2.1.0-beta2-build2981" targetFramework="net451" />
8-
<package id="xunit.runner.visualstudio" version="2.1.0-beta2-build1055" targetFramework="net451" />
9-
</packages>
5+
<package id="xunit.assert" version="2.1.0-beta4-build3109" targetFramework="net451" />
6+
<package id="xunit.core" version="2.1.0-beta4-build3109" targetFramework="net451" />
7+
<package id="xunit.extensibility.core" version="2.1.0-beta4-build3109" targetFramework="net451" />
8+
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net451" />
9+
</packages>

libsassnet.Web/libsassnet.Web.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<AssemblyName>libsassnet.Web</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
1514
</PropertyGroup>
1615
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1716
<DebugSymbols>true</DebugSymbols>
@@ -32,15 +31,12 @@
3231
</PropertyGroup>
3332
<ItemGroup>
3433
<Reference Include="Antlr3.Runtime">
35-
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
34+
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
3635
</Reference>
3736
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
3837
<Private>True</Private>
3938
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
4039
</Reference>
41-
<Reference Include="Newtonsoft.Json">
42-
<HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
43-
</Reference>
4440
<Reference Include="System" />
4541
<Reference Include="System.Core" />
4642
<Reference Include="Microsoft.CSharp" />
@@ -49,7 +45,7 @@
4945
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
5046
</Reference>
5147
<Reference Include="WebGrease">
52-
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
48+
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
5349
</Reference>
5450
</ItemGroup>
5551
<ItemGroup>
@@ -78,4 +74,4 @@
7874
<Target Name="AfterBuild">
7975
</Target>
8076
-->
81-
</Project>
77+
</Project>

libsassnet.Web/libsassnet.Web.x64.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<Private>True</Private>
3939
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
44-
</Reference>
4541
<Reference Include="System" />
4642
<Reference Include="System.Core" />
4743
<Reference Include="Microsoft.CSharp" />
@@ -50,7 +46,7 @@
5046
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
5147
</Reference>
5248
<Reference Include="WebGrease">
53-
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
49+
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
5450
</Reference>
5551
</ItemGroup>
5652
<ItemGroup>
@@ -79,4 +75,4 @@
7975
<Target Name="AfterBuild">
8076
</Target>
8177
-->
82-
</Project>
78+
</Project>

libsassnet.Web/packages.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<package id="Antlr" version="3.5.0.2" targetFramework="net40" />
44
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net40" />
55
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
6-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
76
<package id="WebGrease" version="1.6.0" targetFramework="net40" />
8-
</packages>
7+
</packages>

0 commit comments

Comments
 (0)