Separate SassFilesToCompile items

johan-v-r · Aug 9, 2021 · 35dbf55 · 35dbf55
1 parent 45dae68
commit 35dbf55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package/LibSassBuilder.nuspec b/package/LibSassBuilder.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>LibSassBuilder</id>
-    <version>1.6.3</version>
+    <version>1.6.4</version>
     <title>LibSassBuilder</title>
     <summary>Auto build task to compile .scss/.sass files to .css</summary>
     <authors>Johan van Rensburg</authors>

diff --git a/package/build/LibSassBuilder.props b/package/build/LibSassBuilder.props
@@ -30,12 +30,12 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultSassItems)' == 'true'">
-    <!-- add sass files that must be compiled (also gets tracked by VS) -->
-    <SassFile Include="**/*.scss" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultSassExcludes);$(DefaultExcludesInProjectFolder);**/_*" />
-    <SassFile Include="**/*.sass" ExcludeFromSingleFile="true" Exclude="$(DefaultSassExcludes);$(DefaultExcludesInProjectFolder);**/_*" />
+    <!-- add all sass files -->
+    <SassFile Include="**/*.scss" ExcludeFromSingleFile="true" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultSassExcludes);$(DefaultExcludesInProjectFolder)" />
+    <SassFile Include="**/*.sass" ExcludeFromSingleFile="true" Exclude="$(DefaultSassExcludes);$(DefaultExcludesInProjectFolder)" />
 
-    <!-- add all other sass files to show up in VS -->
-    <None Condition="'$(BuildingInsideVisualStudio)'=='true'" Include="**/_*.scss;**/_*.sass" />
+    <!-- filter out variable files that don't get compiled -->
+    <SassFilesToCompile Include="@(SassFile)" Exclude="**/_*.scss;**/_*.sass"></SassFilesToCompile>
   </ItemGroup>
 
 </Project>
diff --git a/package/build/LibSassBuilder.targets b/package/build/LibSassBuilder.targets
@@ -72,7 +72,7 @@
           BeforeTargets="BeforeBuild"  
           Condition="'$(_LibSassHashChanged)-$(LibSassShouldBuildBasedOnSassFiles)' == 'true-true' ">
     <PropertyGroup>
-      <_SassFileList>@(SassFile->'&quot;%(FullPath)&quot;', ' ')</_SassFileList> <!-- all files, space seperated, surrounded with quotes -->
+      <_SassFileList>@(SassFilesToCompile->'&quot;%(FullPath)&quot;', ' ')</_SassFileList> <!-- all valid files, space seperated, surrounded with quotes -->
       <LibSassBuilderArgs>files $(_SassFileList) --outputstyle $(LibSassOutputStyle) --level $(LibSassOutputLevel)</LibSassBuilderArgs>
     </PropertyGroup>
     <Message Text="Converted SassFile list to argument" Importance="$(LibSassMessageLevel)" />