Skip to content

Commit de3f038

Browse files
NikolaSivkovNikolaSivkov
committed
Merge pull request #33 from am11/master
LibSass: Updates solution to support VS2015
2 parents 8088270 + 8f3f3a5 commit de3f038

File tree

9 files changed

+31
-33
lines changed

9 files changed

+31
-33
lines changed

‎.nuget/NuGet.exe

-760 KB
Binary file not shown.

‎.nuget/nuget.exe

1.61 MB
Binary file not shown.

‎libsass-net.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSass", "libsass\LibSass.vcxproj", "{3A1CF114-A5C0-4BA2-8C0D-47001E361718}"
77
EndProject

‎libsass/LibSass.vcxproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -44,8 +44,8 @@
4444
<CompileAsManaged>false</CompileAsManaged>
4545
</ClCompile>
4646
<ClCompile Include="native\inspect.cpp" />
47-
<ClCompile Include="native\json.cpp" >
48-
<CompileAsManaged>false</CompileAsManaged>
47+
<ClCompile Include="native\json.cpp">
48+
<CompileAsManaged>false</CompileAsManaged>
4949
</ClCompile>
5050
<ClCompile Include="native\node.cpp" />
5151
<ClCompile Include="native\emitter.cpp" />
@@ -139,36 +139,37 @@
139139
</ItemGroup>
140140
<PropertyGroup Label="Globals">
141141
<ProjectGuid>{3A1CF114-A5C0-4BA2-8C0D-47001E361718}</ProjectGuid>
142-
<Keyword>Win32Proj</Keyword>
143142
<RootNamespace>LibSass</RootNamespace>
144143
</PropertyGroup>
144+
<PropertyGroup Label="VS2013 toolset selection" Condition="'$(VisualStudioVersion)' == '12.0'">
145+
<PlatformToolset>v120</PlatformToolset>
146+
</PropertyGroup>
147+
<PropertyGroup Label="VS2015 toolset selection" Condition="'$(VisualStudioVersion)' == '14.0'">
148+
<PlatformToolset>v140</PlatformToolset>
149+
</PropertyGroup>
145150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
146151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
147152
<ConfigurationType>DynamicLibrary</ConfigurationType>
148153
<UseDebugLibraries>true</UseDebugLibraries>
149-
<PlatformToolset>v120</PlatformToolset>
150154
<CharacterSet>Unicode</CharacterSet>
151155
<CLRSupport>true</CLRSupport>
152156
</PropertyGroup>
153157
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
154158
<ConfigurationType>DynamicLibrary</ConfigurationType>
155159
<UseDebugLibraries>true</UseDebugLibraries>
156-
<PlatformToolset>v120</PlatformToolset>
157160
<CharacterSet>Unicode</CharacterSet>
158161
<CLRSupport>true</CLRSupport>
159162
</PropertyGroup>
160163
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
161164
<ConfigurationType>DynamicLibrary</ConfigurationType>
162165
<UseDebugLibraries>false</UseDebugLibraries>
163-
<PlatformToolset>v120</PlatformToolset>
164166
<WholeProgramOptimization>true</WholeProgramOptimization>
165167
<CharacterSet>Unicode</CharacterSet>
166168
<CLRSupport>true</CLRSupport>
167169
</PropertyGroup>
168170
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
169171
<ConfigurationType>DynamicLibrary</ConfigurationType>
170172
<UseDebugLibraries>false</UseDebugLibraries>
171-
<PlatformToolset>v120</PlatformToolset>
172173
<WholeProgramOptimization>true</WholeProgramOptimization>
173174
<CharacterSet>Unicode</CharacterSet>
174175
<CLRSupport>true</CLRSupport>
@@ -284,4 +285,4 @@
284285
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
285286
<ImportGroup Label="ExtensionTargets">
286287
</ImportGroup>
287-
</Project>
288+
</Project>

‎libsassnet.Tests/libsassnet.Tests.csproj

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.runner.visualstudio.2.1.0-beta2-build1055\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0-beta2-build1055\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\packages\xunit.core.2.1.0-beta2-build2981\build\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.1.0-beta2-build2981\build\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
5-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
63
<PropertyGroup>
74
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
85
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -36,17 +33,14 @@
3633
<Reference Include="System" />
3734
<Reference Include="System.Core" />
3835
<Reference Include="Microsoft.CSharp" />
39-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
40-
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
41-
<Private>True</Private>
36+
<Reference Include="xunit.abstractions">
37+
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
4238
</Reference>
43-
<Reference Include="xunit.assert, Version=2.1.0.2981, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
44-
<HintPath>..\packages\xunit.assert.2.1.0-beta2-build2981\lib\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
45-
<Private>True</Private>
39+
<Reference Include="xunit.assert">
40+
<HintPath>..\packages\xunit.assert.2.1.0-beta4-build3109\lib\portable-net45+netcore45+wp8+wpa81\xunit.assert.dll</HintPath>
4641
</Reference>
47-
<Reference Include="xunit.core, Version=2.1.0.2981, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
48-
<HintPath>..\packages\xunit.extensibility.core.2.1.0-beta2-build2981\lib\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
49-
<Private>True</Private>
42+
<Reference Include="xunit.core">
43+
<HintPath>..\packages\xunit.extensibility.core.2.1.0-beta4-build3109\lib\dotnet\xunit.core.dll</HintPath>
5044
</Reference>
5145
</ItemGroup>
5246
<ItemGroup>
@@ -70,12 +64,15 @@
7064
</ProjectReference>
7165
</ItemGroup>
7266
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
67+
<Import Project="..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" />
68+
<Import Project="..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
69+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
7370
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7471
<PropertyGroup>
7572
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7673
</PropertyGroup>
77-
<Error Condition="!Exists('..\packages\xunit.core.2.1.0-beta2-build2981\build\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.1.0-beta2-build2981\build\portable-net45+dnxcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
78-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0-beta2-build1055\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0-beta2-build1055\build\net20\xunit.runner.visualstudio.props'))" />
74+
<Error Condition="!Exists('..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.1.0-beta4-build3109\build\portable-net45+netcore45+wp8+wpa81\xunit.core.props'))" />
75+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
7976
</Target>
8077
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8178
Other similar extension points exist, see Microsoft.Common.targets.
@@ -84,4 +81,4 @@
8481
<Target Name="AfterBuild">
8582
</Target>
8683
-->
87-
</Project>
84+
</Project>

‎libsassnet.Web/libsassnet.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

‎libsassnet.Web/libsassnet.Web.x64.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

‎libsassnet/libsassnet.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -63,4 +63,4 @@
6363
<Target Name="AfterBuild">
6464
</Target>
6565
-->
66-
</Project>
66+
</Project>

‎libsassnet/libsassnet.x64.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -64,4 +64,4 @@
6464
<Target Name="AfterBuild">
6565
</Target>
6666
-->
67-
</Project>
67+
</Project>

0 commit comments

Comments
 (0)