Skip to content

Commit 377ffe8

Browse files
committed
Fixed build script to put 'npm pack' output to artifacts directory
1 parent a828ecf commit 377ffe8

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

build.msbuild

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
</ItemGroup>
55
<PropertyGroup>
66
<NuspecPath>Microsoft.jQuery.Unobtrusive.Validation.nuspec</NuspecPath>
7-
<NpmPackOutputDir>$(MSBuildThisFileDirectory)npmpackoutput\</NpmPackOutputDir>
87
<DistDir>$(MSBuildThisFileDirectory)dist\</DistDir>
98
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts\build\</ArtifactsDir>
109
<WebPackTestDir>$(MSBuildThisFileDirectory)test\webpacktest\</WebPackTestDir>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
14-
<DistDirFiles Include="$(DistDir)*.*"/>
13+
<DistDirFiles Include="$(DistDir)*.*;"/>
1514
</ItemGroup>
1615

1716
<Target Name="Build">
@@ -24,6 +23,7 @@
2423
<Copy
2524
SourceFiles="@(DistDirFiles)"
2625
DestinationFolder="$(ArtifactsDir)" OverwriteReadOnlyFiles="true"/>
26+
<Exec Command="npm pack $(MSBuildThisFileDirectory)" WorkingDirectory="$(ArtifactsDir)" />
2727
<Exec Command="nuget pack $(NuspecPath) -Version $(PackageVersion) -OutputDirectory $(ArtifactsDir)" />
2828

2929
<MSBuild Projects ="$(MSBuildProjectFullPath)"
@@ -33,10 +33,8 @@
3333

3434
<Target Name="Test">
3535
<Message Text="Testing Webpack build..." />
36-
<MakeDir Directories="$(NpmPackOutputDir)" />
37-
<Exec Command="npm pack $(MSBuildThisFileDirectory)" WorkingDirectory="$(NpmPackOutputDir)" />
3836
<Exec Command="npm init -y" WorkingDirectory="$(WebPackTestDir)" />
39-
<Exec Command="npm install $(NpmPackOutputDir)jquery-validation-unobtrusive-$(PackageVersion).tgz --save-dev --force" WorkingDirectory="$(WebPackTestDir)" />
37+
<Exec Command="npm install $(ArtifactsDir)jquery-validation-unobtrusive-$(PackageVersion).tgz --save-dev --force" WorkingDirectory="$(WebPackTestDir)" />
4038
<Exec Command="npm install webpack webpack-cli --save-dev" WorkingDirectory="$(WebPackTestDir)" />
4139
<Exec Command="npx webpack" WorkingDirectory="$(WebPackTestDir)" />
4240
</Target>

0 commit comments

Comments
 (0)