diff --git a/.gitignore b/.gitignore index 5f426a1c8a8f..29f59c3a3e70 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ modules/ *.user *.userprefs *.vspx +*.json.bak # Specific files, typically generated by tools .config/dotnet-tools.json diff --git a/eng/scripts/npm/update-dependency-versions.mjs b/eng/scripts/npm/update-dependency-versions.mjs index 632152b69c9c..9311284a3999 100644 --- a/eng/scripts/npm/update-dependency-versions.mjs +++ b/eng/scripts/npm/update-dependency-versions.mjs @@ -52,9 +52,18 @@ function applyPackageVersion(packagesToPack, defaultPackageVersion) { renames.push([`${packagePath}.bak`, packagePath]); process.chdir(packageDir); - execSync(`npm version ${packageVersion} --no-git-tag-version --allow-same-version`, { stdio: 'inherit' }); + try { + execSync(`npm version ${packageVersion} --no-git-tag-version --allow-same-version`, { stdio: 'inherit' }); + console.log(`Applied version ${packageVersion} to ${packageName} in ${packageDir}...`); + } catch (error) { + console.warn(`Failed to run npm version command for ${packageName}, falling back to manual version update...`); + // Fallback: manually update the version in package.json + const packageJson = fs.readJsonSync(packagePath); + packageJson.version = packageVersion; + fs.writeJsonSync(packagePath, packageJson, { spaces: 2 }); + console.log(`Manually applied version ${packageVersion} to ${packageName} in ${packageDir}...`); + } process.chdir(currentDir); - console.log(`Applied version ${packageVersion} to ${packageName} in ${packageDir}...`); } return renames; diff --git a/package-lock.json b/package-lock.json index e15d0bf8cf1e..95e6c7158c66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18895,7 +18895,7 @@ }, "src/SignalR/clients/ts/signalr": { "name": "@microsoft/signalr", - "version": "5.0.0-dev", + "version": "10.0.0-dev", "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", @@ -18907,10 +18907,10 @@ }, "src/SignalR/clients/ts/signalr-protocol-msgpack": { "name": "@microsoft/signalr-protocol-msgpack", - "version": "5.0.0-dev", + "version": "10.0.0-dev", "license": "MIT", "dependencies": { - "@microsoft/signalr": "*", + "@microsoft/signalr": ">=10.0.0-dev", "@msgpack/msgpack": "^2.7.0" } }, diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/package.json b/src/JSInterop/Microsoft.JSInterop.JS/src/package.json index 4a91339cf24f..8f480f3052c6 100644 --- a/src/JSInterop/Microsoft.JSInterop.JS/src/package.json +++ b/src/JSInterop/Microsoft.JSInterop.JS/src/package.json @@ -44,4 +44,4 @@ "rimraf": "^5.0.5", "typescript": "^5.3.3" } -} \ No newline at end of file +} diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json index c9cc83805bbc..3f9769cdc736 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/signalr-protocol-msgpack", - "version": "5.0.0-dev", + "version": "10.0.0-dev", "description": "MsgPack Protocol support for ASP.NET Core SignalR", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -41,11 +41,11 @@ "src/**/*" ], "dependencies": { - "@microsoft/signalr": "*", + "@microsoft/signalr": ">=10.0.0-dev", "@msgpack/msgpack": "^2.7.0" }, "overrides": { "ws": ">=7.4.6", "tough-cookie": ">=4.1.3" } -} +} \ No newline at end of file diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index 805aed5a9bb2..a13e0ba8ee8b 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/signalr", - "version": "5.0.0-dev", + "version": "10.0.0-dev", "description": "ASP.NET Core SignalR Client", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js",