Merge branch 'main' into fix/php-integration-tests

microsoft · Dec 2, 2024 · 50de6be · 50de6be
2 parents 3af85e6 + 5590c59
commit 50de6be
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 68 deletions.
diff --git 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:
@@ -128,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: DownloadPipelineArtifact@2
-                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
@@ -318,7 +354,7 @@ extends:
                 inputs:
                   targetFolder: $(Build.ArtifactStagingDirectory)/Nugets
                   sourceFolder: $(Build.ArtifactStagingDirectory)
-                  content: "*.nupkg"
+                  Contents: "*.*nupkg"
 
               - task: 1ES.PublishPipelineArtifact@1
                 displayName: "Publish Artifact: Nugets"
@@ -341,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
@@ -355,12 +395,6 @@ extends:
                     inputs:
                       version: 8.x
 
-                  - task: DownloadPipelineArtifact@2
-                    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
@@ -554,20 +588,18 @@ 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
                 submodules: true
               - task: NodeTool@0
                 inputs:
                   versionSpec: "18.x"
-              - ${{ each distribution in parameters.distributions }}:
-                  - task: DownloadPipelineArtifact@2
-                    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
@@ -656,27 +688,23 @@ 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: $(Pipeline.Workspace)/VSCode
+                - input: pipelineArtifact
+                  artifactName: scripts
+                  targetPath: "$(Pipeline.Workspace)/scripts"
             dependsOn:
               - github_release
             steps:
-              - download: none
-              - checkout: self
-                clean: true
-                submodules: true
-              - task: DownloadPipelineArtifact@2
-                inputs:
-                  artifact: VSCode
-                  source: current
               - 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:
@@ -685,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")
@@ -716,35 +744,32 @@ 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)/scripts"
+                - input: pipelineArtifact
+                  artifactName: csproj
+                  targetPath: "$(Pipeline.Workspace)/csproj"
+                - input: pipelineArtifact
+                  artifactName: changelog
+                  targetPath: "$(Pipeline.Workspace)/changelog"
+                - ${{ each distribution in parameters.distributions }}:
+                    - input: pipelineArtifact
+                      artifactName: Binaries_${{ distribution.jobPrefix }}
             dependsOn: []
             environment: kiota-github-releases
             strategy:
               runOnce:
                 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 +780,7 @@ extends:
                         tag: "v$(artifactVersion)"
                         title: "v$(artifactVersion)"
                         releaseNotesSource: filePath
-                        releaseNotesFilePath: $(Build.SourcesDirectory)/release-notes.txt
+                        releaseNotesFilePath: $(Pipeline.Workspace)/changelog/release-notes.txt
                         assets: |
                           $(Pipeline.Workspace)/*.zip
                           $(Pipeline.Workspace)/*.vsix
@@ -770,7 +795,7 @@ extends:
                         tag: "v$(artifactVersion)$(versionSuffix)"
                         title: "v$(artifactVersion)$(versionSuffix)"
                         releaseNotesSource: filePath
-                        releaseNotesFilePath: $(Build.SourcesDirectory)/release-notes.txt
+                        releaseNotesFilePath: $(Pipeline.Workspace)/changelog/release-notes.txt
                         assets: |
                           $(Pipeline.Workspace)/*.zip
                           $(Pipeline.Workspace)/*.vsix
@@ -797,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
@@ -827,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

diff --git 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
@@ -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"

diff --git a/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json
diff --git 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",