From 4328c06060c885f3e17d5e9ed0f9e14d10cdf2c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 23:20:53 +0000 Subject: [PATCH 01/57] Bump less-loader from 4.1.0 to 12.2.0 Bumps [less-loader](https://github.com/webpack-contrib/less-loader) from 4.1.0 to 12.2.0. - [Release notes](https://github.com/webpack-contrib/less-loader/releases) - [Changelog](https://github.com/webpack-contrib/less-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/less-loader/compare/v4.1.0...v12.2.0) --- updated-dependencies: - dependency-name: less-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../ClientSide/AdminLogs.Web/package.json | 2 +- .../ClientSide/Bundle.Web/package.json | 2 +- .../ClientSide/Dnn.React.Common/package.json | 2 +- .../ClientSide/Extensions.Web/package.json | 2 +- .../ClientSide/Licensing.Web/package.json | 2 +- .../ClientSide/Pages.Web/package.json | 2 +- .../ClientSide/Prompt.Web/package.json | 2 +- .../ClientSide/Roles.Web/package.json | 2 +- .../ClientSide/Security.Web/package.json | 2 +- .../ClientSide/Seo.Web/package.json | 2 +- .../ClientSide/Servers.Web/package.json | 2 +- .../ClientSide/SiteGroups.Web/package.json | 2 +- .../SiteImportExport.Web/package.json | 2 +- .../ClientSide/SiteSettings.Web/package.json | 2 +- .../ClientSide/Sites.Web/package.json | 2 +- .../Sites.Web/src/_exportables/package.json | 2 +- .../ClientSide/TaskScheduler.Web/package.json | 2 +- .../ClientSide/Themes.Web/package.json | 2 +- .../ClientSide/Users.Web/package.json | 2 +- .../Users.Web/src/_exportables/package.json | 2 +- .../ClientSide/Vocabularies.Web/package.json | 2 +- yarn.lock | 85 +++++++------------ 22 files changed, 54 insertions(+), 73 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json index 072ab444017..43768e32d68 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json @@ -31,7 +31,7 @@ "i18n-webpack-plugin": "1.0.0", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json index 308cda14890..1ea736627c3 100644 --- a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json @@ -34,7 +34,7 @@ "json-loader": "^0.5.7", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "moment": "^2.29.4", "prop-types": "^15.8.1", "raw-loader": "2.0.0", diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json index 5cde338ba75..4c88ce8dbc7 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json @@ -73,7 +73,7 @@ "eslint-plugin-spellcheck": "0.0.11", "file-loader": "3.0.1", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json index 53240352cdc..b791d6cb7f6 100644 --- a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json @@ -26,7 +26,7 @@ "eslint-plugin-spellcheck": "0.0.11", "file-loader": "3.0.1", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json index 56856559a16..63d39f9ce94 100644 --- a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json @@ -29,7 +29,7 @@ "file-loader": "3.0.1", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react-hot-loader": "4.13.1", diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json index d376cb503fc..cc1b49ed542 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json @@ -47,7 +47,7 @@ "file-loader": "3.0.1", "jest": "^28.1.3", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "lodash": "4.17.21", "raw-loader": "2.0.0", "react-custom-scrollbars": "4.2.1", diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json index bc9a5d303dd..d84da60f96b 100644 --- a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json @@ -44,7 +44,7 @@ "jest": "^28.1.3", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "localization": "^1.0.2", "object-assign": "*", "optimize-css-assets-webpack-plugin": "^5.0.8", diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json index 83bb7f0912c..c6ff180dae4 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json @@ -31,7 +31,7 @@ "file-loader": "3.0.1", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Security.Web/package.json b/Dnn.AdminExperience/ClientSide/Security.Web/package.json index e57af888100..9255aa24116 100644 --- a/Dnn.AdminExperience/ClientSide/Security.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Security.Web/package.json @@ -27,7 +27,7 @@ "file-loader": "3.0.1", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json index 6aeb7df2fc1..4bfdabf7945 100644 --- a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json @@ -32,7 +32,7 @@ "file-loader": "3.0.1", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json index b9e9947bf6d..27a1fd0cbe6 100644 --- a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json @@ -30,7 +30,7 @@ "eslint-plugin-spellcheck": "0.0.11", "file-loader": "3.0.1", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "null-loader": "^4.0.1", "prop-types": "^15.8.1", "raw-loader": "2.0.0", diff --git a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json index a3c973d8af6..96c68656f1d 100644 --- a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json @@ -27,7 +27,7 @@ "eslint-plugin-spellcheck": "0.0.11", "file-loader": "3.0.1", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json index ea4f401d75e..03b5980212d 100644 --- a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json @@ -32,7 +32,7 @@ "i18n-webpack-plugin": "1.0.0", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "localization": "^1.0.2", "prop-types": "^15.8.1", "raw-loader": "^2.0.0", diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json index 373a9437324..a2bac279dd3 100644 --- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json @@ -33,7 +33,7 @@ "jest": "^28.1.3", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json index 9a0923fb573..02bc014a76a 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json @@ -27,7 +27,7 @@ "eslint-plugin-spellcheck": "0.0.11", "file-loader": "3.0.1", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json index 0a49d0c2b9f..88ddff563a0 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json @@ -29,7 +29,7 @@ "eslint-plugin-react": "7.33.0", "eslint-plugin-spellcheck": "0.0.11", "less": "4.1.3", - "less-loader": "4.1.0", + "less-loader": "12.2.0", "null-loader": "^4.0.1", "prop-types": "^15.8.1", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json index aa8e6315dea..a386beb1556 100644 --- a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json @@ -32,7 +32,7 @@ "file-loader": "3.0.1", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json index 82ad1299144..a038c6a2068 100644 --- a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json @@ -28,7 +28,7 @@ "eslint-plugin-spellcheck": "0.0.11", "file-loader": "3.0.1", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "prop-types": "^15.8.1", "raw-loader": "2.0.0", "react": "^16.14.0", diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/package.json index c5ff8366ca7..7fe28204ff7 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/package.json @@ -27,7 +27,7 @@ "file-loader": "3.0.1", "jest": "^28.1.3", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "null-loader": "^4.0.1", "prop-types": "^15.8.1", "raw-loader": "2.0.0", diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json index ac8761db30e..5f621282c25 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json @@ -29,7 +29,7 @@ "eslint-plugin-react": "7.33.0", "eslint-plugin-spellcheck": "0.0.11", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "localization": "^1.0.2", "null-loader": "^4.0.1", "prop-types": "15.8.1", diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json index 4228bdadbc1..25f7a8180b3 100644 --- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json @@ -32,7 +32,7 @@ "file-loader": "3.0.1", "jwt-decode": "2.2.0", "less": "4.1.3", - "less-loader": "5.0.0", + "less-loader": "12.2.0", "object-path": "0.11.8", "prop-types": "^15.8.1", "raw-loader": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 333688c1d49..ff67f78d983 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1688,7 +1688,7 @@ __metadata: file-loader: "npm:3.0.1" interact.js: "npm:^1.2.8" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -4948,7 +4948,7 @@ __metadata: i18n-webpack-plugin: "npm:1.0.0" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -8052,13 +8052,6 @@ __metadata: languageName: node linkType: hard -"clone@npm:^2.1.1": - version: 2.1.2 - resolution: "clone@npm:2.1.2" - checksum: d9c79efba655f0bf601ab299c57eb54cbaa9860fb011aee9d89ed5ac0d12df1660ab7642fddaabb9a26b7eff0e117d4520512cb70798319ff5d30a111b5310c2 - languageName: node - linkType: hard - "clsx@npm:^1.1.0, clsx@npm:^1.1.1": version: 1.2.1 resolution: "clsx@npm:1.2.1" @@ -9609,7 +9602,7 @@ __metadata: eslint-plugin-spellcheck: "npm:0.0.11" file-loader: "npm:3.0.1" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -9648,7 +9641,7 @@ __metadata: eslint-plugin-react: "npm:7.33.0" eslint-plugin-spellcheck: "npm:0.0.11" less: "npm:4.1.3" - less-loader: "npm:4.1.0" + less-loader: "npm:12.2.0" null-loader: "npm:^4.0.1" prop-types: "npm:^15.8.1" react: "npm:^16.14.0" @@ -9683,7 +9676,7 @@ __metadata: eslint-plugin-react: "npm:7.33.0" eslint-plugin-spellcheck: "npm:0.0.11" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" localization: "npm:^1.0.2" null-loader: "npm:^4.0.1" prop-types: "npm:15.8.1" @@ -10992,7 +10985,7 @@ __metadata: json-loader: "npm:^0.5.7" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" moment: "npm:^2.29.4" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" @@ -11127,7 +11120,7 @@ __metadata: eslint-plugin-spellcheck: "npm:0.0.11" file-loader: "npm:3.0.1" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -15200,31 +15193,19 @@ __metadata: languageName: node linkType: hard -"less-loader@npm:4.1.0": - version: 4.1.0 - resolution: "less-loader@npm:4.1.0" - dependencies: - clone: "npm:^2.1.1" - loader-utils: "npm:^1.1.0" - pify: "npm:^3.0.0" - peerDependencies: - less: ^2.3.1 || ^3.0.0 - webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 - checksum: a5b4664b1006b796c6668ef88e62edc53dec24a1e0072acc69d2430a54b562d4150d98a18066b077092414505d6f056eb4bdecacd22f5b1c4a5d087a79dfbebc - languageName: node - linkType: hard - -"less-loader@npm:5.0.0": - version: 5.0.0 - resolution: "less-loader@npm:5.0.0" - dependencies: - clone: "npm:^2.1.1" - loader-utils: "npm:^1.1.0" - pify: "npm:^4.0.1" +"less-loader@npm:12.2.0": + version: 12.2.0 + resolution: "less-loader@npm:12.2.0" peerDependencies: - less: ^2.3.1 || ^3.0.0 - webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 - checksum: 0dabdfb2e4d961b3fcbfe3e124dee6c63e10f8b0d9903b07bbc3c2d0eb61bcb2ae2cc7b9c94269d0a05b570d536ec571db2be66f625cd547db4b5a7c2bf770b5 + "@rspack/core": 0.x || 1.x + less: ^3.5.0 || ^4.0.0 + webpack: ^5.0.0 + peerDependenciesMeta: + "@rspack/core": + optional: true + webpack: + optional: true + checksum: b9527053460aa82668f33bfbcfc23dbcb9023a9cd55f2f04fa9620e020acc3f032eb2dcb3625a1c3dd8852782c41490e6fde342e3185a477fa41d2f5eb35ca6f languageName: node linkType: hard @@ -15332,7 +15313,7 @@ __metadata: file-loader: "npm:3.0.1" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react-hot-loader: "npm:4.13.1" @@ -17875,7 +17856,7 @@ __metadata: file-loader: "npm:3.0.1" jest: "npm:^28.1.3" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" lodash: "npm:4.17.21" promise: "npm:^8.3.0" prop-types: "npm:^15.8.1" @@ -19054,7 +19035,7 @@ __metadata: jest: "npm:^28.1.3" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" localization: "npm:^1.0.2" object-assign: "npm:*" optimize-css-assets-webpack-plugin: "npm:^5.0.8" @@ -20979,7 +20960,7 @@ __metadata: file-loader: "npm:3.0.1" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -21243,7 +21224,7 @@ __metadata: file-loader: "npm:3.0.1" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -21393,7 +21374,7 @@ __metadata: file-loader: "npm:3.0.1" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -21498,7 +21479,7 @@ __metadata: eslint-plugin-spellcheck: "npm:0.0.11" file-loader: "npm:3.0.1" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" null-loader: "npm:^4.0.1" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" @@ -21811,7 +21792,7 @@ __metadata: i18n-webpack-plugin: "npm:1.0.0" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" localization: "npm:^1.0.2" prop-types: "npm:^15.8.1" raw-loader: "npm:^2.0.0" @@ -21865,7 +21846,7 @@ __metadata: jest: "npm:^28.1.3" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -21908,7 +21889,7 @@ __metadata: eslint-plugin-spellcheck: "npm:0.0.11" file-loader: "npm:3.0.1" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -22946,7 +22927,7 @@ __metadata: file-loader: "npm:3.0.1" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -22988,7 +22969,7 @@ __metadata: file-loader: "npm:3.0.1" jwt-decode: "npm:2.2.0" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" object-path: "npm:0.11.8" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" @@ -23226,7 +23207,7 @@ __metadata: eslint-plugin-spellcheck: "npm:0.0.11" file-loader: "npm:3.0.1" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" prop-types: "npm:^15.8.1" raw-loader: "npm:2.0.0" react: "npm:^16.14.0" @@ -24179,7 +24160,7 @@ __metadata: file-loader: "npm:3.0.1" jest: "npm:^28.1.3" less: "npm:4.1.3" - less-loader: "npm:5.0.0" + less-loader: "npm:12.2.0" localization: "npm:^1.0.2" null-loader: "npm:^4.0.1" prop-types: "npm:^15.8.1" From b71174be624f2b6a9b7743e3f8eec0e205e08b84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:16:43 +0000 Subject: [PATCH 02/57] Bump Moq from 4.18.4 to 4.20.70 Bumps [Moq](https://github.com/moq/moq) from 4.18.4 to 4.20.70. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/devlooped/moq/blob/main/CHANGELOG.md) - [Commits](https://github.com/moq/moq/compare/v4.18.4...v4.20.70) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj --- .../DNN.Integration.Test.Framework.csproj | 4 ++-- .../Tests/DNN.Integration.Test.Framework/packages.config | 2 +- .../DotNetNuke.Tests.AspNetCCP.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.AspNetCCP/packages.config | 2 +- .../DotNetNuke.Tests.Authentication.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Authentication/packages.config | 2 +- .../DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config | 2 +- .../Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config | 2 +- .../Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config | 2 +- .../DotNetNuke.Tests.Integration.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Integration/packages.config | 2 +- .../Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config | 2 +- .../DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config | 2 +- .../Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config | 2 +- .../Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config | 2 +- .../DotNetNuke.Tests.Utilities.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Utilities/packages.config | 2 +- .../DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config | 2 +- .../Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj | 4 ++-- DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config | 2 +- .../Dnn.PersonaBar.ConfigConsole.Tests.csproj | 5 +++-- .../Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config | 2 +- .../Dnn.PersonaBar.Pages.Tests.csproj | 5 +++-- .../Tests/Dnn.PersonaBar.Pages.Tests/packages.config | 2 +- .../Dnn.PersonaBar.Security.Tests.csproj | 5 +++-- .../Tests/Dnn.PersonaBar.Security.Tests/packages.config | 2 +- .../Dnn.PersonaBar.Users.Tests.csproj | 5 +++-- .../Tests/Dnn.PersonaBar.Users.Tests/packages.config | 2 +- 36 files changed, 58 insertions(+), 54 deletions(-) diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj index 7fe724c1e75..7e531cacb6a 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj @@ -50,8 +50,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config index 58d62943ea9..cd0a5c42111 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config @@ -6,7 +6,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj index a3b07e96264..0e900b28927 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj @@ -50,8 +50,8 @@ ..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config index 50be2a31776..097dba9884d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config @@ -1,7 +1,7 @@  - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj index 8529f044fa7..0ba6b0c9eab 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/DotNetNuke.Tests.Authentication.csproj @@ -70,8 +70,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config index 50be2a31776..097dba9884d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config @@ -1,7 +1,7 @@  - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj index 92a088262ec..f5d21c80c41 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj @@ -75,8 +75,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config index 7f67eb789df..7dcc4841562 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config @@ -3,7 +3,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj index eef43699581..c7cb3b9a914 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj @@ -97,8 +97,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config index 65402d60430..f610885a9cc 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config @@ -3,7 +3,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj index 6c1918079ca..bc87faf6551 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj @@ -83,8 +83,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config index 0014c76bae6..f8e8a201c99 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config @@ -4,7 +4,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj index d60c83074bb..0d5bc5e584a 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj @@ -76,8 +76,8 @@ ..\..\..\packages\Fare.2.2.1\lib\net35\Fare.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config index 9cf84b56b18..85608369fdb 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config @@ -7,7 +7,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj index bc449466ff5..e6bc08af6df 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Mail/DotNetNuke.Tests.Mail.csproj @@ -52,8 +52,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config index a6d4160b423..ea83afff9d0 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config @@ -3,7 +3,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj index 7088b1b2010..e949034e2ea 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Modules/DotNetNuke.Tests.Modules.csproj @@ -70,8 +70,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config index 50be2a31776..097dba9884d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config @@ -1,7 +1,7 @@  - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj b/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj index 5aa649162a1..d18581dde30 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.UI/DotNetNuke.Tests.UI.csproj @@ -69,8 +69,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config index 50be2a31776..097dba9884d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config @@ -1,7 +1,7 @@  - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj index 0e7ef072fdb..0166c3cd2f0 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Urls/DotNetNuke.Tests.Urls.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config index 04117f3a209..ce1a3a1920c 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config @@ -5,7 +5,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj index d37e66e423f..b3c4002dc8b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/DotNetNuke.Tests.Utilities.csproj @@ -84,8 +84,8 @@ False ..\..\..\..\..\Windows\System32\inetsrv\Microsoft.Web.Administration.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config index 9d6d346a2fe..f977d816747 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config @@ -8,7 +8,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj index 453bbb8c1ed..017d833bc19 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj @@ -56,8 +56,8 @@ True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config index 10ac4c45a84..73411fb3013 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config @@ -7,7 +7,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj index e90b3ccc383..62370f3ee22 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/DotNetNuke.Tests.Web.csproj @@ -56,8 +56,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config index 2e464281e7e..dcf14c2dd02 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config @@ -7,7 +7,7 @@ - + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj index c1ce8e42a08..bcd5cd41737 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj @@ -53,8 +53,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config index 2803397a5de..64025b29336 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config @@ -4,7 +4,7 @@ - + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj index dc345190c18..a88596359e8 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj @@ -44,8 +44,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config index 50be2a31776..097dba9884d 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj index 3bcbb013aaa..4bafd482692 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj @@ -44,8 +44,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + True ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config index bf6b7f680c0..06f4cb0160d 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj index 9a8fb4c7a3a..971353ec9d3 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj @@ -45,8 +45,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config index 50be2a31776..097dba9884d 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config @@ -1,7 +1,7 @@  - + From ae9ca40a30e8544256289b673f9bb46f760a3b44 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 21 Feb 2024 11:45:54 +0800 Subject: [PATCH 03/57] fix the user roles cache issue. --- .../Library/Entities/Users/UserInfo.cs | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/DNN Platform/Library/Entities/Users/UserInfo.cs b/DNN Platform/Library/Entities/Users/UserInfo.cs index 53695cb868d..c214dc36722 100644 --- a/DNN Platform/Library/Entities/Users/UserInfo.cs +++ b/DNN Platform/Library/Entities/Users/UserInfo.cs @@ -33,10 +33,10 @@ namespace DotNetNuke.Entities.Users public class UserInfo : BaseEntityInfo, IPropertyAccess, IUserInfo { private readonly ConcurrentDictionary social = new ConcurrentDictionary(); + private readonly ConcurrentDictionary roles = new ConcurrentDictionary(); private string administratorRoleName; private UserMembership membership; private UserProfile profile; - private string[] roles; /// Initializes a new instance of the class. public UserInfo() @@ -206,26 +206,24 @@ public string[] Roles { get { - if (this.roles == null) + return this.roles.GetOrAdd(this.PortalID, i => { var socialRoles = this.Social.Roles; if (socialRoles.Count == 0) { - this.roles = new string[0]; + return new string[0]; } else { - this.roles = (from r in this.Social.Roles - where - r.Status == RoleStatus.Approved && - (r.EffectiveDate < DateTime.Now || Null.IsNull(r.EffectiveDate)) && - (r.ExpiryDate > DateTime.Now || Null.IsNull(r.ExpiryDate)) - select r.RoleName) + return (from r in this.Social.Roles + where + r.Status == RoleStatus.Approved && + (r.EffectiveDate < DateTime.Now || Null.IsNull(r.EffectiveDate)) && + (r.ExpiryDate > DateTime.Now || Null.IsNull(r.ExpiryDate)) + select r.RoleName) .ToArray(); } - } - - return this.roles; + }); } set From 4120c75e0007604c1ce375ff0b745a2171940893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 22:19:01 +0000 Subject: [PATCH 04/57] Bump peterjgrainger/action-create-branch from 2.4.0 to 3.0.0 Bumps [peterjgrainger/action-create-branch](https://github.com/peterjgrainger/action-create-branch) from 2.4.0 to 3.0.0. - [Release notes](https://github.com/peterjgrainger/action-create-branch/releases) - [Commits](https://github.com/peterjgrainger/action-create-branch/compare/v2.4.0...v3.0.0) --- updated-dependencies: - dependency-name: peterjgrainger/action-create-branch dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/open-merged-pr-to-future.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/open-merged-pr-to-future.yml b/.github/workflows/open-merged-pr-to-future.yml index edf6a0139fd..475d359a4c5 100644 --- a/.github/workflows/open-merged-pr-to-future.yml +++ b/.github/workflows/open-merged-pr-to-future.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: peterjgrainger/action-create-branch@v2.4.0 + - uses: peterjgrainger/action-create-branch@v3.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 060998fb79683b9d0aed22e45fec3afa0b122320 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 1 Mar 2024 15:40:02 -0500 Subject: [PATCH 05/57] Fixed a performance issue while navigating folders for providers When navigating folders using a Folder Provider, this code would refresh the whole providers even though we are not making changes. This PR avoids doing so if EnableFileAutoSync is off, thus improving navigaiton performance. --- DNN Platform/Library/Services/FileSystem/FolderManager.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DNN Platform/Library/Services/FileSystem/FolderManager.cs b/DNN Platform/Library/Services/FileSystem/FolderManager.cs index 687258d7520..83e2f1f63f8 100644 --- a/DNN Platform/Library/Services/FileSystem/FolderManager.cs +++ b/DNN Platform/Library/Services/FileSystem/FolderManager.cs @@ -23,6 +23,7 @@ namespace DotNetNuke.Services.FileSystem using DotNetNuke.ComponentModel; using DotNetNuke.Data; using DotNetNuke.Entities; + using DotNetNuke.Entities.Host; using DotNetNuke.Entities.Portals; using DotNetNuke.Entities.Users; using DotNetNuke.Instrumentation; @@ -945,7 +946,10 @@ internal void ClearFolderProviderCachedLists(int portalId) { var folderProvider = FolderProvider.Instance(folderMapping.FolderProviderType); - if (folderMapping.MappingName != "Standard" && folderMapping.MappingName != "Secure" && folderMapping.MappingName != "Database") + if (folderMapping.MappingName != "Standard" && + folderMapping.MappingName != "Secure" && + folderMapping.MappingName != "Database" && + Host.EnableFileAutoSync) { var type = folderProvider.GetType(); MethodInfo method = type.GetMethod("ClearCache"); From 41280c7d373ff9150bd3bbc3a7435f28fd8da791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20T=C3=A9tard?= <62659880+stetard@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:43:31 +0100 Subject: [PATCH 06/57] Replaced the boolean values by the corresponding permissions constants values --- DNN Platform/Library/Framework/SecurityPolicy.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DNN Platform/Library/Framework/SecurityPolicy.cs b/DNN Platform/Library/Framework/SecurityPolicy.cs index e52c74c4de6..9d42f501d0d 100644 --- a/DNN Platform/Library/Framework/SecurityPolicy.cs +++ b/DNN Platform/Library/Framework/SecurityPolicy.cs @@ -30,17 +30,17 @@ public static string Permissions string strPermissions = string.Empty; if (HasReflectionPermission()) { - strPermissions += ", " + reflectionPermission; + strPermissions += ", " + ReflectionPermission; } if (HasWebPermission()) { - strPermissions += ", " + webPermission; + strPermissions += ", " + WebPermission; } if (HasAspNetHostingPermission()) { - strPermissions += ", " + aspNetHostingPermission; + strPermissions += ", " + AspNetHostingPermission; } if (!string.IsNullOrEmpty(strPermissions)) From 463b867bcdd850aa9bb6a581f6d8b4da59b7f648 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Wed, 13 Mar 2024 11:03:30 -0500 Subject: [PATCH 07/57] Update versions in bug-report.yml --- .github/ISSUE_TEMPLATE/bug-report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index e767189252a..141dc99c35c 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -72,8 +72,8 @@ body: **NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._ multiple: true options: - - 9.13.2 (latest release) - - 9.13.3 (alpha) + - 9.13.3 (latest release) + - 9.13.4 (alpha) - 10.0.0 (alpha) validations: required: true From 2d1fb96c3324d549691c0eb7a26c9fccbf9433c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:39:38 +0000 Subject: [PATCH 08/57] Bump express from 4.18.2 to 4.19.2 Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/yarn.lock b/yarn.lock index aae2ef9ad1b..b4278711bd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7257,12 +7257,12 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.1": - version: 1.20.1 - resolution: "body-parser@npm:1.20.1" +"body-parser@npm:1.20.2": + version: 1.20.2 + resolution: "body-parser@npm:1.20.2" dependencies: bytes: "npm:3.1.2" - content-type: "npm:~1.0.4" + content-type: "npm:~1.0.5" debug: "npm:2.6.9" depd: "npm:2.0.0" destroy: "npm:1.2.0" @@ -7270,10 +7270,10 @@ __metadata: iconv-lite: "npm:0.4.24" on-finished: "npm:2.4.1" qs: "npm:6.11.0" - raw-body: "npm:2.5.1" + raw-body: "npm:2.5.2" type-is: "npm:~1.6.18" unpipe: "npm:1.0.0" - checksum: 5f8d128022a2fb8b6e7990d30878a0182f300b70e46b3f9d358a9433ad6275f0de46add6d63206da3637c01c3b38b6111a7480f7e7ac2e9f7b989f6133fe5510 + checksum: 3cf171b82190cf91495c262b073e425fc0d9e25cc2bf4540d43f7e7bbca27d6a9eae65ca367b6ef3993eea261159d9d2ab37ce444e8979323952e12eb3df319a languageName: node linkType: hard @@ -8589,7 +8589,7 @@ __metadata: languageName: node linkType: hard -"content-type@npm:~1.0.4": +"content-type@npm:~1.0.4, content-type@npm:~1.0.5": version: 1.0.5 resolution: "content-type@npm:1.0.5" checksum: 585847d98dc7fb8035c02ae2cb76c7a9bd7b25f84c447e5ed55c45c2175e83617c8813871b4ee22f368126af6b2b167df655829007b21aa10302873ea9c62662 @@ -8719,10 +8719,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.5.0": - version: 0.5.0 - resolution: "cookie@npm:0.5.0" - checksum: aae7911ddc5f444a9025fbd979ad1b5d60191011339bce48e555cb83343d0f98b865ff5c4d71fecdfb8555a5cafdc65632f6fce172f32aaf6936830a883a0380 +"cookie@npm:0.6.0": + version: 0.6.0 + resolution: "cookie@npm:0.6.0" + checksum: c1f8f2ea7d443b9331680598b0ae4e6af18a618c37606d1bbdc75bec8361cce09fe93e727059a673f2ba24467131a9fb5a4eec76bb1b149c1b3e1ccb268dc583 languageName: node linkType: hard @@ -11215,15 +11215,15 @@ __metadata: linkType: hard "express@npm:^4.17.0, express@npm:^4.17.3": - version: 4.18.2 - resolution: "express@npm:4.18.2" + version: 4.19.2 + resolution: "express@npm:4.19.2" dependencies: accepts: "npm:~1.3.8" array-flatten: "npm:1.1.1" - body-parser: "npm:1.20.1" + body-parser: "npm:1.20.2" content-disposition: "npm:0.5.4" content-type: "npm:~1.0.4" - cookie: "npm:0.5.0" + cookie: "npm:0.6.0" cookie-signature: "npm:1.0.6" debug: "npm:2.6.9" depd: "npm:2.0.0" @@ -11249,7 +11249,7 @@ __metadata: type-is: "npm:~1.6.18" utils-merge: "npm:1.0.1" vary: "npm:~1.1.2" - checksum: 869ae89ed6ff4bed7b373079dc58e5dddcf2915a2669b36037ff78c99d675ae930e5fe052b35c24f56557d28a023bb1cbe3e2f2fb87eaab96a1cedd7e597809d + checksum: 3fcd792536f802c059789ef48db3851b87e78fba103423e524144d79af37da7952a2b8d4e1a007f423329c7377d686d9476ac42e7d9ea413b80345d495e30a3a languageName: node linkType: hard @@ -19571,15 +19571,15 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.5.1": - version: 2.5.1 - resolution: "raw-body@npm:2.5.1" +"raw-body@npm:2.5.2": + version: 2.5.2 + resolution: "raw-body@npm:2.5.2" dependencies: bytes: "npm:3.1.2" http-errors: "npm:2.0.0" iconv-lite: "npm:0.4.24" unpipe: "npm:1.0.0" - checksum: 280bedc12db3490ecd06f740bdcf66093a07535374b51331242382c0e130bb273ebb611b7bc4cba1b4b4e016cc7b1f4b05a6df885a6af39c2bc3b94c02291c84 + checksum: 863b5171e140546a4d99f349b720abac4410338e23df5e409cfcc3752538c9caf947ce382c89129ba976f71894bd38b5806c774edac35ebf168d02aa1ac11a95 languageName: node linkType: hard From ef7a4b1784e718041cd112a57889beed03571463 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:13:58 +0000 Subject: [PATCH 09/57] Bump the teststack-dossier group with 2 updates Bumps the teststack-dossier group with 2 updates: [AutoFixture](https://github.com/AutoFixture/AutoFixture) and NSubstitute. Updates `AutoFixture` from 4.18.0 to 4.18.1 - [Release notes](https://github.com/AutoFixture/AutoFixture/releases) - [Commits](https://github.com/AutoFixture/AutoFixture/compare/v4.18.0...v4.18.1) Updates `NSubstitute` from 5.0.0 to 5.1.0 --- updated-dependencies: - dependency-name: AutoFixture dependency-type: direct:production update-type: version-update:semver-patch dependency-group: teststack-dossier - dependency-name: NSubstitute dependency-type: direct:production update-type: version-update:semver-minor dependency-group: teststack-dossier ... Signed-off-by: dependabot[bot] --- .../DotNetNuke.Tests.Integration.csproj | 10 ++++++---- .../Tests/DotNetNuke.Tests.Integration/packages.config | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj index d60c83074bb..fa2d2c53332 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj @@ -66,8 +66,9 @@ true - - ..\..\..\packages\AutoFixture.4.18.0\lib\net452\AutoFixture.dll + + ..\..\..\packages\AutoFixture.4.18.1\lib\net452\AutoFixture.dll + True ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll @@ -82,8 +83,9 @@ ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NSubstitute.5.0.0\lib\net462\NSubstitute.dll + + ..\..\..\packages\NSubstitute.5.1.0\lib\net462\NSubstitute.dll + True ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config index 9cf84b56b18..c4093286651 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config @@ -1,6 +1,6 @@  - + @@ -9,7 +9,7 @@ - + From f86c54b8afcaaf9c07106f37543976d3489f7502 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Wed, 24 Apr 2024 20:59:13 +0200 Subject: [PATCH 10/57] Use Cake Frosting optimized addins --- Build/Build.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/Build.csproj b/Build/Build.csproj index ec7590e8131..68ee210e9c7 100644 --- a/Build/Build.csproj +++ b/Build/Build.csproj @@ -17,9 +17,9 @@ - - - + + + From ed862f85fe5147e0a380f0654485076f784d9809 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Tue, 30 Apr 2024 11:10:09 -0500 Subject: [PATCH 11/57] Update jQuery UI from 1.13.2 to 1.13.3 --- .../jQueryUI/jQueryUI.dnn | 4 +- .../jQueryUI/jquery-ui.min.js | 8 +- DNN Platform/Library/Framework/jQuery.cs | 2 +- .../CodeEditor/mode/slim/index.html | 4 +- .../Shared/scripts/jquery/jquery-ui.js | 654 +++++++++--------- .../Shared/scripts/jquery/jquery-ui.min.js | 8 +- .../scripts/contrib/jquery-ui.min.js | 8 +- 7 files changed, 348 insertions(+), 340 deletions(-) diff --git a/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn b/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn index 6260e945764..26f6e4da091 100644 --- a/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn +++ b/DNN Platform/JavaScript Libraries/jQueryUI/jQueryUI.dnn @@ -1,6 +1,6 @@ - + jQueryUI JavaScript Library jQueryUI is a JavaScript library that is used to extend jQuery to provide UI widgets. Icons\Sigma\Extensions_32x32_Standard.png @@ -21,7 +21,7 @@ jQuery-UI jquery-ui.min.js - https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js + https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.3/jquery-ui.min.js diff --git a/DNN Platform/JavaScript Libraries/jQueryUI/jquery-ui.min.js b/DNN Platform/JavaScript Libraries/jQueryUI/jquery-ui.min.js index 50b036f4d21..1583fce151f 100644 --- a/DNN Platform/JavaScript Libraries/jQueryUI/jquery-ui.min.js +++ b/DNN Platform/JavaScript Libraries/jQueryUI/jquery-ui.min.js @@ -1,6 +1,6 @@ -/*! jQuery UI - v1.13.2 - 2022-07-14 -* http://jqueryui.com +/*! jQuery UI - v1.13.3 - 2024-04-26 +* https://jqueryui.com * Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js -* Copyright jQuery Foundation and other contributors; Licensed MIT */ +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ -!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(V){"use strict";V.ui=V.ui||{};V.ui.version="1.13.2";var n,i=0,a=Array.prototype.hasOwnProperty,r=Array.prototype.slice;V.cleanData=(n=V.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=V._data(i,"events"))&&e.remove&&V(i).triggerHandler("remove");n(t)}),V.widget=function(t,i,e){var s,n,o,a={},r=t.split(".")[0],l=r+"-"+(t=t.split(".")[1]);return e||(e=i,i=V.Widget),Array.isArray(e)&&(e=V.extend.apply(null,[{}].concat(e))),V.expr.pseudos[l.toLowerCase()]=function(t){return!!V.data(t,l)},V[r]=V[r]||{},s=V[r][t],n=V[r][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},V.extend(n,s,{version:e.version,_proto:V.extend({},e),_childConstructors:[]}),(o=new i).options=V.widget.extend({},o.options),V.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}a[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=V.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},a,{constructor:n,namespace:r,widgetName:t,widgetFullName:l}),s?(V.each(s._childConstructors,function(t,e){var i=e.prototype;V.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),V.widget.bridge(t,n),n},V.widget.extend=function(t){for(var e,i,s=r.call(arguments,1),n=0,o=s.length;n",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=V(e||this.defaultElement||this)[0],this.element=V(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=V(),this.hoverable=V(),this.focusable=V(),this.classesElementLookup={},e!==this&&(V.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=V(e.style?e.ownerDocument:e.document||e),this.window=V(this.document[0].defaultView||this.document[0].parentWindow)),this.options=V.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:V.noop,_create:V.noop,_init:V.noop,destroy:function(){var i=this;this._destroy(),V.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:V.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return V.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=V.widget.extend({},this.options[t]),n=0;n
"),i=e.children()[0];return V("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.widthx(k(s),k(n))?o.important="horizontal":o.important="vertical",u.using.call(this,t,o)}),a.offset(V.extend(h,{using:t}))})},V.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,a=s-o,r=o+e.collisionWidth-n-s;e.collisionWidth>n?0n?0")[0],w=d.each;function P(t){return null==t?t+"":"object"==typeof t?p[e.call(t)]||"object":typeof t}function M(t,e,i){var s=v[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:Math.min(s.max,Math.max(0,t)))}function S(s){var n=m(),o=n._rgba=[];return s=s.toLowerCase(),w(g,function(t,e){var i=e.re.exec(s),i=i&&e.parse(i),e=e.space||"rgba";if(i)return i=n[e](i),n[_[e].cache]=i[_[e].cache],o=n._rgba=i._rgba,!1}),o.length?("0,0,0,0"===o.join()&&d.extend(o,B.transparent),n):B[s]}function H(t,e,i){return 6*(i=(i+1)%1)<1?t+(e-t)*i*6:2*i<1?e:3*i<2?t+(e-t)*(2/3-i)*6:t}y.style.cssText="background-color:rgba(1,1,1,.5)",b.rgba=-1o.mod/2?s+=o.mod:s-n>o.mod/2&&(s-=o.mod)),l[i]=M((n-s)*a+s,e)))}),this[e](l)},blend:function(t){if(1===this._rgba[3])return this;var e=this._rgba.slice(),i=e.pop(),s=m(t)._rgba;return m(d.map(e,function(t,e){return(1-i)*s[e]+i*t}))},toRgbaString:function(){var t="rgba(",e=d.map(this._rgba,function(t,e){return null!=t?t:2").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e={width:i.width(),height:i.height()},n=document.activeElement;try{n.id}catch(t){n=document.body}return i.wrap(t),i[0]!==n&&!V.contains(i[0],n)||V(n).trigger("focus"),t=i.parent(),"static"===i.css("position")?(t.css({position:"relative"}),i.css({position:"relative"})):(V.extend(s,{position:i.css("position"),zIndex:i.css("z-index")}),V.each(["top","left","bottom","right"],function(t,e){s[e]=i.css(e),isNaN(parseInt(s[e],10))&&(s[e]="auto")}),i.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),i.css(e),t.css(s).show()},removeWrapper:function(t){var e=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),t[0]!==e&&!V.contains(t[0],e)||V(e).trigger("focus")),t}}),V.extend(V.effects,{version:"1.13.2",define:function(t,e,i){return i||(i=e,e="effect"),V.effects.effect[t]=i,V.effects.effect[t].mode=e,i},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,e="vertical"!==i?(e||100)/100:1;return{height:t.height()*e,width:t.width()*s,outerHeight:t.outerHeight()*e,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();1").insertAfter(t).css({display:/^(inline|ruby)/.test(t.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:t.css("marginTop"),marginBottom:t.css("marginBottom"),marginLeft:t.css("marginLeft"),marginRight:t.css("marginRight"),float:t.css("float")}).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).addClass("ui-effects-placeholder"),t.data(j+"placeholder",e)),t.css({position:i,left:s.left,top:s.top}),e},removePlaceholder:function(t){var e=j+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(t){V.effects.restoreStyle(t),V.effects.removePlaceholder(t)},setTransition:function(s,t,n,o){return o=o||{},V.each(t,function(t,e){var i=s.cssUnit(e);0");l.appendTo("body").addClass(t.className).css({top:s.top-a,left:s.left-r,height:i.innerHeight(),width:i.innerWidth(),position:n?"fixed":"absolute"}).animate(o,t.duration,t.easing,function(){l.remove(),"function"==typeof e&&e()})}}),V.fx.step.clip=function(t){t.clipInit||(t.start=V(t.elem).cssClip(),"string"==typeof t.end&&(t.end=G(t.end,t.elem)),t.clipInit=!0),V(t.elem).cssClip({top:t.pos*(t.end.top-t.start.top)+t.start.top,right:t.pos*(t.end.right-t.start.right)+t.start.right,bottom:t.pos*(t.end.bottom-t.start.bottom)+t.start.bottom,left:t.pos*(t.end.left-t.start.left)+t.start.left})},Y={},V.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,t){Y[t]=function(t){return Math.pow(t,e+2)}}),V.extend(Y,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;t<((e=Math.pow(2,--i))-1)/11;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),V.each(Y,function(t,e){V.easing["easeIn"+t]=e,V.easing["easeOut"+t]=function(t){return 1-e(1-t)},V.easing["easeInOut"+t]=function(t){return t<.5?e(2*t)/2:1-e(-2*t+2)/2}});y=V.effects,V.effects.define("blind","hide",function(t,e){var i={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},s=V(this),n=t.direction||"up",o=s.cssClip(),a={clip:V.extend({},o)},r=V.effects.createPlaceholder(s);a.clip[i[n][0]]=a.clip[i[n][1]],"show"===t.mode&&(s.cssClip(a.clip),r&&r.css(V.effects.clipToBox(a)),a.clip=o),r&&r.animate(V.effects.clipToBox(a),t.duration,t.easing),s.animate(a,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("bounce",function(t,e){var i,s,n=V(this),o=t.mode,a="hide"===o,r="show"===o,l=t.direction||"up",h=t.distance,c=t.times||5,o=2*c+(r||a?1:0),u=t.duration/o,d=t.easing,p="up"===l||"down"===l?"top":"left",f="up"===l||"left"===l,g=0,t=n.queue().length;for(V.effects.createPlaceholder(n),l=n.css(p),h=h||n["top"==p?"outerHeight":"outerWidth"]()/3,r&&((s={opacity:1})[p]=l,n.css("opacity",0).css(p,f?2*-h:2*h).animate(s,u,d)),a&&(h/=Math.pow(2,c-1)),(s={})[p]=l;g").css({position:"absolute",visibility:"visible",left:-s*p,top:-i*f}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:p,height:f,left:n+(u?a*p:0),top:o+(u?r*f:0),opacity:u?0:1}).animate({left:n+(u?0:a*p),top:o+(u?0:r*f),opacity:u?1:0},t.duration||500,t.easing,m)}),V.effects.define("fade","toggle",function(t,e){var i="show"===t.mode;V(this).css("opacity",i?0:1).animate({opacity:i?1:0},{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("fold","hide",function(e,t){var i=V(this),s=e.mode,n="show"===s,o="hide"===s,a=e.size||15,r=/([0-9]+)%/.exec(a),l=!!e.horizFirst?["right","bottom"]:["bottom","right"],h=e.duration/2,c=V.effects.createPlaceholder(i),u=i.cssClip(),d={clip:V.extend({},u)},p={clip:V.extend({},u)},f=[u[l[0]],u[l[1]]],s=i.queue().length;r&&(a=parseInt(r[1],10)/100*f[o?0:1]),d.clip[l[0]]=a,p.clip[l[0]]=a,p.clip[l[1]]=0,n&&(i.cssClip(p.clip),c&&c.css(V.effects.clipToBox(p)),p.clip=u),i.queue(function(t){c&&c.animate(V.effects.clipToBox(d),h,e.easing).animate(V.effects.clipToBox(p),h,e.easing),t()}).animate(d,h,e.easing).animate(p,h,e.easing).queue(t),V.effects.unshift(i,s,4)}),V.effects.define("highlight","show",function(t,e){var i=V(this),s={backgroundColor:i.css("backgroundColor")};"hide"===t.mode&&(s.opacity=0),V.effects.saveStyle(i),i.css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(s,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("size",function(s,e){var n,i=V(this),t=["fontSize"],o=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],a=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],r=s.mode,l="effect"!==r,h=s.scale||"both",c=s.origin||["middle","center"],u=i.css("position"),d=i.position(),p=V.effects.scaledDimensions(i),f=s.from||p,g=s.to||V.effects.scaledDimensions(i,0);V.effects.createPlaceholder(i),"show"===r&&(r=f,f=g,g=r),n={from:{y:f.height/p.height,x:f.width/p.width},to:{y:g.height/p.height,x:g.width/p.width}},"box"!==h&&"both"!==h||(n.from.y!==n.to.y&&(f=V.effects.setTransition(i,o,n.from.y,f),g=V.effects.setTransition(i,o,n.to.y,g)),n.from.x!==n.to.x&&(f=V.effects.setTransition(i,a,n.from.x,f),g=V.effects.setTransition(i,a,n.to.x,g))),"content"!==h&&"both"!==h||n.from.y!==n.to.y&&(f=V.effects.setTransition(i,t,n.from.y,f),g=V.effects.setTransition(i,t,n.to.y,g)),c&&(c=V.effects.getBaseline(c,p),f.top=(p.outerHeight-f.outerHeight)*c.y+d.top,f.left=(p.outerWidth-f.outerWidth)*c.x+d.left,g.top=(p.outerHeight-g.outerHeight)*c.y+d.top,g.left=(p.outerWidth-g.outerWidth)*c.x+d.left),delete f.outerHeight,delete f.outerWidth,i.css(f),"content"!==h&&"both"!==h||(o=o.concat(["marginTop","marginBottom"]).concat(t),a=a.concat(["marginLeft","marginRight"]),i.find("*[width]").each(function(){var t=V(this),e=V.effects.scaledDimensions(t),i={height:e.height*n.from.y,width:e.width*n.from.x,outerHeight:e.outerHeight*n.from.y,outerWidth:e.outerWidth*n.from.x},e={height:e.height*n.to.y,width:e.width*n.to.x,outerHeight:e.height*n.to.y,outerWidth:e.width*n.to.x};n.from.y!==n.to.y&&(i=V.effects.setTransition(t,o,n.from.y,i),e=V.effects.setTransition(t,o,n.to.y,e)),n.from.x!==n.to.x&&(i=V.effects.setTransition(t,a,n.from.x,i),e=V.effects.setTransition(t,a,n.to.x,e)),l&&V.effects.saveStyle(t),t.css(i),t.animate(e,s.duration,s.easing,function(){l&&V.effects.restoreStyle(t)})})),i.animate(g,{queue:!1,duration:s.duration,easing:s.easing,complete:function(){var t=i.offset();0===g.opacity&&i.css("opacity",f.opacity),l||(i.css("position","static"===u?"relative":u).offset(t),V.effects.saveStyle(i)),e()}})}),V.effects.define("scale",function(t,e){var i=V(this),s=t.mode,s=parseInt(t.percent,10)||(0===parseInt(t.percent,10)||"effect"!==s?0:100),s=V.extend(!0,{from:V.effects.scaledDimensions(i),to:V.effects.scaledDimensions(i,s,t.direction||"both"),origin:t.origin||["middle","center"]},t);t.fade&&(s.from.opacity=1,s.to.opacity=0),V.effects.effect.size.call(this,s,e)}),V.effects.define("puff","hide",function(t,e){t=V.extend(!0,{},t,{fade:!0,percent:parseInt(t.percent,10)||150});V.effects.effect.scale.call(this,t,e)}),V.effects.define("pulsate","show",function(t,e){var i=V(this),s=t.mode,n="show"===s,o=2*(t.times||5)+(n||"hide"===s?1:0),a=t.duration/o,r=0,l=1,s=i.queue().length;for(!n&&i.is(":visible")||(i.css("opacity",0).show(),r=1);l li > :first-child").add(t.find("> :not(li)").even())},heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=V(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),t.collapsible||!1!==t.active&&null!=t.active||(t.active=0),this._processPanels(),t.active<0&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():V()}},_createIcons:function(){var t,e=this.options.icons;e&&(t=V(""),this._addClass(t,"ui-accordion-header-icon","ui-icon "+e.header),t.prependTo(this.headers),t=this.active.children(".ui-accordion-header-icon"),this._removeClass(t,e.header)._addClass(t,null,e.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){"active"!==t?("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||!1!==this.options.active||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons())):this._activate(e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var e=V.ui.keyCode,i=this.headers.length,s=this.headers.index(t.target),n=!1;switch(t.keyCode){case e.RIGHT:case e.DOWN:n=this.headers[(s+1)%i];break;case e.LEFT:case e.UP:n=this.headers[(s-1+i)%i];break;case e.SPACE:case e.ENTER:this._eventHandler(t);break;case e.HOME:n=this.headers[0];break;case e.END:n=this.headers[i-1]}n&&(V(t.target).attr("tabIndex",-1),V(n).attr("tabIndex",0),V(n).trigger("focus"),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===V.ui.keyCode.UP&&t.ctrlKey&&V(t.currentTarget).prev().trigger("focus")},refresh:function(){var t=this.options;this._processPanels(),!1===t.active&&!0===t.collapsible||!this.headers.length?(t.active=!1,this.active=V()):!1===t.active?this._activate(0):this.active.length&&!V.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=V()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;"function"==typeof this.options.header?this.headers=this.options.header(this.element):this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var i,t=this.options,e=t.heightStyle,s=this.element.parent();this.active=this._findActive(t.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var t=V(this),e=t.uniqueId().attr("id"),i=t.next(),s=i.uniqueId().attr("id");t.attr("aria-controls",s),i.attr("aria-labelledby",e)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(t.event),"fill"===e?(i=s.height(),this.element.siblings(":visible").each(function(){var t=V(this),e=t.css("position");"absolute"!==e&&"fixed"!==e&&(i-=t.outerHeight(!0))}),this.headers.each(function(){i-=V(this).outerHeight(!0)}),this.headers.next().each(function(){V(this).height(Math.max(0,i-V(this).innerHeight()+V(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.headers.next().each(function(){var t=V(this).is(":visible");t||V(this).show(),i=Math.max(i,V(this).css("height","").height()),t||V(this).hide()}).height(i))},_activate:function(t){t=this._findActive(t)[0];t!==this.active[0]&&(t=t||this.active[0],this._eventHandler({target:t,currentTarget:t,preventDefault:V.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):V()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&V.each(t.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var e=this.options,i=this.active,s=V(t.currentTarget),n=s[0]===i[0],o=n&&e.collapsible,a=o?V():s.next(),r=i.next(),a={oldHeader:i,oldPanel:r,newHeader:o?V():s,newPanel:a};t.preventDefault(),n&&!e.collapsible||!1===this._trigger("beforeActivate",t,a)||(e.active=!o&&this.headers.index(s),this.active=n?V():s,this._toggle(a),this._removeClass(i,"ui-accordion-header-active","ui-state-active"),e.icons&&(i=i.children(".ui-accordion-header-icon"),this._removeClass(i,null,e.icons.activeHeader)._addClass(i,null,e.icons.header)),n||(this._removeClass(s,"ui-accordion-header-collapsed")._addClass(s,"ui-accordion-header-active","ui-state-active"),e.icons&&(n=s.children(".ui-accordion-header-icon"),this._removeClass(n,null,e.icons.header)._addClass(n,null,e.icons.activeHeader)),this._addClass(s.next(),"ui-accordion-content-active")))},_toggle:function(t){var e=t.newPanel,i=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=e,this.prevHide=i,this.options.animate?this._animate(e,i,t):(i.hide(),e.show(),this._toggleComplete(t)),i.attr({"aria-hidden":"true"}),i.prev().attr({"aria-selected":"false","aria-expanded":"false"}),e.length&&i.length?i.prev().attr({tabIndex:-1,"aria-expanded":"false"}):e.length&&this.headers.filter(function(){return 0===parseInt(V(this).attr("tabIndex"),10)}).attr("tabIndex",-1),e.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,i,e){var s,n,o,a=this,r=0,l=t.css("box-sizing"),h=t.length&&(!i.length||t.index()",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=V(t.target),i=V(V.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){V.contains(this.element[0],V.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=V(t.target).closest(".ui-menu-item"),i=V(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=V(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case V.ui.keyCode.PAGE_UP:this.previousPage(t);break;case V.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case V.ui.keyCode.HOME:this._move("first","first",t);break;case V.ui.keyCode.END:this._move("last","last",t);break;case V.ui.keyCode.UP:this.previous(t);break;case V.ui.keyCode.DOWN:this.next(t);break;case V.ui.keyCode.LEFT:this.collapse(t);break;case V.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case V.ui.keyCode.ENTER:case V.ui.keyCode.SPACE:this._activate(t);break;case V.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=V(this),e=t.prev(),i=V("").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=V(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!V.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(V.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(V.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=V("