Merge pull request #571 from microsoftgraph/feature/version-increment

feature/version-increment

Author: baywet

.azure-pipelines/generate-v1.0-models.yml

@@ -107,6 +107,14 @@ steps:
     workingDirectory: '$(Build.SourcesDirectory)' # Set the root for a multi-repo pipeline. /s
   enabled: true
 
+- task: PowerShell@2
+  displayName: 'Increment minor version number'
+  inputs:
+    targetType: filePath
+    filePath: '$(Build.SourcesDirectory)/msgraph-sdk-java/Scripts/incrementMinorVersion.ps1'
+    workingDirectory: '$(Build.SourcesDirectory)/msgraph-sdk-java/Scripts'
+  enabled: true
+
 - task: PowerShell@2
   displayName: 'Copy generated requests and models into the repo'
   inputs:

.github/workflows/create-v1.0-pull-request.yml

@@ -37,7 +37,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         MESSAGE_TITLE: Generated v1.0 models and request builders using Typewriter
-        MESSAGE_BODY: "This pull request was automatically created by the GitHub Action, **${{github.workflow}}**. \n\n The commit hash is _${{github.sha}}_. \n\n **Important** Check for unexpected deletions or changes in this PR. \n\n - [ ] update version in gradle.properties and Constants.java. \n\n - [ ] update version in readme.md\n\n- [ ] create tag and release\n\n cc: @darrelmiller"
+        MESSAGE_BODY: "This pull request was automatically created by the GitHub Action, **${{github.workflow}}**. \n\n The commit hash is _${{github.sha}}_. \n\n **Important** Check for unexpected deletions or changes in this PR. \n\n cc: @darrelmiller"
         REVIEWERS: peombwa,ddyett,zengin,nikithauc,baywet
         ASSIGNEDTO: baywet
         LABELS: generated

README.md

@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph:2.4.+'
+    implementation 'com.microsoft.graph:microsoft-graph:2.4.0'
 }
 ```
 

Scripts/getLatestVersion.ps1

@@ -0,0 +1,74 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+.Synopsis
+    Increment the minor version string in the gradle.properties if the major,
+    minor, or patch version hasn't been manually updated.
+.Description
+    Assumptions:
+        Targets Gradle.properties
+        This script assumes it is run from the repo root.
+        Minor version is typically auto-incremented.
+
+#>
+
+function Update-ReadmeVersion([string]$readmeFilePath, [string]$version) {
+	$readmeFileContent = Get-Content -Path $readmeFilePath -Raw
+	$readmeFileContent = $readmeFileContent -replace "\d{1,}\.\d{1,}\.\d{1,}", $version
+	Set-Content -Path $readmeFilePath $readmeFileContent
+}
+
+function Update-TelemetryVersion([string]$telemetryFilePath, [string]$version) {
+	$telemetryFileContent = Get-Content -Path $telemetryFilePath -Raw
+	$telemetryFileContent = $telemetryFileContent -replace "\d{1,}\.\d{1,}\.\d{1,}", $version
+	Set-Content -Path $telemetryFilePath $telemetryFileContent
+}
+
+function Update-PackageVersion([string]$propertiesFilePath, [string]$version) {
+	$propertiesFileContent = Get-Content -Path $propertiesFilePath -Raw
+	if($version -match "(\d{1,})\.(\d{1,})\.(\d{1,})") {
+		$patch = $Matches[3]
+		$minor = $Matches[2]
+		$major = $Matches[1]
+		$propertiesFileContent = $propertiesFileContent -replace "mavenMajorVersion\s+=\s+\d{1,}", "mavenMajorVersion = $major"
+		$propertiesFileContent = $propertiesFileContent -replace "mavenMinorVersion\s+=\s+\d{1,}", "mavenMinorVersion = $minor"
+		$propertiesFileContent = $propertiesFileContent -replace "mavenPatchVersion\s+=\s+\d{1,}", "mavenPatchVersion = $patch"
+		Set-Content -Path $propertiesFilePath $propertiesFileContent
+	} else {
+		Write-Error "Invalid version number format $version"
+	}
+}
+function Get-CurrentTelemetryVersion([string]$telemetryFilePath) {
+	$telemetryFileContent = Get-Content -Path $telemetryFilePath -Raw
+	if($telemetryFileContent -match "(\d{1,}\.\d{1,}\.\d{1,})") {
+		return $Matches[1]
+	} else {
+		Write-Error "Invalid version number format"
+		return ""
+	}
+}
+
+function Update-MinorVersionNumber([string]$currentVersion) {
+	if($currentVersion -match "(\d{1,})\.(\d{1,})\.(\d{1,})") {
+		[int]$minor = [convert]::ToInt32($Matches[2])
+		$minor++;
+		$major = $Matches[1]
+		return "$major.$minor.0"
+	} else {
+		Write-Error "Invalid version number format $currentVersion"
+		return ""
+	}
+}
+
+function Update-MinorVersion() {
+	$readmeFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../readme.md"
+	$propertiesFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../gradle.properties"
+	$telemetryFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../src/main/java/com/microsoft/graph/core/Constants.java"
+	$currentVersion = Get-CurrentTelemetryVersion -telemetryFilePath $telemetryFilePath
+	$nextVersion = Update-MinorVersionNumber -currentVersion $currentVersion
+	Update-ReadmeVersion -version $nextVersion -readmeFilePath $readmeFilePath
+	Update-TelemetryVersion -version $nextVersion -telemetryFilePath $telemetryFilePath
+	Update-PackageVersion -version $nextVersion -propertiesFilePath $propertiesFilePath
+}
+Update-MinorVersion