Skip to content

Commit ed1d0b8

Browse files
committed
Set ScriptsPath variables in compressor targets
1 parent f130ae0 commit ed1d0b8

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

RequireJsNet.Compressor/RequireJsNet.Compressor.targets

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<RequireJsNetAutoCompressor Condition="$(RequireJsNetAutoCompressor) == ''">true</RequireJsNetAutoCompressor>
1313
<RequireJsNetEncodingType Condition="$(RequireJsNetEncodingType) == ''">UTF8</RequireJsNetEncodingType>
1414
<RequireJsNetProjectPath Condition="$(RequireJsNetProjectPath) == ''">$(MSBuildProjectDirectory)</RequireJsNetProjectPath>
15+
<RequireJsNetScriptsPath Condition="$(RequireJsNetScriptsPath) == ''">$(MSBuildProjectDirectory)\Scripts\</RequireJsNetScriptsPath>
1516
<RequireJsNetProjectPathForDeploy Condition="$(RequireJsNetProjectPathForDeploy) == ''">$(_PackageTempDir)</RequireJsNetProjectPathForDeploy>
17+
<RequireJsNetScriptsPathForDeploy Condition="$(RequireJsNetScriptsPathForDeploy) == ''">$(_PackageTempDir)\Scripts\</RequireJsNetScriptsPathForDeploy>
1618
<RequireJsNetEntryPointOverride Condition="$(RequireJsNetEntryPointOverride) == ''">$(MSBuildProjectDirectory)\Scripts\</RequireJsNetEntryPointOverride>
1719
<!--<BuildDependsOn>
1820
RequireJsNetMinify;
@@ -34,6 +36,7 @@
3436
AutoCompressor="$(RequireJsNetAutoCompressor)"
3537
EncodingType="$(RequireJsNetEncodingType)"
3638
ProjectPath="$(RequireJsNetProjectPath)"
39+
PackagePath="$(RequireJsNetScriptsPath)"
3740
EntryPointOverride="$(RequireJsNetEntryPointOverride)" />
3841
</Target>
3942

@@ -44,7 +47,7 @@
4447
AutoCompressor="$(RequireJsNetAutoCompressor)"
4548
EncodingType="$(RequireJsNetEncodingType)"
4649
ProjectPath="$(RequireJsNetProjectPathForDeploy)"
47-
PackagePath="$(RequireJsNetProjectPathForDeploy)\Scripts\"
50+
PackagePath="$(RequireJsNetScriptsPathForDeploy)"
4851
EntryPointOverride="$(RequireJsNetEntryPointOverride)" />
4952
</Target>
5053
</Project>

0 commit comments

Comments
 (0)