Jessli/convert

.github/CODEOWNERS

@@ -62,18 +62,12 @@
 # PRLabel: %Storage
 /sdk/storage/                                                        @annatisch @jalauzon-msft @vincenttran-msft @weirongw23-msft
 
-# AzureSdkOwners: @xiangyan99
+# AzureSdkOwners: @mrm9084
 # ServiceLabel: %App Configuration
 # ServiceOwners: @albertofori @avanigupta @mrm9084
 
 # PRLabel: %App Configuration
-/sdk/appconfiguration/                                               @xiangyan99
-
-# ServiceOwners: @mrm9084
-# ServiceLabel: %App Configuration Provider
-
-# PRLabel: %App Configuration Provider
-/sdk/appconfiguration/azure-appconfiguration-provider/               @albertofori @avanigupta @mrm9084 @rossgrambo
+/sdk/appconfiguration/                                               @albertofori @avanigupta @mrm9084 @rossgrambo @xiangyan99
 
 # ServiceLabel: %Attestation
 # PRLabel: %Attestation

.vscode/cspell.json

@@ -1873,6 +1873,14 @@
         "Onvif"
       ]
     },
+    {
+      "filename": "sdk/confidentialledger/azure-confidentialledger/**",
+      "words": [
+        "mrenclave",
+        "MRENCLAVE",
+        "oeverify"
+      ]
+    },
     {
       "filename": "sdk/confidentialledger/azure-confidentialledger/azure/confidentialledger/_operations/*.py",
       "words": [

eng/common/pipelines/templates/steps/set-vcpkg-cache-vars.yml

@@ -1,3 +1,9 @@
+
+parameters:
+  - name: TokenTimeoutInHours
+    type: number
+    default: 1
+
 steps:
   - pwsh: |
       Write-Host "Setting vcpkg cache variables for read only access to vcpkg binary and asset caches"
@@ -12,6 +18,7 @@ steps:
         azureSubscription: 'Azure SDK Artifacts'
         ScriptType: FilePath
         ScriptPath: eng/common/scripts/Set-VcpkgWriteModeCache.ps1
+        ScriptArguments: -TokenTimeoutInHours ${{ parameters.TokenTimeoutInHours }}
         azurePowerShellVersion: LatestVersion
         pwsh: true
       # This step is idempotent and can be run multiple times in cases of

eng/common/pipelines/templates/steps/validate-all-packages.yml

@@ -1,14 +1,23 @@
 parameters:
-  ArtifactPath: $(Build.ArtifactStagingDirectory)
-  Artifacts: []
-  ConfigFileDir: $(Build.ArtifactStagingDirectory)/PackageInfo
+  - name: ArtifactPath
+    type: string
+    default: $(Build.ArtifactStagingDirectory)
+  - name: Artifacts
+    type: object
+    default: []
+  - name: ConfigFileDir
+    type: string
+    default: $(Build.ArtifactStagingDirectory)/PackageInfo
+  - name: PackageInfoFiles
+    type: object
+    default: []
 
 steps:
  - ${{ if and(ne(variables['Skip.PackageValidation'], 'true'), and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))) }}:
     - pwsh: |
         echo "##vso[task.setvariable variable=SetAsReleaseBuild]false"
       displayName: "Set as release build"
-      condition: and(succeeded(), eq(variables['SetAsReleaseBuild'], ''))
+      condition: and(succeededOrFailed(), eq(variables['SetAsReleaseBuild'], ''))
 
     - task: AzureCLI@2
       inputs:
@@ -24,7 +33,8 @@ steps:
             -ConfigFileDir '${{ parameters.ConfigFileDir }}' `
             -BuildDefinition $(System.CollectionUri)$(System.TeamProject)/_build?definitionId=$(System.DefinitionId) `
             -PipelineUrl $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) `
-            -IsReleaseBuild $$(SetAsReleaseBuild)
+            -IsReleaseBuild $$(SetAsReleaseBuild) `
+            -PackageInfoFiles ('${{ convertToJson(parameters.PackageInfoFiles) }}' | ConvertFrom-Json -NoEnumerate)
         workingDirectory: $(Pipeline.Workspace)
       displayName: Validate packages and update work items
       continueOnError: true

eng/common/scripts/Create-APIReview.ps1

@@ -24,7 +24,7 @@ Set-StrictMode -Version 3
 . (Join-Path $PSScriptRoot Helpers ApiView-Helpers.ps1)
 
 # Submit API review request and return status whether current revision is approved or pending or failed to create review
