From 955423d2f78b189d9fd64a67df541cafc67e5ae2 Mon Sep 17 00:00:00 2001 From: dingmeng-xue Date: Tue, 28 Jul 2020 19:32:13 +0800 Subject: [PATCH 1/3] Minor version bump if module verison is less than 1.0.0 --- tools/VersionController/Models/VersionBumper.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/VersionController/Models/VersionBumper.cs b/tools/VersionController/Models/VersionBumper.cs index 5e525a804bc4..89ccb824a93d 100644 --- a/tools/VersionController/Models/VersionBumper.cs +++ b/tools/VersionController/Models/VersionBumper.cs @@ -186,6 +186,10 @@ private string GetBumpedVersion() private AzurePSVersion GetBumpedVersionByType(AzurePSVersion version, Version type) { AzurePSVersion bumpedVersion; + if(version.Major < 1) + { + type = Version.MINOR; + } if (type == Version.MAJOR) { bumpedVersion = new AzurePSVersion(version.Major + 1, 0, 0, version.Label); From cde175980e7b78c70141109e3c8030baecdb17ae Mon Sep 17 00:00:00 2001 From: "dixue@microsoft.com" Date: Thu, 30 Jul 2020 13:11:11 +0800 Subject: [PATCH 2/3] Adjust logic according to comments --- tools/VersionController/Models/VersionBumper.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/VersionController/Models/VersionBumper.cs b/tools/VersionController/Models/VersionBumper.cs index 89ccb824a93d..5e1bfc7c4129 100644 --- a/tools/VersionController/Models/VersionBumper.cs +++ b/tools/VersionController/Models/VersionBumper.cs @@ -137,11 +137,16 @@ private string GetBumpedVersion() } } - // PATCH update for preview modules (0.x.x or x.x.x-preview) - if (splitVersion[0] == 0 || _isPreview) + // PATCH update for preview modules (x.x.x-preview) + if (_isPreview) { versionBump = Version.PATCH; } + // MINOR update for modules with version 0.x.x. Otherwise, it is always 0.1.x which gives user perception that module is far from GA. + if (splitVersion[0] == 0) + { + versionBump = Version.MINOR; + } var bumpedVersion = GetBumpedVersionByType(new AzurePSVersion(_oldVersion), versionBump); @@ -186,10 +191,7 @@ private string GetBumpedVersion() private AzurePSVersion GetBumpedVersionByType(AzurePSVersion version, Version type) { AzurePSVersion bumpedVersion; - if(version.Major < 1) - { - type = Version.MINOR; - } + if (type == Version.MAJOR) { bumpedVersion = new AzurePSVersion(version.Major + 1, 0, 0, version.Label); From 80d46829ff518ca52d60b1659d0e58f0c351efd2 Mon Sep 17 00:00:00 2001 From: "dixue@microsoft.com" Date: Thu, 30 Jul 2020 13:12:51 +0800 Subject: [PATCH 3/3] Adjust logic according to comments --- tools/VersionController/Models/VersionBumper.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/VersionController/Models/VersionBumper.cs b/tools/VersionController/Models/VersionBumper.cs index 5e1bfc7c4129..d155f4781c44 100644 --- a/tools/VersionController/Models/VersionBumper.cs +++ b/tools/VersionController/Models/VersionBumper.cs @@ -191,7 +191,6 @@ private string GetBumpedVersion() private AzurePSVersion GetBumpedVersionByType(AzurePSVersion version, Version type) { AzurePSVersion bumpedVersion; - if (type == Version.MAJOR) { bumpedVersion = new AzurePSVersion(version.Major + 1, 0, 0, version.Label);