From 5bc8420f2bf29f10fcd084f2b8275c844dcc65b4 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 01:52:56 +0100 Subject: [PATCH 01/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 77834786..01f6620c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ steps: - task: DownloadSecureFile@1 name: mySecureFile inputs: - secureFile: '$(signing.keystore)' + secureFile: $(signing.keystore) - task: PowerShell@2 inputs: @@ -30,7 +30,7 @@ steps: script: | Write-Host "Start adding the PFX file to the certificate store." - $pfxpath = '$(mySecureFile.keystore)' + $pfxpath = '$(signing.keystore)' $password = '$(signing.password)' Add-Type -AssemblyName System.Security From 965ad9fb8ee036fd4cb68aa6ef9d894dee25e113 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 01:53:57 +0100 Subject: [PATCH 02/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 01f6620c..543b689e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ steps: - task: DownloadSecureFile@1 name: mySecureFile inputs: - secureFile: $(signing.keystore) + secureFile: '$(signing.keystore)' - task: PowerShell@2 inputs: From 0c401c40cf05754d57abd3fe249451582060c79a Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 01:55:10 +0100 Subject: [PATCH 03/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 543b689e..77834786 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,7 +30,7 @@ steps: script: | Write-Host "Start adding the PFX file to the certificate store." - $pfxpath = '$(signing.keystore)' + $pfxpath = '$(mySecureFile.keystore)' $password = '$(signing.password)' Add-Type -AssemblyName System.Security From 2ca8d2997e657aef07feab258e38aa08904bf369 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 01:57:54 +0100 Subject: [PATCH 04/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 77834786..3f6e4632 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,11 +10,11 @@ pool: vmImage: 'windows-latest' variables: - group: status-app solution: 'status/csharp/csharp.sln' buildPlatform: 'x86|x64|ARM' buildConfiguration: 'Release' appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\' + group: status-app steps: - task: NuGetToolInstaller@1 From dd46f0c4ca1f45ccac0fab2b64938248798ec407 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:00:09 +0100 Subject: [PATCH 05/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f6e4632..ec7e620d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ steps: - task: DownloadSecureFile@1 name: mySecureFile inputs: - secureFile: '$(signing.keystore)' + secureFile: $(signing.keystore) - task: PowerShell@2 inputs: From d22951ffe3a44c6f87880216851a5758af4490ba Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:03:48 +0100 Subject: [PATCH 06/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ec7e620d..1b1791e8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,10 +19,14 @@ variables: steps: - task: NuGetToolInstaller@1 +- task: NuGetCommand@2 + inputs: + restoreSolution: '$(solution)' + - task: DownloadSecureFile@1 name: mySecureFile inputs: - secureFile: $(signing.keystore) + secureFile: '$(signing.keystore)' - task: PowerShell@2 inputs: @@ -41,10 +45,6 @@ steps: $store.Add($cert) $store.Close() -- task: NuGetCommand@2 - inputs: - restoreSolution: '$(solution)' - - task: VSBuild@1 inputs: platform: 'x86' From 911b212552d0478343a68527f412f065d915ffc6 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:07:29 +0100 Subject: [PATCH 07/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1b1791e8..cd1c8dfe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,10 +10,6 @@ pool: vmImage: 'windows-latest' variables: - solution: 'status/csharp/csharp.sln' - buildPlatform: 'x86|x64|ARM' - buildConfiguration: 'Release' - appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\' group: status-app steps: From a139f2fa4456dc6dd497a6b8c546382d291ce407 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:07:47 +0100 Subject: [PATCH 08/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cd1c8dfe..1b1791e8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,6 +10,10 @@ pool: vmImage: 'windows-latest' variables: + solution: 'status/csharp/csharp.sln' + buildPlatform: 'x86|x64|ARM' + buildConfiguration: 'Release' + appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\' group: status-app steps: From f06f590104fb37213067630a2fff68f12d71e848 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:12:37 +0100 Subject: [PATCH 09/12] fix variables --- azure-pipelines.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1b1791e8..7d3171c3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,11 +10,15 @@ pool: vmImage: 'windows-latest' variables: - solution: 'status/csharp/csharp.sln' - buildPlatform: 'x86|x64|ARM' - buildConfiguration: 'Release' - appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\' - group: status-app + - group: status-app + - name: solution + value: 'status/csharp/csharp.sln' + - name: buildPlatform + value: 'x86|x64|ARM' + - name: buildConfiguration + value: 'Release' + - name: appxPackageDir + value: '$(build.artifactStagingDirectory)\AppxPackages\\' steps: - task: NuGetToolInstaller@1 From c5a0203a18234a4d1bfea7d9498f1ede1893b446 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:13:26 +0100 Subject: [PATCH 10/12] fix service name --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7d3171c3..ba68cee3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,7 +77,7 @@ steps: - task: AppCenterDistribute@3 inputs: - serverEndpoint: 'VSAC' + serverEndpoint: 'VS AppCenter' appSlug: '$(appSlug)' appFile: '$(build.artifactstagingdirectory)\AppxPackages\*.appxupload' releaseNotesOption: 'input' From 0f6456b9e31a2a65ba5250d0fa665bb940320458 Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:19:31 +0100 Subject: [PATCH 11/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ba68cee3..835828a3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,7 +38,7 @@ steps: script: | Write-Host "Start adding the PFX file to the certificate store." - $pfxpath = '$(mySecureFile.keystore)' + $pfxpath = '$(signing.keystore)' $password = '$(signing.password)' Add-Type -AssemblyName System.Security From 12ecceaeccf87e9704fdaa9a02cc3a6b7262e76e Mon Sep 17 00:00:00 2001 From: "Tobias Burdow [Kaleidox]" Date: Sat, 27 Feb 2021 02:26:30 +0100 Subject: [PATCH 12/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 835828a3..7c7b08a3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ steps: restoreSolution: '$(solution)' - task: DownloadSecureFile@1 - name: mySecureFile + name: keystoreFile inputs: secureFile: '$(signing.keystore)' @@ -38,7 +38,7 @@ steps: script: | Write-Host "Start adding the PFX file to the certificate store." - $pfxpath = '$(signing.keystore)' + $pfxpath = '$(keystoreFile.secureFilePath)' $password = '$(signing.password)' Add-Type -AssemblyName System.Security