Skip to content

Commit db594dc

Browse files
authored
Make Az.Accounts update in last order in version controller (#17684)
1 parent 9469e12 commit db594dc

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

tools/VersionController/Models/VersionBumper.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,18 @@ public class VersionBumper
3333

3434
private string _oldVersion, _newVersion;
3535
private bool _isPreview;
36+
private IList<string> _changedModules { get; set; }
3637

3738
public AzurePSVersion MinimalVersion { get; set; }
3839
public string PSRepositories { get; set; }
3940

40-
public VersionBumper(VersionFileHelper fileHelper)
41+
public VersionBumper(VersionFileHelper fileHelper, IList<string> changedModules)
4142
{
4243
_fileHelper = fileHelper;
4344
_metadataHelper = new VersionMetadataHelper(_fileHelper);
4445
_loggerFactory = LoggerFactory.Create(builder => builder.AddConsole().AddDebug());
4546
_logger = _loggerFactory.CreateLogger<VersionBumper>();
47+
_changedModules = changedModules;
4648
}
4749

4850
/// <summary>
@@ -408,6 +410,8 @@ private void UpdateDependentModules()
408410
!f.Contains("bin") &&
409411
!f.Contains("dll-Help") &&
410412
!ModuleFilter.IsAzureStackModule(f))
413+
// Only update changed modules in this release
414+
.Intersect(_changedModules)
411415
.ToList();
412416
foreach (var moduleManifestPath in moduleManifestPaths)
413417
{

tools/VersionController/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ private static void BumpVersions()
182182
}
183183
}
184184
}
185-
//Make Az.Accounts as the first module to calcuate
186-
changedModules = changedModules.OrderBy(c => c == "Az.Accounts" ? "" : c).ToList();
185+
//Make Az.Accounts as the last module to calculate
186+
changedModules = changedModules.OrderByDescending(c => c == "Az.Accounts" ? "" : c).ToList();
187187
foreach (var projectModuleManifestPath in changedModules)
188188
{
189189
var moduleFileName = Path.GetFileName(projectModuleManifestPath);
@@ -204,7 +204,7 @@ private static void BumpVersions()
204204

205205
var outputModuleManifestFile = outputModuleManifest.FirstOrDefault();
206206

207-
_versionBumper = new VersionBumper(new VersionFileHelper(_rootDirectory, outputModuleManifestFile, projectModuleManifestPath));
207+
_versionBumper = new VersionBumper(new VersionFileHelper(_rootDirectory, outputModuleManifestFile, projectModuleManifestPath), changedModules);
208208
_versionBumper.PSRepositories = targetRepositories;
209209
if (_minimalVersion.ContainsKey(moduleName))
210210
{

0 commit comments

Comments
 (0)