From 16800eb8b46728600aef33ec9b457b045ae4c433 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 21 Aug 2024 12:02:24 -0700 Subject: [PATCH 01/79] add detect api changes --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index e291566766..4a7b3580cf 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -139,7 +139,9 @@ jobs: ne(variables['Build.Reason'],'PullRequest'), eq(variables['System.TeamProject'], 'internal') ) - + - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml + Artifacts: ${{ parameters.Artifacts }} + condition: succeeded() - job: GenerateReleaseArtifacts pool: name: $(WINDOWSPOOL) From 4c1d68be183fe483fb7ca894ea1b5dd2c2d70a04 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 21 Aug 2024 12:11:57 -0700 Subject: [PATCH 02/79] add detect api changes --- sdk/identity/azure-identity/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/identity/azure-identity/README.md b/sdk/identity/azure-identity/README.md index de0574ca5e..02663e5fd1 100644 --- a/sdk/identity/azure-identity/README.md +++ b/sdk/identity/azure-identity/README.md @@ -1,3 +1,4 @@ +Just Triggering Testing Pipelines # Azure Identity client library for C++ The Azure Identity library provides Microsoft Entra ID ([formerly Azure Active Directory](https://learn.microsoft.com/entra/fundamentals/new-name)) token authentication support across the Azure SDK. It provides a set of `TokenCredential` implementations which can be used to construct Azure SDK clients which support Microsoft Entra token authentication. This library follows the [Azure SDK Design Guidelines for C++][azure_sdk_cpp_development_guidelines]. From 541533e06acb97279767b900548a05656b64b105 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 22 Aug 2024 10:33:10 -0700 Subject: [PATCH 03/79] trigger test pipeline --- sdk/identity/azure-identity/README.md | 1 - sdk/template/azure-template/src/template_client.cpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/README.md b/sdk/identity/azure-identity/README.md index 02663e5fd1..de0574ca5e 100644 --- a/sdk/identity/azure-identity/README.md +++ b/sdk/identity/azure-identity/README.md @@ -1,4 +1,3 @@ -Just Triggering Testing Pipelines # Azure Identity client library for C++ The Azure Identity library provides Microsoft Entra ID ([formerly Azure Active Directory](https://learn.microsoft.com/entra/fundamentals/new-name)) token authentication support across the Azure SDK. It provides a set of `TokenCredential` implementations which can be used to construct Azure SDK clients which support Microsoft Entra token authentication. This library follows the [Azure SDK Design Guidelines for C++][azure_sdk_cpp_development_guidelines]. diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp index b6cb638967..d524032422 100644 --- a/sdk/template/azure-template/src/template_client.cpp +++ b/sdk/template/azure-template/src/template_client.cpp @@ -1,5 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. +// Just Triggering Testing Pipelines #include "azure/template/template_client.hpp" From 6dae688b1ede72c765e4cf810f9c3475a36bedcc Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 29 Aug 2024 08:56:38 -0700 Subject: [PATCH 04/79] adding cpp.json ref --- .../templates/jobs/archetype-sdk-client.yml | 18 ++++++- eng/scripts/Create-APIReview.ps1 | 2 +- eng/scripts/Language-Settings.ps1 | 2 +- eng/scripts/Prepare-APIReview.ps1 | 48 +++++++++++++++++++ 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 eng/scripts/Prepare-APIReview.ps1 diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 4a7b3580cf..b98edf5eec 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -118,7 +118,23 @@ jobs: - task: Powershell@2 inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/scripts/Create-APIReview.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/scripts/Prepare-APIReview.ps1 + arguments: > + -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) + -OutPath $(Build.ArtifactStagingDirectory) + -ApiKey "$(azuresdk-apiview-apikey)" + -SourceBranch $(Build.SourceBranchName) + -DefaultBranch $(DefaultBranch) + -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe + -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} + -BuildId $(Build.BuildId) + -RepoName "$(Build.Repository.Name)" + pwsh: true + workingDirectory: $(Pipeline.Workspace) + + - task: Powershell@2 + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/scripts/Create-APIReview.ps1 arguments: > -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) -OutPath $(Build.ArtifactStagingDirectory) diff --git a/eng/scripts/Create-APIReview.ps1 b/eng/scripts/Create-APIReview.ps1 index c10927c314..33c0222b18 100644 --- a/eng/scripts/Create-APIReview.ps1 +++ b/eng/scripts/Create-APIReview.ps1 @@ -39,7 +39,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in $($parentPath)" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o $OutPath/$ArtifactName/$ArtifactName.json $SourcePath + & $ParserPath -o $OutPath/$ArtifactName/$ArtifactName_cpp.json $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index ed22d5a5a5..8c66f89a4f 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "*.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "*_cpp.json") if ($artifact) { $packages = @{ diff --git a/eng/scripts/Prepare-APIReview.ps1 b/eng/scripts/Prepare-APIReview.ps1 new file mode 100644 index 0000000000..035b9f2701 --- /dev/null +++ b/eng/scripts/Prepare-APIReview.ps1 @@ -0,0 +1,48 @@ +Param( + [Parameter(Mandatory=$True)] + [array] $ArtifactList, + [Parameter(Mandatory=$True)] + [string] $OutPath, + [Parameter(Mandatory=$True)] + [string] $ApiKey, + [Parameter(Mandatory=$True)] + [string] $SourceBranch, + [Parameter(Mandatory=$True)] + [string] $DefaultBranch, + [Parameter(Mandatory=$True)] + [string] $ParserPath, + [Parameter(Mandatory=$True)] + [string] $ServicePath, + [Parameter(Mandatory=$True)] + [string] $RepoName, + [Parameter(Mandatory=$True)] + [string] $BuildId +) + +Write-Host "$PSScriptRoot" +. (Join-Path $PSScriptRoot .. common scripts common.ps1) + +foreach ($artifact in $ArtifactList) +{ + $ArtifactName = $artifact.name + Write-Host "Generating artifact for $ArtifactName" + $SourcePath = Join-Path $ServicePath $ArtifactName "inc" + $apiviewSettings = Join-Path $SourcePath "ApiViewSettings.json" + if (!(Test-Path $apiviewSettings)) + { + Write-Host "ApiViewSettings.json file is not found in $($SourcePath). APIView settings file is required to generate API review file." + exit 1 + } + + Write-Host "Creating API review artifact for $($ArtifactName)" + New-Item -ItemType Directory -Path $OutPath/$ArtifactName -force + $parentPath = Split-Path $ParserPath -Parent + Write-Host "Contents in $($parentPath)" + Get-ChildItem -Path $parentPath -Recurse + & $ParserPath -o $OutPath/$ArtifactName/$ArtifactName_cpp.json $SourcePath + if ($LASTEXITCODE -ne 0) + { + Write-Host "Failed to generate API review file for $($ArtifactName)" + exit 1 + } +} From a98a0eb37be97690c774b2b2899caf5d3d0db9c5 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 29 Aug 2024 09:08:03 -0700 Subject: [PATCH 05/79] yml syntax --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index b98edf5eec..076e822c82 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -156,8 +156,9 @@ jobs: eq(variables['System.TeamProject'], 'internal') ) - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml - Artifacts: ${{ parameters.Artifacts }} - condition: succeeded() + parameters: + Artifacts: ${{ parameters.Artifacts }} + condition: succeeded() - job: GenerateReleaseArtifacts pool: name: $(WINDOWSPOOL) From 4eaf9d4e37d71f6724ffd6a7195b3140b9cd35ac Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 29 Aug 2024 09:16:13 -0700 Subject: [PATCH 06/79] move partial script below artifact publish --- .../templates/jobs/archetype-sdk-client.yml | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 076e822c82..1c3ab01495 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -131,34 +131,6 @@ jobs: -RepoName "$(Build.Repository.Name)" pwsh: true workingDirectory: $(Pipeline.Workspace) - - - task: Powershell@2 - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/scripts/Create-APIReview.ps1 - arguments: > - -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) - -OutPath $(Build.ArtifactStagingDirectory) - -ApiKey "$(azuresdk-apiview-apikey)" - -SourceBranch $(Build.SourceBranchName) - -DefaultBranch $(DefaultBranch) - -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe - -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} - -BuildId $(Build.BuildId) - -RepoName "$(Build.Repository.Name)" - pwsh: true - workingDirectory: $(Pipeline.Workspace) - displayName: Create API Review - condition: >- - and( - succeeded(), - ne(variables['Skip.CreateApiReview'], 'true'), - ne(variables['Build.Reason'],'PullRequest'), - eq(variables['System.TeamProject'], 'internal') - ) - - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml - parameters: - Artifacts: ${{ parameters.Artifacts }} - condition: succeeded() - job: GenerateReleaseArtifacts pool: name: $(WINDOWSPOOL) @@ -357,6 +329,34 @@ jobs: parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages ArtifactName: packages + + - task: Powershell@2 + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/scripts/Create-APIReview.ps1 + arguments: > + -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) + -OutPath $(Build.ArtifactStagingDirectory) + -ApiKey "$(azuresdk-apiview-apikey)" + -SourceBranch $(Build.SourceBranchName) + -DefaultBranch $(DefaultBranch) + -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe + -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} + -BuildId $(Build.BuildId) + -RepoName "$(Build.Repository.Name)" + pwsh: true + workingDirectory: $(Pipeline.Workspace) + displayName: Create API Review + condition: >- + and( + succeeded(), + ne(variables['Skip.CreateApiReview'], 'true'), + ne(variables['Build.Reason'],'PullRequest'), + eq(variables['System.TeamProject'], 'internal') + ) + - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml + parameters: + Artifacts: ${{ parameters.Artifacts }} + condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From eebbb077ab8e3a7d77433f99fff98c44d28d97a0 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 4 Sep 2024 07:31:30 -0700 Subject: [PATCH 07/79] renaming + trimming down --- .../templates/jobs/archetype-sdk-client.yml | 16 ++++++---------- ...ew.ps1 => Generate-APIReview-Token-Files.ps1} | 12 +----------- 2 files changed, 7 insertions(+), 21 deletions(-) rename eng/scripts/{Prepare-APIReview.ps1 => Generate-APIReview-Token-Files.ps1} (79%) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 1c3ab01495..1f477439a1 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -118,17 +118,12 @@ jobs: - task: Powershell@2 inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/scripts/Prepare-APIReview.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/scripts/Generate-APIReview-Token-Files.ps1 arguments: > -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) -OutPath $(Build.ArtifactStagingDirectory) - -ApiKey "$(azuresdk-apiview-apikey)" - -SourceBranch $(Build.SourceBranchName) - -DefaultBranch $(DefaultBranch) -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} - -BuildId $(Build.BuildId) - -RepoName "$(Build.Repository.Name)" pwsh: true workingDirectory: $(Pipeline.Workspace) - job: GenerateReleaseArtifacts @@ -353,10 +348,11 @@ jobs: ne(variables['Build.Reason'],'PullRequest'), eq(variables['System.TeamProject'], 'internal') ) - - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml - parameters: - Artifacts: ${{ parameters.Artifacts }} - condition: succeeded() + - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml + parameters: + Artifacts: ${{ parameters.Artifacts }} + condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: diff --git a/eng/scripts/Prepare-APIReview.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 similarity index 79% rename from eng/scripts/Prepare-APIReview.ps1 rename to eng/scripts/Generate-APIReview-Token-Files.ps1 index 035b9f2701..470a517966 100644 --- a/eng/scripts/Prepare-APIReview.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -4,19 +4,9 @@ Param( [Parameter(Mandatory=$True)] [string] $OutPath, [Parameter(Mandatory=$True)] - [string] $ApiKey, - [Parameter(Mandatory=$True)] - [string] $SourceBranch, - [Parameter(Mandatory=$True)] - [string] $DefaultBranch, - [Parameter(Mandatory=$True)] [string] $ParserPath, [Parameter(Mandatory=$True)] - [string] $ServicePath, - [Parameter(Mandatory=$True)] - [string] $RepoName, - [Parameter(Mandatory=$True)] - [string] $BuildId + [string] $ServicePath ) Write-Host "$PSScriptRoot" From 9bf62bb3176887c6eae531fe167fbd4371628d6c Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 4 Sep 2024 07:43:02 -0700 Subject: [PATCH 08/79] download parser --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 1f477439a1..3cf257e30e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -112,8 +112,7 @@ jobs: and( succeeded(), ne(variables['Skip.CreateApiReview'], 'true'), - ne(variables['Build.Reason'],'PullRequest'), - eq(variables['System.TeamProject'], 'internal') + ne(variables['Build.Reason'],'PullRequest') ) - task: Powershell@2 From 32aa7e25e1a62e0066c0b2b67b5c657ecbf3f054 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 4 Sep 2024 07:47:11 -0700 Subject: [PATCH 09/79] download parser --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 3cf257e30e..6a09a68552 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -111,7 +111,6 @@ jobs: condition: >- and( succeeded(), - ne(variables['Skip.CreateApiReview'], 'true'), ne(variables['Build.Reason'],'PullRequest') ) From 630cf6a76131e4b06923bec9987a6bb9f8614de8 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 4 Sep 2024 07:56:19 -0700 Subject: [PATCH 10/79] download parser --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6a09a68552..867c4a9040 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -108,11 +108,7 @@ jobs: vstsFeedPackage: 'parseazuresdkcpp' downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' vstsPackageVersion: 0.13.0 - condition: >- - and( - succeeded(), - ne(variables['Build.Reason'],'PullRequest') - ) + condition: succeeded() - task: Powershell@2 inputs: From 1d29351217dd5230607907c9ebdd861827be7943 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 9 Sep 2024 09:46:16 -0700 Subject: [PATCH 11/79] fix parser download --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 5 +++-- eng/scripts/Generate-APIReview-Token-Files.ps1 | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 867c4a9040..889a376c5e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -104,10 +104,10 @@ jobs: displayName: Download ApiView Parser. inputs: command: download - vstsFeed: 'internal/AzureSDKForCpp' + vstsFeed: 'public/azure-sdk-for-cpp' vstsFeedPackage: 'parseazuresdkcpp' downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' - vstsPackageVersion: 0.13.0 + vstsPackageVersion: 0.1.0 condition: succeeded() - task: Powershell@2 @@ -120,6 +120,7 @@ jobs: -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} pwsh: true workingDirectory: $(Pipeline.Workspace) + displayName: Generate APIReview Token Files - job: GenerateReleaseArtifacts pool: name: $(WINDOWSPOOL) diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index 470a517966..86636e0032 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -24,12 +24,12 @@ foreach ($artifact in $ArtifactList) exit 1 } - Write-Host "Creating API review artifact for $($ArtifactName)" - New-Item -ItemType Directory -Path $OutPath/$ArtifactName -force + Write-Host "Creating API review artifact for $ArtifactName" + New-Item -ItemType Directory -Path "$OutPath/$ArtifactName" -Force $parentPath = Split-Path $ParserPath -Parent - Write-Host "Contents in $($parentPath)" + Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o $OutPath/$ArtifactName/$ArtifactName_cpp.json $SourcePath + & $ParserPath -o "$OutPath/$ArtifactName/${ArtifactName}_cpp.json" $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" From e3296eef43ad6b3b1d18ee600fb8d9d9d5f0dfec Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 9 Sep 2024 10:21:00 -0700 Subject: [PATCH 12/79] update to parser 2.0 --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 889a376c5e..2b272309fd 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -107,7 +107,7 @@ jobs: vstsFeed: 'public/azure-sdk-for-cpp' vstsFeedPackage: 'parseazuresdkcpp' downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' - vstsPackageVersion: 0.1.0 + vstsPackageVersion: 0.2.0 condition: succeeded() - task: Powershell@2 From 5d223329da75e89a89eba8b6a813ed7b9dde7a1e Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 9 Sep 2024 11:21:20 -0700 Subject: [PATCH 13/79] update to parser 2.1 --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 2b272309fd..78e0cd8442 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -107,7 +107,7 @@ jobs: vstsFeed: 'public/azure-sdk-for-cpp' vstsFeedPackage: 'parseazuresdkcpp' downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' - vstsPackageVersion: 0.2.0 + vstsPackageVersion: 0.2.1 condition: succeeded() - task: Powershell@2 From a6eaeb14a2d247c419d15df5459fc1a1c11fe1a2 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 13 Sep 2024 00:11:50 -0700 Subject: [PATCH 14/79] update parser version --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 78e0cd8442..b8bfd2148f 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -107,7 +107,7 @@ jobs: vstsFeed: 'public/azure-sdk-for-cpp' vstsFeedPackage: 'parseazuresdkcpp' downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' - vstsPackageVersion: 0.2.1 + vstsPackageVersion: 0.3.0 condition: succeeded() - task: Powershell@2 From 45172841b8c8bce65845e707af90a8d60369634f Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 13 Sep 2024 00:19:52 -0700 Subject: [PATCH 15/79] trigger pipeline --- sdk/template/azure-template/src/template_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp index d524032422..400f618dad 100644 --- a/sdk/template/azure-template/src/template_client.cpp +++ b/sdk/template/azure-template/src/template_client.cpp @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -// Just Triggering Testing Pipelines +// Just Triggering Testings #include "azure/template/template_client.hpp" From f4e22f43be7ed6e6b0f1c89e215f8e8481823496 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 13 Sep 2024 00:31:54 -0700 Subject: [PATCH 16/79] trigger pipeline --- sdk/template/azure-template/src/template_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp index 400f618dad..1ea557641a 100644 --- a/sdk/template/azure-template/src/template_client.cpp +++ b/sdk/template/azure-template/src/template_client.cpp @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -// Just Triggering Testings +// Just Triggering Testings. #include "azure/template/template_client.hpp" From 0e9511f5db9d899635cf039841ba8b821b4d9230 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 13 Sep 2024 10:35:34 -0700 Subject: [PATCH 17/79] download ste7p testing --- .../templates/jobs/archetype-sdk-client.yml | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index b8bfd2148f..8aa97e0d68 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -100,15 +100,25 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - - task: UniversalPackages@0 - displayName: Download ApiView Parser. - inputs: - command: download - vstsFeed: 'public/azure-sdk-for-cpp' - vstsFeedPackage: 'parseazuresdkcpp' - downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' - vstsPackageVersion: 0.3.0 - condition: succeeded() + - pwsh: | + az artifacts universal download + --organization https://dev.azure.com/azure-sdk/ + --project="public" + --scope project + --feed azure-sdk-for-cpp + --name my-first-package + --version 0.0.1 + --path . + + # - task: UniversalPackages@0 + # displayName: Download ApiView Parser. + # inputs: + # command: download + # vstsFeed: 'public/azure-sdk-for-cpp' + # vstsFeedPackage: 'parseazuresdkcpp' + # downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' + # vstsPackageVersion: 0.3.0 + # condition: succeeded() - task: Powershell@2 inputs: From 0f8dac06e38108183de12959696b7d91e085bd63 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 13 Sep 2024 10:36:25 -0700 Subject: [PATCH 18/79] download ste7p testing --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 8aa97e0d68..86dfee2847 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -101,6 +101,7 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - pwsh: | + az login az artifacts universal download --organization https://dev.azure.com/azure-sdk/ --project="public" From 2326e4f69a0e15df20d74ebf34b1ab6115e36f89 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 13 Sep 2024 10:44:01 -0700 Subject: [PATCH 19/79] download ste7p testing --- .../templates/jobs/archetype-sdk-client.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 86dfee2847..11bc603d54 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -102,13 +102,13 @@ jobs: - pwsh: | az login - az artifacts universal download - --organization https://dev.azure.com/azure-sdk/ - --project="public" - --scope project - --feed azure-sdk-for-cpp - --name my-first-package - --version 0.0.1 + az artifacts universal download ` + --organization https://dev.azure.com/azure-sdk/ ` + --project="public" ` + --scope project ` + --feed azure-sdk-for-cpp ` + --name my-first-package ` + --version 0.0.1 ` --path . # - task: UniversalPackages@0 From 5e54d5defb045433b2c09ed88acef7999ecc3de6 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 02:36:08 -0700 Subject: [PATCH 20/79] download parser from blob --- .../templates/jobs/archetype-sdk-client.yml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 11bc603d54..c02d9036c9 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -100,16 +100,17 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - - pwsh: | - az login - az artifacts universal download ` - --organization https://dev.azure.com/azure-sdk/ ` - --project="public" ` - --scope project ` - --feed azure-sdk-for-cpp ` - --name my-first-package ` - --version 0.0.1 ` - --path . + - task: AzurePowerShell@5 + displayName: Download ApiView Parser. + inputs: + azureSubscription: 'Azure SDK Artifacts' + ScriptType: 'InlineScript' + azurePowerShellVersion: LatestVersion + pwsh: true + Inline: | + azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" + env: + AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' # - task: UniversalPackages@0 # displayName: Download ApiView Parser. From ed493ea8cfee5713bd46897158a7787bc240374d Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 08:41:55 -0700 Subject: [PATCH 21/79] download parser from blob --- .../templates/jobs/archetype-sdk-client.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index c02d9036c9..ebc1fb3c9d 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -100,17 +100,17 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - - task: AzurePowerShell@5 - displayName: Download ApiView Parser. - inputs: - azureSubscription: 'Azure SDK Artifacts' - ScriptType: 'InlineScript' - azurePowerShellVersion: LatestVersion - pwsh: true - Inline: | - azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" - env: - AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' + # - task: AzurePowerShell@5 + # displayName: Download ApiView Parser. + # inputs: + # azureSubscription: 'Azure SDK Artifacts' + # ScriptType: 'InlineScript' + # azurePowerShellVersion: LatestVersion + # pwsh: true + # Inline: | + - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" + # env: + # AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' # - task: UniversalPackages@0 # displayName: Download ApiView Parser. From 525b5ca482979016d1cb11b91a0a0898caadbab1 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 08:51:48 -0700 Subject: [PATCH 22/79] download parser from blob --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index ebc1fb3c9d..a66625449c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -108,7 +108,8 @@ jobs: # azurePowerShellVersion: LatestVersion # pwsh: true # Inline: | - - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" + - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + displayName: Download ApiView Parser. # env: # AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' From 66049475849230f82361264dcbceb6ee6aa0a2d4 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 10:19:00 -0700 Subject: [PATCH 23/79] download parser from blob --- .../templates/jobs/archetype-sdk-client.yml | 38 +++++++++---------- eng/scripts/Create-APIReview.ps1 | 2 +- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index a66625449c..1e01a7fe7b 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -100,28 +100,8 @@ jobs: - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - # - task: AzurePowerShell@5 - # displayName: Download ApiView Parser. - # inputs: - # azureSubscription: 'Azure SDK Artifacts' - # ScriptType: 'InlineScript' - # azurePowerShellVersion: LatestVersion - # pwsh: true - # Inline: | - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. - # env: - # AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED' - - # - task: UniversalPackages@0 - # displayName: Download ApiView Parser. - # inputs: - # command: download - # vstsFeed: 'public/azure-sdk-for-cpp' - # vstsFeedPackage: 'parseazuresdkcpp' - # downloadDirectory: '$(System.DefaultWorkingDirectory)/parser' - # vstsPackageVersion: 0.3.0 - # condition: succeeded() - task: Powershell@2 inputs: @@ -222,14 +202,30 @@ jobs: -Name packages/${{ artifact.Name }} displayName: Create package info artifact location + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 + arguments: > + -ServiceDirectory ${{parameters.ServiceDirectory}} + -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo + pwsh: true + workingDirectory: $(Pipeline.Workspace) + displayName: Dump Package properties + - pwsh: | $outputPath = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/${{ artifact.Name }}/package-info.json $version = eng/scripts/Get-PkgVersion -ServiceDirectory ${{ parameters.ServiceDirectory }} -PackageName ${{ artifact.Path }} - $outputObject = @{ version = $version.ToString(); name = '${{ artifact.Name }}'; packageName = "${{ artifact.Name }}_$version"; } | ConvertTo-Json + $outputObject = @{ version = $version.ToString(); name = '${{ artifact.Name }}'; ArtifactName = '${{ artifact.Name }}'; packageName = "${{ artifact.Name }}_$version"; DirectoryPath = ""} | ConvertTo-Json Set-Content -Path $outputPath -Value $outputObject + $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo/${{ artifact.Name }}_cpp.json + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo/${{ artifact.Name }}.json + + New-Item -path $packageJsonDest -Force + Copy-Item $packageJsonSource $packageJsonDest -Force + # Set AZURE_SDK_VERSION for use in Doxygen generation Write-Host "##vso[task.setvariable variable=AZURE_SDK_VERSION]$version" displayName: Create package info JSON file for ${{ artifact.Name }} diff --git a/eng/scripts/Create-APIReview.ps1 b/eng/scripts/Create-APIReview.ps1 index 33c0222b18..f745b18ab6 100644 --- a/eng/scripts/Create-APIReview.ps1 +++ b/eng/scripts/Create-APIReview.ps1 @@ -39,7 +39,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in $($parentPath)" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o $OutPath/$ArtifactName/$ArtifactName_cpp.json $SourcePath + & $ParserPath -o $OutPath/$ArtifactName/${ArtifactName}_cpp.json $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" From ef789ce2ecd275a0bf58550f9f4b1f7bc52a637a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 10:37:44 -0700 Subject: [PATCH 24/79] cspell --- .vscode/cspell.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index d92a1947ad..16a263f65e 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -74,6 +74,7 @@ "avro", "antkmsft", "azcmagent", + "azcopy", "azcore", "azsdk", "azsdkengsys", From 663558c92598b03e67ca2f33693b74991e3d50a7 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 11:04:19 -0700 Subject: [PATCH 25/79] download parser from blob --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 1e01a7fe7b..e0b8830f3b 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -221,7 +221,7 @@ jobs: Set-Content -Path $outputPath -Value $outputObject $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo/${{ artifact.Name }}_cpp.json - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo/${{ artifact.Name }}.json + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo/${{ artifact.Name }}_cpp.json New-Item -path $packageJsonDest -Force Copy-Item $packageJsonSource $packageJsonDest -Force From ac697d82dcd2fe77c5195825a7d86c8c86758177 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 11:30:03 -0700 Subject: [PATCH 26/79] download parser from blob --- .../templates/jobs/archetype-sdk-client.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index e0b8830f3b..462da96969 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -220,12 +220,6 @@ jobs: Set-Content -Path $outputPath -Value $outputObject - $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo/${{ artifact.Name }}_cpp.json - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo/${{ artifact.Name }}_cpp.json - - New-Item -path $packageJsonDest -Force - Copy-Item $packageJsonSource $packageJsonDest -Force - # Set AZURE_SDK_VERSION for use in Doxygen generation Write-Host "##vso[task.setvariable variable=AZURE_SDK_VERSION]$version" displayName: Create package info JSON file for ${{ artifact.Name }} @@ -353,6 +347,12 @@ jobs: eq(variables['System.TeamProject'], 'internal') ) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - pwsh: | + $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + mkdir $packageJsonDest + Copy-Item $packageJsonSource/* $packageJsonDest -Force + displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: Artifacts: ${{ parameters.Artifacts }} From 80b25abf7e364126f05356849de5f3663d725281 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 12:05:49 -0700 Subject: [PATCH 27/79] directory change for get artifacts --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 8c66f89a4f..76af21debb 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "*_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath/packages $PackageName) -Filter "*_cpp.json") if ($artifact) { $packages = @{ From 52bf54f8dd57e59fc85153d8b7071db865270d02 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 14:05:56 -0700 Subject: [PATCH 28/79] directory change for get artifacts --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 76af21debb..8d47f7c020 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath/packages $PackageName) -Filter "*_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path "$ArtifactPath/packages" $PackageName) -Filter "*_cpp.json") if ($artifact) { $packages = @{ From d12c9e5207515b88ed2891526880dce1c185e7a4 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 15:39:09 -0700 Subject: [PATCH 29/79] publish packageinfo artifact --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 462da96969..dbe99a640c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -322,6 +322,10 @@ jobs: parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages ArtifactName: packages + - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml + parameters: + ArtifactPath: $(Build.ArtifactStagingDirectory)/PackageInfo + ArtifactName: PackageInfo - task: Powershell@2 inputs: From f7ac431b63c125226774169eebb3c39b23bd586e Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 16:31:24 -0700 Subject: [PATCH 30/79] publish packageinfo artifact --- .../templates/jobs/archetype-sdk-client.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index dbe99a640c..a80b4c8b23 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -318,6 +318,12 @@ jobs: continueOnError: true condition: and(succeeded(), eq(variables['VerifyChangeLogForRelease'], 'true')) + - pwsh: | + $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + mkdir $packageJsonDest + Copy-Item $packageJsonSource/* $packageJsonDest -Force + displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages @@ -351,12 +357,6 @@ jobs: eq(variables['System.TeamProject'], 'internal') ) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - pwsh: | - $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo - mkdir $packageJsonDest - Copy-Item $packageJsonSource/* $packageJsonDest -Force - displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: Artifacts: ${{ parameters.Artifacts }} From b3a9ac3ddf6c4de02484ea1f0b47b968cd424a6d Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 17 Sep 2024 16:52:20 -0700 Subject: [PATCH 31/79] publish packageinfo artifact --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index a80b4c8b23..bced71d186 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -323,6 +323,7 @@ jobs: $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo mkdir $packageJsonDest Copy-Item $packageJsonSource/* $packageJsonDest -Force + Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace ".json","_cpp.json"} displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From c7290526d0d9158ce9f750e1f798f6117be11947 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 18 Sep 2024 08:08:35 -0700 Subject: [PATCH 32/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index bced71d186..a8769acbd7 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -322,8 +322,11 @@ jobs: $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo mkdir $packageJsonDest + ls $packageJsonDest Copy-Item $packageJsonSource/* $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace ".json","_cpp.json"} + write-host "after" + ls $packageJsonDest displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From a222425912481692b34a48a3dbec5309aa18ac37 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 18 Sep 2024 08:27:23 -0700 Subject: [PATCH 33/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 --- eng/scripts/Language-Settings.ps1 | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index a8769acbd7..bced71d186 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -322,11 +322,8 @@ jobs: $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo mkdir $packageJsonDest - ls $packageJsonDest Copy-Item $packageJsonSource/* $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace ".json","_cpp.json"} - write-host "after" - ls $packageJsonDest displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 8d47f7c020..1584608da0 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path "$ArtifactPath/packages" $PackageName) -Filter "*_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath "packages/PackageInfo") -Filter "${PackageName}_cpp.json") if ($artifact) { $packages = @{ From 5348be8d26c8921688d062bc89193fde485b184c Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 18 Sep 2024 08:41:37 -0700 Subject: [PATCH 34/79] artifact name --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index bced71d186..d96c83c923 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -360,7 +360,7 @@ jobs: - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: - Artifacts: ${{ parameters.Artifacts }} + ArtifactName: ${{ parameters.Artifacts }} condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml From b878fe7b0a4ab04f86b2f711f9fa1b930e8b4822 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 18 Sep 2024 08:49:32 -0700 Subject: [PATCH 35/79] artifact name --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index d96c83c923..2b2658fe53 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -358,10 +358,11 @@ jobs: eq(variables['System.TeamProject'], 'internal') ) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml - parameters: - ArtifactName: ${{ parameters.Artifacts }} - condition: succeeded() + - ${{ each artifact in parameters.Artifacts }}: + - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml + parameters: + ArtifactName: ${{ artifact.Name }} + condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From 1cc0dea1c93af2014fc0dbbdd7382de67464b647 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 18 Sep 2024 10:18:02 -0700 Subject: [PATCH 36/79] artifact name --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 5 +++++ eng/scripts/Language-Settings.ps1 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 2b2658fe53..4fc1c63286 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -220,6 +220,11 @@ jobs: Set-Content -Path $outputPath -Value $outputObject + $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force + Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} + # Set AZURE_SDK_VERSION for use in Doxygen generation Write-Host "##vso[task.setvariable variable=AZURE_SDK_VERSION]$version" displayName: Create package info JSON file for ${{ artifact.Name }} diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 1584608da0..ccbe5552a9 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath "packages/PackageInfo") -Filter "${PackageName}_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path "$ArtifactPath/packages" $PackageName) -Filter "${PackageName}_cpp.json") if ($artifact) { $packages = @{ From 4d3646e85203fcb4f9c46bfd2af60319901af0b9 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 18 Sep 2024 10:31:33 -0700 Subject: [PATCH 37/79] artifact name --- .../templates/jobs/archetype-sdk-client.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 4fc1c63286..9ccbae627c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -323,13 +323,13 @@ jobs: continueOnError: true condition: and(succeeded(), eq(variables['VerifyChangeLogForRelease'], 'true')) - - pwsh: | - $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo - mkdir $packageJsonDest - Copy-Item $packageJsonSource/* $packageJsonDest -Force - Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace ".json","_cpp.json"} - displayName: Copy PackageJson + # - pwsh: | + # $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo + # $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + # mkdir $packageJsonDest + # Copy-Item $packageJsonSource/* $packageJsonDest -Force + # Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace ".json","_cpp.json"} + # displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages From c299e357c0f96d7ca9541025a76325a18359a845 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 08:48:52 -0700 Subject: [PATCH 38/79] api file --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 7 +++++++ eng/scripts/Generate-APIReview-Token-Files.ps1 | 2 +- eng/scripts/Language-Settings.ps1 | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 9ccbae627c..48eb326c58 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -114,6 +114,12 @@ jobs: pwsh: true workingDirectory: $(Pipeline.Workspace) displayName: Generate APIReview Token Files + + - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml + parameters: + ArtifactPath: $(Build.ArtifactStagingDirectory)/packages + ArtifactName: packages + - job: GenerateReleaseArtifacts pool: name: $(WINDOWSPOOL) @@ -223,6 +229,7 @@ jobs: $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force + Copy-Item $packageJsonSource/${{ artifact.Name }}_cpp.api.json $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} # Set AZURE_SDK_VERSION for use in Doxygen generation diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index 86636e0032..d80383a3f6 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -29,7 +29,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o "$OutPath/$ArtifactName/${ArtifactName}_cpp.json" $SourcePath + & $ParserPath -o "$OutPath/$ArtifactName/${ArtifactName}_cpp.api.json" $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index ccbe5552a9..041a78b214 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path "$ArtifactPath/packages" $PackageName) -Filter "${PackageName}_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path "$ArtifactPath/packages" $PackageName) -Filter "${PackageName}_cpp.api.json") if ($artifact) { $packages = @{ From a94ece6c4728f96403d07bddaced09db7cabf26a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 13:55:08 -0700 Subject: [PATCH 39/79] delete job --- .../templates/jobs/archetype-sdk-client.yml | 57 ++++++------------- .../Generate-APIReview-Token-Files.ps1 | 2 +- 2 files changed, 17 insertions(+), 42 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 48eb326c58..d59174f4c0 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -80,46 +80,6 @@ jobs: # Disable build for cpp - client - ${{ if and(eq(parameters.RunMetaJobs, 'true'), ne(parameters.ServiceDirectory, 'not-specified' )) }}: - - job: - displayName: Create API Review - pool: - name: $(WINDOWSPOOL) - image: $(WINDOWSVMIMAGE) - os: windows - steps: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 - arguments: > - -ServiceDirectory ${{ parameters.ServiceDirectory }} - -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo - pwsh: true - workingDirectory: $(Pipeline.Workspace) - displayName: Dump Package properties - condition: succeeded() - - - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - - - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" --recursive - displayName: Download ApiView Parser. - - - task: Powershell@2 - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/scripts/Generate-APIReview-Token-Files.ps1 - arguments: > - -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) - -OutPath $(Build.ArtifactStagingDirectory) - -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe - -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} - pwsh: true - workingDirectory: $(Pipeline.Workspace) - displayName: Generate APIReview Token Files - - - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml - parameters: - ArtifactPath: $(Build.ArtifactStagingDirectory)/packages - ArtifactName: packages - - job: GenerateReleaseArtifacts pool: name: $(WINDOWSPOOL) @@ -129,6 +89,7 @@ jobs: VCPKG_DEFAULT_TRIPLET: 'x64-windows-static' Package.EnableSBOMSigning: true steps: + - template: /eng/common/pipelines/templates/steps/set-default-branch.yml - template: /eng/common/pipelines/templates/steps/credscan.yml parameters: SuppressionFilePath: $(Build.SourcesDirectory)/eng/CredScanSuppression.json @@ -199,6 +160,21 @@ jobs: - pwsh: npm install -g moxygen displayName: Install Moxygen to generate markdown for docs.microsoft.com + - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + displayName: Download ApiView Parser. + + - task: Powershell@2 + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/scripts/Generate-APIReview-Token-Files.ps1 + arguments: > + -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) + -OutPath $(Build.ArtifactStagingDirectory) + -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe + -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} + pwsh: true + workingDirectory: $(Pipeline.Workspace) + displayName: Generate APIReview Token Files + # Generate package spec JSON files for tagging the repo - ${{ each artifact in parameters.Artifacts }}: - pwsh: >- @@ -229,7 +205,6 @@ jobs: $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force - Copy-Item $packageJsonSource/${{ artifact.Name }}_cpp.api.json $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} # Set AZURE_SDK_VERSION for use in Doxygen generation diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index d80383a3f6..ea3e6d481e 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -29,7 +29,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o "$OutPath/$ArtifactName/${ArtifactName}_cpp.api.json" $SourcePath + & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.api.json" $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" From f0edfc11ad4d7b10407df65e9f353bfd30194e51 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 14:13:53 -0700 Subject: [PATCH 40/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index d59174f4c0..23f24658cb 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -207,6 +207,9 @@ jobs: Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} + Write-host "lslslslslslslslsls" + ls -recurse $(Build.ArtifactStagingDirectory)/packages + # Set AZURE_SDK_VERSION for use in Doxygen generation Write-Host "##vso[task.setvariable variable=AZURE_SDK_VERSION]$version" displayName: Create package info JSON file for ${{ artifact.Name }} From 221fc0198dde55fe52e17f18c2f17d6d13b1012a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 14:31:35 -0700 Subject: [PATCH 41/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 23f24658cb..6dd6e20a0a 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -207,7 +207,7 @@ jobs: Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} - Write-host "lslslslslslslslsls" + Write-host "ls -recurse" ls -recurse $(Build.ArtifactStagingDirectory)/packages # Set AZURE_SDK_VERSION for use in Doxygen generation From 50ac051942577babf916b71997fc65d05271df0c Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 14:49:48 -0700 Subject: [PATCH 42/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6dd6e20a0a..f4f319a7f6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -175,6 +175,9 @@ jobs: workingDirectory: $(Pipeline.Workspace) displayName: Generate APIReview Token Files + - pwsh: ls -recurse $(Build.ArtifactStagingDirectory)/packages + displayName: show current packages folder + # Generate package spec JSON files for tagging the repo - ${{ each artifact in parameters.Artifacts }}: - pwsh: >- From 878befa3d06088f91971535754879f1480b5df1a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 14:58:54 -0700 Subject: [PATCH 43/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 +++- eng/scripts/Generate-APIReview-Token-Files.ps1 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index f4f319a7f6..667f3244e9 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -175,7 +175,9 @@ jobs: workingDirectory: $(Pipeline.Workspace) displayName: Generate APIReview Token Files - - pwsh: ls -recurse $(Build.ArtifactStagingDirectory)/packages + - pwsh: | + ls -recurse $(Build.ArtifactStagingDirectory)/packages + write-host "ls -recurse $(Build.ArtifactStagingDirectory)/packages" displayName: show current packages folder # Generate package spec JSON files for tagging the repo diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index ea3e6d481e..5995e9fe4f 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -25,7 +25,7 @@ foreach ($artifact in $ArtifactList) } Write-Host "Creating API review artifact for $ArtifactName" - New-Item -ItemType Directory -Path "$OutPath/$ArtifactName" -Force + New-Item -ItemType Directory -Path "$OutPath/packages/$ArtifactName" -Force $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse From 254ca38159e50ef839d0f06628c6178718ed085f Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 15:13:31 -0700 Subject: [PATCH 44/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 667f3244e9..42e70d22aa 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -187,6 +187,7 @@ jobs: -ItemType directory -Path $(Build.ArtifactStagingDirectory) -Name packages/${{ artifact.Name }} + -Force displayName: Create package info artifact location - task: Powershell@2 From 165af9a0653f0c577499f919ec856be85dc9889a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 15:39:10 -0700 Subject: [PATCH 45/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 42e70d22aa..3259521430 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -357,7 +357,6 @@ jobs: - ${{ each artifact in parameters.Artifacts }}: - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: - ArtifactName: ${{ artifact.Name }} condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml From 9379092255afc951a89750cdd778fdcd5bd41e14 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 16:04:21 -0700 Subject: [PATCH 46/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 3259521430..f62240b936 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -357,7 +357,8 @@ jobs: - ${{ each artifact in parameters.Artifacts }}: - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: - condition: succeeded() + ArtifactPath: $(Build.ArtifactStagingDirectory)/packages + condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From 66b749a9ebec9a0c80c2b39079d2933ec2b3a2e1 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 16:26:40 -0700 Subject: [PATCH 47/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index f62240b936..2774d4e748 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -358,7 +358,6 @@ jobs: - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages - condition: succeeded() - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From 9b331b4b437eeed506187d17aad25b46293eb41b Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 22:30:57 -0700 Subject: [PATCH 48/79] debug --- .../templates/jobs/archetype-sdk-client.yml | 10 ++-- eng/scripts/Create-APIReview.ps1 | 52 ------------------- 2 files changed, 5 insertions(+), 57 deletions(-) delete mode 100644 eng/scripts/Create-APIReview.ps1 diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 2774d4e748..b029df36f2 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -195,7 +195,7 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 arguments: > -ServiceDirectory ${{parameters.ServiceDirectory}} - -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo + -OutDirectory $(Build.ArtifactStagingDirectory)/packages/PackageInfo pwsh: true workingDirectory: $(Pipeline.Workspace) displayName: Dump Package properties @@ -208,10 +208,10 @@ jobs: Set-Content -Path $outputPath -Value $outputObject - $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo - Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force - Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} + # $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" + # $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + # Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force + # Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} Write-host "ls -recurse" ls -recurse $(Build.ArtifactStagingDirectory)/packages diff --git a/eng/scripts/Create-APIReview.ps1 b/eng/scripts/Create-APIReview.ps1 deleted file mode 100644 index f745b18ab6..0000000000 --- a/eng/scripts/Create-APIReview.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -Param( - [Parameter(Mandatory=$True)] - [array] $ArtifactList, - [Parameter(Mandatory=$True)] - [string] $OutPath, - [Parameter(Mandatory=$True)] - [string] $ApiKey, - [Parameter(Mandatory=$True)] - [string] $SourceBranch, - [Parameter(Mandatory=$True)] - [string] $DefaultBranch, - [Parameter(Mandatory=$True)] - [string] $ParserPath, - [Parameter(Mandatory=$True)] - [string] $ServicePath, - [Parameter(Mandatory=$True)] - [string] $RepoName, - [Parameter(Mandatory=$True)] - [string] $BuildId -) - -Write-Host "$PSScriptRoot" -. (Join-Path $PSScriptRoot .. common scripts common.ps1) - -foreach ($artifact in $ArtifactList) -{ - $ArtifactName = $artifact.name - Write-Host "Generating artifact for $ArtifactName" - $SourcePath = Join-Path $ServicePath $ArtifactName "inc" - $apiviewSettings = Join-Path $SourcePath "ApiViewSettings.json" - if (!(Test-Path $apiviewSettings)) - { - Write-Host "ApiViewSettings.json file is not found in $($SourcePath). APIView settings file is required to generate API review file." - exit 1 - } - - Write-Host "Creating API review artifact for $($ArtifactName)" - New-Item -ItemType Directory -Path $OutPath/$ArtifactName -force - $parentPath = Split-Path $ParserPath -Parent - Write-Host "Contents in $($parentPath)" - Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o $OutPath/$ArtifactName/${ArtifactName}_cpp.json $SourcePath - if ($LASTEXITCODE -ne 0) - { - Write-Host "Failed to generate API review file for $($ArtifactName)" - exit 1 - } -} - -$createReviewScript = (Join-Path $PSScriptRoot .. common scripts Create-APIReview.ps1) -Write-Host "Running script to create review for all artifacts." -&($createReviewScript) -ArtifactList $ArtifactList -ArtifactPath $OutPath -APIKey $ApiKey -SourceBranch $SourceBranch -DefaultBranch $DefaultBranch -RepoName $RepoName -BuildId $BuildId From 7296268e4c7f01d1ec9d906c13e51321ed44515e Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 22:44:35 -0700 Subject: [PATCH 49/79] debug --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 041a78b214..6a99a8ec99 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path "$ArtifactPath/packages" $PackageName) -Filter "${PackageName}_cpp.api.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.api.json") if ($artifact) { $packages = @{ From 936ac237c708eebfe58a0eed5bc7ac40c6f43f44 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 22:52:57 -0700 Subject: [PATCH 50/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index b029df36f2..bc3f4a3857 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -349,9 +349,7 @@ jobs: condition: >- and( succeeded(), - ne(variables['Skip.CreateApiReview'], 'true'), - ne(variables['Build.Reason'],'PullRequest'), - eq(variables['System.TeamProject'], 'internal') + ne(variables['Skip.CreateApiReview'], 'true') ) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ each artifact in parameters.Artifacts }}: From 7f3213de2387e8388b10e6dd6d92b7228c9e7804 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 19 Sep 2024 23:03:32 -0700 Subject: [PATCH 51/79] debug --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index bc3f4a3857..b029df36f2 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -349,7 +349,9 @@ jobs: condition: >- and( succeeded(), - ne(variables['Skip.CreateApiReview'], 'true') + ne(variables['Skip.CreateApiReview'], 'true'), + ne(variables['Build.Reason'],'PullRequest'), + eq(variables['System.TeamProject'], 'internal') ) - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ each artifact in parameters.Artifacts }}: From 8e83a54b9d4c1bbb98ab26d5d4cd76b42d0cc6ba Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 02:42:05 -0700 Subject: [PATCH 52/79] dupe package json --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index b029df36f2..1ec66a949e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -208,10 +208,10 @@ jobs: Set-Content -Path $outputPath -Value $outputObject - # $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" - # $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo - # Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force - # Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} + $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force + Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} Write-host "ls -recurse" ls -recurse $(Build.ArtifactStagingDirectory)/packages From 26cee854a34ad96d2438f0feeeee9a32ca3a33ea Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 03:00:30 -0700 Subject: [PATCH 53/79] dupe package json --- .../templates/jobs/archetype-sdk-client.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 1ec66a949e..a89cb64267 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -209,7 +209,7 @@ jobs: Set-Content -Path $outputPath -Value $outputObject $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) "packages/PackageInfo" Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} @@ -314,13 +314,12 @@ jobs: continueOnError: true condition: and(succeeded(), eq(variables['VerifyChangeLogForRelease'], 'true')) - # - pwsh: | - # $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo - # $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo - # mkdir $packageJsonDest - # Copy-Item $packageJsonSource/* $packageJsonDest -Force - # Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace ".json","_cpp.json"} - # displayName: Copy PackageJson + - pwsh: | + $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory) PackageInfo + $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo + mkdir $packageJsonDest + Copy-Item $packageJsonSource/* $packageJsonDest -Force + displayName: Copy PackageJson - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages From d821c701c3856968b1f6aad879b4140a60420370 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 09:43:02 -0700 Subject: [PATCH 54/79] codefile --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - eng/scripts/Generate-APIReview-Token-Files.ps1 | 2 +- eng/scripts/Language-Settings.ps1 | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index a89cb64267..52692f40ba 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -211,7 +211,6 @@ jobs: $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) "packages/PackageInfo" Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force - Get-ChildItem $packageJsonDest | Rename-Item -NewName {$_ -replace "${{ artifact.Name }}.json","${{ artifact.Name }}_cpp.json"} Write-host "ls -recurse" ls -recurse $(Build.ArtifactStagingDirectory)/packages diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index 5995e9fe4f..63a0b50512 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -29,7 +29,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.api.json" $SourcePath + & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.json" $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 6a99a8ec99..1f933c8942 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.api.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.json") if ($artifact) { $packages = @{ From b2f7141d04d167f094e297ae9ef3315f6c4523f3 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 12:09:10 -0700 Subject: [PATCH 55/79] codefile --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 52692f40ba..5da1746b58 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -355,7 +355,7 @@ jobs: - ${{ each artifact in parameters.Artifacts }}: - template: /eng/common/pipelines/templates/steps/detect-api-changes.yml parameters: - ArtifactPath: $(Build.ArtifactStagingDirectory)/packages + ArtifactPath: $(Build.ArtifactStagingDirectory)\packages - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: From 81f44563ee015207f82664567b5aef86628385bb Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 12:29:15 -0700 Subject: [PATCH 56/79] codefile --- eng/scripts/Generate-APIReview-Token-Files.ps1 | 2 +- eng/scripts/Language-Settings.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index 63a0b50512..5995e9fe4f 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -29,7 +29,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.json" $SourcePath + & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.api.json" $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 1f933c8942..6a99a8ec99 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.api.json") if ($artifact) { $packages = @{ From 48fda930dae6b793f558abc1342dc2271e18037e Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 12:48:34 -0700 Subject: [PATCH 57/79] codefile --- eng/scripts/Generate-APIReview-Token-Files.ps1 | 2 +- eng/scripts/Language-Settings.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/scripts/Generate-APIReview-Token-Files.ps1 b/eng/scripts/Generate-APIReview-Token-Files.ps1 index 5995e9fe4f..63a0b50512 100644 --- a/eng/scripts/Generate-APIReview-Token-Files.ps1 +++ b/eng/scripts/Generate-APIReview-Token-Files.ps1 @@ -29,7 +29,7 @@ foreach ($artifact in $ArtifactList) $parentPath = Split-Path $ParserPath -Parent Write-Host "Contents in ${parentPath}:" Get-ChildItem -Path $parentPath -Recurse - & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.api.json" $SourcePath + & $ParserPath -o "$OutPath/packages/$ArtifactName/${ArtifactName}_cpp.json" $SourcePath if ($LASTEXITCODE -ne 0) { Write-Host "Failed to generate API review file for $($ArtifactName)" diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 6a99a8ec99..1f933c8942 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.api.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.json") if ($artifact) { $packages = @{ From e9355e27b9d9d112558a59e676605ca37202731a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 20 Sep 2024 14:43:01 -0700 Subject: [PATCH 58/79] codefile --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 1f933c8942..5db001808b 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}_cpp.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}.json") if ($artifact) { $packages = @{ From 12335cc077b704940830e7e4417c977c8d3b3eda Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 23 Sep 2024 08:25:29 -0700 Subject: [PATCH 59/79] test in staging --- eng/common/pipelines/templates/steps/detect-api-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/detect-api-changes.yml b/eng/common/pipelines/templates/steps/detect-api-changes.yml index 8d605d8694..206ffd1678 100644 --- a/eng/common/pipelines/templates/steps/detect-api-changes.yml +++ b/eng/common/pipelines/templates/steps/detect-api-changes.yml @@ -4,7 +4,7 @@ parameters: steps: - pwsh: | - $apiChangeDetectRequestUrl = "https://apiview.dev/PullRequest/DetectApiChanges" + $apiChangeDetectRequestUrl = "https://apiviewstagingtest.com/PullRequest/DetectApiChanges" echo "##vso[task.setvariable variable=ApiChangeDetectRequestUrl]$apiChangeDetectRequestUrl" displayName: "Set API change detect request URL" condition: eq(variables['ApiChangeDetectRequestUrl'], '') From 34d4a5610cdb9868b6637e00abfb2f05c57fe764 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 24 Sep 2024 00:06:23 -0700 Subject: [PATCH 60/79] cleanup --- .../pipelines/templates/steps/detect-api-changes.yml | 2 +- .../templates/jobs/archetype-sdk-client.yml | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/eng/common/pipelines/templates/steps/detect-api-changes.yml b/eng/common/pipelines/templates/steps/detect-api-changes.yml index 206ffd1678..8d605d8694 100644 --- a/eng/common/pipelines/templates/steps/detect-api-changes.yml +++ b/eng/common/pipelines/templates/steps/detect-api-changes.yml @@ -4,7 +4,7 @@ parameters: steps: - pwsh: | - $apiChangeDetectRequestUrl = "https://apiviewstagingtest.com/PullRequest/DetectApiChanges" + $apiChangeDetectRequestUrl = "https://apiview.dev/PullRequest/DetectApiChanges" echo "##vso[task.setvariable variable=ApiChangeDetectRequestUrl]$apiChangeDetectRequestUrl" displayName: "Set API change detect request URL" condition: eq(variables['ApiChangeDetectRequestUrl'], '') diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 5da1746b58..fb27ebc1fb 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -175,11 +175,6 @@ jobs: workingDirectory: $(Pipeline.Workspace) displayName: Generate APIReview Token Files - - pwsh: | - ls -recurse $(Build.ArtifactStagingDirectory)/packages - write-host "ls -recurse $(Build.ArtifactStagingDirectory)/packages" - displayName: show current packages folder - # Generate package spec JSON files for tagging the repo - ${{ each artifact in parameters.Artifacts }}: - pwsh: >- @@ -204,7 +199,7 @@ jobs: $outputPath = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/${{ artifact.Name }}/package-info.json $version = eng/scripts/Get-PkgVersion -ServiceDirectory ${{ parameters.ServiceDirectory }} -PackageName ${{ artifact.Path }} - $outputObject = @{ version = $version.ToString(); name = '${{ artifact.Name }}'; ArtifactName = '${{ artifact.Name }}'; packageName = "${{ artifact.Name }}_$version"; DirectoryPath = ""} | ConvertTo-Json + $outputObject = @{ version = $version.ToString(); name = '${{ artifact.Name }}'; packageName = "${{ artifact.Name }}_$version"; } | ConvertTo-Json Set-Content -Path $outputPath -Value $outputObject @@ -212,9 +207,6 @@ jobs: $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) "packages/PackageInfo" Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force - Write-host "ls -recurse" - ls -recurse $(Build.ArtifactStagingDirectory)/packages - # Set AZURE_SDK_VERSION for use in Doxygen generation Write-Host "##vso[task.setvariable variable=AZURE_SDK_VERSION]$version" displayName: Create package info JSON file for ${{ artifact.Name }} @@ -318,7 +310,7 @@ jobs: $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/PackageInfo mkdir $packageJsonDest Copy-Item $packageJsonSource/* $packageJsonDest -Force - displayName: Copy PackageJson + displayName: Copy Package Json - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml parameters: ArtifactPath: $(Build.ArtifactStagingDirectory)/packages From 9d30bab44d0216c5cf46ecf64d067287196dbe39 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 24 Sep 2024 03:41:53 -0700 Subject: [PATCH 61/79] use api parser 0.15.0 --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index fb27ebc1fb..3f5e23dbab 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -160,7 +160,7 @@ jobs: - pwsh: npm install -g moxygen displayName: Install Moxygen to generate markdown for docs.microsoft.com - - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/0.15.0/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. - task: Powershell@2 From 002ce2e710bf10a573219ad2526bce8780e4780f Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 24 Sep 2024 04:02:19 -0700 Subject: [PATCH 62/79] ignore unfound package for apiview artifacts --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 5db001808b..abba202c43 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}.json") + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}.json" -ErrorAction Ignore) if ($artifact) { $packages = @{ From 288e9e5ff745db4ad8b3f6cd339073ef889e8bce Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 25 Sep 2024 09:50:15 -0700 Subject: [PATCH 63/79] pr adjustments --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 9 ++++----- eng/scripts/Language-Settings.ps1 | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 3f5e23dbab..eb29ba7e41 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -160,7 +160,10 @@ jobs: - pwsh: npm install -g moxygen displayName: Install Moxygen to generate markdown for docs.microsoft.com - - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/0.15.0/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + - pwsh: | + $latestVersion = (azcopy list "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/") -replace '[\/;].*' | Get-Unique | sort {[version] $_} -Descending | Select-Object -First 1 + Write-Host "##vso[task.setvariable variable=APIVIEW_PARSER_VERSION]$latestVersion" + - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$(APIVIEW_PARSER_VERSION)/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. - task: Powershell@2 @@ -203,10 +206,6 @@ jobs: Set-Content -Path $outputPath -Value $outputObject - $packageJsonDest = Join-Path -Path $(Build.ArtifactStagingDirectory)/packages "${{ artifact.Name }}" - $packageJsonSource = Join-Path -Path $(Build.ArtifactStagingDirectory) "packages/PackageInfo" - Copy-Item $packageJsonSource/${{ artifact.Name }}.json $packageJsonDest -Force - # Set AZURE_SDK_VERSION for use in Doxygen generation Write-Host "##vso[task.setvariable variable=AZURE_SDK_VERSION]$version" displayName: Create package info JSON file for ${{ artifact.Name }} diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index abba202c43..738d7f2be4 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -106,7 +106,7 @@ function SetPackageVersion ($PackageName, $Version, $ServiceDirectory, $ReleaseD function Find-cpp-Artifacts-For-Apireview($ArtifactPath, $PackageName) { - $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath $PackageName) -Filter "${PackageName}.json" -ErrorAction Ignore) + $artifact = @(Get-ChildItem -Path (Join-Path $ArtifactPath "PackageInfo") -Filter "${PackageName}.json" -ErrorAction Ignore) if ($artifact) { $packages = @{ From 3d084b99c6411cf9dbb631b345e4df9a25280861 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 25 Sep 2024 10:15:31 -0700 Subject: [PATCH 64/79] pr adjustments --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index eb29ba7e41..d506a1491c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -161,9 +161,8 @@ jobs: displayName: Install Moxygen to generate markdown for docs.microsoft.com - pwsh: | - $latestVersion = (azcopy list "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/") -replace '[\/;].*' | Get-Unique | sort {[version] $_} -Descending | Select-Object -First 1 Write-Host "##vso[task.setvariable variable=APIVIEW_PARSER_VERSION]$latestVersion" - - pwsh: azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$(APIVIEW_PARSER_VERSION)/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$(APIVIEW_PARSER_VERSION)/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. - task: Powershell@2 From 6ad7f30ead1df8b54da8eeb37a362d718a7f2126 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 25 Sep 2024 12:24:15 -0700 Subject: [PATCH 65/79] pr adjustments --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index d506a1491c..b0612bc83b 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -161,8 +161,9 @@ jobs: displayName: Install Moxygen to generate markdown for docs.microsoft.com - pwsh: | - Write-Host "##vso[task.setvariable variable=APIVIEW_PARSER_VERSION]$latestVersion" - azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$(APIVIEW_PARSER_VERSION)/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + $latestVersion = "0.15.0" + Write-Host "Using apiview parser version $latestVersion" + azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$latestVersion/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. - task: Powershell@2 From 4588a4764f4ede29934ddbdf40e4b3aafbdf05d1 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 27 Sep 2024 10:13:33 -0700 Subject: [PATCH 66/79] latest version update --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index b0612bc83b..6800545741 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -161,7 +161,7 @@ jobs: displayName: Install Moxygen to generate markdown for docs.microsoft.com - pwsh: | - $latestVersion = "0.15.0" + $latestVersion = "20240927.2" Write-Host "Using apiview parser version $latestVersion" azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$latestVersion/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. From d8d80aea5fb796623d5037dff354b3468407df99 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Sun, 29 Sep 2024 21:14:15 -0700 Subject: [PATCH 67/79] update latest parser version --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6800545741..14e50e18d0 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -161,7 +161,7 @@ jobs: displayName: Install Moxygen to generate markdown for docs.microsoft.com - pwsh: | - $latestVersion = "20240927.2" + $latestVersion = "20240927.5" Write-Host "Using apiview parser version $latestVersion" azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$latestVersion/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. From 6612b7721181df2999cdfb170998eebe9ed33d6a Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 08:57:36 -0700 Subject: [PATCH 68/79] add api parser version --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 14e50e18d0..df28579452 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -86,6 +86,7 @@ jobs: image: $(WINDOWSVMIMAGE) os: windows variables: + apiviewParserVersion: "20240927.5" VCPKG_DEFAULT_TRIPLET: 'x64-windows-static' Package.EnableSBOMSigning: true steps: @@ -161,9 +162,8 @@ jobs: displayName: Install Moxygen to generate markdown for docs.microsoft.com - pwsh: | - $latestVersion = "20240927.5" - Write-Host "Using apiview parser version $latestVersion" - azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/$latestVersion/*" "$(System.DefaultWorkingDirectory)/parser" --recursive + Write-Host "Using apiview parser version ${{ variables.apiviewParserVersion }}" + azcopy copy "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-cpp/parseazuresdkcpp/${{ variables.apiviewParserVersion }}/*" "$(System.DefaultWorkingDirectory)/parser" --recursive displayName: Download ApiView Parser. - task: Powershell@2 From 0886b24288e5ae6553b29e82f6b91a3eddfc5fb6 Mon Sep 17 00:00:00 2001 From: Albert Cheng <38804567+ckairen@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:01:43 -0700 Subject: [PATCH 69/79] Update sdk/template/azure-template/src/template_client.cpp --- sdk/template/azure-template/src/template_client.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp index 1ea557641a..b6cb638967 100644 --- a/sdk/template/azure-template/src/template_client.cpp +++ b/sdk/template/azure-template/src/template_client.cpp @@ -1,6 +1,5 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -// Just Triggering Testings. #include "azure/template/template_client.hpp" From c7c54cfec072a5eed27b9e67ab15d3e70fdf5b71 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 10:49:42 -0700 Subject: [PATCH 70/79] add template testing for api changes --- sdk/template/azure-template/src/private/package_version.hpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/template/azure-template/src/private/package_version.hpp b/sdk/template/azure-template/src/private/package_version.hpp index 74e9734cdf..5beab6352e 100644 --- a/sdk/template/azure-template/src/private/package_version.hpp +++ b/sdk/template/azure-template/src/private/package_version.hpp @@ -37,6 +37,11 @@ namespace Azure { namespace Template { namespace _detail { */ static constexpr int Patch = AZURE_TEMPLATE_VERSION_PATCH; + /** + * @brief Patch numeric identifier. + */ + static constexpr int Testing = 1000; + /** * @brief Indicates whether the SDK is in a pre-release state. */ From 2185e702f348f2fde349c4c9aa03ee7b5ec6292b Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 11:06:47 -0700 Subject: [PATCH 71/79] add template testing for api changes --- .../azure-template/inc/azure/template/template_client.hpp | 8 ++++++++ sdk/template/azure-template/src/template_client.cpp | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/sdk/template/azure-template/inc/azure/template/template_client.hpp b/sdk/template/azure-template/inc/azure/template/template_client.hpp index aafaff9432..ba5a49b091 100644 --- a/sdk/template/azure-template/inc/azure/template/template_client.hpp +++ b/sdk/template/azure-template/inc/azure/template/template_client.hpp @@ -30,6 +30,14 @@ namespace Azure { namespace Template { * @returns the value associated with the key. */ int GetValue(int key, Azure::Core::Context const& context = Azure::Core::Context{}) const; + /** @brief Return the value associated with the input key. + * + * @param key Key to query. + * @param context Context for cancelling long running operations. + * @returns the value associated with the key. + */ + int GetValue2(int key, Azure::Core::Context const& context = Azure::Core::Context{}) const; + private: Azure::Core::Tracing::_internal::TracingContextFactory m_tracingFactory; diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp index b6cb638967..3a94a6182c 100644 --- a/sdk/template/azure-template/src/template_client.cpp +++ b/sdk/template/azure-template/src/template_client.cpp @@ -64,3 +64,8 @@ int TemplateClient::GetValue(int key, Azure::Core::Context const& context) const throw; } } + +int TemplateClient::GetValue2(int key, Azure::Core::Context const& context) const +{ + return 0; +} From 11a5db91760540180ec9d3a303ff6a0037fd4e2e Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 11:20:09 -0700 Subject: [PATCH 72/79] out path change --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index df28579452..0e4f0fd580 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -324,7 +324,6 @@ jobs: filePath: $(System.DefaultWorkingDirectory)/eng/common/scripts/Create-APIReview.ps1 arguments: > -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) - -OutPath $(Build.ArtifactStagingDirectory) -ApiKey "$(azuresdk-apiview-apikey)" -SourceBranch $(Build.SourceBranchName) -DefaultBranch $(DefaultBranch) From bf78024c63f02eeb878ccc038060a68dae73dcf6 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 11:22:15 -0700 Subject: [PATCH 73/79] out path change --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 0e4f0fd580..6a5c69ee01 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -324,6 +324,7 @@ jobs: filePath: $(System.DefaultWorkingDirectory)/eng/common/scripts/Create-APIReview.ps1 arguments: > -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) + -ArtifactPath "$(Build.ArtifactStagingDirectory)/packages" -ApiKey "$(azuresdk-apiview-apikey)" -SourceBranch $(Build.SourceBranchName) -DefaultBranch $(DefaultBranch) From 4b83f888fe21f0e43b06e1810562026ad3657cb1 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 11:32:40 -0700 Subject: [PATCH 74/79] delete parser path --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6a5c69ee01..1e3d433bc1 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -328,7 +328,6 @@ jobs: -ApiKey "$(azuresdk-apiview-apikey)" -SourceBranch $(Build.SourceBranchName) -DefaultBranch $(DefaultBranch) - -ParserPath $(System.DefaultWorkingDirectory)/parser/RelWithDebInfo/ParseAzureSdkCpp.exe -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} -BuildId $(Build.BuildId) -RepoName "$(Build.Repository.Name)" From d38dab487542dcf1034723908e2642120f550a0d Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 30 Sep 2024 11:44:04 -0700 Subject: [PATCH 75/79] delete parser path --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 1e3d433bc1..23306bfef4 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -328,7 +328,6 @@ jobs: -ApiKey "$(azuresdk-apiview-apikey)" -SourceBranch $(Build.SourceBranchName) -DefaultBranch $(DefaultBranch) - -ServicePath $(Build.SourcesDirectory)/sdk/${{ parameters.ServiceDirectory }} -BuildId $(Build.BuildId) -RepoName "$(Build.Repository.Name)" pwsh: true From 206aa8c35da4ae12c525b8a523fe7281f118a56e Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 2 Oct 2024 11:20:13 -0700 Subject: [PATCH 76/79] move save package properties out of artifacts loop --- .../templates/jobs/archetype-sdk-client.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 23306bfef4..c22a9527a9 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -178,6 +178,16 @@ jobs: workingDirectory: $(Pipeline.Workspace) displayName: Generate APIReview Token Files + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 + arguments: > + -ServiceDirectory ${{parameters.ServiceDirectory}} + -OutDirectory $(Build.ArtifactStagingDirectory)/packages/PackageInfo + pwsh: true + workingDirectory: $(Pipeline.Workspace) + displayName: Dump Package properties + # Generate package spec JSON files for tagging the repo - ${{ each artifact in parameters.Artifacts }}: - pwsh: >- @@ -188,16 +198,6 @@ jobs: -Force displayName: Create package info artifact location - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 - arguments: > - -ServiceDirectory ${{parameters.ServiceDirectory}} - -OutDirectory $(Build.ArtifactStagingDirectory)/packages/PackageInfo - pwsh: true - workingDirectory: $(Pipeline.Workspace) - displayName: Dump Package properties - - pwsh: | $outputPath = Join-Path -Path $(Build.ArtifactStagingDirectory) packages/${{ artifact.Name }}/package-info.json From 430931c3fb33ac11ce9140cab25318a2761b1b36 Mon Sep 17 00:00:00 2001 From: Albert Cheng <38804567+ckairen@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:04:04 -0700 Subject: [PATCH 77/79] Update sdk/template/azure-template/src/template_client.cpp --- sdk/template/azure-template/src/template_client.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp index 3a94a6182c..b6cb638967 100644 --- a/sdk/template/azure-template/src/template_client.cpp +++ b/sdk/template/azure-template/src/template_client.cpp @@ -64,8 +64,3 @@ int TemplateClient::GetValue(int key, Azure::Core::Context const& context) const throw; } } - -int TemplateClient::GetValue2(int key, Azure::Core::Context const& context) const -{ - return 0; -} From d16270232bffd0063443211e9a29c86470c64d46 Mon Sep 17 00:00:00 2001 From: Albert Cheng <38804567+ckairen@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:04:25 -0700 Subject: [PATCH 78/79] Update sdk/template/azure-template/src/private/package_version.hpp --- sdk/template/azure-template/src/private/package_version.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk/template/azure-template/src/private/package_version.hpp b/sdk/template/azure-template/src/private/package_version.hpp index 5beab6352e..74e9734cdf 100644 --- a/sdk/template/azure-template/src/private/package_version.hpp +++ b/sdk/template/azure-template/src/private/package_version.hpp @@ -37,11 +37,6 @@ namespace Azure { namespace Template { namespace _detail { */ static constexpr int Patch = AZURE_TEMPLATE_VERSION_PATCH; - /** - * @brief Patch numeric identifier. - */ - static constexpr int Testing = 1000; - /** * @brief Indicates whether the SDK is in a pre-release state. */ From 62ddf1b236c1381c0e0bf0ed7038efafb1caec1d Mon Sep 17 00:00:00 2001 From: Albert Cheng <38804567+ckairen@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:04:47 -0700 Subject: [PATCH 79/79] Update sdk/template/azure-template/inc/azure/template/template_client.hpp --- .../azure-template/inc/azure/template/template_client.hpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sdk/template/azure-template/inc/azure/template/template_client.hpp b/sdk/template/azure-template/inc/azure/template/template_client.hpp index ba5a49b091..aafaff9432 100644 --- a/sdk/template/azure-template/inc/azure/template/template_client.hpp +++ b/sdk/template/azure-template/inc/azure/template/template_client.hpp @@ -30,14 +30,6 @@ namespace Azure { namespace Template { * @returns the value associated with the key. */ int GetValue(int key, Azure::Core::Context const& context = Azure::Core::Context{}) const; - /** @brief Return the value associated with the input key. - * - * @param key Key to query. - * @param context Context for cancelling long running operations. - * @returns the value associated with the key. - */ - int GetValue2(int key, Azure::Core::Context const& context = Azure::Core::Context{}) const; - private: Azure::Core::Tracing::_internal::TracingContextFactory m_tracingFactory;