-function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVersion)
+function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVersion, $packageType)
 {
     Write-Host "File path: $filePath"
     $fileName = Split-Path -Leaf $filePath
@@ -61,6 +61,13 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
     $multipartContent.Add($releaseTagParamContent)
     Write-Host "Request param, setReleaseTag: $MarkPackageAsShipped"
 
+    $packageTypeParam = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("form-data")
+    $packageTypeParam.Name = "packageType"
+    $packageTypeParamContent = [System.Net.Http.StringContent]::new($packageType)
+    $packageTypeParamContent.Headers.ContentDisposition = $packageTypeParam
+    $multipartContent.Add($packageTypeParamContent)
+    Write-Host "Request param, packageType: $packageType"
+
     if ($releaseStatus -and ($releaseStatus -ne "Unreleased"))
     {
         $compareAllParam = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("form-data")
@@ -92,14 +99,14 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
     return $StatusCode
 }
 
-function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $reviewFileName, $packageVersion, $filePath)
+function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $reviewFileName, $packageVersion, $filePath, $packageType)
 {
     Write-Host "Original File path: $filePath"
     $fileName = Split-Path -Leaf $filePath
     Write-Host "OriginalFile name: $fileName"
 
     $params = "buildId=${BuildId}&artifactName=${ArtifactName}&originalFilePath=${fileName}&reviewFilePath=${reviewFileName}"
-    $params += "&label=${apiLabel}&repoName=${RepoName}&packageName=${packageName}&project=internal&packageVersion=${packageVersion}"
+    $params +="&label=${apiLabel}&repoName=${RepoName}&packageName=${packageName}&project=internal&packageVersion=${packageVersion}&packageType=${packageType}"
     if($MarkPackageAsShipped) {
         $params += "&setReleaseTag=true"
     }
@@ -146,17 +153,18 @@ function Get-APITokenFileName($packageName)
 function Submit-APIReview($packageInfo, $packagePath)
 {
     $apiLabel = "Source Branch:${SourceBranch}"
+    $packageType = $packageInfo.SdkType
 
     # Get generated review token file if present
     # APIView processes request using different API if token file is already generated
     $reviewTokenFileName =  Get-APITokenFileName $packageInfo.ArtifactName
     if ($reviewTokenFileName) {
         Write-Host "Uploading review token file $reviewTokenFileName to APIView."
-        return Upload-ReviewTokenFile $packageInfo.ArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath
+        return Upload-ReviewTokenFile $packageInfo.ArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath $packageType
     }
     else {
         Write-Host "Uploading $packagePath to APIView."
-        return Upload-SourceArtifact $packagePath $apiLabel $packageInfo.ReleaseStatus $packageInfo.Version
+        return Upload-SourceArtifact $packagePath $apiLabel $packageInfo.ReleaseStatus $packageInfo.Version $packageType
     }
 }
 

eng/common/scripts/Detect-Api-Changes.ps1

@@ -22,7 +22,7 @@ Param (
 $configFileDir = Join-Path -Path $ArtifactPath "PackageInfo"
 
 # Submit API review request and return status whether current revision is approved or pending or failed to create review
-function Submit-Request($filePath, $packageName)
+function Submit-Request($filePath, $packageName, $packageType)
 {
     $repoName = $RepoFullName
     if (!$repoName) {
@@ -39,6 +39,7 @@ function Submit-Request($filePath, $packageName)
     $query.Add('packageName', $packageName)
     $query.Add('language', $LanguageShort)
     $query.Add('project', $DevopsProject)
+    $query.Add('packageType', $packageType)
     $reviewFileFullName = Join-Path -Path $ArtifactPath $packageName $reviewFileName
     # If CI generates token file then it passes both token file name and original file (filePath) to APIView
     # If both files are passed then APIView downloads the parent directory as a zip
@@ -126,6 +127,7 @@ foreach ($packageInfoFile in $packageInfoFiles)
 {
     $packageInfo = Get-Content $packageInfoFile | ConvertFrom-Json
     $pkgArtifactName = $packageInfo.ArtifactName ?? $packageInfo.Name
+    $packageType = $packageInfo.SdkType
 
     LogInfo "Processing $($pkgArtifactName)"
 
@@ -157,7 +159,7 @@ foreach ($packageInfoFile in $packageInfoFiles)
         if ($isRequired -eq $True)
         {
             $filePath = $pkgPath.Replace($ArtifactPath , "").Replace("\", "/")
-            $respCode = Submit-Request -filePath $filePath -packageName $pkgArtifactName
+            $respCode = Submit-Request -filePath $filePath -packageName $pkgArtifactName -packageType $packageType
             if ($respCode -ne '200')
             {
                 $responses[$pkgArtifactName] = $respCode