From 45dae68663049495f0cfb620c960f9cdfe748b63 Mon Sep 17 00:00:00 2001
From: johan-v-r <jhnvnrnsbrg@gmail.com>
Date: Mon, 19 Jul 2021 18:30:55 +0200
Subject: [PATCH 1/2] Add BuildingInsideVisualStudio condition check

---
 package/build/LibSassBuilder.props | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/build/LibSassBuilder.props b/package/build/LibSassBuilder.props
index ff462d9..a44f925 100644
--- a/package/build/LibSassBuilder.props
+++ b/package/build/LibSassBuilder.props
@@ -14,7 +14,13 @@
     <EnableDefaultSassItems Condition="'$(EnableDefaultSassItems)'==''">true</EnableDefaultSassItems>
     <DefaultSassExcludes>**/bin/**;**/obj/**;**/node_modules/**;**/logs/**</DefaultSassExcludes>
     
-    <DefaultItemExcludes Condition="'$(EnableDefaultSassItems)'=='true'">$(DefaultItemExcludes);**/*.scss;**/*.sass</DefaultItemExcludes>
+    <!-- 
+      exclude for VS - https://docs.microsoft.com/en-us/visualstudio/msbuild/visual-studio-integration-msbuild#build-solutions 
+      required from this issue (VS bug) - https://github.com/johan-v-r/LibSassBuilder/issues/15
+      -->
+    <DefaultItemExcludes Condition="'$(EnableDefaultSassItems)'=='true' and '$(BuildingInsideVisualStudio)'=='true'">
+      $(DefaultItemExcludes);**/*.scss;**/*.sass
+    </DefaultItemExcludes>
 
     <!-- Provide LibSassBuilderArgs to take complete control -->
     <LibSassBuilderArgs Condition=" '$(LibSassBuilderArgs)'=='' "></LibSassBuilderArgs>
@@ -22,10 +28,14 @@
     <!-- Add target to CustomCollectWatchItems -->
     <CustomCollectWatchItems>$(CustomCollectWatchItems);_LibSass_CustomCollectWatchItems</CustomCollectWatchItems>
   </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 other sass files to show up in VS -->
+    <None Condition="'$(BuildingInsideVisualStudio)'=='true'" Include="**/_*.scss;**/_*.sass" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file

From 35dbf550dc09e1b77bdd2aa01e5256556b5a7838 Mon Sep 17 00:00:00 2001
From: johan-v-r <jhnvnrnsbrg@gmail.com>
Date: Mon, 9 Aug 2021 14:52:00 +0200
Subject: [PATCH 2/2] Separate SassFilesToCompile items

---
 package/LibSassBuilder.nuspec        |  2 +-
 package/build/LibSassBuilder.props   | 10 +++++-----
 package/build/LibSassBuilder.targets |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/LibSassBuilder.nuspec b/package/LibSassBuilder.nuspec
index 36a36aa..4f1ad6d 100644
--- 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
index a44f925..6dab7d2 100644
--- 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>
\ No newline at end of file
diff --git a/package/build/LibSassBuilder.targets b/package/build/LibSassBuilder.targets
index 446829e..2a9d18c 100644
--- 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)" />