Skip to content

Commit 128789e

Browse files
derekfreedderekfreed
authored
Merge pull request microsoft#118 from jwittner/fix/uwpInstallerSupport
Support newer UWP installers
2 parents af1bd39 + 2b4b6f5 commit 128789e

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

‎README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ Get-UnitySetupInstance
3030
# Example output:
3131
# Version Components Path
3232
# ------- ---------- ----
33-
# 2017.1.2f1 Windows, Metro, UWP_IL2CPP C:\Program Files\Unity-2017.1.2f1\
34-
# 2017.1.3f1 Windows, Metro, UWP_IL2CPP C:\Program Files\Unity-2017.1.3f1\
35-
# 2017.2.1f1 Windows, Metro, UWP_IL2CPP C:\Program Files\Unity-2017.2.1f1\
36-
# 2017.3.1f1 Windows, Metro, UWP_IL2CPP, Linux, Vuforia C:\Program Files\Unity-2017.3.1f1\
37-
# 2018.1.0b4 Windows, Metro, UWP_IL2CPP, Vuforia C:\Program Files\Unity-2018.1.0b4\
33+
# 2017.1.2f1 Windows, UWP, UWP_IL2CPP C:\Program Files\Unity-2017.1.2f1\
34+
# 2017.1.3f1 Windows, UWP, UWP_IL2CPP C:\Program Files\Unity-2017.1.3f1\
35+
# 2017.2.1f1 Windows, UWP, UWP_IL2CPP C:\Program Files\Unity-2017.2.1f1\
36+
# 2017.3.1f1 Windows, UWP, UWP_IL2CPP, Linux, Vuforia C:\Program Files\Unity-2017.3.1f1\
37+
# 2018.1.0b4 Windows, UWP, UWP_IL2CPP, Vuforia C:\Program Files\Unity-2018.1.0b4\
3838
# 2018.1.0b8 All C:\Program Files\Unity-2018.1.0b8\
39-
# 2017.1.0p5 Windows, Metro, UWP_IL2CPP C:\Program Files\Unity.2017.1.0p5\
40-
# 2017.1.1f1 Windows, Metro, UWP_IL2CPP C:\Program Files\Unity.2017.1.1f1\
41-
# 2017.1.1p3 Windows, StandardAssets, Metro, UWP_IL2CPP C:\Program Files\Unity.2017.1.1p3\
42-
# 2017.2.0f3 Windows, Metro, UWP_IL2CPP, Vuforia C:\Program Files\Unity.2017.2.0f3\
43-
# 2017.3.0f3 Windows, Metro, UWP_IL2CPP, Mac, Vuforia C:\Program Files\Unity.2017.3.0f3\
39+
# 2017.1.0p5 Windows, UWP, UWP_IL2CPP C:\Program Files\Unity.2017.1.0p5\
40+
# 2017.1.1f1 Windows, UWP, UWP_IL2CPP C:\Program Files\Unity.2017.1.1f1\
41+
# 2017.1.1p3 Windows, StandardAssets, UWP, UWP_IL2CPP C:\Program Files\Unity.2017.1.1p3\
42+
# 2017.2.0f3 Windows, UWP, UWP_IL2CPP, Vuforia C:\Program Files\Unity.2017.2.0f3\
43+
# 2017.3.0f3 Windows, UWP, UWP_IL2CPP, Mac, Vuforia C:\Program Files\Unity.2017.3.0f3\
4444
```
4545

4646
Select the Unity installs that you want:
@@ -85,7 +85,7 @@ Find-UnitySetupInstaller -Version '2017.3.0f3' | Format-Table
8585
# Mac 2017.3.0f3 28103888 12/18/2017 8:06:53 AM https://download.unity3d.com/download_unity/...
8686
# Documentation 2017.3.0f3 358911256 12/18/2017 8:07:34 AM https://download.unity3d.com/download_unity/...
8787
# StandardAssets 2017.3.0f3 189886032 12/18/2017 8:05:50 AM https://download.unity3d.com/download_unity/...
88-
# Metro 2017.3.0f3 172298008 12/18/2017 8:07:04 AM https://download.unity3d.com/download_unity/...
88+
# UWP 2017.3.0f3 172298008 12/18/2017 8:07:04 AM https://download.unity3d.com/download_unity/...
8989
# UWP_IL2CPP 2017.3.0f3 152933480 12/18/2017 8:07:10 AM https://download.unity3d.com/download_unity/...
9090
# Android 2017.3.0f3 194240888 12/18/2017 8:05:58 AM https://download.unity3d.com/download_unity/...
9191
# iOS 2017.3.0f3 802853872 12/18/2017 8:06:46 AM https://download.unity3d.com/download_unity/...
@@ -156,7 +156,7 @@ Configuration Sample_xUnitySetupInstance_Install {
156156
157157
xUnitySetupInstance Unity {
158158
Versions = '2017.4.2f2,2018.1.0f2'
159-
Components = 'Windows', 'Mac', 'Linux', 'Metro', 'iOS'
159+
Components = 'Windows', 'Mac', 'Linux', 'UWP', 'iOS'
160160
Ensure = 'Present'
161161
}
162162

‎UnitySetup/Examples/Sample_xUnity.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Configuration Sample_xUnity {
1212
$Ensure = 'Present',
1313

1414
[System.String[]]
15-
$Components = @('Windows', 'Mac', 'Linux', 'Metro', 'iOS', 'Android'),
15+
$Components = @('Windows', 'Mac', 'Linux', 'UWP', 'iOS', 'Android'),
1616

1717
[PSCredential]
1818
$UnityCredential,

‎UnitySetup/Examples/Sample_xUnity_Install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Configuration Sample_xUnity_Install {
1414

1515
xUnitySetupInstance Unity {
1616
Versions = '2017.4.2f2'
17-
Components = 'Windows', 'Mac', 'Linux', 'Metro', 'iOS', 'Android'
17+
Components = 'Windows', 'Mac', 'Linux', 'UWP', 'iOS', 'Android'
1818
Ensure = 'Present'
1919
}
2020

‎UnitySetup/UnitySetup.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
RootModule = 'UnitySetup'
1515

1616
# Version number of this module.
17-
ModuleVersion = '4.0'
17+
ModuleVersion = '4.1'
1818

1919
# Supported PSEditions
2020
# CompatiblePSEditions = @()

‎UnitySetup/UnitySetup.psm1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ enum UnitySetupComponent {
1111
StandardAssets = (1 -shl 4)
1212
Windows_IL2CPP = (1 -shl 5)
1313
Metro = (1 -shl 6)
14+
UWP = (1 -shl 6)
1415
UWP_IL2CPP = (1 -shl 7)
1516
Android = (1 -shl 8)
1617
iOS = (1 -shl 9)
@@ -70,7 +71,7 @@ class UnitySetupInstance {
7071
[UnitySetupComponent]::Documentation = , [io.path]::Combine("$Path", "Editor\Data\Documentation");
7172
[UnitySetupComponent]::StandardAssets = , [io.path]::Combine("$Path", "Editor\Standard Assets");
7273
[UnitySetupComponent]::Windows_IL2CPP = , [io.path]::Combine("$playbackEnginePath", "windowsstandalonesupport\Variations\win32_development_il2cpp");
73-
[UnitySetupComponent]::Metro = [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_.NET_D3D"),
74+
[UnitySetupComponent]::UWP = [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_.NET_D3D"),
7475
[io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_D3D");
7576
[UnitySetupComponent]::UWP_IL2CPP = , [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_IL2CPP_D3D");
7677
[UnitySetupComponent]::Linux = , [io.path]::Combine("$playbackEnginePath", "LinuxStandaloneSupport");
@@ -235,7 +236,7 @@ function Get-OperatingSystem {
235236
.PARAMETER Components
236237
What components would you like included?
237238
.EXAMPLE
238-
ConvertTo-UnitySetupComponent Windows,Metro
239+
ConvertTo-UnitySetupComponent Windows,UWP
239240
#>
240241
function ConvertTo-UnitySetupComponent {
241242
[CmdletBinding()]
@@ -281,7 +282,8 @@ function Find-UnitySetupInstaller {
281282
$installerTemplates = @{
282283
[UnitySetupComponent]::Documentation = , "WindowsDocumentationInstaller/UnityDocumentationSetup-$Version.exe";
283284
[UnitySetupComponent]::StandardAssets = , "WindowsStandardAssetsInstaller/UnityStandardAssetsSetup-$Version.exe";
284-
[UnitySetupComponent]::Metro = , "TargetSupportInstaller/UnitySetup-Metro-Support-for-Editor-$Version.exe";
285+
[UnitySetupComponent]::UWP = "TargetSupportInstaller/UnitySetup-UWP-.NET-Support-for-Editor-$Version.exe",
286+
"TargetSupportInstaller/UnitySetup-Metro-Support-for-Editor-$Version.exe";
285287
[UnitySetupComponent]::UWP_IL2CPP = , "TargetSupportInstaller/UnitySetup-UWP-IL2CPP-Support-for-Editor-$Version.exe";
286288
[UnitySetupComponent]::Android = , "TargetSupportInstaller/UnitySetup-Android-Support-for-Editor-$Version.exe";
287289
[UnitySetupComponent]::iOS = , "TargetSupportInstaller/UnitySetup-iOS-Support-for-Editor-$Version.exe";

0 commit comments

Comments
 (0)