@@ -64,8 +64,8 @@ class UnitySetupInstance {
64
64
[UnitySetupComponent ]::Documentation = , [io.path ]::Combine(" $Path " , " Editor\Data\Documentation" );
65
65
[UnitySetupComponent ]::StandardAssets = , [io.path ]::Combine(" $Path " , " Editor\Standard Assets" );
66
66
[UnitySetupComponent ]::Windows_IL2CPP = , [io.path ]::Combine(" $playbackEnginePath " , " windowsstandalonesupport\Variations\win32_development_il2cpp" );
67
- [UnitySetupComponent ]::UWP = [io.path ]::Combine(" $playbackEnginePath " , " MetroSupport\Templates\UWP_.NET_D3D" ),
68
- [io.path ]::Combine(" $playbackEnginePath " , " MetroSupport\Templates\UWP_D3D" );
67
+ [UnitySetupComponent ]::UWP = [io.path ]::Combine(" $playbackEnginePath " , " MetroSupport\Templates\UWP_.NET_D3D" ),
68
+ [io.path ]::Combine(" $playbackEnginePath " , " MetroSupport\Templates\UWP_D3D" );
69
69
[UnitySetupComponent ]::UWP_IL2CPP = , [io.path ]::Combine(" $playbackEnginePath " , " MetroSupport\Templates\UWP_IL2CPP_D3D" );
70
70
[UnitySetupComponent ]::Linux = , [io.path ]::Combine(" $playbackEnginePath " , " LinuxStandaloneSupport" );
71
71
[UnitySetupComponent ]::Mac = , [io.path ]::Combine(" $playbackEnginePath " , " MacStandaloneSupport" );
@@ -90,12 +90,12 @@ class UnitySetupInstance {
90
90
}
91
91
92
92
# Common playback engines:
93
- $componentTests [[UnitySetupComponent ]::Android ] = , [io.path ]::Combine(" $playbackEnginePath " , " AndroidPlayer" );
94
- $componentTests [[UnitySetupComponent ]::iOS ] = , [io.path ]::Combine(" $playbackEnginePath " , " iOSSupport" );
95
- $componentTests [[UnitySetupComponent ]::AppleTV ] = , [io.path ]::Combine(" $playbackEnginePath " , " AppleTVSupport" );
93
+ $componentTests [[UnitySetupComponent ]::Android ] = , [io.path ]::Combine(" $playbackEnginePath " , " AndroidPlayer" );
94
+ $componentTests [[UnitySetupComponent ]::iOS ] = , [io.path ]::Combine(" $playbackEnginePath " , " iOSSupport" );
95
+ $componentTests [[UnitySetupComponent ]::AppleTV ] = , [io.path ]::Combine(" $playbackEnginePath " , " AppleTVSupport" );
96
96
$componentTests [[UnitySetupComponent ]::Facebook ] = , [io.path ]::Combine(" $playbackEnginePath " , " Facebook" );
97
- $componentTests [[UnitySetupComponent ]::Vuforia ] = , [io.path ]::Combine(" $playbackEnginePath " , " VuforiaSupport" );
98
- $componentTests [[UnitySetupComponent ]::WebGL ] = , [io.path ]::Combine(" $playbackEnginePath " , " WebGLSupport" );
97
+ $componentTests [[UnitySetupComponent ]::Vuforia ] = , [io.path ]::Combine(" $playbackEnginePath " , " VuforiaSupport" );
98
+ $componentTests [[UnitySetupComponent ]::WebGL ] = , [io.path ]::Combine(" $playbackEnginePath " , " WebGLSupport" );
99
99
100
100
$componentTests.Keys | ForEach-Object {
101
101
foreach ( $test in $componentTests [$_ ] ) {
@@ -306,8 +306,8 @@ function Find-UnitySetupInstaller {
306
306
[UnitySetupComponent ]::AppleTV = , " $targetSupport /UnitySetup-AppleTV-Support-for-Editor-$Version .$installerExtension " ;
307
307
[UnitySetupComponent ]::Facebook = , " $targetSupport /UnitySetup-Facebook-Games-Support-for-Editor-$Version .$installerExtension " ;
308
308
[UnitySetupComponent ]::Linux = , " $targetSupport /UnitySetup-Linux-Support-for-Editor-$Version .$installerExtension " ;
309
- [UnitySetupComponent ]::Mac = " $targetSupport /UnitySetup-Mac-Support-for-Editor-$Version .$installerExtension " ,
310
- " $targetSupport /UnitySetup-Mac-Mono-Support-for-Editor-$Version .$installerExtension " ;
309
+ [UnitySetupComponent ]::Mac = " $targetSupport /UnitySetup-Mac-Support-for-Editor-$Version .$installerExtension " ,
310
+ " $targetSupport /UnitySetup-Mac-Mono-Support-for-Editor-$Version .$installerExtension " ;
311
311
[UnitySetupComponent ]::Mac_IL2CPP = , " $targetSupport /UnitySetup-Mac-IL2CPP-Support-for-Editor-$Version .$installerExtension " ;
312
312
[UnitySetupComponent ]::Vuforia = , " $targetSupport /UnitySetup-Vuforia-AR-Support-for-Editor-$Version .$installerExtension " ;
313
313
[UnitySetupComponent ]::WebGL = , " $targetSupport /UnitySetup-WebGL-Support-for-Editor-$Version .$installerExtension " ;
@@ -1075,8 +1075,8 @@ function Get-UnitySetupInstance {
1075
1075
}
1076
1076
}
1077
1077
1078
- Get-ChildItem $BasePath - Directory | Where-Object {
1079
- Test-Path (Join-Path $_.FullName ' Editor\Unity.exe' ) - PathType Leaf
1078
+ Get-ChildItem $BasePath - Directory | Where-Object {
1079
+ Test-Path (Join-Path $_.FullName ' Editor\Unity.exe' ) - PathType Leaf
1080
1080
} | ForEach-Object {
1081
1081
$path = $_.FullName
1082
1082
try {
@@ -1126,7 +1126,7 @@ function Get-UnitySetupInstanceVersion {
1126
1126
return [UnityVersion ]$Matches [0 ]
1127
1127
}
1128
1128
}
1129
-
1129
+
1130
1130
if ( Test-Path " $path \Editor" - PathType Container ) {
1131
1131
# We'll attempt to search for the version using the ivy.xml definitions for legacy editor compatibility.
1132
1132
@@ -1136,12 +1136,12 @@ function Get-UnitySetupInstanceVersion {
1136
1136
if ( $null -eq $ivy ) { continue ; }
1137
1137
1138
1138
Write-Verbose " `t Looking for version in $ ( $ivy.FullName ) "
1139
-
1139
+
1140
1140
[xml ]$xmlDoc = Get-Content $ivy.FullName
1141
1141
1142
1142
[string ]$version = $xmlDoc .' ivy-module' .info.unityVersion
1143
1143
if ( -not $version ) { continue ; }
1144
-
1144
+
1145
1145
Write-Verbose " `t Found version!"
1146
1146
return [UnityVersion ]$version
1147
1147
}
0 commit comments