Merge branch 'dev'

This commit is contained in:
Jeremy Wu 2020-03-31 22:08:45 +11:00
commit 4ba4324ab4

View file

@ -38,7 +38,8 @@ function Copy-Resources ($path, $config) {
Copy-Item -Recurse -Force $project\Images\* $target\Images\ Copy-Item -Recurse -Force $project\Images\* $target\Images\
Copy-Item -Recurse -Force $path\Plugins\HelloWorldPython $target\Plugins\HelloWorldPython Copy-Item -Recurse -Force $path\Plugins\HelloWorldPython $target\Plugins\HelloWorldPython
Copy-Item -Recurse -Force $path\JsonRPC $target\JsonRPC Copy-Item -Recurse -Force $path\JsonRPC $target\JsonRPC
Copy-Item -Force $path\packages\squirrel*\tools\Squirrel.exe $output\Update.exe # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
Copy-Item -Force $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe $output\Update.exe
} }
function Delete-Unused ($path, $config) { function Delete-Unused ($path, $config) {
@ -96,9 +97,9 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
$icon = "$path\Wox\Resources\app.ico" $icon = "$path\Wox\Resources\app.ico"
Write-Host "icon: $icon" Write-Host "icon: $icon"
# Squirrel.com: https://github.com/Squirrel/Squirrel.Windows/issues/369 # Squirrel.com: https://github.com/Squirrel/Squirrel.Windows/issues/369
New-Alias Squirrel $path\packages\squirrel*\tools\Squirrel.exe -Force New-Alias Squirrel $env:USERPROFILE\.nuget\packages\squirrel.windows\1.5.2\tools\Squirrel.exe -Force
# why we need Write-Output: https://github.com/Squirrel/Squirrel.Windows/issues/489#issuecomment-156039327 # why we need Write-Output: https://github.com/Squirrel/Squirrel.Windows/issues/489#issuecomment-156039327
# directory of releaseDir in fucking squirrel can't be same as directory ($nupkg) in releasify # directory of releaseDir in squirrel can't be same as directory ($nupkg) in releasify
$temp = "$output\Temp" $temp = "$output\Temp"
Squirrel --releasify $nupkg --releaseDir $temp --setupIcon $icon --no-msi | Write-Output Squirrel --releasify $nupkg --releaseDir $temp --setupIcon $icon --no-msi | Write-Output
@ -123,7 +124,8 @@ function Main {
Delete-Unused $p $config Delete-Unused $p $config
$o = "$p\Output\Packages" $o = "$p\Output\Packages"
Validate-Directory $o Validate-Directory $o
New-Alias Nuget $p\packages\NuGet.CommandLine.*\tools\NuGet.exe -Force # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\3.4.3\tools\NuGet.exe -Force
Pack-Squirrel-Installer $p $v $o Pack-Squirrel-Installer $p $v $o
$isInCI = $env:APPVEYOR $isInCI = $env:APPVEYOR