Set ScriptsPath variables in compressor targets

vtfuture · Jul 19, 2016 · ed1d0b8 · ed1d0b8
1 parent f130ae0
commit ed1d0b8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/RequireJsNet.Compressor/RequireJsNet.Compressor.targets b/RequireJsNet.Compressor/RequireJsNet.Compressor.targets
@@ -12,7 +12,9 @@
     <RequireJsNetAutoCompressor Condition="$(RequireJsNetAutoCompressor) == ''">true</RequireJsNetAutoCompressor>
     <RequireJsNetEncodingType Condition="$(RequireJsNetEncodingType) == ''">UTF8</RequireJsNetEncodingType>
     <RequireJsNetProjectPath Condition="$(RequireJsNetProjectPath) == ''">$(MSBuildProjectDirectory)</RequireJsNetProjectPath>
+    <RequireJsNetScriptsPath Condition="$(RequireJsNetScriptsPath) == ''">$(MSBuildProjectDirectory)\Scripts\</RequireJsNetScriptsPath>
     <RequireJsNetProjectPathForDeploy Condition="$(RequireJsNetProjectPathForDeploy) == ''">$(_PackageTempDir)</RequireJsNetProjectPathForDeploy>
+    <RequireJsNetScriptsPathForDeploy Condition="$(RequireJsNetScriptsPathForDeploy) == ''">$(_PackageTempDir)\Scripts\</RequireJsNetScriptsPathForDeploy>
     <RequireJsNetEntryPointOverride Condition="$(RequireJsNetEntryPointOverride) == ''">$(MSBuildProjectDirectory)\Scripts\</RequireJsNetEntryPointOverride>
     <!--<BuildDependsOn>
       RequireJsNetMinify;
@@ -34,6 +36,7 @@
       AutoCompressor="$(RequireJsNetAutoCompressor)"
       EncodingType="$(RequireJsNetEncodingType)"
       ProjectPath="$(RequireJsNetProjectPath)"
+      PackagePath="$(RequireJsNetScriptsPath)"
       EntryPointOverride="$(RequireJsNetEntryPointOverride)" />
   </Target>
 
@@ -44,7 +47,7 @@
       AutoCompressor="$(RequireJsNetAutoCompressor)"
       EncodingType="$(RequireJsNetEncodingType)"
       ProjectPath="$(RequireJsNetProjectPathForDeploy)"
-      PackagePath="$(RequireJsNetProjectPathForDeploy)\Scripts\"
+      PackagePath="$(RequireJsNetScriptsPathForDeploy)"
       EntryPointOverride="$(RequireJsNetEntryPointOverride)" />
   </Target>
 </Project>