Skip to content

Commit 76015dc

Browse files
authored
Include prerelease tag when updating dev versions (Azure#15293)
- Use "semver.eq()" (which includes prerelease tags) instead of comparing major, minor, and patch
1 parent 70c1b3f commit 76015dc

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

eng/tools/versioning/set-dev.js

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ const updateDependencySection = (rushPackages, dependencySection, buildId) => {
7878
const parsedPackageVersion = semver.parse(packageVersion);
7979
const parsedDepMinVersion = semver.minVersion(depVersionRange);
8080

81-
if (
82-
parsedDepMinVersion.major == parsedPackageVersion.major &&
83-
parsedDepMinVersion.minor == parsedPackageVersion.minor &&
84-
parsedDepMinVersion.patch == parsedPackageVersion.patch
85-
) {
81+
if (semver.eq(parsedDepMinVersion, parsedPackageVersion)) {
8682
rushPackages = updatePackageVersion(rushPackages, depName, buildId);
8783
}
8884
}
@@ -137,10 +133,7 @@ const makeDependencySectionConsistentForPackage = (rushPackages, dependencySecti
137133
const parsedDepMinVersion = semver.minVersion(depVersionRange);
138134
// If the dependency range is satisfied by the package's current version,
139135
// replace it with an exact match to the package's new version
140-
if (
141-
parsedDepMinVersion.major == parsedPackageVersion.major &&
142-
parsedDepMinVersion.minor == parsedPackageVersion.minor &&
143-
parsedDepMinVersion.patch == parsedPackageVersion.patch &&
136+
if (semver.eq(parsedDepMinVersion, parsedPackageVersion) &&
144137
rushPackages[depName].newVer !== undefined
145138
) {
146139

@@ -179,9 +172,7 @@ const updateCommonVersions = async (repoRoot, commonVersionsConfig, package, sea
179172
if (allowedAlternativeVersions[package]) {
180173
for (var version of allowedAlternativeVersions[package]) {
181174
const parsedPackageVersion = semver.minVersion(version);
182-
if (parsedPackageVersion.major == parsedSearchVersion.major &&
183-
parsedPackageVersion.minor == parsedSearchVersion.minor &&
184-
parsedPackageVersion.patch == parsedSearchVersion.patch) {
175+
if (semver.eq(parsedPackageVersion, parsedSearchVersion)) {
185176
var devVersionRange = "^" + parsedSearchVersion.major + "." + parsedSearchVersion.minor + "." + parsedSearchVersion.patch + "-alpha";
186177
allowedAlternativeVersions[package].push(devVersionRange);
187178
break;

0 commit comments

Comments
 (0)