Merge pull request #1220 from microsoftgraph/dev

Merge dev to main

Author: baywet

.azure-pipelines/generation-templates/capture-metadata.yml

@@ -120,7 +120,7 @@ steps:
   displayName: 'verify whether metadata is parsable as an Edm model'
 
 # clean up extra files
-- pwsh: rm $(Build.SourcesDirectory)/msgraph-metadata/transformed_*_metadata.* -Verbose -Force
+- pwsh: Remove-Item "$(Build.SourcesDirectory)/msgraph-metadata/transformed_*_metadata.*" -Verbose -Force
   displayName: 'clean up transformed metadata generated by validation'
 
 # Checkin clean metadata into metadata repo or make it an artifact.

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

@@ -13,6 +13,7 @@ steps:
 - 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'