Skip to content

Commit 2cbe5b1

Browse files
authored
[Infrastructure] Avoid polluting the repo with changes on builds (#62399)
* Ignore json backup files * Add error handling to npm version command in pack-workspace script
1 parent 081b826 commit 2cbe5b1

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ modules/
3636
*.user
3737
*.userprefs
3838
*.vspx
39+
*.json.bak
3940

4041
# Specific files, typically generated by tools
4142
.config/dotnet-tools.json

eng/scripts/npm/update-dependency-versions.mjs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,18 @@ function applyPackageVersion(packagesToPack, defaultPackageVersion) {
5252
renames.push([`${packagePath}.bak`, packagePath]);
5353

5454
process.chdir(packageDir);
55-
execSync(`npm version ${packageVersion} --no-git-tag-version --allow-same-version`, { stdio: 'inherit' });
55+
try {
56+
execSync(`npm version ${packageVersion} --no-git-tag-version --allow-same-version`, { stdio: 'inherit' });
57+
console.log(`Applied version ${packageVersion} to ${packageName} in ${packageDir}...`);
58+
} catch (error) {
59+
console.warn(`Failed to run npm version command for ${packageName}, falling back to manual version update...`);
60+
// Fallback: manually update the version in package.json
61+
const packageJson = fs.readJsonSync(packagePath);
62+
packageJson.version = packageVersion;
63+
fs.writeJsonSync(packagePath, packageJson, { spaces: 2 });
64+
console.log(`Manually applied version ${packageVersion} to ${packageName} in ${packageDir}...`);
65+
}
5666
process.chdir(currentDir);
57-
console.log(`Applied version ${packageVersion} to ${packageName} in ${packageDir}...`);
5867
}
5968

6069
return renames;

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/JSInterop/Microsoft.JSInterop.JS/src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
"rimraf": "^5.0.5",
4545
"typescript": "^5.3.3"
4646
}
47-
}
47+
}

src/SignalR/clients/ts/signalr-protocol-msgpack/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/signalr-protocol-msgpack",
3-
"version": "5.0.0-dev",
3+
"version": "10.0.0-dev",
44
"description": "MsgPack Protocol support for ASP.NET Core SignalR",
55
"main": "./dist/cjs/index.js",
66
"module": "./dist/esm/index.js",
@@ -41,11 +41,11 @@
4141
"src/**/*"
4242
],
4343
"dependencies": {
44-
"@microsoft/signalr": "*",
44+
"@microsoft/signalr": ">=10.0.0-dev",
4545
"@msgpack/msgpack": "^2.7.0"
4646
},
4747
"overrides": {
4848
"ws": ">=7.4.6",
4949
"tough-cookie": ">=4.1.3"
5050
}
51-
}
51+
}

src/SignalR/clients/ts/signalr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/signalr",
3-
"version": "5.0.0-dev",
3+
"version": "10.0.0-dev",
44
"description": "ASP.NET Core SignalR Client",
55
"main": "./dist/cjs/index.js",
66
"module": "./dist/esm/index.js",

0 commit comments

Comments
 (0)