From c382de378815dd36121889121fcf5563c0e1535e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 22:02:32 +0000 Subject: [PATCH 01/15] Bump react-slider from 0.11.2 to 2.0.6 Bumps [react-slider](https://github.com/zillow/react-slider) from 0.11.2 to 2.0.6. - [Release notes](https://github.com/zillow/react-slider/releases) - [Changelog](https://github.com/zillow/react-slider/blob/master/CHANGELOG.md) - [Commits](https://github.com/zillow/react-slider/compare/v0.11.2...v2.0.6) --- updated-dependencies: - dependency-name: react-slider dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../ClientSide/Dnn.React.Common/package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json index cbced8b9032..31f02b5540c 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json @@ -34,7 +34,7 @@ "react-modal": "^3.16.1", "react-motion": "^0.5.2", "react-scrollbar": "^0.5.6", - "react-slider": "0.11.2", + "react-slider": "2.0.6", "react-tabs": "3.2.3", "react-tooltip": "^4.5.1", "react-widgets": "^5.8.4", diff --git a/yarn.lock b/yarn.lock index 3526ad2e1ec..e53180417b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1790,7 +1790,7 @@ __metadata: react-modal: "npm:^3.16.1" react-motion: "npm:^0.5.2" react-scrollbar: "npm:^0.5.6" - react-slider: "npm:0.11.2" + react-slider: "npm:2.0.6" react-tabs: "npm:3.2.3" react-test-renderer: "npm:^17.0.2" react-tooltip: "npm:^4.5.1" @@ -19439,14 +19439,14 @@ __metadata: languageName: node linkType: hard -"react-slider@npm:0.11.2": - version: 0.11.2 - resolution: "react-slider@npm:0.11.2" +"react-slider@npm:2.0.6": + version: 2.0.6 + resolution: "react-slider@npm:2.0.6" + dependencies: + prop-types: "npm:^15.8.1" peerDependencies: - create-react-class: ^15.6 - prop-types: ^15.6 - react: ^16.2 - checksum: fc2394b732acef42548473128a84f4b24f4d49d6fedd82307fc4d3de66a0af1a6318c185b39bcadde2d5ad7fcce1cc0204b91ec3d5620cd20859ba85a45dafad + react: ^16 || ^17 || ^18 + checksum: 9ee7f9073207f559a37e10aa52cfebc3d54925d23906bc2902ba8cb55f3607d867c5b3d77614f46a48204de47a4adb11254b52f6ead458ab6b409e3d5be9144e languageName: node linkType: hard From 758ff71a882f9dd32b4056dd4e8f8c54b10fc7f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:43:54 +0000 Subject: [PATCH 02/15] Bump @storybook/addon-actions from 6.5.16 to 8.3.6 Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/actions) from 6.5.16 to 8.3.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.3.6/code/addons/actions) --- updated-dependencies: - dependency-name: "@storybook/addon-actions" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../ClientSide/Dnn.React.Common/package.json | 2 +- yarn.lock | 293 +++--------------- 2 files changed, 40 insertions(+), 255 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json index 2d22bd27a9d..0846e44491d 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json @@ -48,7 +48,7 @@ "@babel/plugin-transform-object-assign": "^7.22.5", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@storybook/addon-actions": "^6.5.16", + "@storybook/addon-actions": "^8.3.6", "@storybook/react": "^5.3.21", "babel-eslint": "^10.1.0", "babel-loader": "^8.3.0", diff --git a/yarn.lock b/yarn.lock index e1e4acd6212..7606676393c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1748,7 +1748,7 @@ __metadata: "@babel/plugin-transform-object-assign": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@storybook/addon-actions": "npm:^6.5.16" + "@storybook/addon-actions": "npm:^8.3.6" "@storybook/react": "npm:^5.3.21" babel-eslint: "npm:^10.1.0" babel-loader: "npm:^8.3.0" @@ -3184,38 +3184,18 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-actions@npm:^6.5.16": - version: 6.5.16 - resolution: "@storybook/addon-actions@npm:6.5.16" +"@storybook/addon-actions@npm:^8.3.6": + version: 8.3.6 + resolution: "@storybook/addon-actions@npm:8.3.6" dependencies: - "@storybook/addons": "npm:6.5.16" - "@storybook/api": "npm:6.5.16" - "@storybook/client-logger": "npm:6.5.16" - "@storybook/components": "npm:6.5.16" - "@storybook/core-events": "npm:6.5.16" - "@storybook/csf": "npm:0.0.2--canary.4566f4d.1" - "@storybook/theming": "npm:6.5.16" - core-js: "npm:^3.8.2" - fast-deep-equal: "npm:^3.1.3" - global: "npm:^4.4.0" - lodash: "npm:^4.17.21" + "@storybook/global": "npm:^5.0.0" + "@types/uuid": "npm:^9.0.1" + dequal: "npm:^2.0.2" polished: "npm:^4.2.2" - prop-types: "npm:^15.7.2" - react-inspector: "npm:^5.1.0" - regenerator-runtime: "npm:^0.13.7" - telejson: "npm:^6.0.8" - ts-dedent: "npm:^2.0.0" - util-deprecate: "npm:^1.0.2" - uuid-browser: "npm:^3.1.0" + uuid: "npm:^9.0.0" peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 10/ae9cb386f6f08bc3f0b502665d33b03754d73b27b053e8481643267b04f09e81d2020343f41251be5ba11c7b7d02f5aa791a01d114d330638b9c8edb176f75bc + storybook: ^8.3.6 + checksum: 10/94b5832dfab5494570ee06b39ccf4d0ae119332c8db479b0ef73aa9e06c853808aca642e14aca26c713ddfbaccccfcc56b8d38429d4d54d9d96fb4223474e406 languageName: node linkType: hard @@ -3234,28 +3214,6 @@ __metadata: languageName: node linkType: hard -"@storybook/addons@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/addons@npm:6.5.16" - dependencies: - "@storybook/api": "npm:6.5.16" - "@storybook/channels": "npm:6.5.16" - "@storybook/client-logger": "npm:6.5.16" - "@storybook/core-events": "npm:6.5.16" - "@storybook/csf": "npm:0.0.2--canary.4566f4d.1" - "@storybook/router": "npm:6.5.16" - "@storybook/theming": "npm:6.5.16" - "@types/webpack-env": "npm:^1.16.0" - core-js: "npm:^3.8.2" - global: "npm:^4.4.0" - regenerator-runtime: "npm:^0.13.7" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10/c1093bfdd212cceaee5ec92737409dc9ecf7145aa456ea93aec3578ab1c4ceab8fbbdb3aa5fbf473b16bf829a7342965a8f8f5cbec1d727d1194e356d708dff8 - languageName: node - linkType: hard - "@storybook/api@npm:5.3.21": version: 5.3.21 resolution: "@storybook/api@npm:5.3.21" @@ -3286,34 +3244,6 @@ __metadata: languageName: node linkType: hard -"@storybook/api@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/api@npm:6.5.16" - dependencies: - "@storybook/channels": "npm:6.5.16" - "@storybook/client-logger": "npm:6.5.16" - "@storybook/core-events": "npm:6.5.16" - "@storybook/csf": "npm:0.0.2--canary.4566f4d.1" - "@storybook/router": "npm:6.5.16" - "@storybook/semver": "npm:^7.3.2" - "@storybook/theming": "npm:6.5.16" - core-js: "npm:^3.8.2" - fast-deep-equal: "npm:^3.1.3" - global: "npm:^4.4.0" - lodash: "npm:^4.17.21" - memoizerific: "npm:^1.11.3" - regenerator-runtime: "npm:^0.13.7" - store2: "npm:^2.12.0" - telejson: "npm:^6.0.8" - ts-dedent: "npm:^2.0.0" - util-deprecate: "npm:^1.0.2" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10/217f0070c54203f699932e5d7b16593a2fbfb1b6b038f2b36eadadf3433ba9ce70faed76a110a09311d9946c630cb93d3982b34b10c75a137a150ba2fc905440 - languageName: node - linkType: hard - "@storybook/channel-postmessage@npm:5.3.21": version: 5.3.21 resolution: "@storybook/channel-postmessage@npm:5.3.21" @@ -3336,17 +3266,6 @@ __metadata: languageName: node linkType: hard -"@storybook/channels@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/channels@npm:6.5.16" - dependencies: - core-js: "npm:^3.8.2" - ts-dedent: "npm:^2.0.0" - util-deprecate: "npm:^1.0.2" - checksum: 10/8023575f6382ea14148253aabe637b192ce2ae5e394fe2d47064540698d6cd8e2ed08788b74a6f8c946a80deb5df1d1bc8d14c84a7ae489c8bcdbde45ca64f45 - languageName: node - linkType: hard - "@storybook/client-api@npm:5.3.21": version: 5.3.21 resolution: "@storybook/client-api@npm:5.3.21" @@ -3381,16 +3300,6 @@ __metadata: languageName: node linkType: hard -"@storybook/client-logger@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/client-logger@npm:6.5.16" - dependencies: - core-js: "npm:^3.8.2" - global: "npm:^4.4.0" - checksum: 10/2f9f5dbdc5605e6eee2abd624580ffd658a835304e3f8510891efac0415acc0c224b80ece3be0032c79939659e3a6744941e214cccbf2cff19bcb940e2181ece - languageName: node - linkType: hard - "@storybook/components@npm:5.3.21": version: 5.3.21 resolution: "@storybook/components@npm:5.3.21" @@ -3423,25 +3332,6 @@ __metadata: languageName: node linkType: hard -"@storybook/components@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/components@npm:6.5.16" - dependencies: - "@storybook/client-logger": "npm:6.5.16" - "@storybook/csf": "npm:0.0.2--canary.4566f4d.1" - "@storybook/theming": "npm:6.5.16" - core-js: "npm:^3.8.2" - memoizerific: "npm:^1.11.3" - qs: "npm:^6.10.0" - regenerator-runtime: "npm:^0.13.7" - util-deprecate: "npm:^1.0.2" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10/d133fc20af5d0026c988d825afb809f261e606929f3c12e484c9c3f8a92d03b2d6b7fa7be06479cf6a69fd6673502d9e5925fb87df934241a4c9d1541763b74f - languageName: node - linkType: hard - "@storybook/core-events@npm:5.3.21": version: 5.3.21 resolution: "@storybook/core-events@npm:5.3.21" @@ -3451,15 +3341,6 @@ __metadata: languageName: node linkType: hard -"@storybook/core-events@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/core-events@npm:6.5.16" - dependencies: - core-js: "npm:^3.8.2" - checksum: 10/d9da1492b95490df2d4d053df607ddb52e05cf245da0f29b336c8ae928ef3a30ee2fc8e5a4e0761b9857ec95958ebdb64866ffa37e6bcc1785f83dece9f041c1 - languageName: node - linkType: hard - "@storybook/core@npm:5.3.21": version: 5.3.21 resolution: "@storybook/core@npm:5.3.21" @@ -3555,12 +3436,10 @@ __metadata: languageName: node linkType: hard -"@storybook/csf@npm:0.0.2--canary.4566f4d.1": - version: 0.0.2--canary.4566f4d.1 - resolution: "@storybook/csf@npm:0.0.2--canary.4566f4d.1" - dependencies: - lodash: "npm:^4.17.15" - checksum: 10/194a7c04a1440946c9cfebecd21fa5223c17238ae802bd4595ef45227f94bd504772d418ec2510e310a9f781c71866def8d0982513666fde58de421a990b4756 +"@storybook/global@npm:^5.0.0": + version: 5.0.0 + resolution: "@storybook/global@npm:5.0.0" + checksum: 10/0e7b495f4fe7f36447e793926f1c0460ec07fd66f0da68e3150da5878f6043c9eeb9b41614a45c5ec0d48d5d383c59ca8f88b6dc7882a2a784ac9b20375d8edb languageName: node linkType: hard @@ -3636,34 +3515,6 @@ __metadata: languageName: node linkType: hard -"@storybook/router@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/router@npm:6.5.16" - dependencies: - "@storybook/client-logger": "npm:6.5.16" - core-js: "npm:^3.8.2" - memoizerific: "npm:^1.11.3" - qs: "npm:^6.10.0" - regenerator-runtime: "npm:^0.13.7" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10/238597e08ba6d04b375e4f7a45dd4ae77f3cbce0734682184b94aff73c335c66d75c54817d1a70585b36f7601577982f94a05435842d5a11fa7020b6ff678194 - languageName: node - linkType: hard - -"@storybook/semver@npm:^7.3.2": - version: 7.3.2 - resolution: "@storybook/semver@npm:7.3.2" - dependencies: - core-js: "npm:^3.6.5" - find-up: "npm:^4.1.0" - bin: - semver: bin/semver.js - checksum: 10/0e95b1e0b997f75f05e5d891235f5b456793bb43ffb165d4b425a8761a8e20283175f10da48ef7eaa2e52141b4abe57cd5baa95c31ae6afb1b8dfbde409ac990 - languageName: node - linkType: hard - "@storybook/theming@npm:5.3.21": version: 5.3.21 resolution: "@storybook/theming@npm:5.3.21" @@ -3687,21 +3538,6 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@npm:6.5.16": - version: 6.5.16 - resolution: "@storybook/theming@npm:6.5.16" - dependencies: - "@storybook/client-logger": "npm:6.5.16" - core-js: "npm:^3.8.2" - memoizerific: "npm:^1.11.3" - regenerator-runtime: "npm:^0.13.7" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10/a234ccd7d1c647979806f6a4baee446fe0715d485c937cb06c7db42a8e043f14f2de65d1712e282d0b0efc5ac5752fb68113e1bcb477c7e98cb19fbdef3ee0da - languageName: node - linkType: hard - "@storybook/ui@npm:5.3.21": version: 5.3.21 resolution: "@storybook/ui@npm:5.3.21" @@ -4426,7 +4262,14 @@ __metadata: languageName: node linkType: hard -"@types/webpack-env@npm:^1.15.0, @types/webpack-env@npm:^1.16.0": +"@types/uuid@npm:^9.0.1": + version: 9.0.8 + resolution: "@types/uuid@npm:9.0.8" + checksum: 10/b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275 + languageName: node + linkType: hard + +"@types/webpack-env@npm:^1.15.0": version: 1.18.4 resolution: "@types/webpack-env@npm:1.18.4" checksum: 10/a1c37f8eb93fa86077b2406d3b8dd50c7505cd2b6ec46044786aa9681b0114ad6c3c3cd6402f8ecce9e4de6626c2fd91e5acda62d5d450c1f531533c3812b7c0 @@ -8756,7 +8599,7 @@ __metadata: languageName: node linkType: hard -"core-js@npm:^3.0.1, core-js@npm:^3.0.4, core-js@npm:^3.6.5, core-js@npm:^3.8.2": +"core-js@npm:^3.0.1, core-js@npm:^3.0.4": version: 3.35.1 resolution: "core-js@npm:3.35.1" checksum: 10/5d31f22eb05cf66bd1a2088a04b7106faa5d0b91c1ffa5d72c5203e4974c31bd7e11969297f540a806c00c74c23991eaad5639592df8b5dbe4412fff3c075cd5 @@ -9469,7 +9312,7 @@ __metadata: languageName: node linkType: hard -"dequal@npm:^2.0.3": +"dequal@npm:^2.0.2, dequal@npm:^2.0.3": version: 2.0.3 resolution: "dequal@npm:2.0.3" checksum: 10/6ff05a7561f33603df87c45e389c9ac0a95e3c056be3da1a0c4702149e3a7f6fe5ffbb294478687ba51a9e95f3a60e8b6b9005993acd79c292c7d15f71964b6b @@ -13776,16 +13619,6 @@ __metadata: languageName: node linkType: hard -"is-dom@npm:^1.0.0": - version: 1.1.0 - resolution: "is-dom@npm:1.1.0" - dependencies: - is-object: "npm:^1.0.1" - is-window: "npm:^1.0.2" - checksum: 10/6183ca958528bc203264e349b30059a40e418862ba679db28c55de6d076905de321bb979b3e2880595bdab947f90aabe10bc6fddea60b0901c1d74afda15ab92 - languageName: node - linkType: hard - "is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1": version: 0.1.1 resolution: "is-extendable@npm:0.1.1" @@ -13848,7 +13681,7 @@ __metadata: languageName: node linkType: hard -"is-function@npm:^1.0.1, is-function@npm:^1.0.2": +"is-function@npm:^1.0.1": version: 1.0.2 resolution: "is-function@npm:1.0.2" checksum: 10/7d564562e07b4b51359547d3ccc10fb93bb392fd1b8177ae2601ee4982a0ece86d952323fc172a9000743a3971f09689495ab78a1d49a9b14fc97a7e28521dc0 @@ -13988,13 +13821,6 @@ __metadata: languageName: node linkType: hard -"is-object@npm:^1.0.1": - version: 1.0.2 - resolution: "is-object@npm:1.0.2" - checksum: 10/db53971751c50277f0ed31d065d93038d23cb9785090ab5c8070a903cf5bab16cdb18f05b8855599ad87ec19eb4c85afa05980bcda77dd4a8482120b6348c73c - languageName: node - linkType: hard - "is-path-cwd@npm:^2.2.0": version: 2.2.0 resolution: "is-path-cwd@npm:2.2.0" @@ -14046,7 +13872,7 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.0.4, is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.2, is-regex@npm:^1.1.4": +"is-regex@npm:^1.0.4, is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" dependencies: @@ -14208,13 +14034,6 @@ __metadata: languageName: node linkType: hard -"is-window@npm:^1.0.2": - version: 1.0.2 - resolution: "is-window@npm:1.0.2" - checksum: 10/aeaacd2ca816d38d4e2fba4670158fba2190061f28a61c5d84df7c479abf8897b8cb634d22cb76cdf7805035e95bebd430faaab6231ac2ebc814eae02d2c8fd4 - languageName: node - linkType: hard - "is-windows@npm:^1.0.2": version: 1.0.2 resolution: "is-windows@npm:1.0.2" @@ -18961,7 +18780,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:15.8.1, prop-types@npm:^15.0.0, prop-types@npm:^15.5.0, prop-types@npm:^15.5.10, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:15.8.1, prop-types@npm:^15.5.0, prop-types@npm:^15.5.10, prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -19094,7 +18913,7 @@ __metadata: languageName: node linkType: hard -"qs@npm:^6.10.0, qs@npm:^6.11.2, qs@npm:^6.6.0": +"qs@npm:^6.11.2, qs@npm:^6.6.0": version: 6.11.2 resolution: "qs@npm:6.11.2" dependencies: @@ -19567,19 +19386,6 @@ __metadata: languageName: node linkType: hard -"react-inspector@npm:^5.1.0": - version: 5.1.1 - resolution: "react-inspector@npm:5.1.1" - dependencies: - "@babel/runtime": "npm:^7.0.0" - is-dom: "npm:^1.0.0" - prop-types: "npm:^15.0.0" - peerDependencies: - react: ^16.8.4 || ^17.0.0 - checksum: 10/593d864c8d6834f743f895ead3764ff6c06fd01568177858cc7cf434bd8abb61d3df56e64b4489c3da6cef5871a134c36aac19b6dcceb0d73c43f12fd65276ff - languageName: node - linkType: hard - "react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" @@ -20327,7 +20133,7 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.13.2, regenerator-runtime@npm:^0.13.3, regenerator-runtime@npm:^0.13.7": +"regenerator-runtime@npm:^0.13.2, regenerator-runtime@npm:^0.13.3": version: 0.13.11 resolution: "regenerator-runtime@npm:0.13.11" checksum: 10/d493e9e118abef5b099c78170834f18540c4933cedf9bfabc32d3af94abfb59a7907bd7950259cbab0a929ebca7db77301e8024e5121e6482a82f78283dfd20c @@ -22167,7 +21973,7 @@ __metadata: languageName: node linkType: hard -"store2@npm:^2.12.0, store2@npm:^2.7.1": +"store2@npm:^2.7.1": version: 2.14.2 resolution: "store2@npm:2.14.2" checksum: 10/896cb4c75b94b630206e0ef414f78d656a5d2498127094d9d0852e1e7b88509b3a7972c92cad3e74ee34ef6b06d25083ad2ac38880254ccb2d40b7930dc0ed01 @@ -22865,22 +22671,6 @@ __metadata: languageName: node linkType: hard -"telejson@npm:^6.0.8": - version: 6.0.8 - resolution: "telejson@npm:6.0.8" - dependencies: - "@types/is-function": "npm:^1.0.0" - global: "npm:^4.4.0" - is-function: "npm:^1.0.2" - is-regex: "npm:^1.1.2" - is-symbol: "npm:^1.0.3" - isobject: "npm:^4.0.0" - lodash: "npm:^4.17.21" - memoizerific: "npm:^1.11.3" - checksum: 10/611129395265e9ac5d1445c2904e42eb013c186cb7adb38a864b33ad17e825e892df6c301d89d020080304792e073f224041f672c586656829ea288df9f77844 - languageName: node - linkType: hard - "temp-dir@npm:1.0.0": version: 1.0.0 resolution: "temp-dir@npm:1.0.0" @@ -23320,13 +23110,6 @@ __metadata: languageName: node linkType: hard -"ts-dedent@npm:^2.0.0": - version: 2.2.0 - resolution: "ts-dedent@npm:2.2.0" - checksum: 10/93ed8f7878b6d5ed3c08d99b740010eede6bccfe64bce61c5a4da06a2c17d6ddbb80a8c49c2d15251de7594a4f93ffa21dd10e7be75ef66a4dc9951b4a94e2af - languageName: node - linkType: hard - "ts-pnp@npm:^1.1.2": version: 1.2.0 resolution: "ts-pnp@npm:1.2.0" @@ -24148,13 +23931,6 @@ __metadata: languageName: node linkType: hard -"uuid-browser@npm:^3.1.0": - version: 3.1.0 - resolution: "uuid-browser@npm:3.1.0" - checksum: 10/2148e152fb80454f82ab086a96c177a748d03c7d5dae57f7a7156a49b11d287d2e054addfdcf5e9e1f2aa03a98ceb73d72b13cbdb7f7d93fa05a420f0f47ac06 - languageName: node - linkType: hard - "uuid@npm:8.3.2, uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" @@ -24182,6 +23958,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^9.0.0": + version: 9.0.1 + resolution: "uuid@npm:9.0.1" + bin: + uuid: dist/bin/uuid + checksum: 10/9d0b6adb72b736e36f2b1b53da0d559125ba3e39d913b6072f6f033e0c87835b414f0836b45bcfaf2bdf698f92297fea1c3cc19b0b258bc182c9c43cc0fab9f2 + languageName: node + linkType: hard + "v8-compile-cache@npm:2.3.0": version: 2.3.0 resolution: "v8-compile-cache@npm:2.3.0" From c12d800637ef150f83aabcd3e34aa4d0ba65e5c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 04:12:15 +0000 Subject: [PATCH 03/15] Bump react-slider from 0.11.2 to 2.0.6 Bumps [react-slider](https://github.com/zillow/react-slider) from 0.11.2 to 2.0.6. - [Release notes](https://github.com/zillow/react-slider/releases) - [Changelog](https://github.com/zillow/react-slider/blob/master/CHANGELOG.md) - [Commits](https://github.com/zillow/react-slider/compare/v0.11.2...v2.0.6) --- updated-dependencies: - dependency-name: react-slider dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../ClientSide/Dnn.React.Common/package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json index 2d22bd27a9d..15e4fc0fa61 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json @@ -34,7 +34,7 @@ "react-modal": "^3.16.1", "react-motion": "^0.5.2", "react-scrollbar": "^0.5.6", - "react-slider": "0.11.2", + "react-slider": "2.0.6", "react-tabs": "3.2.3", "react-tooltip": "^4.5.1", "react-widgets": "^5.8.4", diff --git a/yarn.lock b/yarn.lock index c776c1e6455..4093ee40bdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1790,7 +1790,7 @@ __metadata: react-modal: "npm:^3.16.1" react-motion: "npm:^0.5.2" react-scrollbar: "npm:^0.5.6" - react-slider: "npm:0.11.2" + react-slider: "npm:2.0.6" react-tabs: "npm:3.2.3" react-test-renderer: "npm:^17.0.2" react-tooltip: "npm:^4.5.1" @@ -19792,14 +19792,14 @@ __metadata: languageName: node linkType: hard -"react-slider@npm:0.11.2": - version: 0.11.2 - resolution: "react-slider@npm:0.11.2" +"react-slider@npm:2.0.6": + version: 2.0.6 + resolution: "react-slider@npm:2.0.6" + dependencies: + prop-types: "npm:^15.8.1" peerDependencies: - create-react-class: ^15.6 - prop-types: ^15.6 - react: ^16.2 - checksum: 10/fc2394b732acef42548473128a84f4b24f4d49d6fedd82307fc4d3de66a0af1a6318c185b39bcadde2d5ad7fcce1cc0204b91ec3d5620cd20859ba85a45dafad + react: ^16 || ^17 || ^18 + checksum: 10/9ee7f9073207f559a37e10aa52cfebc3d54925d23906bc2902ba8cb55f3607d867c5b3d77614f46a48204de47a4adb11254b52f6ead458ab6b409e3d5be9144e languageName: node linkType: hard From 11bc7a76225871c0b128c04ae81d68215316776a Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 27 Oct 2024 00:41:22 -0400 Subject: [PATCH 04/15] 'backup' --- .../SqlDataProvider/09.13.05.SqlDataProvider | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.05.SqlDataProvider diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.05.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.05.SqlDataProvider new file mode 100644 index 00000000000..343b722cfe1 --- /dev/null +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.05.SqlDataProvider @@ -0,0 +1,9 @@ +/************************************************************/ +/***** SqlDataProvider *****/ +/***** *****/ +/***** *****/ +/***** Note: To manually execute this script you must *****/ +/***** perform a search and replace operation *****/ +/***** for {databaseOwner} and {objectQualifier} *****/ +/***** *****/ +/************************************************************/ From 20fae923f7dcb3c5df5f24054a880e1faad9b320 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 27 Oct 2024 15:01:31 -0400 Subject: [PATCH 05/15] Fixed react-slider breaking changes --- .../ClientSide/Dnn.React.Common/src/NumberSlider/index.jsx | 4 +--- .../ClientSide/Dnn.React.Common/src/NumberSlider/style.less | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/index.jsx b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/index.jsx index 39b4074c4eb..49bc7c2b02b 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/index.jsx @@ -27,10 +27,8 @@ export default class NumberSlider extends Component { step={step} onChange={this.props.onChange} disabled={!!this.props.disabled} - withBars={true}> - {!this.props.hideValue &&
{value}
} + renderThumb={(props, _state) => !this.props.hideValue &&
{value}
}> - {this.props.withMinMax && {maximum}} ); diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/style.less b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/style.less index a0e84d95010..2c939bb53b7 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/style.less +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/NumberSlider/style.less @@ -20,7 +20,7 @@ width: 100%; float: left; margin-top: 2px; - .handle { + .thumb { width: 20px; height: 20px; border-radius: 100%; @@ -35,9 +35,9 @@ transform: translate(-50%, 0); } } - .bar { + .track { height: 100%; - &.bar-0 { + &.track-0 { border-radius: 10px; background: #0087c6; } From 897128f1707523502ce8dc628b7b957510e50115 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:06:10 +0000 Subject: [PATCH 06/15] Bump NSubstitute from 5.1.0 to 5.3.0 in the teststack-dossier group Bumps the teststack-dossier group with 1 update: [NSubstitute](https://github.com/nsubstitute/NSubstitute). Updates `NSubstitute` from 5.1.0 to 5.3.0 - [Release notes](https://github.com/nsubstitute/NSubstitute/releases) - [Changelog](https://github.com/nsubstitute/NSubstitute/blob/main/CHANGELOG.md) - [Commits](https://github.com/nsubstitute/NSubstitute/compare/v5.1.0...v5.3.0) --- updated-dependencies: - 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 | 4 ++-- .../Tests/DotNetNuke.Tests.Integration/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 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 96a7503d020..e4681dc89b6 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj @@ -86,8 +86,8 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\NSubstitute.5.1.0\lib\net462\NSubstitute.dll + + ..\..\..\packages\NSubstitute.5.3.0\lib\net462\NSubstitute.dll True diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config index 0c76e53de84..da1937a71fc 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config @@ -10,7 +10,7 @@ - + From 59a340175c3f345b2b112bc0246bc97d36496767 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:06:40 +0000 Subject: [PATCH 07/15] Bump the cake-issues group with 3 updates Bumps the cake-issues group with 3 updates: [Cake.Frosting.Issues.MsBuild](https://github.com/cake-contrib/Cake.Issues), [System.Runtime.CompilerServices.Unsafe](https://github.com/dotnet/runtime) and [Cake.Issues](https://github.com/cake-contrib/Cake.Issues). Updates `Cake.Frosting.Issues.MsBuild` from 4.10.1 to 4.11.0 - [Release notes](https://github.com/cake-contrib/Cake.Issues/releases) - [Changelog](https://github.com/cake-contrib/Cake.Issues/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/cake-contrib/Cake.Issues/compare/4.10.1...4.11.0) Updates `System.Runtime.CompilerServices.Unsafe` from 4.5.3 to 6.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v6.0.0) Updates `Cake.Issues` from 4.10.1 to 4.11.0 - [Release notes](https://github.com/cake-contrib/Cake.Issues/releases) - [Changelog](https://github.com/cake-contrib/Cake.Issues/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/cake-contrib/Cake.Issues/compare/4.10.1...4.11.0) --- updated-dependencies: - dependency-name: Cake.Frosting.Issues.MsBuild dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cake-issues - dependency-name: System.Runtime.CompilerServices.Unsafe dependency-type: direct:production update-type: version-update:semver-major dependency-group: cake-issues - dependency-name: Cake.Issues dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cake-issues ... Signed-off-by: dependabot[bot] --- Build/Build.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/Build.csproj b/Build/Build.csproj index fd35d1d08f4..edadd7cdf69 100644 --- a/Build/Build.csproj +++ b/Build/Build.csproj @@ -18,8 +18,8 @@ - - + + From 5c5f5c98f0d5ca873071a71c76e36c03b7aacfc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:08:53 +0000 Subject: [PATCH 08/15] Bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.10.0 to 17.11.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.10.0...v17.11.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../DotNetNuke.Tests.SourceGenerators.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj index 942827bf295..8ec215aaca0 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/DotNetNuke.Tests.SourceGenerators.csproj @@ -21,7 +21,7 @@ - + From 46a8ad3b497971611fcaa86f181db9ae51487fa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:05:25 +0000 Subject: [PATCH 09/15] Bump Castle.Core, Moq, System.Runtime.CompilerServices.Unsafe, System.Threading.Tasks.Extensions and Microsoft.NETFramework.ReferenceAssemblies Bumps [Castle.Core](https://github.com/castleproject/Core), [Moq](https://github.com/moq/moq), System.Runtime.CompilerServices.Unsafe, System.Threading.Tasks.Extensions and [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet). These dependencies needed to be updated together. Updates `Castle.Core` from 5.1.1 to 5.1.1 - [Release notes](https://github.com/castleproject/Core/releases) - [Changelog](https://github.com/castleproject/Core/blob/master/CHANGELOG.md) - [Commits](https://github.com/castleproject/Core/compare/v5.1.1...v5.1.1) Updates `Moq` from 4.20.70 to 4.20.72 - [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.20.70...v4.20.72) Updates `System.Runtime.CompilerServices.Unsafe` from 4.5.3 to 4.5.3 Updates `System.Threading.Tasks.Extensions` from 4.5.4 to 4.5.4 Updates `Microsoft.NETFramework.ReferenceAssemblies` from 1.0.3 to 1.0.3 - [Commits](https://github.com/Microsoft/dotnet/commits) --- updated-dependencies: - dependency-name: Castle.Core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: System.Runtime.CompilerServices.Unsafe dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: System.Threading.Tasks.Extensions dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../DNN.Integration.Test.Framework.csproj | 5 +++-- .../DNN.Integration.Test.Framework/app.config | 4 ++++ .../packages.config | 2 +- .../Tests/DotNetNuke.Tests.AspNetCCP/App.config | 6 +++++- .../DotNetNuke.Tests.AspNetCCP.csproj | 5 +++-- .../DotNetNuke.Tests.AspNetCCP/packages.config | 2 +- .../DotNetNuke.Tests.Authentication.csproj | 5 +++-- .../DotNetNuke.Tests.Authentication/app.config | 4 ++++ .../packages.config | 2 +- .../DotNetNuke.Tests.Content.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Content/app.config | 6 +++++- .../DotNetNuke.Tests.Content/packages.config | 2 +- .../DotNetNuke.Tests.Core.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Core/packages.config | 2 +- .../DotNetNuke.Tests.Data.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Data/packages.config | 2 +- .../DotNetNuke.Tests.Integration.csproj | 5 +++-- .../packages.config | 2 +- .../Tests/DotNetNuke.Tests.Mail/App.config | 8 ++++++-- .../DotNetNuke.Tests.Mail.csproj | 17 +++++++++-------- .../Tests/DotNetNuke.Tests.Mail/packages.config | 2 +- .../DotNetNuke.Tests.Modules.csproj | 5 +++-- .../DotNetNuke.Tests.Modules/packages.config | 2 +- .../DotNetNuke.Tests.UI.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.UI/app.config | 6 +++++- .../Tests/DotNetNuke.Tests.UI/packages.config | 2 +- .../DotNetNuke.Tests.Urls.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Urls/packages.config | 2 +- .../DotNetNuke.Tests.Utilities.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Utilities/app.config | 4 ++++ .../DotNetNuke.Tests.Utilities/packages.config | 2 +- .../DotNetNuke.Tests.Web.Mvc.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Web.Mvc/app.config | 6 +++++- .../DotNetNuke.Tests.Web.Mvc/packages.config | 2 +- .../Tests/DotNetNuke.Tests.Web/App.config | 12 ++++++++---- .../DotNetNuke.Tests.Web.csproj | 5 +++-- .../Tests/DotNetNuke.Tests.Web/packages.config | 2 +- .../Dnn.PersonaBar.ConfigConsole.Tests.csproj | 4 ++-- .../app.config | 4 ++++ .../packages.config | 2 +- .../Dnn.PersonaBar.Pages.Tests.csproj | 4 ++-- .../Tests/Dnn.PersonaBar.Pages.Tests/app.config | 4 ++++ .../Dnn.PersonaBar.Pages.Tests/packages.config | 2 +- .../Dnn.PersonaBar.Security.Tests.csproj | 4 ++-- .../Dnn.PersonaBar.Security.Tests/app.config | 8 ++++++-- .../packages.config | 2 +- .../Dnn.PersonaBar.Users.Tests.csproj | 4 ++-- .../Tests/Dnn.PersonaBar.Users.Tests/app.config | 4 ++++ .../Dnn.PersonaBar.Users.Tests/packages.config | 2 +- 49 files changed, 138 insertions(+), 72 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 773ef1ccab8..2622e9a13b8 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,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config index 2c0cf2cdc75..e16ce64fa6c 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config @@ -14,6 +14,10 @@ + + + + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config index 94b42665dbe..5f293d75052 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/App.config b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config index 0451cc9add5..8eb54bc1f9e 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config @@ -20,7 +20,11 @@ - + + + + + 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 ce169bde160..39a6348a796 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,9 @@ ..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll True - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/packages.config index febde3029b8..4c018296827 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 ca707defa23..b75cf0a35b7 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,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/app.config index 1a1a64e80ad..8592bf986a7 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/app.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/app.config @@ -10,6 +10,10 @@ + + + + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Authentication/packages.config index febde3029b8..4c018296827 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 2f9e02c2a28..6f94cc46872 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,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config index da5f53ba268..c72d122556b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config @@ -36,7 +36,11 @@ - + + + + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config index f63934b570a..01ff0ab0a90 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 fb8d720bde8..fd3d57bce31 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,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config index b5bb554dd5a..be20f3471dc 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 20e1ac11cd9..44b774c0acc 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,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config index 944bd40ee7c..215df4b79ca 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 e4681dc89b6..8d3792a4778 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj @@ -77,8 +77,9 @@ ..\..\..\packages\Fare.2.2.1\lib\net35\Fare.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\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 da1937a71fc..231e9283768 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/App.config b/DNN Platform/Tests/DotNetNuke.Tests.Mail/App.config index 76d98fbb6db..db9fb907bca 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Mail/App.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Mail/App.config @@ -28,7 +28,7 @@ - + @@ -60,7 +60,11 @@ - + + + + + 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 9813474e305..79e516947c8 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,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True @@ -149,11 +150,11 @@ - \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Mail/packages.config index 79994fe9779..cdd16f8fa63 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 4ac4a8bdbbc..faa04b3c61a 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,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Modules/packages.config index febde3029b8..4c018296827 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 94c85c8e8a0..87d69042a4a 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,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config b/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config index cdac020c3e2..b09d9895848 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config @@ -20,7 +20,11 @@ - + + + + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.UI/packages.config index febde3029b8..4c018296827 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 5ab3f3aa48b..bfb642f1f00 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,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Urls/packages.config index cfe27ce3402..c418e011c06 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 1fbfea56577..e87828c4913 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,9 @@ False ..\..\..\..\..\Windows\System32\inetsrv\Microsoft.Web.Administration.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config index a703f623b06..9187f3db59e 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config @@ -18,6 +18,10 @@ + + + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config index 901b91fb777..30303a4496e 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 df329635826..4bf63f7159d 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,9 @@ True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config index 53aa3199bd6..4e9117d2280 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config @@ -40,7 +40,11 @@ - + + + + + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/packages.config index a80d8e61e1b..bcfac812687 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/App.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config index 09a1f7f2277..9f868852948 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config @@ -4,7 +4,7 @@ - + @@ -12,11 +12,11 @@ - + - + @@ -32,7 +32,11 @@ - + + + + + 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 2aaa9cefe33..a1df73a4308 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,9 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll + True ..\..\..\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 3b7bd4a0e5a..cea92b430b3 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 8e7134863ad..f30d66b8995 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,8 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config index f6c578311a3..03e07304b56 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config @@ -26,6 +26,10 @@ + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config index 9d9aca0210f..ade97b782cd 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 f7034c7c410..91fa6d1a624 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,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config index 9dd43d2a7a8..4ed9c2ad903 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config @@ -26,6 +26,10 @@ + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config index febde3029b8..4c018296827 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 593b41b3ba0..f9c05b4ed8b 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,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config index 9dd43d2a7a8..7b0239c323f 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config @@ -16,16 +16,20 @@ - + - + + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config index cf464ab71e1..2a7b25a6a09 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 6686f905ff6..4335faa782d 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,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Moq.4.20.70\lib\net462\Moq.dll + + ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config index e08ed98a2b2..40030b9d5d3 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config @@ -18,6 +18,10 @@ + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config index febde3029b8..4c018296827 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 ad8590f8c452824d8fcafa73e4292649d5c1e1a6 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 5 Nov 2024 12:59:31 -0500 Subject: [PATCH 10/15] Bumps versions to 9.13.6 for next release Bumps versions to 9.13.6 for next release --- Build/Symbols/DotNetNuke_Symbols.dnn | 2 +- .../Dnn.Modules.Console/dnn_Console.dnn | 2 +- .../Connectors/Azure/AzureConnector.dnn | 2 +- .../GoogleAnalyticsConnector.dnn | 2 +- .../GoogleAnalytics4Connector.dnn | 2 +- .../GoogleTagManagerConnector.dnn | 2 +- DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn | 2 +- .../DotNetNuke.ClientAPI.dnn | 2 +- .../DnnPlugins/DnnPlugins.dnn | 2 +- .../Modules/CoreMessaging/CoreMessaging.dnn | 2 +- DNN Platform/Modules/DDRMenu/DDRMenu.dnn | 2 +- .../DnnExportImport/dnn_SiteExportImport.dnn | 2 +- DNN Platform/Modules/Groups/SocialGroups.dnn | 2 +- DNN Platform/Modules/HTML/dnn_HTML.dnn | 2 +- .../dnn_HtmlEditorManager.dnn | 2 +- DNN Platform/Modules/Journal/Journal.dnn | 2 +- .../MemberDirectory/MemberDirectory.dnn | 2 +- DNN Platform/Modules/RazorHost/Manifest.dnn | 2 +- DNN Platform/Modules/RazorHost/RazorHost.dnn | 2 +- .../ResourceManager.Web/package.json | 2 +- .../ResourceManager/ResourceManager.dnn | 2 +- .../Modules/TelerikRemoval/TelerikRemoval.dnn | 2 +- .../Facebook_Auth.dnn | 2 +- .../Google_Auth.dnn | 2 +- .../Live_Auth.dnn | 2 +- .../Twitter_Auth.dnn | 2 +- .../SimpleWebFarmCachingProvider.dnn | 2 +- .../AspNetClientCapabilityProvider.dnn | 2 +- .../FolderProviders/FolderProviders.dnn | 2 +- .../DNNConnect.CKEditorProvider.dnn | 2 +- .../ExchangeOnlineAuthProvider.dnn | 2 +- .../GoogleMailAuthProvider.dnn | 2 +- .../Skins/Xcillion/DNN_Skin_Xcillion.dnn | 4 +- .../SqlDataProvider/09.13.06.SqlDataProvider | 9 ++++ .../ClientSide/AdminLogs.Web/package.json | 4 +- .../ClientSide/Bundle.Web/package.json | 4 +- .../ClientSide/Dnn.React.Common/package.json | 2 +- .../ClientSide/Extensions.Web/package.json | 4 +- .../ClientSide/Licensing.Web/package.json | 4 +- .../ClientSide/Pages.Web/package.json | 4 +- .../ClientSide/Prompt.Web/package.json | 4 +- .../ClientSide/Roles.Web/package.json | 4 +- .../ClientSide/Security.Web/package.json | 4 +- .../ClientSide/Seo.Web/package.json | 4 +- .../ClientSide/Servers.Web/package.json | 4 +- .../ClientSide/SiteGroups.Web/package.json | 4 +- .../SiteImportExport.Web/package.json | 4 +- .../ClientSide/SiteSettings.Web/package.json | 4 +- .../ClientSide/Sites.Web/package.json | 4 +- .../Sites.Web/src/_exportables/package.json | 4 +- .../ClientSide/TaskScheduler.Web/package.json | 4 +- .../ClientSide/Themes.Web/package.json | 4 +- .../ClientSide/Users.Web/package.json | 4 +- .../Users.Web/src/_exportables/package.json | 4 +- .../ClientSide/Vocabularies.Web/package.json | 4 +- .../Dnn.PersonaBar.Extensions.dnn | 2 +- .../EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn | 2 +- .../Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn | 2 +- SolutionInfo.cs | 6 +-- yarn.lock | 44 +++++++++---------- 60 files changed, 112 insertions(+), 103 deletions(-) create mode 100644 DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.06.SqlDataProvider diff --git a/Build/Symbols/DotNetNuke_Symbols.dnn b/Build/Symbols/DotNetNuke_Symbols.dnn index 2e69b8e89a6..9138ba0ebfc 100644 --- a/Build/Symbols/DotNetNuke_Symbols.dnn +++ b/Build/Symbols/DotNetNuke_Symbols.dnn @@ -1,6 +1,6 @@  - + DNN Platform Symbols This package contains Debug Symbols and Intellisense files for DNN Platform. diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn index fbcf2e086f1..57fe9ca9108 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn @@ -1,6 +1,6 @@  - + Console Display children pages as icon links for navigation. ~/DesktopModules/Admin/Console/console.png diff --git a/DNN Platform/Connectors/Azure/AzureConnector.dnn b/DNN Platform/Connectors/Azure/AzureConnector.dnn index ee8d0a21b07..4d131d8fdcc 100644 --- a/DNN Platform/Connectors/Azure/AzureConnector.dnn +++ b/DNN Platform/Connectors/Azure/AzureConnector.dnn @@ -1,6 +1,6 @@  - + Dnn Azure Connector The Azure Connector allows you to create folders mapped to Azure Storage accounts. ~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn index 65b6668a8aa..9b1ec476498 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn +++ b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn @@ -1,6 +1,6 @@ - + Google Analytics (Legacy UA) Connector Configure your site's Google Analytics settings using Universal Analytics. ~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png diff --git a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn index b82dc5428f4..8e4ba2b5bc1 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn +++ b/DNN Platform/Connectors/GoogleAnalytics4/GoogleAnalytics4Connector.dnn @@ -1,6 +1,6 @@ - + Google Analytics 4 Connector Configure your site's Google Analytics 4 settings. ~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png diff --git a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn index ee13c0f3e1d..716fed16edd 100644 --- a/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn +++ b/DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn @@ -1,6 +1,6 @@ - + Google Tag Manager Connector Configure your site's Google Tag Manager settings. ~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn index c4e56a6bfd8..939b186a2da 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn +++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn @@ -1,6 +1,6 @@ - + DNN JWT Auth Handler DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn index 30a67ceb34e..a917a906228 100644 --- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn +++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn @@ -1,6 +1,6 @@  - + DotNetNuke ClientAPI The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience. diff --git a/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn b/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn index cca82778b20..47c40c9bd4b 100644 --- a/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn +++ b/DNN Platform/JavaScript Libraries/DnnPlugins/DnnPlugins.dnn @@ -1,6 +1,6 @@ - + DNN jQuery Plugins A collection of jQuery plugins for DNN UI components (tabs, panels, tooltips, checkboxes, etc.) Icons\Sigma\Extensions_32x32_Standard.png diff --git a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn index 1b9397b5c7c..85938a7446c 100644 --- a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn +++ b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn @@ -1,6 +1,6 @@ - + Message Center Core Messaging module allows users to message each other. ~/DesktopModules/CoreMessaging/Images/messaging_32X32.png diff --git a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn index ddaee9cd549..d0c3979d074 100644 --- a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn +++ b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn @@ -1,6 +1,6 @@  - + DDR Menu DotNetNuke Navigation Provider. diff --git a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn index b1c117866ab..4022cd8d8b1 100644 --- a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn +++ b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn @@ -1,6 +1,6 @@ - + Site Export Import DotNetNuke Corporation Site Export Import Library Images/Files_32x32_Standard.png diff --git a/DNN Platform/Modules/Groups/SocialGroups.dnn b/DNN Platform/Modules/Groups/SocialGroups.dnn index b98f1e6f5b2..f881fc69a17 100644 --- a/DNN Platform/Modules/Groups/SocialGroups.dnn +++ b/DNN Platform/Modules/Groups/SocialGroups.dnn @@ -1,6 +1,6 @@ - + Social Groups DotNetNuke Corporation Social Groups module ~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png diff --git a/DNN Platform/Modules/HTML/dnn_HTML.dnn b/DNN Platform/Modules/HTML/dnn_HTML.dnn index 564aa8185b3..217fa94b972 100644 --- a/DNN Platform/Modules/HTML/dnn_HTML.dnn +++ b/DNN Platform/Modules/HTML/dnn_HTML.dnn @@ -1,6 +1,6 @@  - + HTML This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version. DesktopModules\HTML\Images\html.png diff --git a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn index 907311f54b1..68526e789bd 100644 --- a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn +++ b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn @@ -1,6 +1,6 @@  - + Html Editor Management Images/HtmlEditorManager_Standard_32x32.png A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider. diff --git a/DNN Platform/Modules/Journal/Journal.dnn b/DNN Platform/Modules/Journal/Journal.dnn index eef900f615a..07ca542c5ba 100644 --- a/DNN Platform/Modules/Journal/Journal.dnn +++ b/DNN Platform/Modules/Journal/Journal.dnn @@ -1,6 +1,6 @@ - + Journal DotNetNuke Corporation Journal module DesktopModules/Journal/Images/journal_32X32.png diff --git a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn index 3a2fd12013c..28d2db9b942 100644 --- a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn +++ b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn @@ -1,6 +1,6 @@ - + Member Directory The Member Directory module displays a list of Members based on role, profile property or relationship. ~/DesktopModules/MemberDirectory/Images/member_list_32X32.png diff --git a/DNN Platform/Modules/RazorHost/Manifest.dnn b/DNN Platform/Modules/RazorHost/Manifest.dnn index 6e329e4ef30..0a199571a25 100644 --- a/DNN Platform/Modules/RazorHost/Manifest.dnn +++ b/DNN Platform/Modules/RazorHost/Manifest.dnn @@ -1,6 +1,6 @@  - + {0} {1} diff --git a/DNN Platform/Modules/RazorHost/RazorHost.dnn b/DNN Platform/Modules/RazorHost/RazorHost.dnn index 9e0e0ed26f3..1b2b7342643 100644 --- a/DNN Platform/Modules/RazorHost/RazorHost.dnn +++ b/DNN Platform/Modules/RazorHost/RazorHost.dnn @@ -1,6 +1,6 @@  - + Razor Host The Razor Host module allows developers to host Razor Scripts. diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json index 8e577bbce6a..8db587c809e 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json @@ -1,6 +1,6 @@ { "name": "dnn-resource-manager", - "version": "9.13.4", + "version": "9.13.6", "description": "Resource Manager", "private": true, "main": "dist/index.cjs.js", diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn index 6c3756dcfc0..14efa4eaebb 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.dnn +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.dnn @@ -1,6 +1,6 @@ - + Resource Manager This module allows you to manage files on the server ~/Images/icon_filemanager_32px.gif diff --git a/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn b/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn index b33470fd525..17885d32273 100644 --- a/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn +++ b/DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn @@ -1,6 +1,6 @@ - + Telerik Removal This module allows you to remove the DotNetNuke Telerik Web Components library from your site. diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn index 986724bab55..61f36b271d5 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Facebook Authentication Project The DotNetNuke Facebook Authentication Project is an Authentication provider for DotNetNuke that uses Facebook authentication to authenticate users. diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn index 46564840278..a3660457555 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Google Authentication Project The DotNetNuke Google Authentication Project is an Authentication provider for DotNetNuke that uses Google authentication to authenticate users. diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn index 4f6e78ebadb..bb5f161343f 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Live Authentication Project The DotNetNuke Live Authentication Project is an Authentication provider for DotNetNuke that uses diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn index c6ec527244e..d1619d9feff 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn @@ -1,6 +1,6 @@ - + DotNetNuke Twitter Authentication Project The DotNetNuke Twitter Authentication Project is an Authentication provider for DotNetNuke that uses diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn index 44f23f57de1..a7179fad039 100644 --- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn +++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn @@ -1,6 +1,6 @@  - + DotNetNuke Simple Web Farm Caching Provider DotNetNuke Simple Web Farm Caching Provider diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn index 470a23976de..48e730a0a4e 100644 --- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn +++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn @@ -1,6 +1,6 @@ - + DotNetNuke ASP.NET Client Capability Provider ASP.NET Device Detection / Client Capability Provider ~/Providers/ClientCapabilityProviders/AspNetClientCapabilityProvider/Images/mobiledevicedet_32X32.png diff --git a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn index f1f3ac01630..47bfd5535ef 100644 --- a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn +++ b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn @@ -1,6 +1,6 @@  - + DotNetNuke Folder Providers Azure Folder Providers for DotNetNuke. diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn index 0d0532386d7..2431e972b15 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn @@ -1,5 +1,5 @@  - + CKEditor Provider CKEditor Provider for DNN ~/Providers/HtmlEditorProviders/DNNConnect.CKE/LogoCKEditor.png diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn index 8c81c471c39..6233ebe8d11 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/ExchangeOnlineAuthProvider.dnn @@ -1,6 +1,6 @@  - + Exchange Online SMTP OAuth Provider The provider allows you to config the SMTP client to send emails with Microsoft exchange online service. ~/Icons/Sigma/Extensions_32x32_Standard.png diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn index 8f445a67988..950ecec21a0 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/GoogleMailAuthProvider.dnn @@ -1,6 +1,6 @@  - + Google Mail SMTP OAuth Provider The provider allows you to config the SMTP client to send emails with gmail service. ~/Icons/Sigma/Extensions_32x32_Standard.png diff --git a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn index a041bfdffdb..bbe5e185e5e 100644 --- a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn +++ b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn @@ -1,6 +1,6 @@ - + Xcillion @@ -29,7 +29,7 @@ - + Xcillion diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.06.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.06.SqlDataProvider new file mode 100644 index 00000000000..343b722cfe1 --- /dev/null +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.06.SqlDataProvider @@ -0,0 +1,9 @@ +/************************************************************/ +/***** SqlDataProvider *****/ +/***** *****/ +/***** *****/ +/***** Note: To manually execute this script you must *****/ +/***** perform a search and replace operation *****/ +/***** for {databaseOwner} and {objectQualifier} *****/ +/***** *****/ +/************************************************************/ diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json index 85117a05e75..630661a3b71 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json @@ -1,6 +1,6 @@ { "name": "admin-logs", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -14,7 +14,7 @@ "@babel/plugin-transform-object-assign": "^7.22.5", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-loader": "8.3.0", diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json index 63308aa5f6d..2c9039e9e70 100644 --- a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json @@ -1,6 +1,6 @@ { "name": "export-bundle", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production --progress", @@ -66,6 +66,6 @@ "webpack-dev-server": "4.15.1" }, "dependencies": { - "@dnnsoftware/dnn-react-common": "9.13.4" + "@dnnsoftware/dnn-react-common": "9.13.6" } } diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json index 8228ba54f38..fc52e89d302 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json @@ -1,6 +1,6 @@ { "name": "@dnnsoftware/dnn-react-common", - "version": "9.13.4", + "version": "9.13.6", "description": "DNN React Component Library", "main": "dist/dnn-react-common.min.js", "repository": { diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json index b227746f17b..50373615600 100644 --- a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json @@ -1,6 +1,6 @@ { "name": "extensions", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -12,7 +12,7 @@ "@babel/core": "^7.22.9", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "babel-plugin-transform-object-assign": "6.22.0", "babel-plugin-transform-object-rest-spread": "6.26.0", diff --git a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json index df971210c9c..44fc8bcf893 100644 --- a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json @@ -1,6 +1,6 @@ { "name": "licensing", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -12,7 +12,7 @@ "@babel/core": "^7.22.9", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-loader": "8.3.0", diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json index 4edbc24de03..b886994d091 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json @@ -1,6 +1,6 @@ { "name": "pages", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "start": "npm run webpack", @@ -23,7 +23,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "@types/knockout": "^3.4.72", "@types/redux": "3.6.31", "babel-eslint": "^10.1.0", diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json index 7028b06d7e4..64462774790 100644 --- a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json @@ -1,6 +1,6 @@ { "name": "prompt", - "version": "9.13.4", + "version": "9.13.6", "description": "DNN Prompt", "private": true, "scripts": { @@ -15,7 +15,7 @@ "@babel/core": "^7.22.9", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-eslint": "^10.1.0", diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json index 07731edf42c..19ec55b49b2 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json @@ -1,6 +1,6 @@ { "name": "roles", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -13,7 +13,7 @@ "@babel/core": "^7.22.9", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "^2.2.1", "array.prototype.findindex": "^2.2.1", "babel-loader": "^8.3.0", diff --git a/Dnn.AdminExperience/ClientSide/Security.Web/package.json b/Dnn.AdminExperience/ClientSide/Security.Web/package.json index 6f1fefb4b17..9e2f4648522 100644 --- a/Dnn.AdminExperience/ClientSide/Security.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Security.Web/package.json @@ -1,6 +1,6 @@ { "name": "security-settings", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -15,7 +15,7 @@ "@babel/plugin-transform-react-jsx": "^7.22.5", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "create-react-class": "^15.7.0", diff --git a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json index 93f66f271a0..47adac2cb52 100644 --- a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json @@ -1,6 +1,6 @@ { "name": "seo", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -14,7 +14,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-loader": "8.3.0", diff --git a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json index b6a7d537416..7470f1a2347 100644 --- a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json @@ -1,6 +1,6 @@ { "name": "servers", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -14,7 +14,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "@types/redux": "^3.6.31", "babel-loader": "8.3.0", "babel-plugin-transform-object-assign": "6.22.0", diff --git a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json index 43ce7edc2a4..9d5f92e1488 100644 --- a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json @@ -1,6 +1,6 @@ { "name": "dnn-sitegroups", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -15,7 +15,7 @@ "@babel/plugin-transform-object-assign": "7.22.5", "@babel/preset-env": "7.22.9", "@babel/preset-react": "7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-polyfill": "6.26.0", diff --git a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json index fe71cbfe310..5c39cd830af 100644 --- a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json @@ -1,6 +1,6 @@ { "name": "site-import-export", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -15,7 +15,7 @@ "@babel/plugin-transform-react-jsx": "^7.22.5", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-eslint": "^10.1.0", "babel-loader": "8.3.0", "babel-plugin-transform-class-properties": "^6.24.1", diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json index 379ce39942b..f1242ed0b43 100644 --- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json @@ -1,6 +1,6 @@ { "name": "site-settings", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -17,7 +17,7 @@ "@babel/plugin-transform-react-jsx": "^7.22.5", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-loader": "^8.3.0", diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json index e8bd40a89d9..f2ecc99bbfa 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json @@ -1,6 +1,6 @@ { "name": "sites", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -15,7 +15,7 @@ "@babel/plugin-transform-object-assign": "7.22.5", "@babel/preset-env": "7.22.9", "@babel/preset-react": "7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-polyfill": "6.26.0", diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json index 7628ffdd13c..e642da3ed5b 100644 --- a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json @@ -1,6 +1,6 @@ { "name": "dnn-sites-list-view", - "version": "9.13.4", + "version": "9.13.6", "description": "DNN Sites List View", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -14,7 +14,7 @@ "@babel/plugin-transform-object-assign": "7.22.5", "@babel/preset-env": "7.22.9", "@babel/preset-react": "7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "babel-plugin-transform-react-remove-prop-types": "0.4.24", "babel-polyfill": "6.26.0", diff --git a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json index 1f0df346c45..bfb678e87b9 100644 --- a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json @@ -1,6 +1,6 @@ { "name": "task-scheduler", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -14,7 +14,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-loader": "8.3.0", diff --git a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json index 710cc4ac045..edcb978fa42 100644 --- a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json @@ -1,6 +1,6 @@ { "name": "themes", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -14,7 +14,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "babel-plugin-transform-object-assign": "6.22.0", "babel-plugin-transform-object-rest-spread": "6.26.0", diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/package.json index f22e03c8130..82e41377b99 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/package.json @@ -1,6 +1,6 @@ { "name": "users", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "start": "npm run webpack", @@ -52,7 +52,7 @@ "webpack-dev-server": "4.15.1" }, "dependencies": { - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "localization": "^1.0.2", "react-widgets": "^5.8.4" } diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json index 49d9da3d7e2..63b6ed24635 100644 --- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json +++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json @@ -1,6 +1,6 @@ { "name": "dnn-users-exportables", - "version": "9.13.4", + "version": "9.13.6", "description": "DNN Users Exportables", "scripts": { "start": "npm run webpack", @@ -16,7 +16,7 @@ "@babel/plugin-transform-react-jsx": "^7.22.5", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "babel-loader": "8.3.0", "create-react-class": "^15.7.0", "css-loader": "^7.1.2", diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json index 2ee786831f2..bcb4aed1bd9 100644 --- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json +++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json @@ -1,6 +1,6 @@ { "name": "taxonomy", - "version": "9.13.4", + "version": "9.13.6", "private": true, "scripts": { "build": "set NODE_ENV=production&&webpack --mode production", @@ -14,7 +14,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-env": "^7.22.9", "@babel/preset-react": "^7.22.5", - "@dnnsoftware/dnn-react-common": "9.13.4", + "@dnnsoftware/dnn-react-common": "9.13.6", "array.prototype.find": "2.2.1", "array.prototype.findindex": "2.2.1", "babel-loader": "^8.3.0", diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn index 2b0e636b538..53cc550105e 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn @@ -1,6 +1,6 @@ - + Dnn.PersonaBar.Extensions ~/Images/icon-personabarapp-32px.png diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn index ec42559fa06..82b484bcbad 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn @@ -1,6 +1,6 @@ - + Dnn.EditBar.UI diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn index cccb3d1f0a5..a1f6bb900eb 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn @@ -1,6 +1,6 @@ - + Dnn.PersonaBar.UI diff --git a/SolutionInfo.cs b/SolutionInfo.cs index c130cebbffb..5d3be30bcbc 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -13,6 +13,6 @@ [assembly: AssemblyProduct("https://dnncommunity.org")] [assembly: AssemblyCopyright("DNN Platform is copyright 2002-2020 by .NET Foundation. All Rights Reserved.")] [assembly: AssemblyTrademark("DNN")] -[assembly: AssemblyVersion("9.13.4")] -[assembly: AssemblyFileVersion("9.13.4.0")] -[assembly: AssemblyInformationalVersion("9.13.4 Custom build")] +[assembly: AssemblyVersion("9.13.6")] +[assembly: AssemblyFileVersion("9.13.6.0")] +[assembly: AssemblyInformationalVersion("9.13.6 Custom build")] diff --git a/yarn.lock b/yarn.lock index 0d1ab157489..171163e80d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1739,7 +1739,7 @@ __metadata: languageName: node linkType: hard -"@dnnsoftware/dnn-react-common@npm:9.13.4, @dnnsoftware/dnn-react-common@workspace:Dnn.AdminExperience/ClientSide/Dnn.React.Common": +"@dnnsoftware/dnn-react-common@npm:9.13.6, @dnnsoftware/dnn-react-common@workspace:Dnn.AdminExperience/ClientSide/Dnn.React.Common": version: 0.0.0-use.local resolution: "@dnnsoftware/dnn-react-common@workspace:Dnn.AdminExperience/ClientSide/Dnn.React.Common" dependencies: @@ -4881,7 +4881,7 @@ __metadata: "@babel/plugin-transform-object-assign": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:8.3.0" @@ -9472,7 +9472,7 @@ __metadata: "@babel/plugin-transform-object-assign": "npm:7.22.5" "@babel/preset-env": "npm:7.22.9" "@babel/preset-react": "npm:7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" babel-plugin-transform-react-remove-prop-types: "npm:0.4.24" babel-polyfill: "npm:6.26.0" @@ -9508,7 +9508,7 @@ __metadata: "@babel/plugin-transform-object-assign": "npm:7.22.5" "@babel/preset-env": "npm:7.22.9" "@babel/preset-react": "npm:7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" babel-plugin-transform-react-remove-prop-types: "npm:0.4.24" babel-polyfill: "npm:6.26.0" @@ -9545,7 +9545,7 @@ __metadata: "@babel/plugin-transform-react-jsx": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" create-react-class: "npm:^15.7.0" css-loader: "npm:^7.1.2" @@ -10964,7 +10964,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:^8.3.0" @@ -11099,7 +11099,7 @@ __metadata: "@babel/core": "npm:^7.22.9" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" babel-plugin-transform-object-assign: "npm:6.22.0" babel-plugin-transform-object-rest-spread: "npm:6.26.0" @@ -15257,7 +15257,7 @@ __metadata: "@babel/core": "npm:^7.22.9" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:8.3.0" @@ -17827,7 +17827,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" "@types/knockout": "npm:^3.4.72" "@types/redux": "npm:3.6.31" babel-eslint: "npm:^10.1.0" @@ -18681,7 +18681,7 @@ __metadata: "@babel/core": "npm:^7.22.9" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-eslint: "npm:^10.1.0" @@ -19605,7 +19605,7 @@ __metadata: prop-types: "npm:^15.8.1" peerDependencies: react: ^16 || ^17 || ^18 - checksum: 9ee7f9073207f559a37e10aa52cfebc3d54925d23906bc2902ba8cb55f3607d867c5b3d77614f46a48204de47a4adb11254b52f6ead458ab6b409e3d5be9144e + checksum: 10/9ee7f9073207f559a37e10aa52cfebc3d54925d23906bc2902ba8cb55f3607d867c5b3d77614f46a48204de47a4adb11254b52f6ead458ab6b409e3d5be9144e languageName: node linkType: hard @@ -20533,7 +20533,7 @@ __metadata: "@babel/core": "npm:^7.22.9" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:^2.2.1" array.prototype.findindex: "npm:^2.2.1" babel-loader: "npm:^8.3.0" @@ -20798,7 +20798,7 @@ __metadata: "@babel/plugin-transform-react-jsx": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" babel-plugin-transform-react-remove-prop-types: "npm:0.4.24" create-react-class: "npm:^15.7.0" @@ -20952,7 +20952,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:8.3.0" @@ -21059,7 +21059,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" "@types/redux": "npm:^3.6.31" babel-loader: "npm:8.3.0" babel-plugin-transform-object-assign: "npm:6.22.0" @@ -21415,7 +21415,7 @@ __metadata: "@babel/plugin-transform-react-jsx": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-eslint: "npm:^10.1.0" babel-loader: "npm:8.3.0" babel-plugin-transform-class-properties: "npm:^6.24.1" @@ -21469,7 +21469,7 @@ __metadata: "@babel/plugin-transform-react-jsx": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:^8.3.0" @@ -21516,7 +21516,7 @@ __metadata: "@babel/plugin-transform-object-assign": "npm:7.22.5" "@babel/preset-env": "npm:7.22.9" "@babel/preset-react": "npm:7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" babel-plugin-transform-react-remove-prop-types: "npm:0.4.24" babel-polyfill: "npm:6.26.0" @@ -22579,7 +22579,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:8.3.0" @@ -22621,7 +22621,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" array.prototype.find: "npm:2.2.1" array.prototype.findindex: "npm:2.2.1" babel-loader: "npm:^8.3.0" @@ -22835,7 +22835,7 @@ __metadata: "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.7" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:8.3.0" babel-plugin-transform-object-assign: "npm:6.22.0" babel-plugin-transform-object-rest-spread: "npm:6.26.0" @@ -23797,7 +23797,7 @@ __metadata: "@babel/plugin-transform-react-jsx": "npm:^7.22.5" "@babel/preset-env": "npm:^7.22.9" "@babel/preset-react": "npm:^7.22.5" - "@dnnsoftware/dnn-react-common": "npm:9.13.4" + "@dnnsoftware/dnn-react-common": "npm:9.13.6" babel-loader: "npm:^8.3.0" create-react-class: "npm:^15.7.0" css-loader: "npm:^7.1.2" From 059b15108b1dc45778eee0ff70c90e3a79bb1b73 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 5 Nov 2024 15:15:00 -0500 Subject: [PATCH 11/15] Updated resource-manager dependencies and some polishing - Bumps @stencil/core to v4.22.2 - Bumps @dnncommunity/dnn-elements to v0.24.1 - Bumps @stencil/sass to v3.0.12 - Bumps @stencil/store to v2.0.16 - Bumps @types/node to v22.9.0 Also adjusts to use the new dnn-elements form pattern and handle the few breaking changes in that release. And polishes some of the css. Supercedes #6189 --- .../App_LocalResources/ResourceManager.resx | 6 + .../ResourceManager.Web/package.json | 10 +- .../ResourceManager.Web/src/components.d.ts | 138 + .../dnn-resource-manager.tsx | 2 + .../dnn-rm-create-folder.scss | 1 + .../dnn-rm-create-folder.tsx | 130 +- .../dnn-rm-delete-items.scss | 1 + .../dnn-rm-delete-items.tsx | 4 +- .../dnn-rm-edit-file/dnn-rm-edit-file.scss | 6 +- .../dnn-rm-edit-file/dnn-rm-edit-file.tsx | 35 +- .../dnn-rm-edit-folder.scss | 18 +- .../dnn-rm-edit-folder/dnn-rm-edit-folder.tsx | 11 +- .../dnn-rm-move-items/dnn-rm-move-items.tsx | 4 +- .../dnn-rm-queued-file/dnn-rm-queued-file.tsx | 6 +- .../dnn-rm-unlink-items.tsx | 4 +- .../src/services/LocalizationClient.ts | 2 + yarn.lock | 42715 +++++++--------- 17 files changed, 18090 insertions(+), 25003 deletions(-) diff --git a/DNN Platform/Modules/ResourceManager/App_LocalResources/ResourceManager.resx b/DNN Platform/Modules/ResourceManager/App_LocalResources/ResourceManager.resx index 277736c9b09..82c43e67b93 100644 --- a/DNN Platform/Modules/ResourceManager/App_LocalResources/ResourceManager.resx +++ b/DNN Platform/Modules/ResourceManager/App_LocalResources/ResourceManager.resx @@ -438,4 +438,10 @@ Open + + Collapse Folders + + + Expand Folders + \ No newline at end of file diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json index 8db587c809e..334a77ec58c 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json @@ -26,13 +26,13 @@ "generate": "stencil generate" }, "dependencies": { - "@stencil/core": "^2.22.3" + "@stencil/core": "^4.22.2" }, "license": "MIT", "devDependencies": { - "@dnncommunity/dnn-elements": "^0.15.2", - "@stencil/sass": "^2.0.4", - "@stencil/store": "^2.0.9", - "@types/node": "^20.11.16" + "@dnncommunity/dnn-elements": "^0.24.1", + "@stencil/sass": "^3.0.12", + "@stencil/store": "^2.0.16", + "@types/node": "^22.9.0" } } diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components.d.ts b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components.d.ts index 91058ceba56..262c935d88e 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components.d.ts +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components.d.ts @@ -7,6 +7,8 @@ import { HTMLStencilElement, JSXBase } from "@stencil/core/internal"; import { GetFolderContentResponse, Item } from "./services/ItemsClient"; import { FolderTreeItem } from "./services/InternalServicesClient"; +export { GetFolderContentResponse, Item } from "./services/ItemsClient"; +export { FolderTreeItem } from "./services/InternalServicesClient"; export namespace Components { interface DnnActionCopyUrl { "items": Item[]; @@ -267,7 +269,18 @@ declare global { prototype: HTMLDnnActionUnlinkItemsElement; new (): HTMLDnnActionUnlinkItemsElement; }; + interface HTMLDnnActionUploadFileElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnActionUploadFileElement extends Components.DnnActionUploadFile, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnActionUploadFileElement, ev: DnnActionUploadFileCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnActionUploadFileElement, ev: DnnActionUploadFileCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnActionUploadFileElement: { prototype: HTMLDnnActionUploadFileElement; @@ -285,25 +298,69 @@ declare global { prototype: HTMLDnnRmActionsBarElement; new (): HTMLDnnRmActionsBarElement; }; + interface HTMLDnnRmCreateFolderElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmCreateFolderElement extends Components.DnnRmCreateFolder, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmCreateFolderElement, ev: DnnRmCreateFolderCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmCreateFolderElement, ev: DnnRmCreateFolderCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmCreateFolderElement: { prototype: HTMLDnnRmCreateFolderElement; new (): HTMLDnnRmCreateFolderElement; }; + interface HTMLDnnRmDeleteItemsElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmDeleteItemsElement extends Components.DnnRmDeleteItems, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmDeleteItemsElement, ev: DnnRmDeleteItemsCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmDeleteItemsElement, ev: DnnRmDeleteItemsCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmDeleteItemsElement: { prototype: HTMLDnnRmDeleteItemsElement; new (): HTMLDnnRmDeleteItemsElement; }; + interface HTMLDnnRmEditFileElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmEditFileElement extends Components.DnnRmEditFile, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmEditFileElement, ev: DnnRmEditFileCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmEditFileElement, ev: DnnRmEditFileCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmEditFileElement: { prototype: HTMLDnnRmEditFileElement; new (): HTMLDnnRmEditFileElement; }; + interface HTMLDnnRmEditFolderElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmEditFolderElement extends Components.DnnRmEditFolder, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmEditFolderElement, ev: DnnRmEditFolderCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmEditFolderElement, ev: DnnRmEditFolderCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmEditFolderElement: { prototype: HTMLDnnRmEditFolderElement; @@ -327,13 +384,37 @@ declare global { prototype: HTMLDnnRmFolderContextMenuElement; new (): HTMLDnnRmFolderContextMenuElement; }; + interface HTMLDnnRmFolderListElementEventMap { + "dnnRmFolderListFolderPicked": FolderTreeItem; + "dnnRmcontextMenuOpened": number; + } interface HTMLDnnRmFolderListElement extends Components.DnnRmFolderList, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmFolderListElement, ev: DnnRmFolderListCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmFolderListElement, ev: DnnRmFolderListCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmFolderListElement: { prototype: HTMLDnnRmFolderListElement; new (): HTMLDnnRmFolderListElement; }; + interface HTMLDnnRmFolderListItemElementEventMap { + "dnnRmcontextMenuOpened": number; + "dnnRmFolderListItemClicked": FolderTreeItem; + } interface HTMLDnnRmFolderListItemElement extends Components.DnnRmFolderListItem, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmFolderListItemElement, ev: DnnRmFolderListItemCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmFolderListItemElement, ev: DnnRmFolderListItemCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmFolderListItemElement: { prototype: HTMLDnnRmFolderListItemElement; @@ -345,13 +426,37 @@ declare global { prototype: HTMLDnnRmFolderMappingsElement; new (): HTMLDnnRmFolderMappingsElement; }; + interface HTMLDnnRmItemsCardviewElementEventMap { + "dnnRmFolderDoubleClicked": number; + "dnnRmFileDoubleClicked": string; + } interface HTMLDnnRmItemsCardviewElement extends Components.DnnRmItemsCardview, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmItemsCardviewElement, ev: DnnRmItemsCardviewCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmItemsCardviewElement, ev: DnnRmItemsCardviewCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmItemsCardviewElement: { prototype: HTMLDnnRmItemsCardviewElement; new (): HTMLDnnRmItemsCardviewElement; }; + interface HTMLDnnRmItemsListviewElementEventMap { + "dnnRmFolderDoubleClicked": number; + "dnnRmFileDoubleClicked": string; + } interface HTMLDnnRmItemsListviewElement extends Components.DnnRmItemsListview, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmItemsListviewElement, ev: DnnRmItemsListviewCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmItemsListviewElement, ev: DnnRmItemsListviewCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmItemsListviewElement: { prototype: HTMLDnnRmItemsListviewElement; @@ -363,7 +468,18 @@ declare global { prototype: HTMLDnnRmLeftPaneElement; new (): HTMLDnnRmLeftPaneElement; }; + interface HTMLDnnRmMoveItemsElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmMoveItemsElement extends Components.DnnRmMoveItems, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmMoveItemsElement, ev: DnnRmMoveItemsCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmMoveItemsElement, ev: DnnRmMoveItemsCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmMoveItemsElement: { prototype: HTMLDnnRmMoveItemsElement; @@ -399,13 +515,35 @@ declare global { prototype: HTMLDnnRmTopBarElement; new (): HTMLDnnRmTopBarElement; }; + interface HTMLDnnRmUnlinkItemsElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmUnlinkItemsElement extends Components.DnnRmUnlinkItems, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmUnlinkItemsElement, ev: DnnRmUnlinkItemsCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmUnlinkItemsElement, ev: DnnRmUnlinkItemsCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmUnlinkItemsElement: { prototype: HTMLDnnRmUnlinkItemsElement; new (): HTMLDnnRmUnlinkItemsElement; }; + interface HTMLDnnRmUploadFileElementEventMap { + "dnnRmFoldersChanged": void; + } interface HTMLDnnRmUploadFileElement extends Components.DnnRmUploadFile, HTMLStencilElement { + addEventListener(type: K, listener: (this: HTMLDnnRmUploadFileElement, ev: DnnRmUploadFileCustomEvent) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLDnnRmUploadFileElement, ev: DnnRmUploadFileCustomEvent) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; } var HTMLDnnRmUploadFileElement: { prototype: HTMLDnnRmUploadFileElement; diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-resource-manager/dnn-resource-manager.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-resource-manager/dnn-resource-manager.tsx index 7079b5956e5..be671787245 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-resource-manager/dnn-resource-manager.tsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-resource-manager/dnn-resource-manager.tsx @@ -88,8 +88,10 @@ export class DnnResourceManager { >
diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss index 898f5863232..32c2b80a884 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.scss @@ -1,5 +1,6 @@ :host { display: block; + margin: 0.25rem; } .form{ diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx index 6df3fca6c12..bd50f9db80a 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-create-folder/dnn-rm-create-folder.tsx @@ -26,7 +26,7 @@ export class DnnRmCreateFolder { } private readonly itemsClient: ItemsClient; - private nameField: HTMLInputElement; + private nameField: HTMLDnnInputElement; constructor(){ this.itemsClient = new ItemsClient(state.moduleId); @@ -60,17 +60,8 @@ export class DnnRmCreateFolder { }); } - private handleTypeChanged(e: Event): void { - const select = e.target as HTMLSelectElement; - const option = select.options[select.selectedIndex] as HTMLOptionElement; - const newValue = Number.parseInt(option.value); - this.newFolderRequest = { - ...this.newFolderRequest, - FolderMappingId: newValue, - }; - } - - private handleSave(): void { + private handleSave(e: Event): void { + e.preventDefault(); this.itemsClient.createNewFolder(this.newFolderRequest) .then(() => { this.dnnRmFoldersChanged.emit(); @@ -97,69 +88,70 @@ export class DnnRmCreateFolder { return (

{state.localization.AddFolder}

-
- {state.currentItems.folder.folderName.length > 0 &&[ - , - {state.currentItems.folder.folderName} - ]} - - this.nameField = el} - value={this.newFolderRequest.FolderName} - onInput={e => this.newFolderRequest = { - ...this.newFolderRequest, - FolderName: (e.target as HTMLInputElement).value, - }} - /> - {!this.newFolderRequest.FolderName && - {state.localization.FolderNameRequiredMessage} - } - {this.canChooseFolderProvider() && - [ - , - - ] - } - {this.canChooseFolderProvider() && this.folderMappings.find(m => m.FolderMappingID == this.newFolderRequest.FolderMappingId).IsDefault == false &&[ - , - this.handleSave(e)} + > +
+ {state.currentItems.folder.folderName.length > 0 &&[ + , + {state.currentItems.folder.folderName} + ]} + this.nameField = el} + value={this.newFolderRequest.FolderName} onInput={e => this.newFolderRequest = { ...this.newFolderRequest, - MappedName: (e.target as HTMLInputElement).value, + FolderName: (e.target as HTMLInputElement).value, }} /> - ]} -
-
- this.handleCancel()} - > - {state.localization.Cancel} - - {state.localization.Type}, + this.newFolderRequest = { + ...this.newFolderRequest, + FolderMappingId: Number.parseInt(e.detail), + }}> + {this.folderMappings?.map((folderMapping, index) => + + )} + + ] } - onClick={() => this.handleSave()} - > - {state.localization.Save} - -
+ {this.canChooseFolderProvider() && this.folderMappings.find(m => m.FolderMappingID == this.newFolderRequest.FolderMappingId).IsDefault == false &&[ + this.newFolderRequest = { + ...this.newFolderRequest, + MappedName: (e.target as HTMLInputElement).value, + }} + /> + ]} +
+
+ this.handleCancel()} + > + {state.localization.Cancel} + + + {state.localization.Save} + +
+ ); } diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.scss b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.scss index ee2702875fa..01acaf26d54 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.scss +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.scss @@ -1,5 +1,6 @@ :host { display: block; + margin: 0.25rem; } .general{ display: flex; diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.tsx index 5f62c1b59f2..5c91766f233 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.tsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-delete-items/dnn-rm-delete-items.tsx @@ -95,7 +95,7 @@ export class DnnRmDeleteItems { }
this.closeModal()} @@ -103,7 +103,7 @@ export class DnnRmDeleteItems { {state.localization.Cancel} this.handleDelete()} disabled={this.deleting} > diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.scss b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.scss index ee2702875fa..88e05445cff 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.scss +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.scss @@ -1,5 +1,6 @@ :host { display: block; + margin: 0.25rem; } .general{ display: flex; @@ -17,9 +18,8 @@ } .form{ - display: grid; - grid-template-columns: 1fr 2fr; - align-items: flex-end; + display: flex; + flex-direction: column; label{ font-weight: bold; text-align: right; diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.tsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.tsx index 13ecabceefd..39825eae57e 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.tsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/src/components/dnn-rm-edit-file/dnn-rm-edit-file.tsx @@ -65,7 +65,7 @@ export class DnnRmEditFile {
{this.fileDetails && this.fileDetails.iconUrl && - + {this.fileDetails.fileName} } {this.fileDetails &&
@@ -88,35 +88,36 @@ export class DnnRmEditFile {
- - + onValueInput={e => this.fileDetails = { ...this.fileDetails, - fileName: (e.target as HTMLInputElement).value, + fileName: (e.detail as string), } } /> - - - + onValueInput={e => this.fileDetails = { ...this.fileDetails, - title: (e.target as HTMLInputElement).value.substring(0, 255), + title: (e.detail as string).substring(0, 255), } } /> - - -