Merge pull request #199 from jwittner/dev/2019UWPSupport

Gracefully handle UWP/UWP_IL2CPP components for Unity 2019.x

Author: jwittner

UnitySetup/DSCResources/xUnitySetupInstance/xUnitySetupInstance.psm1

@@ -23,7 +23,7 @@ function Get-TargetResource {
     $setupInstances = Get-UnitySetupInstance | Where-Object { $splitVersions -contains $_.Version }
     $result = @{
         "Versions" = $setupInstances | Select-Object -ExpandProperty Version | Sort-Object -Unique
-        "Ensure"   = if ($setupInstances.Count -gt 0) { 'Present'} else { 'Absent' }
+        "Ensure"   = if ($setupInstances.Count -gt 0) { 'Present' } else { 'Absent' }
     }
 
     Write-Verbose "Found versions: $($result['Versions'])"
@@ -81,7 +81,7 @@ function Set-TargetResource {
             foreach ($version in $splitVersions) {
                 $findArgs = @{ 
                     'Version'    = $version
-                    'Components' = ConvertTo-UnitySetupComponent $Components 
+                    'Components' = ConvertTo-UnitySetupComponent $Components -Version $version
                 }
 
                 $installArgs = @{ 'Cache' = "$env:TEMP\.unitysetup" }
@@ -158,9 +158,9 @@ function Test-TargetResource {
     $result = $true
     switch ( $Ensure ) {
         'Present' {
-            $setupComponents = ConvertTo-UnitySetupComponent $Components
             foreach ($version in $splitVersions) {
                 Write-Verbose "Starting test for $version"
+                $setupComponents = ConvertTo-UnitySetupComponent $Components -Version $version
                 $setupInstances = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $version
                 Write-Verbose "Found $($setupInstances.Count) instance(s) of $version"
 

UnitySetup/UnitySetup.psd1

@@ -14,7 +14,7 @@
     RootModule        = 'UnitySetup'
 
     # Version number of this module.
-    ModuleVersion     = '5.2'
+    ModuleVersion     = '5.3'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

UnitySetup/UnitySetup.psm1

@@ -290,15 +290,38 @@ function Get-UnityEditor {
    Help to create UnitySetupComponent
 .PARAMETER Components
    What components would you like included?
+.PARAMETER Version
+   Allows for conversion that can take into account version restrictions
+   E.g. 2019.x only supports UWP_IL2CPP
 .EXAMPLE
    ConvertTo-UnitySetupComponent Windows,UWP
+.EXAMPLE
+   ConvertTo-UnitySetupComponent Windows,UWP -Version 2019.3.4f1
 #>
 function ConvertTo-UnitySetupComponent {
     [CmdletBinding()]
     param(
         [parameter(Mandatory = $true, Position = 0)]
-        [UnitySetupComponent] $Component
+        [UnitySetupComponent] $Component,
+        [parameter(Mandatory = $false)]
+        [UnityVersion] $Version
     )
+    
+    if ($Version) {
+        if ($Version.Major -ge 2019) {
+            if ($Component -band [UnitySetupComponent]::UWP) {
+                if ( $Component -band [UnitySetupComponent]::UWP_IL2CPP) {
+                    Write-Verbose "2019.x only supports IL2CPP for UWP - removing $([UnitySetupComponent]::UWP)"
+                }
+                else {
+                    Write-Verbose "2019.x only supports IL2CPP for UWP - swapping to $([UnitySetupComponent]::UWP_IL2CPP)"
+                    $Component += [UnitySetupComponent]::UWP_IL2CPP;
+                }
+
+                $Component -= [UnitySetupComponent]::UWP;
+            }
+        }
+    }
 
     $Component
 }
@@ -327,6 +350,8 @@ function Find-UnitySetupInstaller {
         [UnitySetupComponent] $Components = [UnitySetupComponent]::All
     )
 
+    $Components = ConvertTo-UnitySetupComponent -Component $Components -Version $Version
+
     $currentOS = Get-OperatingSystem
     switch ($currentOS) {
         ([OperatingSystem]::Windows) {
@@ -370,6 +395,12 @@ function Find-UnitySetupInstaller {
         [UnitySetupComponent]::Lumin          = , "$targetSupport/UnitySetup-Lumin-Support-for-Editor-$Version.$installerExtension";
     }
 
+    # In 2019.x there is only IL2CPP UWP so change the search for UWP_IL2CPP
+    if ( $Version.Major -ge 2019 ) {
+        $installerTemplates[[UnitySetupComponent]::UWP_IL2CPP] = @(
+            "$targetSupport/UnitySetup-Universal-Windows-Platform-Support-for-Editor-$Version.$installerExtension");
+    }
+
     switch ($currentOS) {
         ([OperatingSystem]::Windows) {
             $setupComponent = [UnitySetupComponent]::Windows
@@ -589,10 +620,11 @@ function Select-UnitySetupInstaller {
         }
 
         # Keep only the matching component(s).
-        $Installers = $Installers | Where-Object { $Components -band $_.ComponentType } | ForEach-Object { $_ }
-
-        if ($Installers.Length -ne 0) {
-            $selectedInstallers += $Installers
+        foreach ($installer in $Installers) {
+            $versionComponents = ConvertTo-UnitySetupComponent $Components -Version $installer.Version
+            if ( $versionComponents -band $_.ComponentType ) {
+                $selectedInstallers += $installer
+            }
         }
     }
     end {