Skip to content

Commit

Permalink
Added support of the LibSass version 3.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Taritsyn
Taritsyn committed Nov 8, 2019
1 parent bc2def8 commit 10817ed
Show file tree
Hide file tree
Showing 37 changed files with 144 additions and 94 deletions.
Binary file modified lib/linux-x64/libsass.so
View file
Binary file not shown.
Binary file modified lib/osx-x64/libsass.dylib
View file
Binary file not shown.
Binary file modified lib/win-x64/libsass.dll
View file
Binary file not shown.
Binary file modified lib/win-x86/libsass.dll
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions samples/LibSassHost.Sample.Net4.ConsoleApp/LibSassHost.Sample.Net4.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\LibSassHost.Native.win-x86.1.2.9\build\LibSassHost.Native.win-x86.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.9\build\LibSassHost.Native.win-x86.props')" />
<Import Project="..\..\packages\LibSassHost.Native.win-x64.1.2.9\build\LibSassHost.Native.win-x64.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.9\build\LibSassHost.Native.win-x64.props')" />
<Import Project="..\..\packages\LibSassHost.Native.win-x86.1.2.10\build\LibSassHost.Native.win-x86.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.10\build\LibSassHost.Native.win-x86.props')" />
<Import Project="..\..\packages\LibSassHost.Native.win-x64.1.2.10\build\LibSassHost.Native.win-x64.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.10\build\LibSassHost.Native.win-x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -59,7 +59,7 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.9\build\LibSassHost.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x64.1.2.9\build\LibSassHost.Native.win-x64.props'))" />
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.9\build\LibSassHost.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x86.1.2.9\build\LibSassHost.Native.win-x86.props'))" />
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.10\build\LibSassHost.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x64.1.2.10\build\LibSassHost.Native.win-x64.props'))" />
<Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.10\build\LibSassHost.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x86.1.2.10\build\LibSassHost.Native.win-x86.props'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions samples/LibSassHost.Sample.Net4.ConsoleApp/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LibSassHost.Native.win-x64" version="1.2.9" targetFramework="net40-client" />
<package id="LibSassHost.Native.win-x86" version="1.2.9" targetFramework="net40-client" />
<package id="LibSassHost.Native.win-x64" version="1.2.10" targetFramework="net40-client" />
<package id="LibSassHost.Native.win-x86" version="1.2.10" targetFramework="net40-client" />
</packages>
8 changes: 4 additions & 4 deletions samples/LibSassHost.Sample.NetCore1.ConsoleApp/LibSassHost.Sample.NetCore1.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.0.1" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.10" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...SassHost.Sample.NetCore1Full.ConsoleApp/LibSassHost.Sample.NetCore1Full.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<Import Project="../../build/common.props" />

<ItemGroup>
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.10" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...es/LibSassHost.Sample.NetCore21.ConsoleApp/LibSassHost.Sample.NetCore21.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.10" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions samples/LibSassHost.Sample.NetCore3.ConsoleApp/LibSassHost.Sample.NetCore3.ConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<ItemGroup>
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.9" />
<PackageReference Include="LibSassHost.Native.win-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.win-x86" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.linux-x64" Version="1.2.10" />
<PackageReference Include="LibSassHost.Native.osx-x64" Version="1.2.10" />

<ProjectReference Include="..\LibSassHost.Sample.Logic\LibSassHost.Sample.Logic.csproj" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.linux-x64/LibSassHost.Native.linux-x64.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.linux-x64</id>
<version>1.2.9</version>
<version>1.2.10</version>
<title>LibSass Host Native for Linux (x64)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -11,10 +11,10 @@
<icon>icon.png</icon>
<repository type="git" url="https://github.com/Taritsyn/LibSassHost" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for Linux (x64).
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.3 for Linux (x64).

This package is only compatible with .NET Core.</description>
<releaseNotes>Improved a fix for error #31 “Unhandled exceptions”.</releaseNotes>
<releaseNotes>Added support of the LibSass version 3.6.3.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS Linux x64</tags>
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.linux-x64/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for Linux x64 v1.2.9
README file for LibSass Host Native for Linux x64 v1.2.10

