File tree 1 file changed +3
-5
lines changed 1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change 4
4
</ItemGroup>
5
5
<PropertyGroup>
6
6
<NuspecPath>Microsoft.jQuery.Unobtrusive.Validation.nuspec</NuspecPath>
7
- <NpmPackOutputDir>$(MSBuildThisFileDirectory)npmpackoutput\</NpmPackOutputDir>
8
7
<DistDir>$(MSBuildThisFileDirectory)dist\</DistDir>
9
8
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts\build\</ArtifactsDir>
10
9
<WebPackTestDir>$(MSBuildThisFileDirectory)test\webpacktest\</WebPackTestDir>
11
10
</PropertyGroup>
12
11
13
12
<ItemGroup>
14
- <DistDirFiles Include="$(DistDir)*.*"/>
13
+ <DistDirFiles Include="$(DistDir)*.*; "/>
15
14
</ItemGroup>
16
15
17
16
<Target Name="Build">
24
23
<Copy
25
24
SourceFiles="@(DistDirFiles)"
26
25
DestinationFolder="$(ArtifactsDir)" OverwriteReadOnlyFiles="true"/>
26
+ <Exec Command="npm pack $(MSBuildThisFileDirectory)" WorkingDirectory="$(ArtifactsDir)" />
27
27
<Exec Command="nuget pack $(NuspecPath) -Version $(PackageVersion) -OutputDirectory $(ArtifactsDir)" />
28
28
29
29
<MSBuild Projects ="$(MSBuildProjectFullPath)"
33
33
34
34
<Target Name="Test">
35
35
<Message Text="Testing Webpack build..." />
36
- <MakeDir Directories="$(NpmPackOutputDir)" />
37
- <Exec Command="npm pack $(MSBuildThisFileDirectory)" WorkingDirectory="$(NpmPackOutputDir)" />
38
36
<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)" />
40
38
<Exec Command="npm install webpack webpack-cli --save-dev" WorkingDirectory="$(WebPackTestDir)" />
41
39
<Exec Command="npx webpack" WorkingDirectory="$(WebPackTestDir)" />
42
40
</Target>
You can’t perform that action at this time.
0 commit comments