Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9.11.0 Specify latest version for 9.11 merge action #5226

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 2, 2022

Applying #5224 to release/9.11.0
This action is running into an error resolved in repo-sync/pull-request@v2.6.2

dependabot bot and others added 24 commits May 10, 2022 14:06
Bumps [redux](https://github.com/reduxjs/redux) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/reduxjs/redux/releases)
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md)
- [Commits](reduxjs/redux@v4.1.1...v4.2.0)

---
updated-dependencies:
- dependency-name: redux
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
* Use Client Resource Manager on CKEditor Browser

* Use Client Resource Manager on CKEditor Options

* Remove hardcoded jQuery CDN reference

* Fix CKEditor provider not copying files on build

* Change "Browser-Modus" to "Browser Mode" in en-US

And make it localizable

* Extract LocalizeString method
* Remove unused test

* Adjustments from react-collapse v4 to v5

See https://github.com/nkbt/react-collapse#migrating-from-v4-to-v5

* Move react-collapse styles into CSS

Also remove unused fixedHeight prop from Dropdown
Bumps [throttle-debounce](https://github.com/niksy/throttle-debounce) from 3.0.1 to 5.0.0.
- [Release notes](https://github.com/niksy/throttle-debounce/releases)
- [Changelog](https://github.com/niksy/throttle-debounce/blob/master/CHANGELOG.md)
- [Commits](niksy/throttle-debounce@v3.0.1...v5.0.0)

---
updated-dependencies:
- dependency-name: throttle-debounce
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.4 to 0.11.8.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits/v0.11.8)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [redux-devtools-log-monitor](https://github.com/reduxjs/redux-devtools) from 1.4.0 to 2.1.0.
- [Release notes](https://github.com/reduxjs/redux-devtools/releases)
- [Commits](https://github.com/reduxjs/redux-devtools/compare/d3-state-visualizer@1.4.0...redux-devtools-log-monitor@2.1.0)

---
updated-dependencies:
- dependency-name: redux-devtools-log-monitor
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ottle-debounce-5.0.0

Bump throttle-debounce from 3.0.1 to 5.0.0
…ect-path-0.11.8

Bump object-path from 0.11.4 to 0.11.8
…ux-devtools-log-monitor-2.1.0

Bump redux-devtools-log-monitor from 1.4.0 to 2.1.0
Bumps [Microsoft.AspNet.WebHelpers](https://github.com/aspnet/AspNetWebStack)
from 3.2.7 to 3.2.9.
- [Release notes](https://github.com/aspnet/AspNetWebStack/releases)
- [Commits](aspnet/AspNetWebStack@v3.2.7...v3.2.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNet.WebHelpers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Platform/Components/Microsoft.AspNetWebPages/Microsoft.AspNetWebPages.dnn
Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj
Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj
Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj
Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj
Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj
Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj
Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj
…AspNet.WebHelpers-3.2.8

Bump Microsoft.AspNet.WebHelpers from 3.2.7 to 3.2.9
Bumps [Fare](https://github.com/moodmosaic/Fare) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/moodmosaic/Fare/releases)
- [Commits](moodmosaic/Fare@v2.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: Fare
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj
Bumps [PetaPoco.Compiled](https://github.com/CollaboratingPlatypus/PetaPoco) from 6.0.480 to 6.0.524.
- [Release notes](https://github.com/CollaboratingPlatypus/PetaPoco/releases)
- [Commits](https://github.com/CollaboratingPlatypus/PetaPoco/commits)

---
updated-dependencies:
- dependency-name: PetaPoco.Compiled
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v5.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.Bcl.AsyncInterfaces
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Until we have a `release/10.0.0` this will fail every time
This action is running into an error resolved in repo-sync/pull-request@v2.6.2
…ompiled-6.0.524

Bump PetaPoco.Compiled from 6.0.480 to 6.0.524
…Bcl.AsyncInterfaces-6.0.0

Bump Microsoft.Bcl.AsyncInterfaces from 5.0.0 to 6.0.0
Disable PR merge for 10.0.0 branch
Specify latest version for 9.11 merge action
…01f8b34f5dcd5b449aa1b37a69c

# Conflicts:
#	DNN Platform/Admin Modules/Dnn.Modules.Console/web.config
#	DNN Platform/Connectors/Azure/packages.config
#	DNN Platform/Connectors/GoogleAnalytics/packages.config
#	DNN Platform/Connectors/GoogleTagManager/packages.config
#	DNN Platform/Dnn.AuthServices.Jwt/packages.config
#	DNN Platform/Library/packages.config
#	DNN Platform/Modules/CoreMessaging/packages.config
#	DNN Platform/Modules/CoreMessaging/web.config
#	DNN Platform/Modules/DigitalAssets/DotNetNuke.Modules.DigitalAssets.csproj
#	DNN Platform/Modules/DigitalAssets/packages.config
#	DNN Platform/Modules/DigitalAssets/web.config
#	DNN Platform/Modules/Groups/web.config
#	DNN Platform/Modules/HTML/web.config
#	DNN Platform/Modules/HtmlEditorManager/web.config
#	DNN Platform/Modules/Journal/web.config
#	DNN Platform/Modules/MemberDirectory/packages.config
#	DNN Platform/Modules/MemberDirectory/web.config
#	DNN Platform/Modules/RazorHost/web.config
#	DNN Platform/Modules/ResourceManager/web.config
#	DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config
#	DNN Platform/Skins/Xcillion/packages.config
#	DNN Platform/Skins/Xcillion/web.config
#	DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config
@bdukes bdukes added this to the 9.11.0 milestone Aug 2, 2022
Copy link
Contributor

@valadas valadas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@mitchelsellers mitchelsellers merged commit 5e61ffc into release/9.11.0 Aug 16, 2022
@bdukes bdukes deleted the v9.11.0/fix-pr-merge-83d20e7b957cc01f8b34f5dcd5b449aa1b37a69c branch September 29, 2022 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants