From 20c594dc0426d657aa929bb501c3dcff1398dae2 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 5 Mar 2019 14:24:06 +0100
Subject: [PATCH 1/2] fix: packaging on appveyor

---
 appveyor.yml         | 28 +++++++++++++++-------------
 submodules/packaging |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index cd5c3ed87..bfb3e1b77 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,8 +35,6 @@ install:
     git submodule update
 
     nuget restore GitHub.Unity.sln
-- if %BUILD_TYPE%==full cd submodules\packaging\unitypackage && node .\yarn.js install --prefer-offline
-- ps: >-
 
     Set-Location $env:appveyor_build_folder
 
@@ -75,20 +73,24 @@ test:
     - DoNotRunOnAppVeyor
 on_success:
 - ps: |
-    Set-Location $env:appveyor_build_folder
-    if ($package) {
-      $sourcedir="$($env:appveyor_build_folder)\unity\PackageProject"
-      Get-ChildItem -Recurse "$($sourcedir)\*.pdb" | foreach { $_.fullname.substring(0, $_.fullname.length - $_.extension.length) } | foreach { Write-Output "Generating $($_).mdb"; & 'lib\pdb2mdb.exe' "$($_).dll" }
-    }
-- if %BUILD_TYPE%==full cd %appveyor_build_folder%\submodules\packaging\unitypackage && node yarn.js start --path %appveyor_build_folder%\unity\PackageProject --out %appveyor_build_folder% --file github-for-unity-%package_version%
-- ps: |
-    Set-Location $env:appveyor_build_folder
     if ($package) {
-      $sourcedir="$($env:appveyor_build_folder)\unity\PackageProject"
-      $zipfile="$($env:appveyor_build_folder)\PackageProject-$($env:package_version).zip"
-      $packagefile="$($env:appveyor_build_folder)\github-for-unity-$($env:package_version).unitypackage"
+      $rootdir=$env:appveyor_build_folder
+      Set-Location $rootdir
+      $sourcedir="$rootdir\unity\PackageProject"
+      $packagename="github-for-unity-$($env:package_version)"
+      $packagefile="$rootdir\$($packagename).unitypackage"
       $commitfile="$sourcedir\commit"
+      $zipfile="$rootdir\PackageProject-$($env:package_version).zip"
+
+      # generate mdb files
+      Write-Output "Generating mdb files"
+      Get-ChildItem -Recurse "$($sourcedir)\*.pdb" | foreach { $_.fullname.substring(0, $_.fullname.length - $_.extension.length) } | foreach { Write-Output "Generating $($_).mdb"; & 'lib\pdb2mdb.exe' "$($_).dll" }
+
+      # generate unitypackage
+      Write-Output "Generating $packagefile"
+      submodules\packaging\unitypackage\run.ps1 -PathToPackage:$sourcedir -OutputFolder:$rootdir -PackageName:$packagename
 
+      # save commit
       Add-Content $commitfile $appveyor_repo_commit
 
       Write-Output "Zipping $sourcedir to $zipfile"
diff --git a/submodules/packaging b/submodules/packaging
index 45f12d890..ed68a4c37 160000
--- a/submodules/packaging
+++ b/submodules/packaging
@@ -1 +1 @@
-Subproject commit 45f12d89040ee9ed1298a3a8461256d692b988e1
+Subproject commit ed68a4c37ad306c5e03838066ed7479ed36db58f

From ee355bfc20ab540758474caef99bf821568f2dce Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@spoiledcat.net>
Date: Tue, 5 Mar 2019 14:31:09 +0100
Subject: [PATCH 2/2] Pick up copy-pasta error fix

---
 submodules/packaging | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/packaging b/submodules/packaging
index ed68a4c37..77c7f8765 160000
--- a/submodules/packaging
+++ b/submodules/packaging
@@ -1 +1 @@
-Subproject commit ed68a4c37ad306c5e03838066ed7479ed36db58f
+Subproject commit 77c7f876594e73f09e594d5b0c426fdb1470d3bb