Simplify versioning scripts (Azure#45850)

* Remove build type and update type from version scripts

* Clean up direct script calls

* Fix spelling

* Clean up pipline calls and more spelling

Author: alzimmermsft

.github/CODEOWNERS

@@ -935,9 +935,8 @@
 /.github/workflows/                                           @Azure/azure-sdk-eng
 /.config/1espt/                                               @benbp @weshaggard
 
-# Removing owners for these files to not require codeowner approval for changes to them given they are shared with project
+# Removing owners for this file to not require codeowner approval for changes to them given they are shared with project
 /eng/versioning/version_client.txt
-/eng/versioning/version_data.txt
 
 # Add owners for notifications for specific pipelines
 /eng/pipelines/aggregate-reports.yml                          @joshfree @jonathangiles @Azure/azure-java-sdk

.github/CODEOWNERS_baseline_errors.txt

@@ -238,4 +238,3 @@ Shipra1Mishra is an invalid user. Ensure the user exists, is public member of Az
 zhusijia26 is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
 XiaofeiCao is not a public member of Azure.
 Path entry, /eng/versioning/version_client.txt, is missing owners
-Path entry, /eng/versioning/version_data.txt, is missing owners

.vscode/cspell.json

@@ -280,6 +280,7 @@
     "endtoend",
     "entra",
     "Entra",
+    "ESRP",
     "Esto",
     "etag",
     "euap",
@@ -299,6 +300,7 @@
     "hdfs",
     "hdinsight",
     "healthdataaiservices",
+    "HKLM",
     "hudha",
     "hvac",
     "hybridkubernetes",
@@ -363,6 +365,7 @@
     "Onco",
     "onenote",
     "openai",
+    "ossrh",
     "passthrough",
     "Pnative",
     "premf",
@@ -872,12 +875,6 @@
         "listbyconfigurationprofileassignments"
       ]
     },
