Merge branch 'feature/storage/stg101base' of https://github.com/Azure/azure-sdk-for-java into stg101/missingSKUNames

Author: ibrandes

eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1

@@ -517,7 +517,6 @@ function CreateOrUpdatePackageWorkItem($lang, $pkg, $verMajorMinor, $existingIte
   $pkgType = $pkg.Type
   $pkgNewLibrary = $pkg.New
   $pkgRepoPath = $pkg.RepoPath
-  $specProjectPath = $pkg.SpecProjectPath
   $serviceName = $pkg.ServiceName
   $title = $lang + " - " + $pkg.DisplayName + " - " + $verMajorMinor
 

eng/common/scripts/Verify-ChangeLogs.ps1

@@ -11,8 +11,10 @@ Set-StrictMode -Version 3
 
 function ShouldVerifyChangeLog ($PkgArtifactDetails) {
   if ($PkgArtifactDetails) {
-    if ($PkgArtifactDetails.PSObject.Properties["skipVerifyChangeLog"] -eq $true) {
-      return $false
+    if ($PkgArtifactDetails.PSObject.Properties.Name -contains "skipVerifyChangeLog") {
+      if ($PkgArtifactDetails.skipVerifyChangeLog) {
+        return $false
+      }
     }
 
     return $true

eng/emitter-package-lock.json

@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-java": "0.37.1"
+    "@azure-tools/typespec-java": "0.37.2"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.62.0",

eng/emitter-package.json

@@ -184,6 +184,11 @@ jobs:
           displayName: Update package properties with dev version
           condition: and(succeeded(), eq(variables['SetDevVersion'],'true'))
 
+      - ${{if ne(parameters.SDKType, 'data')}}:
+        - template: /eng/common/pipelines/templates/steps/verify-changelogs.yml
+          parameters:
+            PackagePropertiesFolder: $(Build.ArtifactStagingDirectory)/PackageInfo
+
       - script: |
           python -m pip install markdown2==2.4.6 BeautifulSoup4==4.11.1
         displayName: 'pip install markdown2 and BeautifulSoup4'
@@ -390,20 +395,6 @@ jobs:
           SourceDirectory: $(Build.SourcesDirectory)
           BasePathLength: 38
 
-      - ${{if ne(parameters.SDKType, 'data')}}:
-        - ${{ if and(eq(variables['Build.Reason'], 'PullRequest'), eq(parameters.ServiceDirectory, 'auto')) }}:
-          - template: /eng/common/pipelines/templates/steps/verify-changelogs.yml
-            parameters:
-              PackagePropertiesFolder: $(Build.ArtifactStagingDirectory)/PackageInfo
-        - ${{ else }}:
-          - ${{ each artifact in parameters.Artifacts }}:
-            - ${{if ne(artifact.skipVerifyChangelog, 'true')}}:
-              - template: /eng/common/pipelines/templates/steps/verify-changelog.yml
-                parameters:
-                  PackageName: ${{artifact.name}}
-                  ServiceName: ${{parameters.ServiceDirectory}}
-                  ForRelease: false
-
       - task: UseNode@1
         inputs:
           version: 22.x

eng/pipelines/templates/jobs/ci.yml

@@ -152,13 +152,13 @@ stages:
                 }
               displayName: "Verify no unreleased dependencies or beta dependencies for GA libraries"
 
+            - ${{if ne(parameters.SDKType, 'data')}}:
+              - template: /eng/common/pipelines/templates/steps/verify-changelogs.yml
+                parameters:
+                  PackagePropertiesFolder: $(Pipeline.Workspace)/packages-signed/PackageInfo
+                  ForRelease: true
+
             - ${{ each artifact in parameters.Artifacts }}:
-              - ${{if and(ne(parameters.SDKType, 'data'), ne(artifact.skipVerifyChangelog, 'true'))}}:
-                - template: /eng/common/pipelines/templates/steps/verify-changelog.yml
-                  parameters:
-                    PackageName: ${{artifact.name}}
-                    ServiceName: ${{parameters.ServiceDirectory}}
-                    ForRelease: true
               # Verify both TypeSpec and swagger specification are from the main branch of Azure/azure-rest-api-specs repo.
               - template: /eng/common/pipelines/templates/steps/verify-restapi-spec-location.yml
                 parameters:

eng/pipelines/templates/stages/archetype-java-release-batch.yml

@@ -110,6 +110,12 @@ extends:
               workingDirectory: $(Pipeline.Workspace)
               displayName: "Save Package Properties"
 
+            - ${{if ne(parameters.SDKType, 'data')}}:
+              - template: /eng/common/pipelines/templates/steps/verify-changelogs.yml
+                parameters:
+                  PackagePropertiesFolder: $(Build.ArtifactStagingDirectory)/PackageInfo
+                  ForRelease: true
+
             - task: Maven@4
               displayName: 'Build From Source and Package, JDK Version: ${{ parameters.JavaBuildVersion }}'
               inputs:
@@ -282,20 +288,6 @@ extends:
                 SourceDirectory: $(Build.SourcesDirectory)
                 BasePathLength: 38
 
-            # Verify changelog, the way it currently works would require a complete overhaul in order to be able to deal
-            # with multiple artifacts and multiple service directories. Even ignoring this, there's still the fact that each
-            # artifact's metadata can cause this step to be skipped, so we still need to loop over this.
-            - ${{if ne(parameters.SDKType, 'data')}}:
-              - ${{ each artifact in parameters.Artifacts }}:
-                - ${{if ne(artifact.skipVerifyChangelog, 'true')}}:
-                  - template: /eng/common/pipelines/templates/steps/verify-changelog.yml
-                    parameters:
-                      PackageName: ${{artifact.name}}
-                      ServiceName: ${{artifact.ServiceDirectory}}
-                      # Note: For the patch release pipeline there's no point in verifying the non-release changelog since
-                      # the only time this pipeline should run is for a patch release.
-                      ForRelease: true
-
             - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml
 
       # This pipeline should never get kicked off outside an internal, manual run. Put the checks here so the pipeline never

eng/pipelines/templates/stages/archetype-sdk-client-patch.yml

@@ -0,0 +1,31 @@
+# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
+
+trigger:
+  branches:
+    include:
+      - main
+      - feature/*
+      - release/*
+      - hotfix/*
+  paths:
+    include:
+      - eng/scripts/*
+    exclude:
+      - eng/scripts/typespec
+
+pr:
+  branches:
+    include:
+      - main
+      - feature/*
+      - release/*
+      - hotfix/*
+  paths:
+    include:
+      - eng/scripts/*
+
+extends:
+  template: /eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
+  parameters:
+    TargetDirectory: eng/scripts/
+    TargetTags: 'UnitTest'

eng/scripts/ci.yml

@@ -190,17 +190,17 @@ com.azure:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1
 com.azure.v2:azure-sdk-template;1.0.1-beta.1;1.0.1-beta.1
 com.azure.v2:azure-sdk-template-two;1.0.0-beta.1;1.0.0-beta.1
 com.azure.v2:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-storage-blob;12.32.0;12.33.0-beta.1
-com.azure:azure-storage-blob-batch;12.28.0;12.29.0-beta.1
-com.azure:azure-storage-blob-changefeed;12.0.0-beta.32;12.0.0-beta.33
-com.azure:azure-storage-blob-cryptography;12.31.0;12.32.0-beta.1
-com.azure:azure-storage-blob-nio;12.0.0-beta.33;12.0.0-beta.34
-com.azure:azure-storage-common;12.31.0;12.32.0-beta.1
-com.azure:azure-storage-file-share;12.28.0;12.29.0-beta.1
-com.azure:azure-storage-file-datalake;12.25.0;12.26.0-beta.1
-com.azure:azure-storage-internal-avro;12.17.0;12.18.0-beta.1
+com.azure:azure-storage-blob;12.32.0;12.33.0-beta.2
+com.azure:azure-storage-blob-batch;12.28.0;12.29.0-beta.2
+com.azure:azure-storage-blob-changefeed;12.0.0-beta.33;12.0.0-beta.34
+com.azure:azure-storage-blob-cryptography;12.31.0;12.32.0-beta.2
+com.azure:azure-storage-blob-nio;12.0.0-beta.34;12.0.0-beta.35
+com.azure:azure-storage-common;12.31.0;12.32.0-beta.2
+com.azure:azure-storage-file-share;12.28.0;12.29.0-beta.2
+com.azure:azure-storage-file-datalake;12.25.0;12.26.0-beta.2
+com.azure:azure-storage-internal-avro;12.17.0;12.18.0-beta.2
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-storage-queue;12.27.0;12.28.0-beta.1
+com.azure:azure-storage-queue;12.27.0;12.28.0-beta.2
 com.azure:azure-template-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-template-stress;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-verticals-agrifood-farming;1.0.0-beta.3;1.0.0-beta.4

eng/versioning/version_client.txt

@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.3 (2025-12-03)
 
 ### Features Added