Azure · chrwhit · Jun 7, 2021 · Jun 1, 2021 · Jun 1, 2021 · Jun 1, 2021
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,7 +9,7 @@
 /sdk/                                               @joshfree @srnagar @hemanttanwar @anuchandy @conniey @jianghaolu
 
 # BOM
-# PRLabel: %Azure.Core
+# PRLabel: %bom
 /sdk/boms/azure-sdk-bom/                            @alzimmermsft @jonathangiles @srnagar @hemanttanwar @anuchandy @pallavit
 # PRLabel: %azure-spring
 /sdk/boms/azure-spring-boot-bom/                    @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
@@ -75,6 +75,9 @@
 
 /sdk/monitor/azure-monitor-opentelemetry-exporter   @trask @joshfree @srnagar
 
+# PRLabel: %Mixed Reality Authentication
+/sdk/mixedreality/azure-mixedreality-authentication @craigktreasure
+
 # PRLabel: %Remote Rendering
 /sdk/remoterendering/                               @MalcolmTyrrell
 

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,8 +27,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Setup (please complete the following information):**
  - OS: [e.g. iOS]
- - IDE : [e.g. IntelliJ]
- - Version of the Library used
+ - IDE: [e.g. IntelliJ]
+ - Library/Libraries: [e.g. com.azure:azure-core:1.16.0 (groupId:artifactId:version)]
 
 **Additional context**
 Add any other context about the problem here.

diff --git a/.github/ISSUE_TEMPLATE/question-query-template.md b/.github/ISSUE_TEMPLATE/question-query-template.md
@@ -15,8 +15,8 @@ A clear explanation of why is this not a bug or a feature request?
 
 **Setup (please complete the following information if applicable):**
  - OS: [e.g. iOS]
- - IDE : [e.g. IntelliJ]
- - Version of the Library used
+ - IDE: [e.g. IntelliJ]
+ - Library/Libraries: [e.g. com.azure:azure-core:1.16.0 (groupId:artifactId:version)]
 
  **Information Checklist**
  Kindly make sure that you have added all the following information above and checkoff the required fields otherwise we will treat the issuer as an incomplete report

diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>2.0.5</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
+      <version>2.0.6</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
     </dependency>
 
     <dependency>
@@ -142,7 +142,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
+      <version>1.7.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
     </dependency>
 
     <dependency>

diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
@@ -129,7 +129,7 @@ known_content_issues:
   - ['sdk/communication/azure-communication-sms/swagger/README.md', '#3113']
   - ['sdk/communication/azure-communication-identity/swagger/README.md', '#3113']
   - ['sdk/communication/azure-communication-phonenumbers/swagger/README.md', '#3113']
-  - ['sdk/confidentialledger/azure-data-confidentialledger/swagger/README.md', '#3113']
+  - ['sdk/confidentialledger/azure-security-confidentialledger/swagger/README.md', '#3113']
   - ['sdk/cosmos/changelog/README.md', '#3113']
   - ['sdk/cosmos/faq/README.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-benchmark/README.md', '#3113']

diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json
@@ -506,6 +506,12 @@
         "code": "java.annotation.attributeValueChanged",
         "new": "@interface com.azure.core.annotation.JsonFlatten",
         "justification": "Changes made the annotation more permissive on the target types."
+      },
+      {
+        "code": "java.field.serialVersionUIDUnchanged",
+        "old": "field com.azure.core.amqp.exception.AmqpErrorContext.serialVersionUID",
+        "new": "field com.azure.core.amqp.exception.AmqpErrorContext.serialVersionUID",
+        "justification": "The field ErrorInfo was added to AmqpErrorContext, but no existing fields were removed or changed."
       }
     ]
   }

diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -2486,7 +2486,7 @@
 
   <!-- Two clients in Confidential Ledger share the same builder resulting unused field in each  -->
   <Match>
-    <Class name="~com\.azure\.data\.confidentialledger\.\w+BaseClient"/>
+    <Class name="~com\.azure\.security\.confidentialledger\.\w+BaseClient"/>
     <Bug pattern="URF_UNREAD_FIELD"/>
   </Match>
 

diff --git a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
@@ -35,7 +35,7 @@ parameters:
 # When that occurs, provide a name other than the default value.
 - name: GenerateJobName
   type: string
-  default: 'generate_matrix'
+  default: 'generate_job_matrix'
 
 jobs:
 - job: ${{ parameters.GenerateJobName }}
@@ -44,7 +44,6 @@ jobs:
   pool:
     name: ${{ parameters.Pool }}
     vmImage: ${{ parameters.OsVmImage }}
-  displayName: Generate Job Matrix
   ${{ if parameters.DependsOn }}:
     dependsOn: ${{ parameters.DependsOn }}
   steps:

diff --git a/eng/common/scripts/Delete-RemoteBranches.ps1 b/eng/common/scripts/Delete-RemoteBranches.ps1
@@ -1,7 +1,14 @@
 param(
+  [Parameter(Mandatory = $true)]
   $RepoOwner,
+  # Use this if a pull request might have been opened from one repo against another.
+  # E.g Pull request opened from azure-sdk/azure-sdk prBranch --> Azure/azure-sdk baseBranch
+  $ForkRepoOwner,
+  [Parameter(Mandatory = $true)]
   $RepoName,
+  [Parameter(Mandatory = $true)]
   $BranchPrefix,
+  [Parameter(Mandatory = $true)]
   $AuthToken
 )
 
