Merge branch 'dev' into chore/remove-php-bump-version-script-call

Author: SilasKenneth

.azure-pipelines/generation-pipeline.yml

@@ -27,7 +27,7 @@ resources:
      type: github
      endpoint: microsoftgraph (22)
      name: microsoftgraph/msgraph-sdk-php
-     ref: dev
+     ref: main
    - repository: msgraph-beta-sdk-php
      type: github
      endpoint: microsoftgraph (22)
@@ -52,12 +52,12 @@ resources:
      type: github
      endpoint: microsoftgraph (22)
      name: microsoftgraph/msgraph-sdk-java
-     ref: dev
+     ref: main
    - repository: msgraph-beta-sdk-java
      type: github
      endpoint: microsoftgraph (22)
      name: microsoftgraph/msgraph-beta-sdk-java
-     ref: dev
+     ref: main
    - repository: msgraph-sdk-go
      type: github
      endpoint: microsoftgraph (22)
@@ -342,6 +342,7 @@ stages:
         targetClassName: "GraphBaseServiceClient"
         targetNamespace: "github.com/microsoftgraph/msgraph-sdk-go/"
         customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and Enable the backing store
+        commitMessagePrefix: "feat(generation): update request builders and models"
         cleanMetadataFolder: $(cleanOpenAPIFolderV1)
         languageSpecificSteps:
         - template: generation-templates/go.yml
@@ -370,6 +371,7 @@ stages:
         targetClassName: "GraphBaseServiceClient"
         targetNamespace: "github.com/microsoftgraph/msgraph-beta-sdk-go/"
         customArguments: "-b -e '/me' -e '/me/**'" # Exclude me and Enable the backing store
+        commitMessagePrefix: "feat(generation): update request builders and models"
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         languageSpecificSteps:
         - template: generation-templates/go.yml
@@ -452,7 +454,7 @@ stages:
         language: 'java'
         version: ''
         repoName: 'msgraph-sdk-java'
-        baseBranchName: 'dev'
+        baseBranchName: 'main'
         branchName: '$(v1Branch)'
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph"
@@ -483,12 +485,13 @@ stages:
         language: 'java'
         version: 'beta'
         repoName: 'msgraph-beta-sdk-java'
-        baseBranchName: 'dev'
+        baseBranchName: 'main'
         branchName: '$(betaBranch)'
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph.Beta"
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         customArguments: "-b -e '/me' -e '/me/**'" # Exclude /me/** and enable backing store
+        commitMessagePrefix: "feat(generation): update request builders and models"
         languageSpecificSteps:
         - template: generation-templates/java-kiota.yml
           parameters:
@@ -517,12 +520,8 @@ stages:
             branchName: 'kiota/$(betaBranch)'
             targetClassName: "BaseGraphClient"
             targetNamespace: 'Microsoft\\Graph\\Beta\\Generated'
-<<<<<<< Updated upstream
-            baseBranchName: 'dev'
-=======
             baseBranchName: 'main'
             commitMessagePrefix: "feat(generation): update request builders and models"
->>>>>>> Stashed changes
             cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
             languageSpecificSteps:
               - template: generation-templates/php-kiota.yml
@@ -551,12 +550,8 @@ stages:
             branchName: 'kiota/$(v1Branch)'
             targetClassName: "BaseGraphClient"
             targetNamespace: 'Microsoft\\Graph\\Generated'
-<<<<<<< Updated upstream
-            baseBranchName: 'dev'
-=======
             baseBranchName: 'main'
             commitMessagePrefix: "feat(generation): update request builders and models"
->>>>>>> Stashed changes
             cleanMetadataFolder: $(cleanOpenAPIFolderV1)
             languageSpecificSteps:
               - template: generation-templates/php-kiota.yml

.azure-pipelines/generation-templates/go.yml

@@ -8,10 +8,6 @@ steps:
   env:
     MainDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/
 
-- pwsh : $(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts/incrementMinorVersion.ps1
-  displayName: 'Increment minor version number'
-  workingDirectory: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts'
-
 - pwsh: '$(scriptsDirectory)/copy-go-models.ps1'
   displayName: 'Update models'
   env:

.azure-pipelines/generation-templates/java-kiota.yml

@@ -10,11 +10,6 @@ steps:
   env:
     MainDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/${{ parameters.namespacePath }}/generated/
 
-- pwsh : $(Build.SourcesDirectory)/${{ parameters.repoName }}/Scripts/incrementMinorVersion.ps1
-  displayName: 'Increment minor version number'
-  workingDirectory: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/Scripts'
-  condition: ne( '${{ parameters.repoName }}' , 'msgraph-sdk-java') # The msgraph-sdk-java repo already has a versioning strategy
-
 - pwsh: '$(scriptsDirectory)/copy-java-models-kiota.ps1'
   displayName: 'Update with new models'
   env: