add NonInteractive to nuget restore

lib/templates/deploy.batch.aspnet.template

@@ -7,7 +7,3 @@ IF DEFINED CLEAN_LOCAL_DEPLOYMENT_TEMP (
   IF EXIST "%DEPLOYMENT_TEMP%" rd /s /q "%DEPLOYMENT_TEMP%"
   mkdir "%DEPLOYMENT_TEMP%"
 )
-
-IF DEFINED MSBUILD_PATH goto MsbuildPathDefined
-SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
-:MsbuildPathDefined

lib/templates/deploy.batch.aspnet.wap.template

@@ -7,15 +7,15 @@ echo Handling .NET Web Application deployment.
 
 :: 1. Restore NuGet packages
 IF /I "{SolutionPath}" NEQ "" (
-  call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\{SolutionPath}"
+  call :ExecuteCmd %NUGETRESTORE% "%DEPLOYMENT_SOURCE%\{SolutionPath}"
   IF !ERRORLEVEL! NEQ 0 goto error
 )
 
 :: 2. Build to the temporary path
 IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" (
-  call :ExecuteCmd "%MSBUILD_PATH%" {MSBuildArguments}
+  call :ExecuteCmd "%MSBUILD_DIR%\MSBuild.exe" {MSBuildArguments}
 ) ELSE (
-  call :ExecuteCmd "%MSBUILD_PATH%" {MSBuildArgumentsForInPlace}
+  call :ExecuteCmd "%MSBUILD_DIR%\MSBuild.exe" {MSBuildArgumentsForInPlace}
 )
 
 IF !ERRORLEVEL! NEQ 0 goto error

lib/templates/deploy.batch.aspnet.website.template

@@ -6,7 +6,7 @@
 echo Handling .NET Web Site deployment.
 
 :: 1. Build to the repository path
-call :ExecuteCmd "%MSBUILD_PATH%" {MSBuildArguments}
+call :ExecuteCmd "%MSBUILD_DIR%\MSBuild.exe" {MSBuildArguments}
 IF !ERRORLEVEL! NEQ 0 goto error
 
 :: 2. KuduSync

lib/templates/deploy.batch.dotnetconsole.template

@@ -7,12 +7,12 @@ echo Handling .NET Console Application deployment.
 
 :: 1. Restore NuGet packages
 IF /I "{SolutionPath}" NEQ "" (
-  call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\{SolutionPath}" -MSBuildPath "%MSBUILD_15_DIR%"
+  call :ExecuteCmd %NUGETRESTORE% "%DEPLOYMENT_SOURCE%\{SolutionPath}" 
   IF !ERRORLEVEL! NEQ 0 goto error
 )
 
 :: 2. Build to the temporary path
-call :ExecuteCmd "%MSBUILD_15_DIR%\MSBuild.exe" {MSBuildArguments}
+call :ExecuteCmd "%MSBUILD_DIR%\MSBuild.exe" {MSBuildArguments}
 IF !ERRORLEVEL! NEQ 0 goto error
 
 :: 3. Run web job deploy script

lib/templates/deploy.batch.functionmsbuild.template

@@ -2,13 +2,14 @@
 :: Deployment
 :: ----------
 echo Handling function App deployment with Msbuild.
+:: only works with msbuild15
 
 :: 1. Restore nuget packages
-call :ExecuteCmd nuget.exe restore "%DEPLOYMENT_SOURCE%\{RestoreArguments}" -MSBuildPath "%MSBUILD_15_DIR%"
+call :ExecuteCmd %NUGETRESTORE% "%DEPLOYMENT_SOURCE%\{RestoreArguments}"
 IF !ERRORLEVEL! NEQ 0 goto error
 
 :: 2. Build and publish
-call :ExecuteCmd "%MSBUILD_15_DIR%\MSBuild.exe" "%DEPLOYMENT_SOURCE%\{ProjectPath}" /p:DeployOnBuild=true /p:configuration=Release /p:publishurl="%DEPLOYMENT_TEMP%" %SCM_BUILD_ARGS%
+call :ExecuteCmd "%MSBUILD_DIR%\MSBuild.exe" "%DEPLOYMENT_SOURCE%\{ProjectPath}" /p:DeployOnBuild=true /p:configuration=Release /p:publishurl="%DEPLOYMENT_TEMP%" %SCM_BUILD_ARGS%
 IF !ERRORLEVEL! NEQ 0 goto error
 
 :: 3. KuduSync

lib/templates/deploy.batch.prefix.template