--------------------------------------------------------------------------------

Expand All @@ -12,14 +12,14 @@
DESCRIPTION
===========
This package complements the LibSassHost package and contains the native
implementation of LibSass version 3.6.2 for Linux (x64).
implementation of LibSass version 3.6.3 for Linux (x64).

This package is only compatible with .NET Core.

=============
RELEASE NOTES
=============
Improved a fix for error #31 “Unhandled exceptions”.
Added support of the LibSass version 3.6.3.

============
PROJECT SITE
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.osx-x64/LibSassHost.Native.osx-x64.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.osx-x64</id>
<version>1.2.9</version>
<version>1.2.10</version>
<title>LibSass Host Native for OS X (x64)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -11,10 +11,10 @@
<icon>icon.png</icon>
<repository type="git" url="https://github.com/Taritsyn/LibSassHost" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for OS X (x64).
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.3 for OS X (x64).

This package is only compatible with .NET Core.</description>
<releaseNotes>Improved a fix for error #31 “Unhandled exceptions”.</releaseNotes>
<releaseNotes>Added support of the LibSass version 3.6.3.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS macOS OSX x64</tags>
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.osx-x64/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for OS X x64 v1.2.9
README file for LibSass Host Native for OS X x64 v1.2.10

--------------------------------------------------------------------------------

Expand All @@ -12,14 +12,14 @@
DESCRIPTION
===========
This package complements the LibSassHost package and contains the native
implementation of LibSass version 3.6.2 for OS X (x64).
implementation of LibSass version 3.6.3 for OS X (x64).

This package is only compatible with .NET Core.

=============
RELEASE NOTES
=============
Improved a fix for error #31 “Unhandled exceptions”.
Added support of the LibSass version 3.6.3.

============
PROJECT SITE
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.win-x64/LibSassHost.Native.win-x64.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.win-x64</id>
<version>1.2.9</version>
<version>1.2.10</version>
<title>LibSass Host Native for Windows (x64)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -11,8 +11,8 @@
<icon>icon.png</icon>
<repository type="git" url="https://github.com/Taritsyn/LibSassHost" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for Windows (x64).</description>
<releaseNotes>Improved a fix for error #31 “Unhandled exceptions”.</releaseNotes>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.3 for Windows (x64).</description>
<releaseNotes>Added support of the LibSass version 3.6.3.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS Windows x64</tags>
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.win-x64/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for Windows x64 v1.2.9
README file for LibSass Host Native for Windows x64 v1.2.10

--------------------------------------------------------------------------------

Expand All @@ -12,12 +12,12 @@
DESCRIPTION
===========
This package complements the LibSassHost package and contains the native
implementation of LibSass version 3.6.2 for Windows (x64).
implementation of LibSass version 3.6.3 for Windows (x64).

=============
RELEASE NOTES
=============
Improved a fix for error #31 “Unhandled exceptions”.
Added support of the LibSass version 3.6.3.

============
PROJECT SITE
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.win-x86/LibSassHost.Native.win-x86.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>LibSassHost.Native.win-x86</id>
<version>1.2.9</version>
<version>1.2.10</version>
<title>LibSass Host Native for Windows (x86)</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -11,8 +11,8 @@
<icon>icon.png</icon>
<repository type="git" url="https://github.com/Taritsyn/LibSassHost" />
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.2 for Windows (x86).</description>
<releaseNotes>Improved a fix for error #31 “Unhandled exceptions”.</releaseNotes>
<description>This package complements the LibSassHost package and contains the native implementation of LibSass version 3.6.3 for Windows (x86).</description>
<releaseNotes>Added support of the LibSass version 3.6.3.</releaseNotes>
<copyright>Copyright © 2015-2019 Andrey Taritsyn</copyright>
<language>en-US</language>
<tags>LibSass Sass SCSS CSS Windows x86</tags>
Expand Down
6 changes: 3 additions & 3 deletions src/LibSassHost.Native.win-x86/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


