Fixed build script to put 'npm pack' output to artifacts directory

Author: kichalla

build.msbuild

@@ -4,14 +4,13 @@
     </ItemGroup>
     <PropertyGroup>
         <NuspecPath>Microsoft.jQuery.Unobtrusive.Validation.nuspec</NuspecPath>
-        <NpmPackOutputDir>$(MSBuildThisFileDirectory)npmpackoutput\</NpmPackOutputDir>
         <DistDir>$(MSBuildThisFileDirectory)dist\</DistDir>
         <ArtifactsDir>$(MSBuildThisFileDirectory)artifacts\build\</ArtifactsDir>
         <WebPackTestDir>$(MSBuildThisFileDirectory)test\webpacktest\</WebPackTestDir>
     </PropertyGroup>
 
     <ItemGroup>
-        <DistDirFiles Include="$(DistDir)*.*"/>
+        <DistDirFiles Include="$(DistDir)*.*;"/>
     </ItemGroup>
 
     <Target Name="Build">
@@ -24,6 +23,7 @@
         <Copy
             SourceFiles="@(DistDirFiles)"
             DestinationFolder="$(ArtifactsDir)" OverwriteReadOnlyFiles="true"/>
+        <Exec Command="npm pack $(MSBuildThisFileDirectory)" WorkingDirectory="$(ArtifactsDir)" />
         <Exec Command="nuget pack $(NuspecPath) -Version $(PackageVersion) -OutputDirectory $(ArtifactsDir)" />
 
         <MSBuild Projects ="$(MSBuildProjectFullPath)"
@@ -33,10 +33,8 @@
 
     <Target Name="Test">
         <Message Text="Testing Webpack build..." />
-        <MakeDir Directories="$(NpmPackOutputDir)" />
-        <Exec Command="npm pack $(MSBuildThisFileDirectory)" WorkingDirectory="$(NpmPackOutputDir)" />
         <Exec Command="npm init -y" WorkingDirectory="$(WebPackTestDir)" />
-        <Exec Command="npm install $(NpmPackOutputDir)jquery-validation-unobtrusive-$(PackageVersion).tgz --save-dev --force" WorkingDirectory="$(WebPackTestDir)" />
+        <Exec Command="npm install $(ArtifactsDir)jquery-validation-unobtrusive-$(PackageVersion).tgz --save-dev --force" WorkingDirectory="$(WebPackTestDir)" />
         <Exec Command="npm install webpack webpack-cli --save-dev" WorkingDirectory="$(WebPackTestDir)" />
         <Exec Command="npx webpack" WorkingDirectory="$(WebPackTestDir)" />
     </Target>