Skip to content

Commit 2fd2886

Browse files
committed
Update Release targets to use configuration and different intermediate dirs
1 parent 83cc049 commit 2fd2886

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

LibSass.NET.Tests/LibSass.NET.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</Target>
126126
-->
127127
<Target Name="AfterBuild">
128-
<Copy SourceFiles="$(SolutionDir)$(OutDir)libsass32.dll" DestinationFiles="$(TargetDir)libsass32.dll" />
129-
<Copy SourceFiles="$(SolutionDir)$(OutDir)libsass64.dll" DestinationFiles="$(TargetDir)libsass64.dll" />
128+
<Copy SourceFiles="$(SolutionDir)$(OutDir)\libsass32.dll" DestinationFolder="$(TargetDir)" />
129+
<Copy SourceFiles="$(SolutionDir)$(OutDir)\libsass64.dll" DestinationFolder="$(TargetDir)" />
130130
</Target>
131131
</Project>

LibSass.NET/LibSass.NET.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2727
<DebugType>pdbonly</DebugType>
2828
<Optimize>true</Optimize>
29-
<OutputPath>$(SolutionDir)bin\</OutputPath>
30-
<IntermediateOutputPath>$(SolutionDir)bin\obj\</IntermediateOutputPath>
29+
<OutputPath>$(SolutionDir)bin\Release\</OutputPath>
30+
<IntermediateOutputPath>$(SolutionDir)bin\Release\obj\</IntermediateOutputPath>
3131
<DefineConstants>TRACE</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
@@ -82,7 +82,7 @@
8282
<Copy SourceFiles="$(OutDir)x64\libsass.dll" DestinationFiles="$(OutDir)libsass64.dll" />
8383
</Target>
8484
<Target Name="BuildLibSass">
85-
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win32;OutDir=$(OutDir)x86\" />
86-
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win64;OutDir=$(OutDir)x64\" />
85+
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win32;OutDir=$(OutDir)x86\;IntDir=$(OutDir)x86\" />
86+
<MSBuild Targets="Build" Projects="..\LibSass\win\libsass.sln" BuildInParallel="true" Properties="Configuration=$(Configuration);Platform=Win64;OutDir=$(OutDir)x64\;IntDir=$(OutDir)x64\" />
8787
</Target>
8888
</Project>

LibSass.NET/LibSass.Net.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<tags>SASS SCSS CSS LibSass</tags>
1414
</metadata>
1515
<files>
16-
<file src="..\bin\x64\libsass.dll" target="build\libsass64.dll" />
17-
<file src="..\bin\x86\libsass.dll" target="build\libsass32.dll" />
16+
<file src="..\bin\$configuration$\libsass64.dll" target="build\libsass64.dll" />
17+
<file src="..\bin\$configuration$\libsass32.dll" target="build\libsass32.dll" />
1818
<file src="libsassnet.targets" target="build\libsassnet.targets" />
19-
<file src="..\bin\LibSass.NET.dll" target="lib\net40\LibSass.NET.dll" />
19+
<file src="..\bin\$configuration$\LibSass.NET.dll" target="lib\net40\LibSass.NET.dll" />
2020
</files>
21-
</package>
21+
</package>

contrib/LibSass.NET.Console/LibSass.NET.Console.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
2222
<OutputPath>bin\Debug\</OutputPath>
23-
<IntermediateOutputPath>$(SolutionDir)bin\Debug\obj\</IntermediateOutputPath>
2423
<DefineConstants>DEBUG;TRACE</DefineConstants>
2524
<ErrorReport>prompt</ErrorReport>
2625
<WarningLevel>4</WarningLevel>
@@ -30,8 +29,7 @@
3029
<PlatformTarget>AnyCPU</PlatformTarget>
3130
<DebugType>pdbonly</DebugType>
3231
<Optimize>true</Optimize>
33-
<OutputPath>bin\</OutputPath>
34-
<IntermediateOutputPath>$(SolutionDir)bin\obj\</IntermediateOutputPath>
32+
<OutputPath>bin\Release\</OutputPath>
3533
<DefineConstants>TRACE</DefineConstants>
3634
<ErrorReport>prompt</ErrorReport>
3735
<WarningLevel>4</WarningLevel>
@@ -60,7 +58,7 @@
6058
</Target>
6159
-->
6260
<Target Name="AfterBuild">
63-
<Copy SourceFiles="$(SolutionDir)$(OutDir)libsass32.dll" DestinationFiles="$(TargetDir)libsass32.dll" />
64-
<Copy SourceFiles="$(SolutionDir)$(OutDir)libsass64.dll" DestinationFiles="$(TargetDir)libsass64.dll" />
61+
<Copy SourceFiles="$(SolutionDir)$(OutDir)\libsass32.dll" DestinationFolder="$(TargetDir)" />
62+
<Copy SourceFiles="$(SolutionDir)$(OutDir)\libsass64.dll" DestinationFolder="$(TargetDir)" />
6563
</Target>
6664
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</Target>
6262
-->
6363
<Target Name="AfterBuild">
64-
<Copy SourceFiles="$(SolutionDir)$(OutDir)libsass32.dll" DestinationFiles="$(TargetDir)libsass32.dll" />
65-
<Copy SourceFiles="$(SolutionDir)$(OutDir)libsass64.dll" DestinationFiles="$(TargetDir)libsass64.dll" />
64+
<Copy SourceFiles="$(SolutionDir)$(OutDir)\libsass32.dll" DestinationFolder="$(TargetDir)" />
65+
<Copy SourceFiles="$(SolutionDir)$(OutDir)\libsass64.dll" DestinationFolder="$(TargetDir)" />
6666
</Target>
6767
</Project>

0 commit comments

Comments
 (0)