From 68711ba0baeafac34c70091f34350069e5fb1d45 Mon Sep 17 00:00:00 2001
From: Martin Steinisch <martin.steinisch@gmail.com>
Date: Sat, 27 Jul 2019 23:23:42 +0200
Subject: [PATCH 1/4] AppVeyor configuration for release branch

---
 appveyor.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d0a9fe1..2507050 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,13 +47,31 @@ build_script:
 test_script:
 - ps: .\tools\Run-Tests.ps1
 
+after_test:
+- ps: |
+    # do not sign artifacts for PR to release branches, publish dev builds instead
+    if ($env:APPVEYOR_PULL_REQUEST_TITLE) {
+        Write-Host "[INFO]: Do not sign artifacts from PR to release branch"
+        Get-ChildItem GitExtensions.PluginManager*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+        Get-ChildItem GitExtensions.PluginManager*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+        Exit-AppVeyorBuild
+        return
+    }
+    else {
+        Write-Host "[INFO]: Prepare combined artifact for signing on release branch"
+        Write-Host "Creating combined build artifact ..."
+        $nupkg = (Resolve-Path .\GitExtensions.PluginManager*.nupkg)[0].Path;
+        $zip = (Resolve-Path .\GitExtensions.PluginManager*.zip)[0].Path;
+        $combined = ".\GitExtensions.PluginManager.$($env:APPVEYOR_BUILD_VERSION)$($env:version_suffix).combined-unsigned.zip"
+        Compress-Archive -LiteralPath $nupkg, $zip -CompressionLevel NoCompression -DestinationPath $combined -Force
+    }
+
 #---------------------------------#
 #      artifacts configuration    #
 #---------------------------------#
 
 artifacts:
-- path: .\*.zip
-- path: .\*.nupkg
+- path: .\GitExtensions.PluginManager.*.combined-unsigned.zip
 
 #---------------------------------#
 #     deployment configuration    #
@@ -63,7 +81,7 @@ deploy:
 - provider: Webhook
   on:
     ARTIFACT_SIGNING_ENABLED: true
-  url: https://app.signpath.io/API/v1/7c19b2cf-90f7-4d15-9b12-1b615f7c18c4/Integrations/AppVeyor?SigningPolicyId=8a4ce84a-78d1-4fc0-8c0c-7cd51fb108c0
+  url: https://app.signpath.io/API/v1/7c19b2cf-90f7-4d15-9b12-1b615f7c18c4/Integrations/AppVeyor?SigningPolicyId=cae0b405-4eda-43db-b19e-7e47faa929e0
   on_build_success: true
   on_build_failure: false
   on_build_status_changed: false

From 73aad576f4f319e973d81376007e26dd71c6c502 Mon Sep 17 00:00:00 2001
From: Martin Steinisch <martin.steinisch@gmail.com>
Date: Tue, 3 Sep 2019 23:18:32 +0200
Subject: [PATCH 2/4] bump version number

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2507050..6148665 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ version: 1.0.0.{build}
 
 # version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
 environment:
-  version_suffix: '-RC1'
+  version_suffix: ''
 
 # Do not build on tags (GitHub and BitBucket)
 skip_tags: true

From 7c74caed5c9f5e954c60fdd32dc94a5e144cd545 Mon Sep 17 00:00:00 2001
From: Martin Steinisch <martin.steinisch@gmail.com>
Date: Sat, 16 Nov 2019 00:23:38 +0100
Subject: [PATCH 3/4] Build releases with latest "nightly" build from AppVeyor,
 not with latest stable release from GitHub

---
 .../GitExtensions.PluginManager.csproj.user                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user
index 1d1ba20..b2562da 100644
--- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user
+++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath> <!-- path is relative to $(ProjectDir) -->
     <GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion> <!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
-    <GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppYevor' -->
+    <GitExtensionsReferenceSource>AppVeyor</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppYevor' -->
     <GitExtensionsPath></GitExtensionsPath> <!-- for local builds (no download) -->
   </PropertyGroup>
 </Project>

From df6ad3685b5e433d36ce96ba1eb9b5d8d1294e9f Mon Sep 17 00:00:00 2001
From: Martin Steinisch <martin.steinisch@gmail.com>
Date: Sat, 16 Nov 2019 00:39:15 +0100
Subject: [PATCH 4/4] Fix System.IO.DirectoryNotFoundException

---
 test/PackageManager.Tests/ViewModels/Commands/TestCommands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/PackageManager.Tests/ViewModels/Commands/TestCommands.cs b/test/PackageManager.Tests/ViewModels/Commands/TestCommands.cs
index 1ede0c9..5cb6958 100644
--- a/test/PackageManager.Tests/ViewModels/Commands/TestCommands.cs
+++ b/test/PackageManager.Tests/ViewModels/Commands/TestCommands.cs
@@ -15,7 +15,7 @@ namespace PackageManager.ViewModels.Commands
     [TestClass]
     public class TestCommands
     {
-        private const string ExtractPath = @"D:\";
+        private const string ExtractPath = @"C:\";
 
         [TestMethod]
         public void Install()