Skip to content

Commit db87d76

Browse files
committed
Fix band calculation
1 parent 674d271 commit db87d76

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,13 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v
296296
}
297297

298298
string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name);
299+
var bandVersion = VersionBandForManifestPackages;
299300
// regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3
300-
string bandVersion = bandVersionRegex().Match(version).Value;
301-
// use VersionBandForManifestPackages for CI/dev builds
302-
// ideally we could compare against PackageVersion but that isn't available in the task
303-
if (bandVersion.EndsWith("-ci") || bandVersion.EndsWith("-dev"))
304-
bandVersion = VersionBandForManifestPackages;
301+
string packagePreleaseVersion = bandVersionRegex().Match(version).Groups[1].Value;
302+
string bandPreleaseVersion = bandVersionRegex().Match(bandVersion).Groups[1].Value;
303+
304+
if (packagePreleaseVersion != bandPreleaseVersion && packagePreleaseVersion != "-dev" && packagePreleaseVersion != "-ci")
305+
bandVersion = bandVersion.Replace (bandPreleaseVersion, packagePreleaseVersion);
305306

306307
PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}",
307308
Version: version,

0 commit comments

Comments
 (0)