From d3322b8508e160b52bef96bd4e44c81b4ff0e142 Mon Sep 17 00:00:00 2001 From: Davyd McColl Date: Wed, 13 Dec 2023 12:30:07 +0200 Subject: [PATCH] :arrow_up: upgrade all the things --- package-lock.json | 420 +++++++++++++++++- package.json | 2 +- src/CoreConsumer/CoreConsumer.csproj | 8 +- src/CoreTests/CoreTests.csproj | 4 +- .../NExpect.Matchers.AspNetCore.Tests.csproj | 10 +- .../ControllerMatchers.cs | 6 +- .../NExpect.Matchers.AspNetCore.csproj | 4 +- .../NExpect.Matchers.AspNetMvc.Tests.csproj | 10 +- .../NExpect.Matchers.AspNetMvc.csproj | 4 +- .../NExpect.Matchers.NSubstitute.Tests.csproj | 10 +- .../NExpect.Matchers.NSubstitute.csproj | 2 +- .../NExpect.Matchers.Xml.Tests.csproj | 8 +- .../NExpect.Matchers.Xml.csproj | 2 +- src/NExpect.Tests/ArbitraryBehaviorTests.cs | 18 +- src/NExpect.Tests/NExpect.Tests.csproj | 10 +- src/NExpect/NExpect.csproj | 2 +- src/PeanutButter | 2 +- 17 files changed, 456 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index b768d5a3..1aea0be7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "ts-node": "^10.9.1", "typescript": "^5.1.6", "yafs": "^1.23.0", - "zarro": "^1.144.285" + "zarro": "^1.166.0" } }, "node_modules/@cspotcode/source-map-support": { @@ -335,6 +335,15 @@ "@types/node": "*" } }, + "node_modules/@xmldom/xmldom": { + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "dev": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", @@ -2091,6 +2100,12 @@ "safer-buffer": "^2.1.0" } }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -2244,6 +2259,15 @@ "es6-symbol": "^3.1.1" } }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -3763,6 +3787,12 @@ "node": ">= 4" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -4398,6 +4428,18 @@ "node": ">=0.6.0" } }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "node_modules/just-debounce": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", @@ -4462,6 +4504,15 @@ "node": ">= 0.10" } }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/liftoff": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", @@ -4983,6 +5034,160 @@ } } }, + "node_modules/node-nuget-client": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/node-nuget-client/-/node-nuget-client-0.12.0.tgz", + "integrity": "sha512-dr+EmAhlvCkyZTGh+7qXqJhNNNuZCnL97RQt9n9I7IrGKIFyiOd5SjUjE75s1szQrk+mf9ZmeDZytRO6EyIgag==", + "dev": true, + "dependencies": { + "@xmldom/xmldom": "^0.8.10", + "bent": "^7.3.0", + "chalk": "^4.1.0", + "jszip": "^3.10.1", + "rimraf": "^3.0.2", + "yafs": "^1.36.0", + "yargs": "^17.7.2" + }, + "bin": { + "node-nuget": "dist/nuget-client-cli.js" + } + }, + "node_modules/node-nuget-client/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-nuget-client/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/node-nuget-client/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/node-nuget-client/node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/node-nuget-client/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-nuget-client/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-nuget-client/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-nuget-client/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/node-nuget-client/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-nuget-client/node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/node-nuget-client/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/node-version": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", @@ -5387,6 +5592,12 @@ "node": ">=8" } }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "node_modules/parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -6525,6 +6736,12 @@ "node": ">=0.10.0" } }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -7917,9 +8134,9 @@ "dev": true }, "node_modules/yafs": { - "version": "1.34.0", - "resolved": "https://registry.npmjs.org/yafs/-/yafs-1.34.0.tgz", - "integrity": "sha512-XcFkkbsi1+nHTNUN8FaO1C2gAb0TBpw4SZu97K2BHHJDX8NPhQM+J6AhRa5mN2LHGfbBkmMVYKn3nEzbiXBarA==", + "version": "1.36.0", + "resolved": "https://registry.npmjs.org/yafs/-/yafs-1.36.0.tgz", + "integrity": "sha512-6n1KkWmhyFNV56Hrr4o+TzEjUDzUlVdMdv8hA8yNirOzzRFfeig9o/Kd1SkboVA4dqWWhHk4ggCe6zOP8I9tDw==", "dev": true }, "node_modules/yallist": { @@ -7979,9 +8196,9 @@ } }, "node_modules/zarro": { - "version": "1.144.285", - "resolved": "https://registry.npmjs.org/zarro/-/zarro-1.144.285.tgz", - "integrity": "sha512-G0mT9eHOIvZrJx7XJo6yyijKTDBXVYf4+8vtK+WhqKrmmZ3+qWL+3KgNmDd4D/KSDPKcbNJY5B7WIeBL2QP5Vg==", + "version": "1.166.0", + "resolved": "https://registry.npmjs.org/zarro/-/zarro-1.166.0.tgz", + "integrity": "sha512-kpjT5Vcup7XDllvSV2WysZjVnrRTWuEL8s6csQRAQt+oAbU0/Km7uf5NNYPFN5e4LKAIGj3FOqtGIApbdPSCWQ==", "dev": true, "dependencies": { "@octokit/rest": "^20.0.1", @@ -8003,6 +8220,7 @@ "gulp-filter": "^6.0.0", "gulp-msbuild": "^0.10.0", "lodash.kebabcase": "^4.1.1", + "node-nuget-client": "^0.12.0", "npm-run-all": "^4.1.5", "plugin-error": "^1.0.1", "readline": "^1.3.0", @@ -8021,7 +8239,7 @@ "vinyl": "^2.2.1", "which": "^2.0.2", "xml2js": "^0.6.2", - "yafs": "^1.34.0" + "yafs": "^1.35.0" }, "bin": { "zarro": "index.js" @@ -8378,6 +8596,12 @@ "@types/node": "*" } }, + "@xmldom/xmldom": { + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "dev": true + }, "acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", @@ -9778,6 +10002,12 @@ "safer-buffer": "^2.1.0" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -9912,6 +10142,12 @@ "es6-symbol": "^3.1.1" } }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -11137,6 +11373,12 @@ "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -11613,6 +11855,18 @@ "verror": "1.10.0" } }, + "jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "just-debounce": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", @@ -11662,6 +11916,15 @@ "flush-write-stream": "^1.0.2" } }, + "lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "requires": { + "immediate": "~3.0.5" + } + }, "liftoff": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", @@ -12097,6 +12360,120 @@ "whatwg-url": "^5.0.0" } }, + "node-nuget-client": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/node-nuget-client/-/node-nuget-client-0.12.0.tgz", + "integrity": "sha512-dr+EmAhlvCkyZTGh+7qXqJhNNNuZCnL97RQt9n9I7IrGKIFyiOd5SjUjE75s1szQrk+mf9ZmeDZytRO6EyIgag==", + "dev": true, + "requires": { + "@xmldom/xmldom": "^0.8.10", + "bent": "^7.3.0", + "chalk": "^4.1.0", + "jszip": "^3.10.1", + "rimraf": "^3.0.2", + "yafs": "^1.36.0", + "yargs": "^17.7.2" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + } + }, + "yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true + } + } + }, "node-version": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz", @@ -12407,6 +12784,12 @@ "aggregate-error": "^3.0.0" } }, + "pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -13286,6 +13669,12 @@ } } }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -14417,9 +14806,9 @@ "dev": true }, "yafs": { - "version": "1.34.0", - "resolved": "https://registry.npmjs.org/yafs/-/yafs-1.34.0.tgz", - "integrity": "sha512-XcFkkbsi1+nHTNUN8FaO1C2gAb0TBpw4SZu97K2BHHJDX8NPhQM+J6AhRa5mN2LHGfbBkmMVYKn3nEzbiXBarA==", + "version": "1.36.0", + "resolved": "https://registry.npmjs.org/yafs/-/yafs-1.36.0.tgz", + "integrity": "sha512-6n1KkWmhyFNV56Hrr4o+TzEjUDzUlVdMdv8hA8yNirOzzRFfeig9o/Kd1SkboVA4dqWWhHk4ggCe6zOP8I9tDw==", "dev": true }, "yallist": { @@ -14476,9 +14865,9 @@ "dev": true }, "zarro": { - "version": "1.144.285", - "resolved": "https://registry.npmjs.org/zarro/-/zarro-1.144.285.tgz", - "integrity": "sha512-G0mT9eHOIvZrJx7XJo6yyijKTDBXVYf4+8vtK+WhqKrmmZ3+qWL+3KgNmDd4D/KSDPKcbNJY5B7WIeBL2QP5Vg==", + "version": "1.166.0", + "resolved": "https://registry.npmjs.org/zarro/-/zarro-1.166.0.tgz", + "integrity": "sha512-kpjT5Vcup7XDllvSV2WysZjVnrRTWuEL8s6csQRAQt+oAbU0/Km7uf5NNYPFN5e4LKAIGj3FOqtGIApbdPSCWQ==", "dev": true, "requires": { "@octokit/rest": "^20.0.1", @@ -14500,6 +14889,7 @@ "gulp-filter": "^6.0.0", "gulp-msbuild": "^0.10.0", "lodash.kebabcase": "^4.1.1", + "node-nuget-client": "^0.12.0", "npm-run-all": "^4.1.5", "plugin-error": "^1.0.1", "readline": "^1.3.0", @@ -14518,7 +14908,7 @@ "vinyl": "^2.2.1", "which": "^2.0.2", "xml2js": "^0.6.2", - "yafs": "^1.34.0" + "yafs": "^1.35.0" }, "dependencies": { "cross-env": { diff --git a/package.json b/package.json index c2046016..6b3f7097 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "ts-node": "^10.9.1", "typescript": "^5.1.6", "yafs": "^1.23.0", - "zarro": "^1.144.285" + "zarro": "^1.166.0" } } diff --git a/src/CoreConsumer/CoreConsumer.csproj b/src/CoreConsumer/CoreConsumer.csproj index 8bed3417..eaf80ab1 100644 --- a/src/CoreConsumer/CoreConsumer.csproj +++ b/src/CoreConsumer/CoreConsumer.csproj @@ -8,13 +8,13 @@ - + - - - + + + \ No newline at end of file diff --git a/src/CoreTests/CoreTests.csproj b/src/CoreTests/CoreTests.csproj index c89b980f..10256438 100644 --- a/src/CoreTests/CoreTests.csproj +++ b/src/CoreTests/CoreTests.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj b/src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj index 98438009..9530c2ac 100644 --- a/src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj +++ b/src/NExpect.Matchers.AspNetCore.Tests/NExpect.Matchers.AspNetCore.Tests.csproj @@ -12,12 +12,12 @@ - + - - - - + + + + diff --git a/src/NExpect.Matchers.AspNetCore/ControllerMatchers.cs b/src/NExpect.Matchers.AspNetCore/ControllerMatchers.cs index 029f620b..c7516643 100644 --- a/src/NExpect.Matchers.AspNetCore/ControllerMatchers.cs +++ b/src/NExpect.Matchers.AspNetCore/ControllerMatchers.cs @@ -238,10 +238,10 @@ Func matcher .Where(o => o.Name == Member) .ToArray(); - return method.Length switch + return method switch { - 0 => CreateMissingMethodResult(controllerType), - 1 => VerifyAttribute(controllerType, method[0], matcher), + [] => CreateMissingMethodResult(controllerType), + [var m] => VerifyAttribute(controllerType, m, matcher), _ => CreateAmbiguousMethodResult(controllerType, method.Length) }; } diff --git a/src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj b/src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj index 6a230b53..ee92e897 100644 --- a/src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj +++ b/src/NExpect.Matchers.AspNetCore/NExpect.Matchers.AspNetCore.csproj @@ -68,8 +68,8 @@ - - + + diff --git a/src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj b/src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj index 9474e9b8..1cf1c435 100644 --- a/src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj +++ b/src/NExpect.Matchers.AspNetMvc.Tests/NExpect.Matchers.AspNetMvc.Tests.csproj @@ -9,12 +9,12 @@ - - + + - - - + + + diff --git a/src/NExpect.Matchers.AspNetMvc/NExpect.Matchers.AspNetMvc.csproj b/src/NExpect.Matchers.AspNetMvc/NExpect.Matchers.AspNetMvc.csproj index 28c69a53..200f944a 100644 --- a/src/NExpect.Matchers.AspNetMvc/NExpect.Matchers.AspNetMvc.csproj +++ b/src/NExpect.Matchers.AspNetMvc/NExpect.Matchers.AspNetMvc.csproj @@ -65,8 +65,8 @@ - - + + diff --git a/src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj b/src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj index f7b4a60d..db4a97c9 100644 --- a/src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj +++ b/src/NExpect.Matchers.NSubstitute.Tests/NExpect.Matchers.NSubstitute.Tests.csproj @@ -9,12 +9,12 @@ - + - - - - + + + + diff --git a/src/NExpect.Matchers.NSubstitute/NExpect.Matchers.NSubstitute.csproj b/src/NExpect.Matchers.NSubstitute/NExpect.Matchers.NSubstitute.csproj index b05d37c0..532dc33a 100644 --- a/src/NExpect.Matchers.NSubstitute/NExpect.Matchers.NSubstitute.csproj +++ b/src/NExpect.Matchers.NSubstitute/NExpect.Matchers.NSubstitute.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj b/src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj index c40fe83b..6122eb94 100644 --- a/src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj +++ b/src/NExpect.Matchers.Xml.Tests/NExpect.Matchers.Xml.Tests.csproj @@ -8,11 +8,11 @@ - + - - - + + + diff --git a/src/NExpect.Matchers.Xml/NExpect.Matchers.Xml.csproj b/src/NExpect.Matchers.Xml/NExpect.Matchers.Xml.csproj index f2695e2e..01d770b8 100644 --- a/src/NExpect.Matchers.Xml/NExpect.Matchers.Xml.csproj +++ b/src/NExpect.Matchers.Xml/NExpect.Matchers.Xml.csproj @@ -39,7 +39,7 @@ BUILD_PEANUTBUTTER_INTERNAL - + diff --git a/src/NExpect.Tests/ArbitraryBehaviorTests.cs b/src/NExpect.Tests/ArbitraryBehaviorTests.cs index 6f9ede97..3a65ff52 100644 --- a/src/NExpect.Tests/ArbitraryBehaviorTests.cs +++ b/src/NExpect.Tests/ArbitraryBehaviorTests.cs @@ -867,15 +867,10 @@ public void ExceptionCollectionPropertyMatchingLikeOtherCollections() Expect(() => throw ex) .To.Throw() .With.CollectionProperty(e => e.InnerExceptions) - .Containing.Exactly(1) + .Not.Containing.Exactly(1) .Matched.By(e => e.Message == "1"); - Expect(() => throw ex) - .To.Throw() - .With.CollectionProperty(e => e.InnerExceptions) - .Not.Containing.Any - .Matched.By(e => e.Message == "3"); }, - Throws.Nothing + Throws.Exception.InstanceOf() ); Assert.That( () => @@ -883,10 +878,15 @@ public void ExceptionCollectionPropertyMatchingLikeOtherCollections() Expect(() => throw ex) .To.Throw() .With.CollectionProperty(e => e.InnerExceptions) - .Not.Containing.Exactly(1) + .Containing.Exactly(1) .Matched.By(e => e.Message == "1"); + Expect(() => throw ex) + .To.Throw() + .With.CollectionProperty(e => e.InnerExceptions) + .Not.Containing.Any + .Matched.By(e => e.Message == "3"); }, - Throws.Exception.InstanceOf() + Throws.Nothing ); Assert.That( () => diff --git a/src/NExpect.Tests/NExpect.Tests.csproj b/src/NExpect.Tests/NExpect.Tests.csproj index ab61cae6..4bcae407 100644 --- a/src/NExpect.Tests/NExpect.Tests.csproj +++ b/src/NExpect.Tests/NExpect.Tests.csproj @@ -5,13 +5,13 @@ latest - + - + - - - + + + diff --git a/src/NExpect/NExpect.csproj b/src/NExpect/NExpect.csproj index 22a4013e..0b1f86ba 100644 --- a/src/NExpect/NExpect.csproj +++ b/src/NExpect/NExpect.csproj @@ -36,7 +36,7 @@ BUILD_PEANUTBUTTER_INTERNAL - + diff --git a/src/PeanutButter b/src/PeanutButter index 6ae832b9..c8b56811 160000 --- a/src/PeanutButter +++ b/src/PeanutButter @@ -1 +1 @@ -Subproject commit 6ae832b9684ea6c9076259f26291bb5347cc8105 +Subproject commit c8b5681115c9f3e829c2ce4cbd5201e3d9c8799a