feat(): Add functions for VS 2022 (#22)

Allows installation as well as usage of Visual Studio 2022.

Author: donny-dont

WebKitDev/Functions/Get-VSBuildTools2022InstallationPath.ps1

@@ -0,0 +1,47 @@
+# Copyright (c) 2021, the WebKit for Windows project authors.  Please see the
+# AUTHORS file for details. All rights reserved. Use of this source code is
+# governed by a BSD-style license that can be found in the LICENSE file.
+
+<#
+  .Synopsis
+  Retrieves the location of a Visual Studio Build Tools 2022 installation.
+
+  .Description
+  Interacts with Visual Studio Setup to find an instance of Visual Studio 2022.
+  If not found the default path will be returned.
+
+  The path should be tested before using. No error checking is performed.
+#>
+Function Get-VSBuildTools2022InstallationPath {
+    $installs = Get-VSSetupInstance;
+
+    foreach ($install in $installs) {
+        if ($install.DisplayName -eq 'Visual Studio Build Tools 2022') {
+            return $install.InstallationPath;
+        }
+    }
+
+    # If the Build Tools are not found, try Enterprise, then Professional, and
+    # then Community.
+    # These packages all contain the Build Tools as a component.
+    foreach ($install in $installs) {
+        if ($install.DisplayName -eq 'Visual Studio Enterprise 2022') {
+            return $install.InstallationPath;
+        }
+    }
+
+    foreach ($install in $installs) {
+        if ($install.DisplayName -eq 'Visual Studio Professional 2022') {
+            return $install.InstallationPath;
+        }
+    }
+
+    foreach ($install in $installs) {
+        if ($install.DisplayName -eq 'Visual Studio Community 2022') {
+            return $install.InstallationPath;
+        }
+    }
+
+    # Return the default path
+    return 'C:\Program Files\Microsoft Visual Studio\2022\BuildTools';
+}

WebKitDev/Functions/Get-VSBuildTools2022VCVarsAllPath.ps1

@@ -0,0 +1,19 @@
+# Copyright (c) 2021, the WebKit for Windows project authors.  Please see the
+# AUTHORS file for details. All rights reserved. Use of this source code is
+# governed by a BSD-style license that can be found in the LICENSE file.
+
+<#
+  .Synopsis
+  Retrieves the location for `vcvarsall.bat` within Visual Studio Build
+  Tools 2022.
+
+  .Description
+  Retrieves the location of a Visual Studio Build Tools 2022 install and
+  appends the path to `vcvarsall.bat`.
+
+  The path should be tested before attempting to call the executable. No error
+  checking is performed.
+#>
+Function Get-VSBuildTools2022VCVarsAllPath {
+    return (Join-Path (Get-VSBuildTools2022InstallationPath) 'VC\Auxiliary\Build\vcvarsall.bat');
+}

WebKitDev/Functions/Install-VSBuildTools2022.ps1

@@ -0,0 +1,42 @@
+# Copyright (c) 2021, the WebKit for Windows project authors.  Please see the
+# AUTHORS file for details. All rights reserved. Use of this source code is
+# governed by a BSD-style license that can be found in the LICENSE file.
+
+<#
+  .Synopsis
+  Installs Visual Studio Build Tools 2022.
+
+  .Description
+  Downloads VS Build Tools and installs it silently on the host.
+
+  .Parameter InstallationPath
+  The location to install to.
+#>
+Function Install-VSBuildTools2022 {
+    Param(
+        [Parameter()]
+        [string[]] $workloads = @('Microsoft.VisualStudio.Workload.VCTools'),
+        [Parameter()]
+        [AllowNull()]
+        [string] $installationPath
+    )
+
+    $url = 'https://aka.ms/vs/17/release/vs_BuildTools.exe';
+
+    $options = @(
+        '--quiet',
+        '--norestart',
+        '--nocache',
+        '--wait'
+    );
+
+    foreach ($workload in $workloads) {
+        $options += @('--add', $workload);
+    }
+
+    if ($installationPath) {
+        $options += @('--installPath', $installationPath);
+    }
+
+    Install-FromExe -Name 'VSBuildTools2022' -Url $url -Options $options -NoVerify;
+}

WebKitDev/Functions/Select-VSEnvironment.ps1

@@ -21,14 +21,18 @@ Function Select-VSEnvironment {
     param(
         [ValidateSet('x86', 'amd64')]
         [string] $architecture = 'amd64',
-        [ValidateSet('vs2015', 'vs2017', 'vs2019')]
+        [ValidateSet('vs2015', 'vs2017', 'vs2019', 'vs2022')]
         [AllowNull()]
         [string] $version
     )
 
     # Find version if not specified
     if (!$version) {
-        if (Test-Path (Get-VSBuildTools2019InstallationPath)) {
+        if (Test-Path (Get-VSBuildTools2022InstallationPath)) {
+            Write-Host 'Found VS2022 Build Tools';
+            $version = 'vs2022';
+        }
+        elseif (Test-Path (Get-VSBuildTools2019InstallationPath)) {
             Write-Host 'Found VS2019 Build Tools';
             $version = 'vs2019';
         }
@@ -49,7 +53,10 @@ Function Select-VSEnvironment {
     # Get vcvarsall.bat path
     $vcvars = $null;
 
-    if ($version -eq 'vs2019') {
+    if ($version -eq 'vs2022') {
+        $vcvars = Get-VSBuildTools2022VCVarsAllPath;
+    }
+    elseif ($version -eq 'vs2019') {
         $vcvars = Get-VSBuildTools2019VCVarsAllPath;
     }
     elseif ($version -eq 'vs2017') {

WebKitDev/WebKitDev.psd1

@@ -78,6 +78,8 @@
         'Functions/Get-VSBuildTools2017VCVarsAllPath.ps1',
         'Functions/Get-VSBuildTools2019InstallationPath.ps1',
         'Functions/Get-VSBuildTools2019VCVarsAllPath.ps1',
+        'Functions/Get-VSBuildTools2022InstallationPath.ps1',
+        'Functions/Get-VSBuildTools2022VCVarsAllPath.ps1',
         'Functions/Get-WebKitGitHubUrl.ps1',
         'Functions/Get-WebKitGitUrl.ps1',
         'Functions/Get-WebKitSVNSnapshotUrl.ps1',
@@ -113,6 +115,7 @@
         'Functions/Install-VSBuildTools2015.ps1',
         'Functions/Install-VSBuildTools2017.ps1',
         'Functions/Install-VSBuildTools2019.ps1',
+        'Functions/Install-VSBuildTools2022.ps1',
         'Functions/Install-Windows10SDK.ps1',
         'Functions/Invoke-CMakeBuild.ps1',
         'Functions/Invoke-WebFileRequest.ps1',
@@ -135,6 +138,8 @@
         'Get-VSBuildTools2017VCVarsAllPath',
         'Get-VSBuildTools2019InstallationPath',
         'Get-VSBuildTools2019VCVarsAllPath',
+        'Get-VSBuildTools2022InstallationPath',
+        'Get-VSBuildTools2022VCVarsAllPath',
         'Get-WebKitGitHubUrl',
         'Get-WebKitGitUrl',
         'Get-WebKitSVNSnapshotUrl',
@@ -169,6 +174,7 @@
         'Install-VSBuildTools2015',
         'Install-VSBuildTools2017',
         'Install-VSBuildTools2019',
+        'Install-VSBuildTools2022',
         'Install-Windows10SDK',
         'Install-Xampp',
         'Invoke-CMakeBuild',