Additional Windows Image Updates (#589)
* Update workflows, bump image version for docker * Fix Unity pathing and cleanup scripts * Fix Unity pathing * Fix activation scripts
This commit is contained in:
19
dist/platforms/windows/activate.ps1
vendored
19
dist/platforms/windows/activate.ps1
vendored
@@ -1,7 +1,14 @@
|
||||
# Activates Unity
|
||||
& "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics `
|
||||
-username $Env:UNITY_EMAIL `
|
||||
-password $Env:UNITY_PASSWORD `
|
||||
-serial $Env:UNITY_SERIAL `
|
||||
-projectPath "c:/BlankProject" `
|
||||
-logfile | Out-Host
|
||||
|
||||
Write-Output ""
|
||||
Write-Output "###########################"
|
||||
Write-Output "# Activating #"
|
||||
Write-Output "###########################"
|
||||
Write-Output ""
|
||||
|
||||
& "$Env:UNITY_PATH/Editor/Unity.exe" -batchmode -quit -nographics `
|
||||
-username $Env:UNITY_EMAIL `
|
||||
-password $Env:UNITY_PASSWORD `
|
||||
-serial $Env:UNITY_SERIAL `
|
||||
-projectPath "c:/BlankProject" `
|
||||
-logfile - | Out-Host
|
||||
|
||||
4
dist/platforms/windows/build.ps1
vendored
4
dist/platforms/windows/build.ps1
vendored
@@ -156,17 +156,17 @@ $unityArgs = @(
|
||||
# Remove null items as that will fail the Start-Process call
|
||||
$unityArgs = $unityArgs | Where-Object { $_ -ne $null }
|
||||
|
||||
$process = Start-Process -FilePath "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" `
|
||||
$process = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Unity.exe" `
|
||||
-ArgumentList $unityArgs `
|
||||
-PassThru `
|
||||
-NoNewWindow
|
||||
|
||||
while (!$process.HasExited) {
|
||||
if ($process.HasExited) {
|
||||
Start-Sleep -Seconds 5
|
||||
Get-Process
|
||||
|
||||
Start-Sleep -Seconds 10
|
||||
|
||||
Get-Process
|
||||
|
||||
# Display results
|
||||
|
||||
3
dist/platforms/windows/entrypoint.ps1
vendored
3
dist/platforms/windows/entrypoint.ps1
vendored
@@ -1,4 +1,5 @@
|
||||
Get-Process
|
||||
Start-Sleep -Seconds 3
|
||||
|
||||
# Import any necessary registry keys, ie: location of windows 10 sdk
|
||||
# No guarantee that there will be any necessary registry keys, ie: tvOS
|
||||
@@ -22,5 +23,5 @@ Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force }
|
||||
# Free the seat for the activated license
|
||||
& "c:\steps\return_license.ps1"
|
||||
|
||||
Start-Sleep 3
|
||||
Start-Sleep -Seconds 3
|
||||
Get-Process
|
||||
|
||||
19
dist/platforms/windows/return_license.ps1
vendored
19
dist/platforms/windows/return_license.ps1
vendored
@@ -1,7 +1,14 @@
|
||||
# Return the active Unity license
|
||||
& "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics `
|
||||
-username $Env:UNITY_EMAIL `
|
||||
-password $Env:UNITY_PASSWORD `
|
||||
-returnlicense `
|
||||
-projectPath "c:/BlankProject" `
|
||||
-logfile | Out-Host
|
||||
|
||||
Write-Output ""
|
||||
Write-Output "###########################"
|
||||
Write-Output "# Return License #"
|
||||
Write-Output "###########################"
|
||||
Write-Output ""
|
||||
|
||||
& "$Env:UNITY_PATH\Editor\Unity.exe" -batchmode -quit -nographics `
|
||||
-username $Env:UNITY_EMAIL `
|
||||
-password $Env:UNITY_PASSWORD `
|
||||
-returnlicense `
|
||||
-projectPath "c:/BlankProject" `
|
||||
-logfile - | Out-Host
|
||||
|
||||
Reference in New Issue
Block a user