From c8de8a6bb4af91734c95c81e8b2f40af1dcaa10c Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Thu, 16 May 2024 22:27:54 +0530 Subject: [PATCH 01/12] Made deepinstall package manager aware --- npm/deepinstall.js | 29 ++++++---- package-lock.json | 129 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 5 +- 3 files changed, 151 insertions(+), 12 deletions(-) diff --git a/npm/deepinstall.js b/npm/deepinstall.js index e3741a9af..3d392578a 100644 --- a/npm/deepinstall.js +++ b/npm/deepinstall.js @@ -1,6 +1,8 @@ var shell = require('shelljs'), path = require('path'), async = require('async'), + { detect } = require('detect-package-manager'), + pm, PRODUCTION_FLAG = '', getSubfolders, fs = require('fs'), @@ -8,13 +10,6 @@ var shell = require('shelljs'), const args = process.argv, PATH_TO_CODEGENS_FOLDER = path.resolve(__dirname, '../codegens'); -if (args[2] && args[2] === 'dev') { - console.log('Dev flag detected running npm install'); -} -else { - PRODUCTION_FLAG = '--no-audit --production'; -} - getSubfolders = (folder) => { return fs.readdirSync(folder) .map((subfolder) => { return { path: path.join(folder, subfolder), name: subfolder}; }) @@ -23,6 +18,20 @@ getSubfolders = (folder) => { async.series([ function (next) { + detect().then((res) => { + pm = res; + console.log('Detected package manager: ' + pm); + return next(); + }); + }, + function (next) { + if (args[2] && args[2] === 'dev') { + console.log('Dev flag detected running ' + pm + ' install'); + } + else { + PRODUCTION_FLAG = '--no-audit --production'; + } + console.log('Running pre-package script'); var prepackagePath = path.resolve(__dirname, 'pre-package.js'), commandOutput = shell.exec(`node "${prepackagePath}"`); @@ -42,11 +51,11 @@ async.series([ var commandOut; - console.log(codegen.name + ': npm install ' + PRODUCTION_FLAG); - commandOut = shell.exec('npm install ' + PRODUCTION_FLAG, { silent: true }); + console.log(codegen.name + ': ' + pm + ' install ' + PRODUCTION_FLAG); + commandOut = shell.exec(pm + ' install ' + PRODUCTION_FLAG, { silent: true }); if (commandOut.code !== 0) { - console.error('Failed to run npm install on codegen ' + codegen.name + ', here is the error:'); + console.error('Failed to run ' + pm + ' install on codegen ' + codegen.name + ', here is the error:'); return next(commandOut.stderr); } console.log(commandOut.stdout); diff --git a/package-lock.json b/package-lock.json index 7489b7a0b..c7bff187e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1568,6 +1568,117 @@ "minimalistic-assert": "^1.0.0" } }, + "detect-package-manager": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/detect-package-manager/-/detect-package-manager-3.0.2.tgz", + "integrity": "sha512-8JFjJHutStYrfWwzfretQoyNGoZVW1Fsrp4JO9spa7h/fBfwgTMEIy4/LBzRDGsxwVPHU0q+T9YvwLDJoOApLQ==", + "dev": true, + "requires": { + "execa": "^5.1.1" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true + }, + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "detective": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", @@ -3246,6 +3357,12 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -4311,6 +4428,12 @@ } } }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -6591,6 +6714,12 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", diff --git a/package.json b/package.json index c511ad9b0..cc4022c6a 100644 --- a/package.json +++ b/package.json @@ -35,18 +35,19 @@ "browserify": "14.5.0", "chai": "4.3.7", "chalk": "2.4.2", - "eslint": "5.16.0", "dependency-check": "3.0.0", + "detect-package-manager": "^3.0.2", "editorconfig": "0.15.3", + "eslint": "5.16.0", "eslint-plugin-jsdoc": "3.15.1", "eslint-plugin-lodash": "2.7.0", "eslint-plugin-mocha": "4.12.1", "eslint-plugin-security": "1.5.0", "istanbul": "0.4.5", "js-yaml": "3.14.1", - "newman": "5.3.2", "jsdoc": "3.6.10", "mocha": "6.2.3", + "newman": "5.3.2", "nyc": "14.1.1", "parse-gitignore": "1.0.1", "pretty-ms": "3.2.0", From f69b92d490af81987e76aadd36d7eae7f323ec73 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Thu, 16 May 2024 22:52:13 +0530 Subject: [PATCH 02/12] using correct version format --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc4022c6a..50612b8be 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "chai": "4.3.7", "chalk": "2.4.2", "dependency-check": "3.0.0", - "detect-package-manager": "^3.0.2", + "detect-package-manager": "3.0.2", "editorconfig": "0.15.3", "eslint": "5.16.0", "eslint-plugin-jsdoc": "3.15.1", From 35e0197b3137f9bcc9bfa100f7dde592a552b579 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Wed, 22 May 2024 13:07:05 +0530 Subject: [PATCH 03/12] Moving detect-package-manager to dependencies --- package-lock.json | 37 ++++++++++--------------------------- package.json | 4 ++-- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7bff187e..cd5e75a03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1572,7 +1572,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/detect-package-manager/-/detect-package-manager-3.0.2.tgz", "integrity": "sha512-8JFjJHutStYrfWwzfretQoyNGoZVW1Fsrp4JO9spa7h/fBfwgTMEIy4/LBzRDGsxwVPHU0q+T9YvwLDJoOApLQ==", - "dev": true, "requires": { "execa": "^5.1.1" }, @@ -1581,7 +1580,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1592,7 +1590,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, "requires": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -1608,26 +1605,22 @@ "get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, "requires": { "path-key": "^3.0.0" } @@ -1636,7 +1629,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, "requires": { "mimic-fn": "^2.1.0" } @@ -1644,14 +1636,12 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -1659,20 +1649,17 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -3360,8 +3347,7 @@ "human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" }, "iconv-lite": { "version": "0.4.24", @@ -3800,8 +3786,7 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "3.0.1", @@ -4431,8 +4416,7 @@ "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" }, "micromatch": { "version": "3.1.10", @@ -6717,8 +6701,7 @@ "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" }, "strip-json-comments": { "version": "2.0.1", diff --git a/package.json b/package.json index 50612b8be..8da389e60 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,9 @@ "license": "Apache-2.0", "homepage": "https://github.com/postmanlabs/code-generators", "dependencies": { - "lodash": "4.17.21", "async": "3.2.2", + "detect-package-manager": "^3.0.2", + "lodash": "4.17.21", "path": "0.12.7", "postman-collection": "4.0.0", "shelljs": "0.8.5" @@ -36,7 +37,6 @@ "chai": "4.3.7", "chalk": "2.4.2", "dependency-check": "3.0.0", - "detect-package-manager": "3.0.2", "editorconfig": "0.15.3", "eslint": "5.16.0", "eslint-plugin-jsdoc": "3.15.1", From 25bfe780e14cc8d1c385509a468c1013eafb2585 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Wed, 22 May 2024 22:11:39 +0530 Subject: [PATCH 04/12] using correct version format --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8da389e60..40769a1df 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "homepage": "https://github.com/postmanlabs/code-generators", "dependencies": { "async": "3.2.2", - "detect-package-manager": "^3.0.2", + "detect-package-manager": "3.0.2", "lodash": "4.17.21", "path": "0.12.7", "postman-collection": "4.0.0", From 2e77ecce2df2c548b090bc4129fe88f47fe9e204 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 07:40:29 +0530 Subject: [PATCH 05/12] Upgrade restsharp version to fix failing tests --- npm/ci-requirements.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ci-requirements.sh b/npm/ci-requirements.sh index 69d612a51..fb61187fd 100755 --- a/npm/ci-requirements.sh +++ b/npm/ci-requirements.sh @@ -39,7 +39,7 @@ pushd ./codegens/csharp-restsharp &>/dev/null; sudo apt-get install dotnet-sdk-6.0 dotnet new console -o testProject -f net6.0 pushd ./testProject &>/dev/null; - dotnet add package RestSharp + dotnet add package RestSharp --version 111.0.0 popd &>/dev/null; popd &>/dev/null; From 699c3eebb52801e9e627416f5bca9445ee344fa4 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 08:08:36 +0530 Subject: [PATCH 06/12] Upgrade dotnet version to 8.0 --- npm/ci-requirements.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ci-requirements.sh b/npm/ci-requirements.sh index fb61187fd..ddd827e2e 100755 --- a/npm/ci-requirements.sh +++ b/npm/ci-requirements.sh @@ -36,8 +36,8 @@ pushd ./codegens/csharp-restsharp &>/dev/null; sudo dpkg -i packages-microsoft-prod.deb sudo apt-get install apt-transport-https sudo apt-get update - sudo apt-get install dotnet-sdk-6.0 - dotnet new console -o testProject -f net6.0 + sudo apt-get install dotnet-sdk-8.0 + dotnet new console -o testProject -f net8.0 pushd ./testProject &>/dev/null; dotnet add package RestSharp --version 111.0.0 popd &>/dev/null; From cd18aaea15b1b4316ccce08779c18a8f0e351af6 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 08:35:17 +0530 Subject: [PATCH 07/12] Rename MaxTimeout to Timeout as per the latest RestSharp version --- codegens/csharp-restsharp/lib/restsharp.js | 4 ++-- codegens/csharp-restsharp/test/unit/convert.test.js | 2 +- .../test/unit/fixtures/testResponseAsync.json | 2 +- .../test/unit/fixtures/testResponseJsonParams.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/codegens/csharp-restsharp/lib/restsharp.js b/codegens/csharp-restsharp/lib/restsharp.js index 46c7b2a7f..44ecc6052 100644 --- a/codegens/csharp-restsharp/lib/restsharp.js +++ b/codegens/csharp-restsharp/lib/restsharp.js @@ -36,10 +36,10 @@ function makeOptionsSnippet (urlOrigin, options, indentString, headers) { }); } if (options.requestTimeout) { - snippet += `${indentString}MaxTimeout = ${options.requestTimeout},\n`; + snippet += `${indentString}Timeout = ${options.requestTimeout},\n`; } else { - snippet += `${indentString}MaxTimeout = -1,\n`; + snippet += `${indentString}Timeout = -1,\n`; } if (!options.followRedirect) { snippet += `${indentString}FollowRedirects = false,\n`; diff --git a/codegens/csharp-restsharp/test/unit/convert.test.js b/codegens/csharp-restsharp/test/unit/convert.test.js index ca497f0b6..c861a521b 100644 --- a/codegens/csharp-restsharp/test/unit/convert.test.js +++ b/codegens/csharp-restsharp/test/unit/convert.test.js @@ -93,7 +93,7 @@ describe('csharp restsharp function', function () { expect.fail(null, null, error); } expect(snippet).to.be.a('string'); - expect(snippet).to.include('MaxTimeout = 5'); + expect(snippet).to.include('Timeout = 5'); }); }); diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json index 4c51c6eff..eb665fd95 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json @@ -1,3 +1,3 @@ { - "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tMaxTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json index 8ea7f16d7..f4a8ab6ff 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json @@ -1,3 +1,3 @@ { - "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tMaxTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } From 123e2d346a37f91723b49afca8191e7d6530af03 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 08:53:17 +0530 Subject: [PATCH 08/12] TimeOut expects a TimeSpan Object as value --- codegens/csharp-restsharp/lib/restsharp.js | 4 ++-- .../test/unit/fixtures/testResponseAsync.json | 2 +- .../test/unit/fixtures/testResponseJsonParams.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codegens/csharp-restsharp/lib/restsharp.js b/codegens/csharp-restsharp/lib/restsharp.js index 44ecc6052..1e96e01c3 100644 --- a/codegens/csharp-restsharp/lib/restsharp.js +++ b/codegens/csharp-restsharp/lib/restsharp.js @@ -36,10 +36,10 @@ function makeOptionsSnippet (urlOrigin, options, indentString, headers) { }); } if (options.requestTimeout) { - snippet += `${indentString}Timeout = ${options.requestTimeout},\n`; + snippet += `${indentString}Timeout = new TimeSpan(${options.requestTimeout}),\n`; } else { - snippet += `${indentString}Timeout = -1,\n`; + snippet += `${indentString}Timeout = new TimeSpan(-1),\n`; } if (!options.followRedirect) { snippet += `${indentString}FollowRedirects = false,\n`; diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json index eb665fd95..bb091957d 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json @@ -1,3 +1,3 @@ { - "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = new TimeSpan(-1),\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json index f4a8ab6ff..b1c1c61a3 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json @@ -1,3 +1,3 @@ { - "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = new TimeSpan(-1),\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } From 8eb66f926765e95622315ec7829576ec8c60be9f Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 09:16:39 +0530 Subject: [PATCH 09/12] Fixing test assertions --- codegens/csharp-restsharp/test/unit/convert.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegens/csharp-restsharp/test/unit/convert.test.js b/codegens/csharp-restsharp/test/unit/convert.test.js index c861a521b..8bf861881 100644 --- a/codegens/csharp-restsharp/test/unit/convert.test.js +++ b/codegens/csharp-restsharp/test/unit/convert.test.js @@ -93,7 +93,7 @@ describe('csharp restsharp function', function () { expect.fail(null, null, error); } expect(snippet).to.be.a('string'); - expect(snippet).to.include('Timeout = 5'); + expect(snippet).to.include('Timeout = new TimeSpan(5)'); }); }); From 020624c039b097cca840921a90f1557357fca064 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 10:17:39 +0530 Subject: [PATCH 10/12] Revert version changes as it would automatically use the latest RestSharp version --- npm/ci-requirements.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/ci-requirements.sh b/npm/ci-requirements.sh index ddd827e2e..69d612a51 100755 --- a/npm/ci-requirements.sh +++ b/npm/ci-requirements.sh @@ -36,10 +36,10 @@ pushd ./codegens/csharp-restsharp &>/dev/null; sudo dpkg -i packages-microsoft-prod.deb sudo apt-get install apt-transport-https sudo apt-get update - sudo apt-get install dotnet-sdk-8.0 - dotnet new console -o testProject -f net8.0 + sudo apt-get install dotnet-sdk-6.0 + dotnet new console -o testProject -f net6.0 pushd ./testProject &>/dev/null; - dotnet add package RestSharp --version 111.0.0 + dotnet add package RestSharp popd &>/dev/null; popd &>/dev/null; From 3c8ef7c604674b211b2351cd2f18934330de1811 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Fri, 24 May 2024 11:10:10 +0530 Subject: [PATCH 11/12] Fixed the format of TimeSpan --- codegens/csharp-restsharp/lib/restsharp.js | 5 +---- codegens/csharp-restsharp/test/unit/convert.test.js | 2 +- .../test/unit/fixtures/testResponseAsync.json | 2 +- .../test/unit/fixtures/testResponseJsonParams.json | 2 +- npm/ci-requirements.sh | 6 +++--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/codegens/csharp-restsharp/lib/restsharp.js b/codegens/csharp-restsharp/lib/restsharp.js index 1e96e01c3..e04128640 100644 --- a/codegens/csharp-restsharp/lib/restsharp.js +++ b/codegens/csharp-restsharp/lib/restsharp.js @@ -36,10 +36,7 @@ function makeOptionsSnippet (urlOrigin, options, indentString, headers) { }); } if (options.requestTimeout) { - snippet += `${indentString}Timeout = new TimeSpan(${options.requestTimeout}),\n`; - } - else { - snippet += `${indentString}Timeout = new TimeSpan(-1),\n`; + snippet += `${indentString}Timeout = new TimeSpan(0, 0, 0, ${options.requestTimeout}),\n`; } if (!options.followRedirect) { snippet += `${indentString}FollowRedirects = false,\n`; diff --git a/codegens/csharp-restsharp/test/unit/convert.test.js b/codegens/csharp-restsharp/test/unit/convert.test.js index 8bf861881..6852de3f3 100644 --- a/codegens/csharp-restsharp/test/unit/convert.test.js +++ b/codegens/csharp-restsharp/test/unit/convert.test.js @@ -93,7 +93,7 @@ describe('csharp restsharp function', function () { expect.fail(null, null, error); } expect(snippet).to.be.a('string'); - expect(snippet).to.include('Timeout = new TimeSpan(5)'); + expect(snippet).to.include('Timeout = new TimeSpan(0, 0, 0, 5)'); }); }); diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json index bb091957d..7ee4d1389 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json @@ -1,3 +1,3 @@ { - "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = new TimeSpan(-1),\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json index b1c1c61a3..45a0b5fd4 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json @@ -1,3 +1,3 @@ { - "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tTimeout = new TimeSpan(-1),\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } diff --git a/npm/ci-requirements.sh b/npm/ci-requirements.sh index 69d612a51..ddd827e2e 100755 --- a/npm/ci-requirements.sh +++ b/npm/ci-requirements.sh @@ -36,10 +36,10 @@ pushd ./codegens/csharp-restsharp &>/dev/null; sudo dpkg -i packages-microsoft-prod.deb sudo apt-get install apt-transport-https sudo apt-get update - sudo apt-get install dotnet-sdk-6.0 - dotnet new console -o testProject -f net6.0 + sudo apt-get install dotnet-sdk-8.0 + dotnet new console -o testProject -f net8.0 pushd ./testProject &>/dev/null; - dotnet add package RestSharp + dotnet add package RestSharp --version 111.0.0 popd &>/dev/null; popd &>/dev/null; From 5ba8fc24a10d1a26386f06606b44fdd9a9d37432 Mon Sep 17 00:00:00 2001 From: Aman Singh <121886615+aman-v-singh@users.noreply.github.com> Date: Mon, 27 May 2024 13:32:58 +0530 Subject: [PATCH 12/12] Reverting changes and using the Previous version of RestSharp --- codegens/csharp-restsharp/lib/restsharp.js | 5 ++++- codegens/csharp-restsharp/test/unit/convert.test.js | 2 +- .../test/unit/fixtures/testResponseAsync.json | 2 +- .../test/unit/fixtures/testResponseJsonParams.json | 2 +- npm/ci-requirements.sh | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/codegens/csharp-restsharp/lib/restsharp.js b/codegens/csharp-restsharp/lib/restsharp.js index e04128640..46c7b2a7f 100644 --- a/codegens/csharp-restsharp/lib/restsharp.js +++ b/codegens/csharp-restsharp/lib/restsharp.js @@ -36,7 +36,10 @@ function makeOptionsSnippet (urlOrigin, options, indentString, headers) { }); } if (options.requestTimeout) { - snippet += `${indentString}Timeout = new TimeSpan(0, 0, 0, ${options.requestTimeout}),\n`; + snippet += `${indentString}MaxTimeout = ${options.requestTimeout},\n`; + } + else { + snippet += `${indentString}MaxTimeout = -1,\n`; } if (!options.followRedirect) { snippet += `${indentString}FollowRedirects = false,\n`; diff --git a/codegens/csharp-restsharp/test/unit/convert.test.js b/codegens/csharp-restsharp/test/unit/convert.test.js index 6852de3f3..ca497f0b6 100644 --- a/codegens/csharp-restsharp/test/unit/convert.test.js +++ b/codegens/csharp-restsharp/test/unit/convert.test.js @@ -93,7 +93,7 @@ describe('csharp restsharp function', function () { expect.fail(null, null, error); } expect(snippet).to.be.a('string'); - expect(snippet).to.include('Timeout = new TimeSpan(0, 0, 0, 5)'); + expect(snippet).to.include('MaxTimeout = 5'); }); }); diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json index 7ee4d1389..4c51c6eff 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseAsync.json @@ -1,3 +1,3 @@ { - "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result" : "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tMaxTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post/?hardik=\\\"me\\\"\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/x-www-form-urlencoded\");\nrequest.AddParameter(\"1\", \"a\");\nrequest.AddParameter(\"2\", \"b\");\nrequest.AddParameter(\"\\\"\\\"12\\\"\\\"\", \"\\\"23\\\"\");\nrequest.AddParameter(\"'1\\\"2\\\\\\\"\\\"3'\", \"'1\\\"23\\\"4'\");\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } diff --git a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json index 45a0b5fd4..8ea7f16d7 100644 --- a/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json +++ b/codegens/csharp-restsharp/test/unit/fixtures/testResponseJsonParams.json @@ -1,3 +1,3 @@ { - "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" + "result": "var options = new RestClientOptions(\"https://postman-echo.com\")\n{\n\tMaxTimeout = -1,\n};\nvar client = new RestClient(options);\nvar request = new RestRequest(\"/post\", Method.Post);\nrequest.AddHeader(\"Content-Type\", \"application/json\");\nvar body = @\"{\" + \"\\n\" +\n@\" \"\"json\"\": \"\"Test-Test\"\"\" + \"\\n\" +\n@\"}\";\nrequest.AddStringBody(body, DataFormat.Json);\nRestResponse response = await client.ExecuteAsync(request);\nConsole.WriteLine(response.Content);" } diff --git a/npm/ci-requirements.sh b/npm/ci-requirements.sh index ddd827e2e..f58c13a24 100755 --- a/npm/ci-requirements.sh +++ b/npm/ci-requirements.sh @@ -36,10 +36,10 @@ pushd ./codegens/csharp-restsharp &>/dev/null; sudo dpkg -i packages-microsoft-prod.deb sudo apt-get install apt-transport-https sudo apt-get update - sudo apt-get install dotnet-sdk-8.0 - dotnet new console -o testProject -f net8.0 + sudo apt-get install dotnet-sdk-6.0 + dotnet new console -o testProject -f net6.0 pushd ./testProject &>/dev/null; - dotnet add package RestSharp --version 111.0.0 + dotnet add package RestSharp --version 110.0.0 popd &>/dev/null; popd &>/dev/null;