@@ -23,6 +30,11 @@ foreach ($branch in $branches)
     $head = "${RepoOwner}/${RepoName}:${branchName}"
     LogDebug "Operating on branch [ $branchName ]"
     $pullRequests = Get-GitHubPullRequests -RepoOwner $RepoOwner -RepoName $RepoName -State "all" -Head $head -AuthToken $AuthToken
+
+    if ($ForkRepoOwner)
+    {
+      $pullRequests += Get-GitHubPullRequests -RepoOwner $ForkRepoOwner -RepoName $RepoName -State "all" -Head $head -AuthToken $AuthToken
+    }
   }
   catch
   {
@@ -31,16 +43,19 @@ foreach ($branch in $branches)
   }
 
   $openPullRequests = $pullRequests | ? { $_.State -eq "open" }
-
-  if ($openPullRequests.Count -eq 0)
+  if ($openPullRequests.Count -gt 0)
   {
-    LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has no associated open Pull Request. Deleting Branch"
-    try{
-      Remove-GitHubSourceReferences -RepoOwner $RepoOwner -RepoName $RepoName -Ref ($branch.Remove(0,5)) -AuthToken $AuthToken
-    }
-    catch {
-      LogError "Remove-GitHubSourceReferences failed with exception:`n$_"
-      exit 1
-    }
+    LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has open pull Requests. Skipping"
+    LogDebug $openPullRequests.url
+    continue
+  }
+
+  LogDebug "Branch [ $branchName ] in repo [ $RepoName ] has no associated open Pull Request. Deleting Branch"
+  try{
+    Remove-GitHubSourceReferences -RepoOwner $RepoOwner -RepoName $RepoName -Ref ($branch.Remove(0,5)) -AuthToken $AuthToken
+  }
+  catch {
+    LogError "Remove-GitHubSourceReferences failed with exception:`n$_"
+    exit 1
   }
 }
