From a081697637f71e07146f82c375715ba4697386b6 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Thu, 19 Jan 2017 02:05:55 -0500
Subject: [PATCH] Add linked DLL references and remove copying Took another
 pass after the last set of improvements to see if I could get something that
 worked with the regular clean operations

---
 LibSass.NET.Tests/LibSass.NET.Tests.csproj    |  9 +----
 LibSass.NET/LibSass.NET.csproj                | 33 +++++++++++++++----
 LibSass.NET/LibSass.Net.nuspec                |  6 ++--
 .../LibSass.NET.Console.csproj                |  9 +----
 .../LibSass.NET.Web/LibSass.NET.Web.csproj    |  9 +----
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/LibSass.NET.Tests/LibSass.NET.Tests.csproj b/LibSass.NET.Tests/LibSass.NET.Tests.csproj
index c4c579b..4f6a1c2 100644
--- a/LibSass.NET.Tests/LibSass.NET.Tests.csproj
+++ b/LibSass.NET.Tests/LibSass.NET.Tests.csproj
@@ -12,13 +12,12 @@
     <AssemblyName>LibSass.NET.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>bin\$(Configuration)\obj\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>512</FileAlignment>
-    <LibSassPath>$(SolutionDir)\bin\$(Configuration)\</LibSassPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -115,10 +114,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
-  <Target Name="AfterBuild">
-    <Copy
-      SourceFiles="$(LibSassPath)libsass32.dll;$(LibSassPath)libsass64.dll"
-      DestinationFolder="$(OutputPath)"
-      SkipUnchangedFiles="true" />
-  </Target>
 </Project>
diff --git a/LibSass.NET/LibSass.NET.csproj b/LibSass.NET/LibSass.NET.csproj
index 48e39f5..29f5845 100644
--- a/LibSass.NET/LibSass.NET.csproj
+++ b/LibSass.NET/LibSass.NET.csproj
@@ -10,13 +10,15 @@
     <RootNamespace>LibSass</RootNamespace>
     <AssemblyName>LibSass.NET</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <OutputPath>$(SolutionDir)bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>$(SolutionDir)bin\$(Configuration)\obj\</IntermediateOutputPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>512</FileAlignment>
+    <LibSass32>$(SolutionDir)bin\$(Configuration)\libsass32.dll</LibSass32>
+    <LibSass64>$(SolutionDir)bin\$(Configuration)\libsass64.dll</LibSass64>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,16 +68,35 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="LibSass.Net.nuspec" />
-    <None Include="libsassnet.targets" />
+    <None Include="libsassnet.targets">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(LibSass32)">
+      <Link>libsass32.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(LibSass64)">
+      <Link>libsass64.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- Build LibSass -->
-  <Target Name="AfterBuild">
-    <MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win32;TargetName=libsass32;OutDir=$(OutputPath);IntDir=$(IntermediateOutputPath)" />
-    <MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win64;TargetName=libsass64;OutDir=$(OutputPath);IntDir=$(IntermediateOutputPath)" />
+  <Target Name="BeforeBuild">
+    <MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win32;TargetName=libsass32;OutDir=$(SolutionDir)bin\$(Configuration)\;IntDir=$(SolutionDir)bin\$(Configuration)\obj\Win32\" Condition="!Exists('$(LibSass32)')" />
+    <MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win64;TargetName=libsass64;OutDir=$(SolutionDir)bin\$(Configuration)\;IntDir=$(SolutionDir)bin\$(Configuration)\obj\Win64\" Condition="!Exists('$(LibSass64)')" />
+  </Target>
+  <Target Name="AfterClean">
+    <ItemGroup>
+        <FilesToDelete Include="$(SolutionDir)bin\$(Configuration)\**\*"/>
+    </ItemGroup>   
+    <Delete Files="@(FilesToDelete)" />   
+    <RemoveDir Directories="$(SolutionDir)bin\$(Configuration)\" />
   </Target>
 </Project>
diff --git a/LibSass.NET/LibSass.Net.nuspec b/LibSass.NET/LibSass.Net.nuspec
index 8624128..f94cd41 100644
--- a/LibSass.NET/LibSass.Net.nuspec
+++ b/LibSass.NET/LibSass.Net.nuspec
@@ -13,9 +13,9 @@
     <tags>SASS SCSS CSS LibSass</tags>
   </metadata>
   <files>
-    <file src="..\bin\$configuration$\libsass64.dll" target="build\libsass64.dll" />
-    <file src="..\bin\$configuration$\libsass32.dll" target="build\libsass32.dll" />
+    <file src="bin\$configuration$\libsass64.dll" target="build\libsass64.dll" />
+    <file src="bin\$configuration$\libsass32.dll" target="build\libsass32.dll" />
     <file src="libsassnet.targets" target="build\libsassnet.targets" />
-    <file src="..\bin\$configuration$\LibSass.NET.dll" target="lib\net40\LibSass.NET.dll" />
+    <file src="bin\$configuration$\LibSass.NET.dll" target="lib\net40\LibSass.NET.dll" />
   </files>
 </package>
diff --git a/contrib/LibSass.NET.Console/LibSass.NET.Console.csproj b/contrib/LibSass.NET.Console/LibSass.NET.Console.csproj
index 21c6438..7945aaa 100644
--- a/contrib/LibSass.NET.Console/LibSass.NET.Console.csproj
+++ b/contrib/LibSass.NET.Console/LibSass.NET.Console.csproj
@@ -11,13 +11,12 @@
     <AssemblyName>LibSass.NET.Console</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>bin\$(Configuration)\obj\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>512</FileAlignment>
-    <LibSassPath>$(SolutionDir)\bin\$(Configuration)\</LibSassPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,10 +48,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <Copy
-      SourceFiles="$(LibSassPath)libsass32.dll;$(LibSassPath)libsass64.dll"
-      DestinationFolder="$(OutputPath)"
-      SkipUnchangedFiles="true" />
-  </Target>
 </Project>
diff --git a/contrib/LibSass.NET.Web/LibSass.NET.Web.csproj b/contrib/LibSass.NET.Web/LibSass.NET.Web.csproj
index 8283781..919fdc6 100644
--- a/contrib/LibSass.NET.Web/LibSass.NET.Web.csproj
+++ b/contrib/LibSass.NET.Web/LibSass.NET.Web.csproj
@@ -11,13 +11,12 @@
     <AssemblyName>LibSass.NET.Web</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>bin\$(Configuration)\obj\</IntermediateOutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>512</FileAlignment>
-    <LibSassPath>$(SolutionDir)\bin\$(Configuration)\</LibSassPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,10 +55,4 @@
     <None Include="web.config.transform" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <Copy
-      SourceFiles="$(LibSassPath)libsass32.dll;$(LibSassPath)libsass64.dll"
-      DestinationFolder="$(OutputPath)"
-      SkipUnchangedFiles="true" />
-  </Target>
 </Project>