From f10f9ac185ca7dc9dc236078f78a71410a54018a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 08:37:28 +0000 Subject: [PATCH 1/9] chore(deps-dev): bump @types/adm-zip in /vscode/microsoft-kiota Bumps [@types/adm-zip](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/adm-zip) from 0.5.6 to 0.5.7. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/adm-zip) --- updated-dependencies: - dependency-name: "@types/adm-zip" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vscode/microsoft-kiota/package-lock.json | 9 ++++----- vscode/microsoft-kiota/package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json index f9006f292a..a15157cb07 100644 --- a/vscode/microsoft-kiota/package-lock.json +++ b/vscode/microsoft-kiota/package-lock.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@stylistic/eslint-plugin-ts": "^2.11.0", - "@types/adm-zip": "^0.5.6", + "@types/adm-zip": "^0.5.7", "@types/chai": "^5.0.1", "@types/mocha": "^10.0.10", "@types/node": "22.x", @@ -649,11 +649,10 @@ } }, "node_modules/@types/adm-zip": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/@types/adm-zip/-/adm-zip-0.5.6.tgz", - "integrity": "sha512-lRlcSLg5Yoo7C2H2AUiAoYlvifWoCx/se7iUNiCBTfEVVYFVn+Tr9ZGed4K73tYgLe9O4PjdJvbxlkdAOx/qiw==", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@types/adm-zip/-/adm-zip-0.5.7.tgz", + "integrity": "sha512-DNEs/QvmyRLurdQPChqq0Md4zGvPwHerAJYWk9l2jCbD1VPpnzRJorOdiq4zsw09NFbYnhfsoEhWtxIzXpn2yw==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json index 266efb9622..64c0b50aa3 100644 --- a/vscode/microsoft-kiota/package.json +++ b/vscode/microsoft-kiota/package.json @@ -492,7 +492,7 @@ }, "devDependencies": { "@stylistic/eslint-plugin-ts": "^2.11.0", - "@types/adm-zip": "^0.5.6", + "@types/adm-zip": "^0.5.7", "@types/chai": "^5.0.1", "@types/mocha": "^10.0.10", "@types/node": "22.x", From 978ffad44a79d703c53b87a9a2bcde005184ab5e Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 08:46:40 -0500 Subject: [PATCH 2/9] ci: adds artifacts for scripts due to new security requirements Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 69 ++++++++++++++++++++++------- scripts/get-release-notes.ps1 | 8 +++- scripts/get-version-from-csproj.ps1 | 8 +++- 3 files changed, 66 insertions(+), 19 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 859a534df2..17a958ad05 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -116,6 +116,44 @@ extends: artifactName: AppSettings targetPath: "$(Build.ArtifactStagingDirectory)/AppSettings" + # upload the scripts directory as scripts artifact + + - task: 1ES.PublishPipelineArtifact@1 + displayName: "Publish Artifact: scripts" + inputs: + artifactName: scripts + targetPath: $(Build.SourcesDirectory)/scripts + + # upload the csproj file as csproj artifact + + - task: CopyFiles@2 + displayName: Prepare staging folder for upload + inputs: + targetFolder: $(Build.ArtifactStagingDirectory)/csproj + sourceFolder: $(Build.SourcesDirectory)/src/kiota + Contents: "*.csproj" + + - task: 1ES.PublishPipelineArtifact@1 + displayName: "Publish Artifact: csproj" + inputs: + artifactName: csproj + targetPath: "$(Build.ArtifactStagingDirectory)/csproj" + + # upload the changelog file as changelog artifact + + - task: CopyFiles@2 + displayName: Prepare staging folder for upload + inputs: + targetFolder: $(Build.ArtifactStagingDirectory)/changelog + sourceFolder: $(Build.SourcesDirectory) + Contents: "CHANGELOG.md" + + - task: 1ES.PublishPipelineArtifact@1 + displayName: "Publish Artifact: changelog" + inputs: + artifactName: changelog + targetPath: "$(Build.ArtifactStagingDirectory)/changelog" + - job: build dependsOn: [update_appsettings] pool: @@ -318,7 +356,7 @@ extends: inputs: targetFolder: $(Build.ArtifactStagingDirectory)/Nugets sourceFolder: $(Build.ArtifactStagingDirectory) - content: "*.nupkg" + Contents: "*.*nupkg" - task: 1ES.PublishPipelineArtifact@1 displayName: "Publish Artifact: Nugets" @@ -716,11 +754,15 @@ extends: - input: pipelineArtifact artifactName: Nugets targetPath: "$(Pipeline.Workspace)" - sdl: - baseline: - baselineFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnbaselines - suppression: - suppressionFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnsuppress + - input: pipelineArtifact + artifactName: scripts + targetPath: "$(Pipeline.Workspace)" + - input: pipelineArtifact + artifactName: csproj + targetPath: "$(Pipeline.Workspace)" + - input: pipelineArtifact + artifactName: changelog + targetPath: "$(Pipeline.Workspace)" dependsOn: [] environment: kiota-github-releases strategy: @@ -728,23 +770,20 @@ extends: deploy: steps: - download: none - - checkout: self - clean: true - submodules: true - ${{ each distribution in parameters.distributions }}: - task: DownloadPipelineArtifact@2 displayName: Download ${{ distribution.jobPrefix }} binaries from artifacts inputs: artifact: Binaries_${{ distribution.jobPrefix }} source: current - - pwsh: $(Build.SourcesDirectory)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} + - pwsh: $(Pipeline.Workspace)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} displayName: "Set version suffix" - - pwsh: $(Build.SourcesDirectory)/scripts/get-version-from-csproj.ps1 + - pwsh: $(Pipeline.Workspace)/scripts/get-version-from-csproj.ps1 -csprojPath "$(Pipeline.Workspace)/csproj/kiota.csproj" displayName: "Get Kiota's version-number from .csproj" - - pwsh: $(Build.SourcesDirectory)/scripts/get-release-notes.ps1 -version $(artifactVersion) -createNotes + - pwsh: $(Pipeline.Workspace)/scripts/get-release-notes.ps1 -version $(artifactVersion) -createNotes -changelogPath "$(Pipeline.Workspace)/changelog/CHANGELOG.md" condition: eq(variables['isPrerelease'], 'false') displayName: "Get release notes from CHANGELOG.md" - - pwsh: $(Build.SourcesDirectory)/scripts/get-release-notes.ps1 -version Unreleased -createNotes + - pwsh: $(Pipeline.Workspace)/scripts/get-release-notes.ps1 -version Unreleased -createNotes -changelogPath "$(Pipeline.Workspace)/changelog/CHANGELOG.md" condition: eq(variables['isPrerelease'], 'true') displayName: "Get release notes from CHANGELOG.md" - task: GitHubRelease@1 @@ -755,7 +794,7 @@ extends: tag: "v$(artifactVersion)" title: "v$(artifactVersion)" releaseNotesSource: filePath - releaseNotesFilePath: $(Build.SourcesDirectory)/release-notes.txt + releaseNotesFilePath: $(Pipeline.Workspace)/release-notes.txt assets: | $(Pipeline.Workspace)/*.zip $(Pipeline.Workspace)/*.vsix @@ -770,7 +809,7 @@ extends: tag: "v$(artifactVersion)$(versionSuffix)" title: "v$(artifactVersion)$(versionSuffix)" releaseNotesSource: filePath - releaseNotesFilePath: $(Build.SourcesDirectory)/release-notes.txt + releaseNotesFilePath: $(Pipeline.Workspace)/release-notes.txt assets: | $(Pipeline.Workspace)/*.zip $(Pipeline.Workspace)/*.vsix diff --git a/scripts/get-release-notes.ps1 b/scripts/get-release-notes.ps1 index c3b1f02e3e..a775fca87b 100644 --- a/scripts/get-release-notes.ps1 +++ b/scripts/get-release-notes.ps1 @@ -4,12 +4,16 @@ param ( $version, [switch] [bool] - $createNotes + $createNotes, + [string] + $changelogPath = "" ) $version = $version.TrimStart("v") -$changelogPath = Join-Path -Path $PSScriptRoot -ChildPath "../CHANGELOG.md" +if ($changelogPath -eq "") { + $changelogPath = Join-Path -Path $PSScriptRoot -ChildPath "../CHANGELOG.md" +} $changeLogContent = Get-Content $changelogPath -Raw $headerLine = "## [$version]" diff --git a/scripts/get-version-from-csproj.ps1 b/scripts/get-version-from-csproj.ps1 index 2f6aaea5e9..649bab7ee2 100644 --- a/scripts/get-version-from-csproj.ps1 +++ b/scripts/get-version-from-csproj.ps1 @@ -1,9 +1,13 @@ param ( [switch] [bool] - $isGHA + $isGHA, + [string] + $csprojPath = "" ) -$csprojPath = Join-Path $PSScriptRoot "../src/kiota/kiota.csproj" +if ($csprojPath -eq "") { + $csprojPath = Join-Path $PSScriptRoot "../src/kiota/kiota.csproj" +} $xml = [Xml] (Get-Content $csprojPath) $version = $xml.Project.PropertyGroup.VersionPrefix[0] Write-Output "csproj version is $version" From 06d7e57d2a525f3d2e6c99565eb1eb15e3830338 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 08:48:43 -0500 Subject: [PATCH 3/9] fix: use 1es tasks Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 17a958ad05..8f341ddd09 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -393,7 +393,7 @@ extends: inputs: version: 8.x - - task: DownloadPipelineArtifact@2 + - task: 1ES.DownloadPipelineArtifact@1 inputs: artifact: AppSettings source: current @@ -600,7 +600,7 @@ extends: inputs: versionSpec: "18.x" - ${{ each distribution in parameters.distributions }}: - - task: DownloadPipelineArtifact@2 + - task: 1ES.DownloadPipelineArtifact@1 displayName: Download ${{ distribution.jobPrefix }} binaries from artifacts inputs: artifact: Binaries_${{ distribution.jobPrefix }} @@ -706,7 +706,7 @@ extends: - checkout: self clean: true submodules: true - - task: DownloadPipelineArtifact@2 + - task: 1ES.DownloadPipelineArtifact@1 inputs: artifact: VSCode source: current From 933c01c5426f7f1fd3c5d1e3afa9f2516635b98a Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 08:49:26 -0500 Subject: [PATCH 4/9] fix: additional 1es task replacement Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 8f341ddd09..45de69711b 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -171,7 +171,7 @@ extends: clean: true submodules: true - - task: DownloadPipelineArtifact@2 + - task: 1ES.DownloadPipelineArtifact@1 inputs: artifact: AppSettings source: current @@ -771,7 +771,7 @@ extends: steps: - download: none - ${{ each distribution in parameters.distributions }}: - - task: DownloadPipelineArtifact@2 + - task: 1ES.DownloadPipelineArtifact@1 displayName: Download ${{ distribution.jobPrefix }} binaries from artifacts inputs: artifact: Binaries_${{ distribution.jobPrefix }} From c6271b3a2dd8b8ae4e1da2b92fcee46aef41e7c9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 08:57:08 -0500 Subject: [PATCH 5/9] fix: switches download steps to inputs Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 50 +++++++++++++++-------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 45de69711b..90aa261269 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -166,17 +166,15 @@ extends: baselineFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnbaselines suppression: suppressionFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnsuppress + inputs: + - input: pipelineArtifact + artifactName: AppSettings + targetPath: $(Build.ArtifactStagingDirectory)/AppSettings steps: - checkout: self clean: true submodules: true - - task: 1ES.DownloadPipelineArtifact@1 - inputs: - artifact: AppSettings - source: current - targetPath: $(Build.ArtifactStagingDirectory)/AppSettings - - pwsh: | Copy-Item $(Build.ArtifactStagingDirectory)/AppSettings/appsettings.json $(Build.SourcesDirectory)/src/kiota/appsettings.json -Force -Verbose displayName: Copy the appsettings.json @@ -379,6 +377,10 @@ extends: baselineFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnbaselines suppression: suppressionFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnsuppress + inputs: + - input: pipelineArtifact + artifactName: AppSettings + targetPath: $(Build.ArtifactStagingDirectory)/AppSettings steps: - checkout: self @@ -393,12 +395,6 @@ extends: inputs: version: 8.x - - task: 1ES.DownloadPipelineArtifact@1 - inputs: - artifact: AppSettings - source: current - targetPath: $(Build.ArtifactStagingDirectory)/AppSettings - - pwsh: | Copy-Item $(Build.ArtifactStagingDirectory)/AppSettings/appsettings.json $(Build.SourcesDirectory)/src/kiota/appsettings.json -Force -Verbose displayName: Copy the appsettings.json @@ -592,6 +588,11 @@ extends: baselineFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnbaselines suppression: suppressionFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnsuppress + inputs: + - ${{ each distribution in parameters.distributions }}: + - input: pipelineArtifact + artifactName: Binaries_${{ distribution.jobPrefix }} + targetPath: $(Build.ArtifactStagingDirectory)/Binaries steps: - checkout: self clean: true @@ -599,13 +600,6 @@ extends: - task: NodeTool@0 inputs: versionSpec: "18.x" - - ${{ each distribution in parameters.distributions }}: - - task: 1ES.DownloadPipelineArtifact@1 - displayName: Download ${{ distribution.jobPrefix }} binaries from artifacts - inputs: - artifact: Binaries_${{ distribution.jobPrefix }} - source: current - targetPath: $(Build.ArtifactStagingDirectory)/Binaries - pwsh: $(Build.SourcesDirectory)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} displayName: "Set version suffix" - pwsh: $(Build.SourcesDirectory)/scripts/get-version-from-csproj.ps1 @@ -687,6 +681,11 @@ extends: - stage: deploy condition: and(or(contains(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['build.sourceBranch'], '${{ parameters.previewBranch }}')), succeeded()) dependsOn: build + templateContext: + inputs: + - input: pipelineArtifact + artifactName: VSCode + targetPath: $(Build.ArtifactStagingDirectory)/VSCode jobs: - job: vs_marketplace pool: @@ -706,10 +705,6 @@ extends: - checkout: self clean: true submodules: true - - task: 1ES.DownloadPipelineArtifact@1 - inputs: - artifact: VSCode - source: current - task: NodeTool@0 inputs: versionSpec: "18.x" @@ -763,6 +758,9 @@ extends: - input: pipelineArtifact artifactName: changelog targetPath: "$(Pipeline.Workspace)" + - ${{ each distribution in parameters.distributions }}: + - input: pipelineArtifact + artifactName: Binaries_${{ distribution.jobPrefix }} dependsOn: [] environment: kiota-github-releases strategy: @@ -770,12 +768,6 @@ extends: deploy: steps: - download: none - - ${{ each distribution in parameters.distributions }}: - - task: 1ES.DownloadPipelineArtifact@1 - displayName: Download ${{ distribution.jobPrefix }} binaries from artifacts - inputs: - artifact: Binaries_${{ distribution.jobPrefix }} - source: current - pwsh: $(Pipeline.Workspace)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} displayName: "Set version suffix" - pwsh: $(Pipeline.Workspace)/scripts/get-version-from-csproj.ps1 -csprojPath "$(Pipeline.Workspace)/csproj/kiota.csproj" From 79dc51151f568009d7dece67a634873433ff75d8 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 09:32:21 -0500 Subject: [PATCH 6/9] ci: fix vscode deployment job type and input Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 90aa261269..8f70c85bfd 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -681,11 +681,6 @@ extends: - stage: deploy condition: and(or(contains(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['build.sourceBranch'], '${{ parameters.previewBranch }}')), succeeded()) dependsOn: build - templateContext: - inputs: - - input: pipelineArtifact - artifactName: VSCode - targetPath: $(Build.ArtifactStagingDirectory)/VSCode jobs: - job: vs_marketplace pool: @@ -693,23 +688,24 @@ extends: os: linux image: ubuntu-latest templateContext: - sdl: - baseline: - baselineFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnbaselines - suppression: - suppressionFile: $(Build.SourcesDirectory)/guardian/SDL/common/.gdnsuppress + type: releaseJob + isProduction: true + inputs: + - input: pipelineArtifact + artifactName: VSCode + targetPath: $(Build.ArtifactStagingDirectory)/VSCode + - input: pipelineArtifact + artifactName: scripts + targetPath: "$(Pipeline.Workspace)" dependsOn: - github_release steps: - download: none - - checkout: self - clean: true - submodules: true - task: NodeTool@0 inputs: versionSpec: "18.x" - pwsh: npm i -g @vscode/vsce - - pwsh: $(Build.SourcesDirectory)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} + - pwsh: $(Pipeline.Workspace)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} displayName: "Set version suffix" - task: AzureCLI@2 inputs: @@ -751,13 +747,13 @@ extends: targetPath: "$(Pipeline.Workspace)" - input: pipelineArtifact artifactName: scripts - targetPath: "$(Pipeline.Workspace)" + targetPath: "$(Pipeline.Workspace)/scripts" - input: pipelineArtifact artifactName: csproj - targetPath: "$(Pipeline.Workspace)" + targetPath: "$(Pipeline.Workspace)/csproj" - input: pipelineArtifact artifactName: changelog - targetPath: "$(Pipeline.Workspace)" + targetPath: "$(Pipeline.Workspace)/changelog" - ${{ each distribution in parameters.distributions }}: - input: pipelineArtifact artifactName: Binaries_${{ distribution.jobPrefix }} From a7ffb5d8b1a29a4a331abffd83c457c4fbb86975 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 12:07:31 -0500 Subject: [PATCH 7/9] fix: removes downlaod none steps Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 8f70c85bfd..35f3f066d2 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -700,7 +700,6 @@ extends: dependsOn: - github_release steps: - - download: none - task: NodeTool@0 inputs: versionSpec: "18.x" @@ -763,7 +762,6 @@ extends: runOnce: deploy: steps: - - download: none - pwsh: $(Pipeline.Workspace)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} displayName: "Set version suffix" - pwsh: $(Pipeline.Workspace)/scripts/get-version-from-csproj.ps1 -csprojPath "$(Pipeline.Workspace)/csproj/kiota.csproj" @@ -824,7 +822,6 @@ extends: runOnce: deploy: steps: - - download: none - powershell: | Remove-Item "$(Pipeline.Workspace)/Microsoft.OpenApi.Kiota.Builder.*.nupkg" -Verbose displayName: remove other nupkgs to avoid duplication @@ -854,7 +851,6 @@ extends: runOnce: deploy: steps: - - download: none - powershell: | Remove-Item "$(Pipeline.Workspace)/Microsoft.OpenApi.Kiota.*.nupkg" -Verbose -Exclude "*.Builder.*" displayName: remove other nupkgs to avoid duplication From 465cae13de008d88b7dc7b9c0a54bc5ac2e67487 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 12:54:58 -0500 Subject: [PATCH 8/9] fix: wrong path to changelog --- .azure-pipelines/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 35f3f066d2..ef27cf5aae 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -780,7 +780,7 @@ extends: tag: "v$(artifactVersion)" title: "v$(artifactVersion)" releaseNotesSource: filePath - releaseNotesFilePath: $(Pipeline.Workspace)/release-notes.txt + releaseNotesFilePath: $(Pipeline.Workspace)/changelog/release-notes.txt assets: | $(Pipeline.Workspace)/*.zip $(Pipeline.Workspace)/*.vsix @@ -795,7 +795,7 @@ extends: tag: "v$(artifactVersion)$(versionSuffix)" title: "v$(artifactVersion)$(versionSuffix)" releaseNotesSource: filePath - releaseNotesFilePath: $(Pipeline.Workspace)/release-notes.txt + releaseNotesFilePath: $(Pipeline.Workspace)/changelog/release-notes.txt assets: | $(Pipeline.Workspace)/*.zip $(Pipeline.Workspace)/*.vsix From 3edf722eafbfced63c53698b98ee4a13bb07fcf2 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 29 Nov 2024 13:34:46 -0500 Subject: [PATCH 9/9] ci: fixes paths for vscode publish Signed-off-by: Vincent Biret --- .azure-pipelines/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index ef27cf5aae..c9ebf81771 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -693,10 +693,10 @@ extends: inputs: - input: pipelineArtifact artifactName: VSCode - targetPath: $(Build.ArtifactStagingDirectory)/VSCode + targetPath: $(Pipeline.Workspace)/VSCode - input: pipelineArtifact artifactName: scripts - targetPath: "$(Pipeline.Workspace)" + targetPath: "$(Pipeline.Workspace)/scripts" dependsOn: - github_release steps: @@ -713,7 +713,7 @@ extends: scriptLocation: "inlineScript" inlineScript: | $aadToken = az account get-access-token --query accessToken --resource 499b84ac-1321-427f-aa17-267ca6975798 -o tsv - Get-ChildItem -Path $(Pipeline.Workspace) -Filter *.vsix -Recurse | ForEach-Object { + Get-ChildItem -Path $(Pipeline.Workspace)/VSCode -Filter *.vsix -Recurse | ForEach-Object { $packagePath = $_.FullName $manifestPath = $packagePath.Replace("vsix", "manifest") $signaturePath = $packagePath.Replace("vsix", "signature.p7s")