Skip to content

Commit 5c867e9

Browse files
NikolaSivkovam11
authored andcommitted
Multiple fixes related to nuspec building and packaging
FIX versions of nuspec files FIX reduce nuspecs For any cpu & x64 the x64 version of the binary is inserted at the root of the output folder of the project where libsass is referenced Updated readme FIX webconfig transform
1 parent 8221339 commit 5c867e9

File tree

11 files changed

+57
-61
lines changed

11 files changed

+57
-61
lines changed

LibSass.NET/LibSass.NET.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
<Compile Include="Types\TypeFactory.cs" />
6767
</ItemGroup>
6868
<ItemGroup>
69-
<None Include="libsassnet.nuspec" />
69+
<None Include="LibSass.Net.nuspec" />
70+
<None Include="libsassnet.targets" />
7071
</ItemGroup>
7172
<ItemGroup>
7273
<Reference Include="System" />

LibSass.NET/LibSass.Net.nuspec

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
3+
<metadata>
4+
<id>libsassnet</id>
5+
<version>3.3.6</version>
6+
<authors>Darren Kopp</authors>
7+
<owners>Darren Kopp</owners>
8+
<licenseUrl>https://github.com/darrenkopp/libsass-net/blob/master/LICENSE</licenseUrl>
9+
<projectUrl>https://github.com/darrenkopp/libsass-net/</projectUrl>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<description>Allows you to use the LibSass compiler from .NET</description>
12+
<copyright>Copyright © 2016 by Darren Kopp</copyright>
13+
<tags>SASS SCSS CSS LibSass</tags>
14+
</metadata>
15+
<files>
16+
<file src="..\bin\x64\libsass.dll" target="build\x64\libsass.dll" />
17+
<file src="..\bin\x86\libsass.dll" target="build\x86\libsass.dll" />
18+
<file src="libsassnet.targets" target="build\libsassnet.targets" />
19+
<file src="..\bin\LibSass.NET.dll" target="lib\net40\LibSass.NET.dll" />
20+
</files>
21+
</package>

LibSass.NET/libsassnet.nuspec

Lines changed: 0 additions & 21 deletions
This file was deleted.

LibSass.NET/libsassnet.targets

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<NativeLibs Include="$(MSBuildThisFileDirectory)**\*.dll" />
5+
<None Include="@(NativeLibs)">
6+
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
7+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8+
</None>
9+
</ItemGroup>
10+
<ItemGroup>
11+
<NativeLibs Condition="$(Platform) == 'AnyCPU' Or $(Platform) == 'x64'" Include="$(MSBuildThisFileDirectory)x64\*.dll" />
12+
<NativeLibs Condition="$(Platform) == 'x86'" Include="$(MSBuildThisFileDirectory)x86\*.dll" />
13+
<None Include="@(NativeLibs)">
14+
<Link>%(FileName)%(Extension)</Link>
15+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16+
</None>
17+
</ItemGroup>
18+
</Project>

LibSass.NET/libsassnet.x64.nuspec

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ LibSassNet's version will be the same as http://github.com/sass/LibSass
2323

2424
LibSass.Web's version is independant of LibSass and will be following [SemVer](http://semver.org/)
2525

26-
Current version LibSassNet : 3.2.4.1
26+
Current version LibSassNet : 3.3.6
2727

28-
Currently implemented version of LibSass = 3.2.4
28+
Currently implemented version of LibSass = 3.3.6
2929

30-
Current version of LibSassNet.Web 2.1.3
30+
Current version of LibSassNet.Web 2.2

contrib/LibSass.NET.Web/LibSass.NET.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</ItemGroup>
5151
<ItemGroup>
5252
<None Include="app.config" />
53-
<None Include="libsassnet.Web.nuspec" />
53+
<None Include="LibSass.NET.Web.nuspec" />
5454
<None Include="packages.config" />
5555
<None Include="web.config.transform" />
5656
</ItemGroup>

contrib/LibSass.NET.Web/libsassnet.Web.nuspec renamed to contrib/LibSass.NET.Web/LibSass.NET.Web.nuspec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0"?>
22
<package>
33
<metadata>
4-
<id>$id$</id>
5-
<version>2.1.3.1</version>
4+
<id>libsassnet.Web</id>
5+
<version>2.2.0</version>
66
<authors>Darren Kopp</authors>
7-
<owners>Darren Kopp</owners>
8-
<licenseUrl>https://github.com/darrenkopp/libsass-net/blob/master/LICENSE</licenseUrl>
9-
<projectUrl>https://github.com/darrenkopp/libsass-net/</projectUrl>
7+
<owners>Darren Kopp</owners>
8+
<licenseUrl>https://github.com/darrenkopp/libsass-net/blob/master/LICENSE</licenseUrl>
9+
<projectUrl>https://github.com/darrenkopp/libsass-net/</projectUrl>
1010
<!-- TODO: Add icon -->
1111
<!--<iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>-->
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>Provides SCSS compilation support for System.Web.Optimization</description>
1414
<copyright>Copyright © 2014 by Darren Kopp</copyright>
1515
<tags>SASS SCSS CSS libsass System.Web.Optimization Microsoft.AspNet.Web.Optimization</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.AspNet.Web.Optimization" />
18-
<dependency id="libsassnet" version="3.2.5" />
17+
<dependency id="Microsoft.AspNet.Web.Optimization" />
18+
<dependency id="libsassnet" version="[3.3,)" />
1919
</dependencies>
2020
</metadata>
2121
<files>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<configuration>
22
<system.webServer>
33
<handlers>
4-
<add name="SassHandler" verb="GET" path="*.scss" type="LibSassNet.Web.SassHandler, libsassnet.Web" />
4+
<add name="SassHandler" verb="GET" path="*.scss" type="LibSass.Web.SassHandler, LibSass.NET.Web" />
55
</handlers>
66
</system.webServer>
77
</configuration>

pack.cmd

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
)
1818
)
1919

20-
"%PathToMsBuild32%\MSBuild.exe" libsass-net.sln /nologo /v:n /m:4 /p:Configuration=Release
21-
"%PathToMsBuild64%\MSBuild.exe" libsass-net.sln /nologo /v:n /m:4 /p:Configuration=Release /p:Platform=x64
20+
"%PathToMsBuild32%\MSBuild.exe" LibSass.NET.sln /nologo /v:n /m:4 /p:Configuration=Release
2221

23-
.nuget\NuGet Pack "libsassnet\libsassnet.csproj" -Properties Configuration=Release
24-
.nuget\NuGet Pack "libsassnet.Web\libsassnet.Web.csproj" -Properties Configuration=Release
25-
.nuget\NuGet Pack "libsassnet\libsassnet.x64.csproj" -Properties Configuration=Release;Platform=x64
26-
.nuget\NuGet Pack "libsassnet.Web\libsassnet.Web.x64.csproj" -Properties Configuration=Release;Platform=x64
22+
.nuget\NuGet Pack "LibSass.NET\LibSass.NET.csproj" -Properties Configuration=Release
23+
.nuget\NuGet Pack "contrib\LibSass.NET.Web\LibSass.NET.Web.csproj" -Properties Configuration=Release

0 commit comments

Comments
 (0)