Attempt to fix command line parameters and reduce disk usage by not installing a bunch of random Win 10 SDKs
@@ -35,13 +35,12 @@ if NOT exist "%VSINSTALLER%" (
set VSINSTALLER=vs_buildtools.exe
)
echo Visual Studio installer:
-echo "%VSINSTALLER%"
+echo %VSINSTALLER%
REM Install optional components required for ARM build - vs2017-BuildTools
if exist "%VSINSTALLDIR%" (
echo Running Visual Studio installer..
- "%VSINSTALLER%" ^
- modify --installPath "%VSINSTALLDIR%" -q ^
+ "%VSINSTALLER%" modify --installPath "%VSINSTALLDIR%" -q ^
--add Microsoft.Component.MSBuild ^
--add Microsoft.VisualStudio.Component.Roslyn.Compiler ^
--add Microsoft.VisualStudio.Component.TextTemplating ^
@@ -66,14 +65,10 @@ if exist "%VSINSTALLDIR%" (
--add Microsoft.VisualStudio.Component.VC.Tools.ARM ^
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 ^
- --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 ^
--add Microsoft.VisualStudio.Component.VC.v141.ARM ^
--add Microsoft.VisualStudio.Component.VC.v141.ARM64 ^
--add Microsoft.VisualStudio.Component.VC.v141.x86.x64 ^
--add Microsoft.VisualStudio.Component.Windows10SDK ^
- --add Microsoft.VisualStudio.Component.Windows10SDK.16299 ^
- --add Microsoft.VisualStudio.Component.Windows10SDK.17134 ^
- --add Microsoft.VisualStudio.Component.Windows10SDK.17763 ^
--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core ^
--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang ^
--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81 ^
@@ -81,7 +76,7 @@ if exist "%VSINSTALLDIR%" (
--add Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141.BuildTools ^
--add Microsoft.VisualStudio.Workload.VCTools ^
--add Microsoft.VisualStudio.Component.UWP.VC.ARM64 ^
- --passive --quiet --norestart --noUpdateInstaller
+--norestart --noUpdateInstaller
)
where /Q vcpkg.exe