diff --git a/eng/common/scripts/Helpers/ApiView-Helpers.ps1 b/eng/common/scripts/Helpers/ApiView-Helpers.ps1
@@ -0,0 +1,55 @@
+function MapLanguageName($language)
+{
+    $lang = $language
+    # Update language name to match those in API cosmos DB. Cosmos SQL is case sensitive and handling this within the query makes it slow.
+    if($lang -eq 'javascript'){
+        $lang = "JavaScript"
+    }
+    elseif ($lang -eq "dotnet"){
+        $lang = "C#"
+    }
+    elseif ($lang -eq "java"){
+        $lang = "Java"
+    }
+    elseif ($lang -eq "python"){
+        $lang = "Python"
+    }
+    else{
+      $lang = $null
+    }
+    return $lang
+}
+
+function Check-ApiReviewStatus($packageName, $packageVersion, $language, $url, $apiKey)
+{
+  # Get API view URL and API Key to check status
+  Write-Host "Checking API review status"
+  $lang = MapLanguageName -language $language
+  if ($lang -eq $null) {
+    return
+  }
+  $headers = @{ "ApiKey" = $apiKey }
+  $body = @{
+    language = $lang
+    packageName = $packageName
+    packageVersion = $packageVersion
+  }
+
+  try
+  {
+    $response = Invoke-WebRequest $url -Method 'GET' -Headers $headers -Body $body
+    if ($response.StatusCode -eq '200')
+    {
+      Write-Host "API Review is approved for package $($packageName)"
+    }
+    else
+    {
+      Write-Warning "API Review is not approved for package $($packageName). Release pipeline will fail if API review is not approved."
+      Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+    }
+  }
+  catch
+  {
+    Write-Warning "Failed to check API review status for package $($PackageName). You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
+  }
+}
diff --git a/eng/common/scripts/Prepare-Release.ps1 b/eng/common/scripts/Prepare-Release.ps1
@@ -49,6 +49,7 @@ param(
 Set-StrictMode -Version 3
 
 . ${PSScriptRoot}\common.ps1
+. ${PSScriptRoot}\Helpers\ApiView-Helpers.ps1
 
 function Get-ReleaseDay($baseDate)
 {
@@ -141,6 +142,26 @@ if ($LASTEXITCODE -ne 0) {
   exit 1
 }
 
+# Check API status if version is GA
+if (!$newVersionParsed.IsPrerelease)
+{ 
+  try
+  {
+    az account show *> $null
+    if (!$?) {
+      Write-Host 'Running az login...'
+      az login *> $null
+    }
+    $url = az keyvault secret show --name "APIURL" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
+    $apiKey = az keyvault secret show --name "APIKEY" --vault-name "AzureSDKPrepRelease-KV" --query "value" --output "tsv"
+    Check-ApiReviewStatus -PackageName $packageProperties.Name -packageVersion $newVersion -Language $LanguageDisplayName -url $url -apiKey $apiKey
+  }
+  catch
+  {
+    Write-Warning "Failed to get APIView URL and API Key from Keyvault AzureSDKPrepRelease-KV. Please check and ensure you have access to this Keyvault as reader."
+  }
+}
+
 if ($releaseTrackingOnly)
 {
   Write-Host

diff --git a/eng/common/scripts/git-branch-push.ps1 b/eng/common/scripts/git-branch-push.ps1
@@ -37,7 +37,7 @@ param(
     [boolean] $AmendCommit = $false
 )
 
-# This is necessay because of the janky git command output writing to stderr.
+# This is necessary because of the git command output writing to stderr.
 # Without explicitly setting the ErrorActionPreference to continue the script
 # would fail the first time git wrote command output.
 $ErrorActionPreference = "Continue"
@@ -116,8 +116,9 @@ do
         $needsRetry = $true
         Write-Host "Git push failed with LASTEXITCODE=$($LASTEXITCODE) Need to fetch and rebase: attempt number=$($tryNumber)"
 
-        Write-Host "git fetch $RemoteName"
-        git fetch $RemoteName
+        Write-Host "git fetch $RemoteName $PRBranchName"
+        # Full fetch will fail when the repo is in a sparse-checkout state, and single branch fetch is faster anyway.
+        git fetch $RemoteName $PRBranchName
         if ($LASTEXITCODE -ne 0)
         {
             Write-Error "Unable to fetch remote LASTEXITCODE=$($LASTEXITCODE), see command output above."

diff --git a/eng/pipelines/partner-release.yml b/eng/pipelines/partner-release.yml
@@ -6,7 +6,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20200916.1
+      ref: refs/tags/azure-sdk-build-tools_20210603.1
 
 variables:
   BuildToolScripts: $(Pipeline.Workspace)/azure-sdk-build-tools/scripts

diff --git a/eng/pipelines/templates/jobs/build-validate-pom.yml b/eng/pipelines/templates/jobs/build-validate-pom.yml
@@ -20,6 +20,15 @@ jobs:
           ArtifactName: 'packages'
 
     steps:
+      - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
+        parameters:
+          Paths:
+            - 'sdk/${{ parameters.ServiceDirectory }}'
+            - '**/*.xml'
+            - '**/*.md'
+            - '!sdk/**/test-recordings'
+            - '!sdk/**/session-records'
+
       - script: |
           echo "##vso[build.addbuildtag]Scheduled"
         displayName: 'Tag scheduled builds'

diff --git a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml
@@ -60,12 +60,14 @@ stages:
             variables:
               - template: ../variables/globals.yml
             pool:
+              name: Azure Pipelines
               vmImage: vs2017-win2016
             strategy:
               runOnce:
                 deploy:
                   steps:
-                    - checkout: self
+                    - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
+                    - template: /eng/common/pipelines/templates/steps/retain-run.yml
                     - template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml
                       parameters:
                         ArtifactLocation: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.groupId}}/${{artifact.name}}
@@ -86,10 +88,15 @@ stages:
                 runOnce:
                   deploy:
                     steps:
-                      - checkout: self
-                        path: azure-sdk-for-java
                       - checkout: azure-sdk-build-tools
                         path: azure-sdk-build-tools
+                      - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
+                        parameters:
+                          SkipDefaultCheckout: true
+                          Repositories:
+                            - Name: Azure/azure-sdk-for-java
+                              Commitish: $(Build.SourceVersion)
+                              WorkingDirectory: $(Pipeline.Workspace)/azure-sdk-for-java
                       - template: tools/gpg/gpg.yml@azure-sdk-build-tools
                       - template: /eng/pipelines/templates/steps/java-publishing.yml
                         parameters:

diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml
@@ -274,7 +274,13 @@ stages:
                 runOnce:
                   deploy:
                     steps:
-                      - checkout: self
+                      - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
+                        parameters:
+                          Paths:
+                            - '${{ parameters.ServiceDirectory }}'
+                            - '**/*.xml'
+                            - '!sdk/**/test-recordings'
+                            - '!sdk/**/session-records'
 
                       - task: UsePythonVersion@0
                         displayName: 'Use Python 3.6'

diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20200916.1
+      ref: refs/tags/azure-sdk-build-tools_20210603.1
 
 parameters:
 - name: Artifacts

diff --git a/eng/pipelines/templates/stages/archetype-sdk-pom-only.yml b/eng/pipelines/templates/stages/archetype-sdk-pom-only.yml
@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20200916.1
+      ref: refs/tags/azure-sdk-build-tools_20210603.1
 
 parameters:
 - name: Artifacts

diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20200916.1
+      ref: refs/tags/azure-sdk-build-tools_20210603.1
 
 parameters:
 - name: Artifacts

diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
@@ -8,7 +8,8 @@ variables:
   # Maven build/test options
   MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
   # See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
-  WagonOptions: '-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120'
+  # If reports about Maven dependency downloads become more common investigate re-introducing "-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false", or other iterations of the configurations.
+  WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60'
   DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
   LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
   MemoryOptions: '-Xmx3072m'