@@ -21,6 +21,23 @@ IF %ERRORLEVEL% NEQ 0 (
 setlocal enabledelayedexpansion
 
 SET ARTIFACTS=%~dp0%..\artifacts
+:: select msbuild version
+IF NOT DEFINED MSBUILD_VERSION GOTO useMsbuild15
+IF %MSBUILD_VERSION% == "15" GOTO useMsbuild15
+IF %MSBUILD_VERSION% == "14" GOTO useMsbuild14
+:: defined an invalid version
+GOTO error
+
+:useMsbuild15
+SET MSBUILD_DIR = %MSBUILD_15_DIR%
+GOTO nugetRestore
+
+:useMsbuild14
+SET MSBUILD_DIR = %MSBUILD_14_DIR%
+GOTO nugetRestore
+
+:nugetRestore
+SET NUGETRESTORE=nuget restore -NonInteractive -MSBuildPath "%MSBUILD_DIR%"
 
 IF NOT DEFINED DEPLOYMENT_SOURCE (
   SET DEPLOYMENT_SOURCE=%~dp0%.

lib/templates/deploy.posh.aspnet.template

@@ -1,6 +1,5 @@
 
 $DEPLOYMENT_TEMP = $env:DEPLOYMENT_TEMP
-$MSBUILD_PATH = $env:MSBUILD_PATH
 
 if ($DEPLOYMENT_TEMP -eq $null) {
   $DEPLOYMENT_TEMP = "$env:temp\___deployTemp$env:random"
@@ -13,7 +12,3 @@ if ($CLEAN_LOCAL_DEPLOYMENT_TEMP -eq $true) {
   }
   mkdir "$DEPLOYMENT_TEMP"
 }
-
-if ($MSBUILD_PATH -eq $null) {
-  $MSBUILD_PATH = "${env:ProgramFiles(x86)}\MSBuild\14.0\Bin\MSBuild.exe"
-}

lib/templates/deploy.posh.aspnet.wap.template

@@ -7,15 +7,15 @@ echo "Handling .NET Web Application deployment."
 
 # 1. Restore NuGet packages
 if (Test-Path "{SolutionPath}") {
-  nuget restore "$DEPLOYMENT_SOURCE\{SolutionPath}"
+  $NUGETRESTORE "$DEPLOYMENT_SOURCE\{SolutionPath}"
   exitWithMessageOnError "NuGet restore failed"
 }
 
 # 2. Build to the temporary path
 if ($env:IN_PLACE_DEPLOYMENT -ne "1") {
-  & "$MSBUILD_PATH" {MSBuildArguments}
+  & "$MSBUILD_DIR\MSBuild.exe" {MSBuildArguments}
 } else {
-  & "$MSBUILD_PATH" {MSBuildArgumentsForInPlace}
+  & "$MSBUILD_DIR\MSBuild.exe" {MSBuildArgumentsForInPlace}
 }
 
 exitWithMessageOnError "MSBuild failed"

lib/templates/deploy.posh.aspnet.website.template

@@ -6,7 +6,7 @@
 echo "Handling .NET Web Site deployment."
 
 # 1. Build to the repository path
-& "$MSBUILD_PATH" {MSBuildArguments}
+& "$MSBUILD_DIR\MSBuild.exe" {MSBuildArguments}
 exitWithMessageOnError "MSBuild failed"
 
 # 2. KuduSync

lib/templates/deploy.posh.dotnetconsole.template

@@ -7,12 +7,12 @@ echo "Handling .NET Console Application deployment."
 
 # 1. Restore NuGet packages
 if (Test-Path "{SolutionPath}") {
-  nuget restore "$DEPLOYMENT_SOURCE\{SolutionPath}"
+  $NUGETRESTORE "$DEPLOYMENT_SOURCE\{SolutionPath}"
   exitWithMessageOnError "NuGet restore failed"
 }
 
 # 2. Build to the temporary path
-& "$MSBUILD_PATH" {MSBuildArguments}
+& "$MSBUILD_DIR\MSBuild.exe" {MSBuildArguments}
 exitWithMessageOnError "MSBuild failed"
 
 # 3. Run web job deploy script

lib/templates/deploy.posh.prefix.template

@@ -35,6 +35,14 @@ $DEPLOYMENT_TARGET = $env:DEPLOYMENT_TARGET
 
 $NEXT_MANIFEST_PATH = $env:NEXT_MANIFEST_PATH
 $PREVIOUS_MANIFEST_PATH = $env:PREVIOUS_MANIFEST_PATH
+if ($env:MSBUILD_VERSION -eq $null -Or $env:MSBUILD_VERSION -eq "15") {
+  $MSBUILD_DIR = $env:MSBUILD_15_DIR
+} ElseIf ($env:MSBUILD_VERSION -eq "14") {
+  $MSBUILD_DIR = $env:MSBUILD_14_DIR
+} Else {
+  exitWithMessageOnError "MSBUILD_VERSION is invalid, it needs to be either 14 or 15"
+}
+$NUGETRESTORE = "nuget restore -NonInteractive -MSBuildPath `"$MSBUILD_DIR`""
 
 if ($DEPLOYMENT_SOURCE -eq $null) {
   $DEPLOYMENT_SOURCE = $SCRIPT_DIR