Skip to content

Commit 9e4fef6

Browse files
authored
Update version controller to accept assigned version (#26025)
* Add assigned version parameter for bump up version * Add assigned version parameter for bump up version
1 parent 0871f0a commit 9e4fef6

File tree

4 files changed

+32
-8
lines changed

4 files changed

+32
-8
lines changed

tools/RunVersionController.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ Param(
1717
[Parameter(ParameterSetName='ReleaseSingleModule', Mandatory = $true)]
1818
[string]$ModuleName,
1919

20+
[Parameter(ParameterSetName='ReleaseSingleModule', Mandatory = $false)]
21+
[string]$AssignedVersion,
22+
2023
[Parameter()]
2124
[string]$GalleryName = "PSGallery",
2225

@@ -462,8 +465,8 @@ switch ($PSCmdlet.ParameterSetName)
462465
{
463466
"ReleaseSingleModule"
464467
{
465-
Write-Host executing dotnet $PSScriptRoot/../artifacts/VersionController/VersionController.Netcore.dll $PSScriptRoot/../artifacts/VersionController/Exceptions $ModuleName $ReleaseType
466-
dotnet $PSScriptRoot/../artifacts/VersionController/VersionController.Netcore.dll $PSScriptRoot/../artifacts/VersionController/Exceptions $ModuleName $ReleaseType
468+
Write-Host executing dotnet $PSScriptRoot/../artifacts/VersionController/VersionController.Netcore.dll $PSScriptRoot/../artifacts/VersionController/Exceptions $ModuleName $ReleaseType $AssignedVersion
469+
dotnet $PSScriptRoot/../artifacts/VersionController/VersionController.Netcore.dll $PSScriptRoot/../artifacts/VersionController/Exceptions $ModuleName $ReleaseType $AssignedVersion
467470
Update-AzPreview
468471
}
469472

tools/VersionController/Models/SyntaxChangelogGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public void Analyze(String rootDirectory)
2222
{
2323
var srcDirs = Path.Combine(rootDirectory, @"src\");
2424
var toolsCommonDirs = Path.Combine(rootDirectory, @"tools\Tools.Common");
25-
// bez: Will include psd1 files under test proj
26-
var manifestFiles = Directory.EnumerateFiles(srcDirs, "*.psd1", SearchOption.AllDirectories)
25+
var manifestFiles = Directory.EnumerateFiles(srcDirs, "Az.*.psd1", SearchOption.AllDirectories)
2726
.Where(file =>
2827
!Path.GetDirectoryName(file)
2928
.EndsWith("autorest", StringComparison.OrdinalIgnoreCase))

tools/VersionController/Models/VersionBumper.cs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public class VersionBumper
4141

4242
private IList<string> _changedModules { get; set; }
4343

44+
private AzurePSVersion _assignedVersion { get; set;}
45+
4446
public AzurePSVersion MinimalVersion { get; set; }
4547
public string PSRepositories { get; set; }
4648

@@ -56,6 +58,17 @@ public VersionBumper(VersionFileHelper fileHelper, IList<string> changedModules,
5658
_releaseType = releaseType;
5759
}
5860

61+
public VersionBumper(VersionFileHelper fileHelper, IList<string> changedModules, AzurePSVersion assignedVersion, ReleaseType releaseType = ReleaseType.STS)
62+
{
63+
_fileHelper = fileHelper;
64+
_metadataHelper = new VersionMetadataHelper(_fileHelper);
65+
_loggerFactory = LoggerFactory.Create(builder => builder.AddConsole().AddDebug());
66+
_logger = _loggerFactory.CreateLogger<VersionBumper>();
67+
_changedModules = changedModules;
68+
_assignedVersion = assignedVersion;
69+
_releaseType = releaseType;
70+
}
71+
5972
/// <summary>
6073
/// Bump the version in all necessary files.
6174
/// </summary>
@@ -65,8 +78,13 @@ public void BumpAllVersions()
6578
Console.WriteLine("Bumping version for " + moduleName + "...");
6679

6780
(_oldVersion, _isPreview) = GetOldVersion();
68-
69-
_newVersion = IsNewModule() ? _oldVersion : GetBumpedVersion();
81+
if (_assignedVersion != null)
82+
{
83+
_newVersion = _assignedVersion.ToString();
84+
} else
85+
{
86+
_newVersion = IsNewModule() ? _oldVersion : GetBumpedVersion();
87+
}
7088
if (MinimalVersion != null && MinimalVersion > new AzurePSVersion(_newVersion))
7189
{
7290
Console.WriteLine($"Adjust version from {_newVersion} to {MinimalVersion} due to MinimalVersion.csv");

tools/VersionController/Program.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class Program
3232
private static SyntaxChangelogGenerator _syntaxChangelogGenerator = new SyntaxChangelogGenerator();
3333
private static Dictionary<string, AzurePSVersion> _minimalVersion = new Dictionary<string, AzurePSVersion>();
3434
private static List<string> _projectDirectories, _outputDirectories;
35-
private static string _rootDirectory, _moduleNameFilter, _exceptionsDirectory;
35+
private static string _rootDirectory, _moduleNameFilter, _exceptionsDirectory, _assignedVersion;
3636
private static ReleaseType _releaseType = ReleaseType.STS;
3737
private static bool _generateSyntaxChangelog = true;
3838

@@ -100,6 +100,10 @@ private static void Initialize(string[] args)
100100
{
101101
Enum.TryParse(args[2], out _releaseType);
102102
}
103+
if (args.Length > 3 && !string.IsNullOrEmpty(args[3]))
104+
{
105+
_assignedVersion = args[3];
106+
}
103107
break;
104108
}
105109
}
@@ -261,7 +265,7 @@ private static void BumpVersions()
261265

262266
var outputModuleManifestFile = outputModuleManifest.FirstOrDefault();
263267

264-
_versionBumper = new VersionBumper(new VersionFileHelper(_rootDirectory, outputModuleManifestFile, projectModuleManifestPath), changedModules, _releaseType);
268+
_versionBumper = new VersionBumper(new VersionFileHelper(_rootDirectory, outputModuleManifestFile, projectModuleManifestPath), changedModules,new AzurePSVersion(_assignedVersion), _releaseType);
265269
_versionBumper.PSRepositories = targetRepositories;
266270
if (_minimalVersion.ContainsKey(moduleName))
267271
{

0 commit comments

Comments
 (0)