From a1e3efc65c87389bbe29233a324609fda823407e Mon Sep 17 00:00:00 2001 From: Bhavendra Jaiswal Date: Fri, 22 Mar 2024 12:17:39 +0530 Subject: [PATCH 1/4] Replaced token3 references with token6 --- Pipelines/Templates/build-Solution.yml | 10 +++++----- Pipelines/Templates/deploy-Solution.yml | 10 +++++----- devops-tasks-schema.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Pipelines/Templates/build-Solution.yml b/Pipelines/Templates/build-Solution.yml index fccbd063..01ada634 100644 --- a/Pipelines/Templates/build-Solution.yml +++ b/Pipelines/Templates/build-Solution.yml @@ -134,13 +134,13 @@ steps: # Third party task to replace tokens in files. The FileTransform above replaces JSON tokens based on their path as opposed to replacing text tokens in a file which can be more error prone in some cases. # If you aren't using this task it can be safely removed or disabled by setting enabled: false. Sample token: #{VariableNameToReplace}# -- task: qetza.replacetokens.replacetokens-task.replacetokens@3 +- task: qetza.replacetokens.replacetokens-task.replacetokens@6 displayName: 'Replace Tokens: deploymentSettings.json' inputs: - rootDirectory: $(Build.SourcesDirectory)\$(RepoName)\${{parameters.solutionName}}\config\ - targetFiles: '**\*deploymentSettings*.json' - actionOnMissing: 'silently continue' - writeBOM: false + root: $(Build.SourcesDirectory)\$(RepoName)\${{parameters.solutionName}}\config\ + sources: '**\*deploymentSettings*.json' + missingVarLog: 'off' + addBOM: false encoding: 'utf-8' defaultValue: '' condition: and(succeeded(), or(ne(variables['DeploymentSettingsPath'], ''), ne(variables['CustomDeploymentSettingsPath'], ''))) diff --git a/Pipelines/Templates/deploy-Solution.yml b/Pipelines/Templates/deploy-Solution.yml index c185a32a..c7a1126c 100644 --- a/Pipelines/Templates/deploy-Solution.yml +++ b/Pipelines/Templates/deploy-Solution.yml @@ -103,13 +103,13 @@ steps: # Third party task to replace tokens in files. The FileTransform above replaces JSON tokens based on their path as opposed to replacing text tokens in a file which can be more error prone in some cases. # If you aren't using this task it can be safely removed or disabled by setting enabled: false. Sample token: #{VariableNameToReplace}# -- task: qetza.replacetokens.replacetokens-task.replacetokens@3 +- task: qetza.replacetokens.replacetokens-task.replacetokens@6 displayName: 'Replace Tokens: deploymentSettings.json' inputs: - rootDirectory: '$(Pipeline.Workspace)' - targetFiles: '**\*deploymentSettings*.json' - actionOnMissing: 'silently continue' - writeBOM: false + root: '$(Pipeline.Workspace)' + sources: '**\*deploymentSettings*.json' + missingVarLog: 'off' + addBOM: false encoding: 'utf-8' defaultValue: '' condition: and(succeeded(), or(ne(variables['DeploymentSettingsPath'], ''), ne(variables['CustomDeploymentSettingsPath'], ''))) diff --git a/devops-tasks-schema.json b/devops-tasks-schema.json index 80633ae8..78124328 100644 --- a/devops-tasks-schema.json +++ b/devops-tasks-schema.json @@ -4421,7 +4421,7 @@ "doNotSuggest": false, "ignoreCase": "value", "enum": [ - "replacetokens@3" + "replacetokens@6" ] }, { From 5bdd4044952bf5d88185d9501fe461305a6623e2 Mon Sep 17 00:00:00 2001 From: Mike! <42348035+mikefactorial@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:16:26 -0400 Subject: [PATCH 2/4] Update branch-pipeline-policy.ps1 --- PowerShell/branch-pipeline-policy.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PowerShell/branch-pipeline-policy.ps1 b/PowerShell/branch-pipeline-policy.ps1 index 74a0d76f..e2188035 100644 --- a/PowerShell/branch-pipeline-policy.ps1 +++ b/PowerShell/branch-pipeline-policy.ps1 @@ -610,7 +610,7 @@ function Set-Branch-Policy{ if($buildTypes){ Write-Host "Policy Type by name 'Build' exists. Getting Policy configurations." # Get existing Policy configurations - $uriPolicyConfigs = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=6.0" + $uriPolicyConfigs = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=7.1-preview.1" Write-Host "UriPolicyConfigs - $uriPolicyConfigs" try { $policyConfigResponse = Invoke-RestMethod $uriPolicyConfigs -Method Get -Headers @{ @@ -841,4 +841,4 @@ function Download-File-to-Location{ } return $false -} \ No newline at end of file +} From c45e83dc510f7c76dd4766dba0b018a04453bdc7 Mon Sep 17 00:00:00 2001 From: Mike! <42348035+mikefactorial@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:38:15 -0400 Subject: [PATCH 3/4] Update branch-pipeline-policy.ps1 --- PowerShell/branch-pipeline-policy.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PowerShell/branch-pipeline-policy.ps1 b/PowerShell/branch-pipeline-policy.ps1 index e2188035..6bd4abce 100644 --- a/PowerShell/branch-pipeline-policy.ps1 +++ b/PowerShell/branch-pipeline-policy.ps1 @@ -639,7 +639,7 @@ function Set-Branch-Policy{ # Check if there are existing policies. If yes, delete the policy configuration. if($null -ne $existingPolices){ Write-Host "Policy of branch $solutionName already exists. Deleting existing policy" - $uriDeleteConfig = "$orgUrl$solutionProjectName/_apis/policy/configurations/$($existingPolices.id)?api-version=6.0" + $uriDeleteConfig = "$orgUrl$solutionProjectName/_apis/policy/configurations/$($existingPolices.id)?api-version=7.1-preview.1" Write-Host "UriDeleteConfig - $uriDeleteConfig" $deletePolicyResponse = Invoke-RestMethod $uriDeleteConfig -Method Delete -Headers @{ Authorization = "$azdoAuthType $env:SYSTEM_ACCESSTOKEN" @@ -700,7 +700,7 @@ function Set-Branch-Policy{ Write-Host "NewPolicyBody Updated - $newPolicyBodyUpdated" # API endpoint URL - $urlNewPolicy = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=6.0" + $urlNewPolicy = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=7.1-preview.1" Write-Host "UrlNewPolicy - $urlNewPolicy" try{ From c66ce480a1aad837989effe920928691dd171d08 Mon Sep 17 00:00:00 2001 From: Mike! <42348035+mikefactorial@users.noreply.github.com> Date: Thu, 28 Mar 2024 08:58:50 -0400 Subject: [PATCH 4/4] Update branch-pipeline-policy.ps1 --- PowerShell/branch-pipeline-policy.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PowerShell/branch-pipeline-policy.ps1 b/PowerShell/branch-pipeline-policy.ps1 index 6bd4abce..b29eb56b 100644 --- a/PowerShell/branch-pipeline-policy.ps1 +++ b/PowerShell/branch-pipeline-policy.ps1 @@ -610,7 +610,7 @@ function Set-Branch-Policy{ if($buildTypes){ Write-Host "Policy Type by name 'Build' exists. Getting Policy configurations." # Get existing Policy configurations - $uriPolicyConfigs = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=7.1-preview.1" + $uriPolicyConfigs = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=6.0" Write-Host "UriPolicyConfigs - $uriPolicyConfigs" try { $policyConfigResponse = Invoke-RestMethod $uriPolicyConfigs -Method Get -Headers @{ @@ -639,7 +639,7 @@ function Set-Branch-Policy{ # Check if there are existing policies. If yes, delete the policy configuration. if($null -ne $existingPolices){ Write-Host "Policy of branch $solutionName already exists. Deleting existing policy" - $uriDeleteConfig = "$orgUrl$solutionProjectName/_apis/policy/configurations/$($existingPolices.id)?api-version=7.1-preview.1" + $uriDeleteConfig = "$orgUrl$solutionProjectName/_apis/policy/configurations/$($existingPolices.id)?api-version=6.0" Write-Host "UriDeleteConfig - $uriDeleteConfig" $deletePolicyResponse = Invoke-RestMethod $uriDeleteConfig -Method Delete -Headers @{ Authorization = "$azdoAuthType $env:SYSTEM_ACCESSTOKEN" @@ -700,7 +700,7 @@ function Set-Branch-Policy{ Write-Host "NewPolicyBody Updated - $newPolicyBodyUpdated" # API endpoint URL - $urlNewPolicy = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=7.1-preview.1" + $urlNewPolicy = "$orgUrl$solutionProjectName/_apis/policy/configurations?api-version=6.0" Write-Host "UrlNewPolicy - $urlNewPolicy" try{