--------------------------------------------------------------------------------
README file for LibSass Host Native for Windows x86 v1.2.9
README file for LibSass Host Native for Windows x86 v1.2.10

--------------------------------------------------------------------------------

Expand All @@ -12,12 +12,12 @@
DESCRIPTION
===========
This package complements the LibSassHost package and contains the native
implementation of LibSass version 3.6.2 for Windows (x86).
implementation of LibSass version 3.6.3 for Windows (x86).

=============
RELEASE NOTES
=============
Improved a fix for error #31 “Unhandled exceptions”.
Added support of the LibSass version 3.6.3.

============
PROJECT SITE
Expand Down
2 changes: 1 addition & 1 deletion src/LibSassHost/LibSassHost.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This package does not contain the native implementations of LibSass. Therefore,
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageTags>LibSass;Sass;SCSS;CSS</PackageTags>
<PackageReleaseNotes>Improved a fix for error #31 “Unhandled exceptions”.</PackageReleaseNotes>
<PackageReleaseNotes>Added support of the LibSass version 3.6.3.</PackageReleaseNotes>
<NeutralLanguage>en-US</NeutralLanguage>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/LibSassHost/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
=============
RELEASE NOTES
=============
Improved a fix for error #31 “Unhandled exceptions”.
Added support of the LibSass version 3.6.3.

============
PROJECT SITE
Expand Down
8 changes: 6 additions & 2 deletions src/libsass/ast_sel_weave.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,12 @@ namespace Sass {
// Prepare data structures
choices.push_back(expanded);
choices.push_back({ group });
groups1.erase(groups1.begin());
groups2.erase(groups2.begin());
if (!groups1.empty()) {
groups1.erase(groups1.begin());
}
if (!groups2.empty()) {
groups2.erase(groups2.begin());
}

}

Expand Down
8 changes: 4 additions & 4 deletions src/libsass/eval.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,9 @@ namespace Sass {
b->op(), s_l->last(), b->right());
bin_ex->is_delayed(b->left()->is_delayed() || b->right()->is_delayed()); // unverified
for (size_t i = 0; i < s_l->length() - 1; ++i) {
ret_schema->append(Cast<PreValue>(s_l->at(i)->perform(this)));
ret_schema->append(s_l->at(i)->perform(this));
}
ret_schema->append(Cast<PreValue>(bin_ex->perform(this)));
ret_schema->append(bin_ex->perform(this));
return ret_schema->perform(this);
}
}
Expand All @@ -704,9 +704,9 @@ namespace Sass {
Binary_Expression_Obj bin_ex = SASS_MEMORY_NEW(Binary_Expression, b->pstate(),
b->op(), b->left(), s_r->first());
bin_ex->is_delayed(b->left()->is_delayed() || b->right()->is_delayed()); // verified
ret_schema->append(Cast<PreValue>(bin_ex->perform(this)));
ret_schema->append(bin_ex->perform(this));
for (size_t i = 1; i < s_r->length(); ++i) {
ret_schema->append(Cast<PreValue>(s_r->at(i)->perform(this)));
ret_schema->append(s_r->at(i)->perform(this));
}
return ret_schema->perform(this);
}
Expand Down
6 changes: 3 additions & 3 deletions src/libsass/eval_selectors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ namespace Sass {
SelectorList* Eval::operator()(ComplexSelector* s)
{
bool implicit_parent = !exp.old_at_root_without_rule;
if (is_in_selector_schema) exp.pushToSelectorStack({});
if (is_in_selector_schema) exp.pushNullSelector();
SelectorListObj other = s->resolve_parent_refs(
exp.getSelectorStack(), traces, implicit_parent);
if (is_in_selector_schema) exp.popFromSelectorStack();
exp.getOriginalStack(), traces, implicit_parent);
if (is_in_selector_schema) exp.popNullSelector();

for (size_t i = 0; i < other->length(); i++) {
ComplexSelectorObj sel = other->at(i);
Expand Down
Loading

0 comments on commit 10817ed

Please sign in to comment.