Merge branch 'Azure:main' into main

Author: abdulrahman305

.github/CODEOWNERS

@@ -227,7 +227,7 @@
 
 # ServiceLabel: %Cosmos
 # PRLabel: %Cosmos
-/sdk/cosmos/                                                         @annatisch @Azure/azure-cosmos-python-sdk
+/sdk/cosmos/                                                         @Azure/azure-cosmos-python-sdk
 
 # ServiceLabel: %Cosmos %Service Attention
 #/<NotInRepo>/                                                       @pjohari-ms @simorenoh @AbhinavTrips @bambriz @pilchie
@@ -299,27 +299,26 @@
 
 # ServiceLabel: %Maps
 # PRLabel: %Maps
-/sdk/maps/                                                           @dubiety
+/sdk/maps/                                                           @dubiety @andykao1213
 
 # ServiceLabel: %Mixed Reality
 # PRLabel: %Mixed Reality
 /sdk/mixedreality/azure-mixedreality-authentication/                 @RamonArguelles
 /sdk/remoterendering/                                                @FlorianBorn71
 
-# AzureSdkOwners: @kristapratico
 # ServiceLabel: %OpenAI
 # ServiceOwners: @trrwilson
 
 # PRLabel: %OpenAI
-/sdk/openai/                                                         @kristapratico @glecaros
+/sdk/openai/                                                         @trrwilson
 
 # ServiceLabel: %Operator Nexus - Network Cloud
 # PRLabel: %Operator Nexus - Network Cloud
 /sdk/networkcloud/                                                   @Azure/azure-sdk-write-networkcloud
 
 # ServiceLabel: %Purview
 # PRLabel: %Purview
-/sdk/purview/                                                        @saxenarahulMs
+/sdk/purview/                                                        @saxenarahulMs @adyabansal-ms
 
 # ServiceLabel: %Recovery Services
 # ServiceOwners: @Daya-Patil @Sharmistha-Rai

.vscode/cspell.json

@@ -377,6 +377,7 @@
     "prebuilts",
     "premf",
     "prevsnapshot",
+    "prompty",
     "pschema",
     "PSECRET",
     "pydantic",
@@ -1411,6 +1412,8 @@
         "Inadherent",
         "nbformat",
         "nbconvert",
+        "onedp",
+        "azureai",
       ]
     },
     {
@@ -1840,6 +1843,13 @@
         "adfsasdfzsd"
       ]
     },
