Merge branch 'dev-v3' into master-v3

Author: Claus

build/Build.proj

@@ -96,8 +96,8 @@
 
 	<Target Name="Zip" DependsOnTargets="CopyFiles">
 		<Message Text="Starting to zip to $(BuildDeployPackageFileName)" Importance="high" />
-		<Exec Command="tools\7za.exe a -r %22$(BuildFolder)..\$(BuildDeployPackageFileName)%22 %22$(DeployFolderAbsolutePath)*%22" />
-		<Message Text="Finished zipping to build\$(BuildDeployPackageFileName)" Importance="high" />
+		<Exec Command="tools\7za.exe a -r %22$(BuildFolder)..\$(BuildPackageFileName)%22 %22$(DeployFolderAbsolutePath)*%22" />
+		<Message Text="Finished zipping to build\$(BuildPackageFileName)" Importance="high" />
 	</Target>
 
 	<Target Name="Build" DependsOnTargets="Zip">

build/RunBuild.bat

@@ -23,7 +23,7 @@ ECHO Building UmbracoDeploy.Contrib %version%
 
 RMDIR _BuildOutput /s /q
 DEL UmbracoDeploy.Contrib.*.zip /q
-DEL *.nupkg /q
+DEL UmbracoDeploy.Contrib.*.nupkg /q
 
 ECHO ################################################################
 ECHO Building Umbraco Deploy Contrib
@@ -45,8 +45,6 @@ if exist "%programfiles(x86)%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15
 ECHO MSBUILD is here %MSBUILDPath%
 %MSBUILDPath% "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
 
-DEL .7z /q
-
 ECHO Packing the NuGet release files
 .\tools\NuGet.exe Pack NuSpecs\UmbracoDeploy.Contrib.nuspec -Version %version% -Verbosity quiet