-    {
-      "filename": "sdk/storage/CONTRIBUTING.md",
-      "words": [
-        "HKLM"
-      ]
-    },
     {
       "filename": "sdk/storage/azure-storage-common/**",
       "words": [

CONTRIBUTING.md

@@ -215,19 +215,15 @@ def update_version(sdk_root: str, output_folder: str):
         os.chdir(sdk_root)
         print(os.getcwd())
         subprocess.run(
-            [python_cmd, "eng/versioning/update_versions.py", "--ut", "library", "--bt", "client", "--sr"],
+            [python_cmd, "eng/versioning/update_versions.py", "--skip-readme"],
             stdout=subprocess.DEVNULL,
             stderr=sys.stderr,
         )
         subprocess.run(
             [
                 python_cmd,
                 "eng/versioning/update_versions.py",
-                "--ut",
-                "library",
-                "--bt",
-                "client",
-                "--tf",
+                "--target-file",
                 "{0}/README.md".format(output_folder),
             ],
             stdout=subprocess.DEVNULL,

eng/automation/utils.py

@@ -50,13 +50,13 @@ extends:
                 displayName: 'Set versions for source build'
                 inputs:
                   scriptPath: 'eng/versioning/set_versions.py'
-                  arguments: '--build-type client --pst'
+                  arguments: '--prep-source-testing'
 
               - task: PythonScript@0
                 displayName: 'Update versions for source build'
                 inputs:
                   scriptPath: 'eng/versioning/update_versions.py'
-                  arguments: '--update-type library --build-type client --sr'
+                  arguments: '--skip-readme'
 
               - template: /eng/pipelines/templates/steps/generate-project-list-and-cache-maven-repository.yml
                 parameters:

eng/pipelines/code-quality-reports.yml

@@ -22,8 +22,7 @@ pr:
     exclude:
     - eng/versioning/external_dependencies.txt
     - eng/versioning/version_client.txt
-    - eng/versioning/version_data.txt
-    - eng/versioning/version_data_java_files.txt
+    - eng/versioning/version_java_files.txt
     - sdk/batch/microsoft-azure-batch/ # track 1
     - sdk/boms/ # pom only release pipeline
     - sdk/cosmos/ # emulator tests
@@ -71,8 +70,7 @@ extends:
     ExcludePaths:
     - eng/versioning/external_dependencies.txt
     - eng/versioning/version_client.txt
-    - eng/versioning/version_data.txt
-    - eng/versioning/version_data_java_files.txt
+    - eng/versioning/version_java_files.txt
     - sdk/batch/microsoft-azure-batch/ # track 1
     - sdk/boms/ # pom only release pipeline
     - sdk/cosmos/ # emulator tests

eng/pipelines/pullrequest.yml

@@ -9,29 +9,23 @@ The dev version is based on the date and the build number. The dev version is th
 
 .PARAMETER BuildNumber
 The build number to use for the dev version.
-
-.PARAMETER SdkType
-The type of SDK to set the dev version for.
 #>
 
 param(
   [Parameter(Mandatory = $true)]
-  [string]$BuildNumber,
-
-  [Parameter(Mandatory = $true)]
-  [string]$SdkType
+  [string]$BuildNumber
 )
 
 $artifacts = $env:ARTIFACTSJSON | ConvertFrom-Json
 python3 --version
 
 # Append dev package version suffix for each artifact
 foreach ($artifact in $artifacts) {
-    python3 "$PSScriptRoot/../../versioning/set_versions.py" --build-type $SDKType --build-qualifier "alpha.$BuildNumber" --artifact-id $artifact.name --group-id $artifact.groupId
+    python3 "$PSScriptRoot/../../versioning/set_versions.py" --build-qualifier "alpha.$BuildNumber" --artifact-id $artifact.name --group-id $artifact.groupId
 }
 
 # Set zero-dev-version for packages
-python3 "$PSScriptRoot/../../versioning/set_versions.py" --set-dev-zero-version --build-type $SDKType --build-qualifier "alpha.$BuildNumber"
+python3 "$PSScriptRoot/../../versioning/set_versions.py" --set-dev-zero-version --build-qualifier "alpha.$BuildNumber"
 
 # Apply version settings to repository
-python3 "$PSScriptRoot/../../versioning/update_versions.py" --update-type library --build-type $SDKType --sr --setting-dev-version
+python3 "$PSScriptRoot/../../versioning/update_versions.py" --skip-readme --setting-dev-version

eng/pipelines/scripts/Set-Dev-Versioning.ps1

@@ -157,7 +157,6 @@ jobs:
           filePath: eng/pipelines/scripts/Set-Dev-Versioning.ps1
           arguments: >
             -BuildNumber $(Build.BuildNumber)
-            -SdkType ${{parameters.SDKType}}
         env:
           ARTIFACTSJSON: $(ArtifactsJson)
 

eng/pipelines/templates/jobs/ci.yml

@@ -142,7 +142,7 @@ stages:
                 $ArtifactsList | Format-Table -Property GroupId, Name | Out-String | Write-Host
                 python --version
                 foreach($artifact in $ArtifactsList) {
-                  python eng/versioning/set_versions.py --build-type ${{parameters.SDKType}} --vv --ai $($artifact.name) --gi $($artifact.groupId)
+                  python eng/versioning/set_versions.py --verify-version --artifact-id $($artifact.name) --group-id $($artifact.groupId)
                 }
               displayName: 'Verify artifact versions for release'
 
@@ -172,7 +172,7 @@ stages:
                   ArtifactLocation: $(Pipeline.Workspace)/packages-signed
             # Given a list of libraries to release, verify that the list of libraries has full transitive closure.
             # This prevents us from releasing a library whose dependency is not being released. UberJar needs to be
-            # be passed in, we skip check on UberJars but we still do need to fail correctly if the user didn't
+            # passed in, we skip check on UberJars, but we still do need to fail correctly if the user didn't
             # select any artifacts to be released.
             - task: PowerShell@2
               displayName: Verify Release Set
@@ -316,13 +316,13 @@ stages:
                 $ArtifactsList | Format-Table -Property GroupId, Name | Out-String | Write-Host
                 python --version
                 foreach($artifact in $ArtifactsList) {
-                  python eng/versioning/set_versions.py --build-type ${{ parameters.SDKType }} --increment-version --ai $($artifact.name) --gi $($artifact.groupId)
+                  python eng/versioning/set_versions.py --increment-version --artifact-id $($artifact.name) --group-id $($artifact.groupId)
                 }
               displayName: Increment package versions
 
             - script: |
                 python --version
-                python eng/versioning/update_versions.py --update-type library --build-type ${{ parameters.SDKType }} --avi --sr
+                python eng/versioning/update_versions.py --auto-version-increment --skip-readme
               displayName: Update pom files for incremented versions
 
             - template: /eng/common/pipelines/templates/steps/create-pull-request.yml