+    {
+      "filename": "sdk/appconfiguration/azure-appconfiguration-provider/**",
+      "words": [
+        "aicc",
+        "AICC"
+      ]
+    },
     {
       "filename": "sdk/personalizer/test-resources.json",
       "words": [

README.md

@@ -12,7 +12,7 @@ You can find service libraries in the `/sdk` directory.
 
 ### Prerequisites
 
-The client libraries are supported on Python 3.8 or later. For more details, please read our page on [Azure SDK for Python version support policy](https://github.com/Azure/azure-sdk-for-python/wiki/Azure-SDKs-Python-version-support-policy).
+The client libraries are supported on Python 3.9 or later. For more details, please read our page on [Azure SDK for Python version support policy](https://github.com/Azure/azure-sdk-for-python/wiki/Azure-SDKs-Python-version-support-policy).
 
 ## Packages available
 

doc/analyze_check_versions.md

@@ -5,9 +5,9 @@ This table is to clarify the currently pinned version of tools we run in CI and
 
 | Tool | Current Version | Next Version | Next Version Merge Date |
 |------|-----------------|--------------|-------------------------|
-Pylint | 3.2.7 | 3.2.7 | 2025-04-14 |
-Pylint Guidelines Checker | 0.4.1 | 0.5.1 | 2025-04-14 |
-MyPy | 1.13.0 | 1.14.1 | 2025-04-14 |
-Pyright | 1.1.389 | 1.1.391 | 2025-04-14 |
+Pylint | 3.2.7 | 3.2.7 | 2025-07-21 |
+Pylint Guidelines Checker | 0.5.4 | 0.5.4 | 2025-07-21 |
+MyPy | 1.14.1 | 1.14.1 | 2025-07-21 |
+Pyright | 1.1.391 | 1.1.391 | 2025-07-21 |
 Sphinx | 8.2.0 | N/A | N/A |
 Black | 24.4.0 | N/A | N/A |

doc/dev/tests.md

@@ -174,15 +174,12 @@ Live Azure resources will be necessary in order to run live tests and produce re
 resource management commands, documented in [/eng/common/TestResources][test_resources], that streamline this process.
 Both pure ARM templates (`test-resources.json`) and BICEP files (`test-resources.bicep`) are supported.
 
-User-based authentication is preferred when using test resources. To enable this:
-- Use the [`-UserAuth` command flag][user_auth_flag] when running the `New-TestResources` script.
+User-based authentication is preferred when using test resources. The `New-TestResources` script defaults to user-based authentication. To use it:
 - Choose a development tool to authenticate with by setting an `AZURE_TEST_USE_*_AUTH` environment variable to "true" (tests will authenticate as the tool's logged-in user). The following tools are supported, listed in the order that authentication will be attempted in if requested:
   1. Azure PowerShell: set `AZURE_TEST_USE_PWSH_AUTH`.
   2. Azure CLI (`az`): set `AZURE_TEST_USE_CLI_AUTH`.
-  3. Visual Studio Code: set `AZURE_TEST_USE_VSCODE_AUTH`.
   4. Azure Developer CLI (`azd`): set `AZURE_TEST_USE_AZD_AUTH`.
-- Ensure you're logged into the tool you choose -- if
-you used `New-TestResources.ps1` to deploy resources, you'll already have logged in with Azure PowerShell.
+- Ensure you're logged into the tool you choose -- if you used `New-TestResources` to deploy resources, you'll already have logged in with Azure PowerShell.
 
 **Important:** these environment variables will only be successfully used if test credentials are fetched with the
 [`AzureRecordedTestCase.get_credential`][get_credential] method. See [Write your tests](#write-your-tests) for details.
@@ -215,11 +212,10 @@ environment variables necessary to run live tests for the service. After storing
 -- formatted as `VARIABLE=value` on separate lines -- your credentials and test configuration variables will be set in
 our environment when running tests.
 
-If you used the [`-UserAuth` command flag][user_auth_flag] to deploy test resources, choose a development tool to
+Since `New-TestResources` defaults to user-based authentication, choose a development tool to
 authenticate with by setting an `AZURE_TEST_USE_*_AUTH` environment variable to "true". The following tools are supported, listed in the order that authentication will be attempted in if requested:
   1. Azure PowerShell: set `AZURE_TEST_USE_PWSH_AUTH`.
   2. Azure CLI (`az`): set `AZURE_TEST_USE_CLI_AUTH`.
-  3. Visual Studio Code: set `AZURE_TEST_USE_VSCODE_AUTH`.
   4. Azure Developer CLI (`azd`): set `AZURE_TEST_USE_AZD_AUTH`.
 
 **Important:** these environment variables will only be successfully used if test credentials are fetched with the
@@ -611,4 +607,3 @@ For information about more advanced testing scenarios, refer to the [advanced te
 [test_proxy_startup]: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/test_proxy_migration_guide.md#start-the-proxy-server
 [test_resources]: https://github.com/Azure/azure-sdk-for-python/tree/main/eng/common/TestResources#readme
 [troubleshooting_guide]: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/test_proxy_troubleshooting.md
-[user_auth_flag]: https://github.com/Azure/azure-sdk-for-python/blob/main/eng/common/TestResources/New-TestResources.ps1.md#-userauth

eng/apiview_reqs.txt

@@ -14,4 +14,4 @@ tomli==2.2.1
 tomlkit==0.13.2
 typing_extensions==4.12.2
 wrapt==1.17.2
-apiview-stub-generator==0.3.17
+apiview-stub-generator==0.3.18

eng/common/TestResources/New-TestResources.ps1

@@ -657,6 +657,7 @@ $serialized
 '`@ | ConvertFrom-Json -AsHashtable
 # Set global variables that aren't always passed as parameters
 `$ResourceGroupName = `$parameters.ResourceGroupName
+`$AdditionalParameters = `$parameters.AdditionalParameters
 `$DeploymentOutputs = `$parameters.DeploymentOutputs
 $postDeploymentScript `@parameters
 "@

eng/common/pipelines/templates/archetype-typespec-emitter.yml

@@ -67,6 +67,15 @@ parameters:
   type: object
   default: []
 
+# The path to the emitter package json file.
+- name: EmitterPackageJsonOutputPath
+  type: string
+  default: "eng/emitter-package.json"
+
+# The relative path to the emitter package.
+- name: EmitterPackagePath
+  type: string
+
 extends:
   template: /eng/pipelines/templates/stages/1es-redirect.yml
   parameters:
@@ -89,24 +98,34 @@ extends:
 
         - ${{ parameters.InitializationSteps }}
 
+        # Initialize-WorkingDirectory.ps1 is responsible for setting the emitterVersion output variable.
         - task: PowerShell@2
           displayName: 'Run initialize script'
+          name: initialize
           inputs:
             pwsh: true
             filePath: $(Build.SourcesDirectory)/eng/scripts/typespec/Initialize-WorkingDirectory.ps1
-            arguments: -UseTypeSpecNext:$${{ parameters.UseTypeSpecNext }}
+            ${{ if parameters.BuildPrereleaseVersion }}:
+              arguments: >
+                -PrereleaseSuffix "-alpha.$(Build.BuildNumber)"
+                -OutputDirectory "$(Build.ArtifactStagingDirectory)"
+                -UseTypeSpecNext:$${{ parameters.UseTypeSpecNext }}
+                -EmitterPackagePath:${{ parameters.EmitterPackagePath }}
+            ${{ else }}:
+              arguments: >
+                -OutputDirectory "$(Build.ArtifactStagingDirectory)"
+                -UseTypeSpecNext:$${{ parameters.UseTypeSpecNext }}
+                -EmitterPackagePath:${{ parameters.EmitterPackagePath }}
 
         - task: PowerShell@2
           displayName: 'Run build script'
-          name: ci_build
           inputs:
             pwsh: true
             filePath: $(Build.SourcesDirectory)/eng/scripts/typespec/Build-Emitter.ps1
             arguments: >
-              -BuildNumber "$(Build.BuildNumber)"
-              -OutputDirectory "$(Build.ArtifactStagingDirectory)"
+              -OutputDirectory "$(Build.ArtifactStagingDirectory)/packages"
               -TargetNpmJsFeed:$${{ parameters.PublishPublic }}
-              -Prerelease:$${{ parameters.BuildPrereleaseVersion }}
+              -EmitterPackagePath:${{ parameters.EmitterPackagePath }}
 
         - pwsh: |
             $sourceBranch = '$(Build.SourceBranch)'
@@ -132,10 +151,7 @@ extends:
             artifactPath: $(Build.ArtifactStagingDirectory)
 
     # Publish stage
-    # Responsible for publishing the packages in `build_artifacts/packages` and producing `emitter-package-lock.json`
-    # Produces the artifact `publish_artifacts` which contains the following:
-    #   emitter-package.json: Created using the package json from the build step. 
-    #   emitter-package-lock.json: Created by calling `npm install` using `emitter-package.json`
+    # Responsible for publishing the packages in `build_artifacts/packages`
     - ${{ if parameters.ShouldPublish }}:
       - stage: Publish
         dependsOn:
@@ -189,32 +205,6 @@ extends:
                 ServiceEndpointUrl: https://api.esrp.microsoft.com
                 MainPublisher: ESRPRELPACMANTEST
 
-          - task: PowerShell@2
-            displayName: Create emitter-package.json
-            inputs:
-              pwsh: true
-              filePath: ./eng/common/scripts/typespec/New-EmitterPackageJson.ps1
-              arguments: >
-                -PackageJsonPath '$(buildArtifactsPath)/lock-files/package.json'
-                -OverridesPath '$(buildArtifactsPath)/overrides.json'
-                -OutputDirectory '$(Build.ArtifactStagingDirectory)'
-              workingDirectory: $(Build.SourcesDirectory)
-
-          - task: PowerShell@2
-            displayName: Create emitter-package-lock.json
-            inputs:
-              pwsh: true
-              filePath: ./eng/common/scripts/typespec/New-EmitterPackageLock.ps1
-              arguments: >
-                -EmitterPackageJsonPath '$(Build.ArtifactStagingDirectory)/emitter-package.json'
-                -OutputDirectory '$(Build.ArtifactStagingDirectory)'
-              workingDirectory: $(Build.SourcesDirectory)
-
-          - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
-            parameters:
-              artifactName: publish_artifacts
-              artifactPath: $(Build.ArtifactStagingDirectory)
-
     # Regenerate stage
     # Responsible for regenerating the SDK code using the emitter package and the generation matrix.
     - ${{ if and(parameters.ShouldPublish, parameters.ShouldRegenerate) }}:
@@ -224,7 +214,7 @@ extends:
         - Publish
         variables:
           pullRequestTargetBranch: 'main'
-          publishArtifactsPath: $(Pipeline.Workspace)/publish_artifacts
+          buildArtifactsPath: $(Pipeline.Workspace)/build_artifacts
           branchName: $[stageDependencies.Build.Build.outputs['set_branch_name.branchName']]
         pool: ${{ parameters.Pool }}
         jobs:
@@ -240,12 +230,27 @@ extends:
             displayName: Download pipeline artifacts
 
           - pwsh: |
-              Write-Host "Copying emitter-package.json to $(Build.SourcesDirectory)/eng"
-              Copy-Item $(publishArtifactsPath)/emitter-package.json $(Build.SourcesDirectory)/eng/ -Force
+              npm install -g @azure-tools/typespec-client-generator-cli@latest
+            displayName: Install tsp-client
 
-              Write-Host "Copying emitter-package-lock.json to $(Build.SourcesDirectory)/eng"
-              Copy-Item $(publishArtifactsPath)/emitter-package-lock.json $(Build.SourcesDirectory)/eng/ -Force
-            displayName: Copy emitter-package json files
+          - pwsh: |
+              Write-Host "Overrides location: $(buildArtifactsPath)/packages/overrides.json"
+
+              if (Test-Path -Path '$(buildArtifactsPath)/packages/overrides.json') {
+                Write-Host "Using overrides.json to generate emitter-package.json"
+                tsp-client generate-config-files `
+                --package-json '$(buildArtifactsPath)/lock-files/package.json' `
+                --emitter-package-json-path '${{ parameters.EmitterPackageJsonOutputPath }}' `
+                --overrides '$(buildArtifactsPath)/packages/overrides.json'
+              } else {
+                Write-Host "No overrides.json found. Running tsp-client without overrides."
+                
+                tsp-client generate-config-files `
+                --package-json '$(buildArtifactsPath)/lock-files/package.json' `
+                --emitter-package-json-path '${{ parameters.EmitterPackageJsonOutputPath }}'
+              }
+            displayName: Generate emitter-package.json and emitter-package-lock files
+            workingDirectory: $(Build.SourcesDirectory)
 
           - ${{ parameters.InitializationSteps }}
 
@@ -291,7 +296,7 @@ extends:
               Paths:
               - "/*"
               - "!SessionRecords"
-              
+
           - download: current
             displayName: Download pipeline artifacts
 
@@ -322,7 +327,7 @@ extends:
           - Generate
           variables:
             generateJobResult: $[dependencies.Generate.result]
-            emitterVersion: $[stageDependencies.Build.Build.outputs['ci_build.emitterVersion']]
+            emitterVersion: $[stageDependencies.Build.Build.outputs['initialize.emitterVersion']]
           steps:
           - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
 
@@ -382,6 +387,16 @@ extends:
               } else {
                 Write-Error "Build.Repository.Name not in the expected {Owner}/{Name} format"
               }
+
+              $openAsDraft = -not ($reason -eq 'IndividualCI' -and $sourceBranch -eq 'refs/heads/main')
+              Write-Host "Setting OpenAsDraftBool = $openAsDraft"
+              Write-Host "##vso[task.setvariable variable=OpenAsDraft]$openAsDraft"
+              if ($openAsDraft) {
+                Write-Host "##vso[task.setvariable variable=PRLabels]Do Not Merge"
+              } else {
+                Write-Host "##vso[task.setvariable variable=PRLabels]"
+              }
+              
             displayName: Get PR title and body
 
           - task: PowerShell@2
@@ -398,8 +413,8 @@ extends:
                 -AuthToken '$(azuresdk-github-pat)'
                 -PRTitle '$(PullRequestTitle)'
                 -PRBody '$(PullRequestBody)'
-                -OpenAsDraft $true
-                -PRLabels 'Do Not Merge'
+                -OpenAsDraft $$(OpenAsDraft)
+                -PRLabels '$(PRLabels)'
               workingDirectory: $(Build.SourcesDirectory)
 
     # Test stage
@@ -432,7 +447,9 @@ extends:
             inputs:
               pwsh: true
               filePath: $(Build.SourcesDirectory)/eng/scripts/typespec/Initialize-WorkingDirectory.ps1
-              arguments: -BuildArtifactsPath '$(buildArtifactsPath)'
+              arguments: > 
+                -BuildArtifactsPath '$(buildArtifactsPath)/lock-files'
+                -EmitterPackagePath: ${{ parameters.EmitterPackagePath }}
 
           - task: PowerShell@2
             displayName: 'Run test script'
@@ -442,6 +459,7 @@ extends:
               arguments: >
                 $(TestArguments)
                 -OutputDirectory "$(Build.ArtifactStagingDirectory)"
+                -EmitterPackagePath: ${{ parameters.EmitterPackagePath }}
 
           - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
             parameters:

eng/common/pipelines/templates/jobs/prepare-pipelines.yml

@@ -110,6 +110,7 @@ jobs:
             $generateUnifiedWeekly = 'true'
           }
           "net" {
+            $generatePublicCIPipeline = 'false'
             $internalVariableGroups = '$(AzureSDK_Nuget_Release_Pipeline_Secrets) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
             $testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
             $internalServiceConnections += ' "Azure SDK Symbols Publishing" Nuget.org'

eng/common/scripts/Helpers/ApiView-Helpers.ps1

@@ -180,14 +180,15 @@ function Set-ApiViewCommentForPR {
       $commentText += "APIView identified API level changes in this PR and created the following API reviews"
       $commentText += ""
 
+      $responseContent = $response.Content | ConvertFrom-Json
       if ($RepoName.StartsWith(("azure-sdk-for-"))) {
-        $response | ForEach-Object {
+        $responseContent | ForEach-Object {
           $commentText += "[$($_.packageName)]($($_.url))"
         }
       } else {
         $commentText += "| Language | API Review for Package |"
         $commentText += "|----------|---------|"
-        $response | ForEach-Object {
+        $responseContent | ForEach-Object {
           $commentText += "| $($_.language) | [$($_.packageName)]($($_.url)) |"
         }
       }