task/fix develop merge issues #1617
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.13.1 to 1.13.4. - [Release notes](https://github.com/gui-cs/Terminal.Gui/releases) - [Commits](gui-cs/Terminal.Gui@v1.13.1...v1.13.4) --- updated-dependencies: - dependency-name: Terminal.Gui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…rminal.Gui-1.13.4
Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.13.4 to 1.13.5. - [Release notes](https://github.com/gui-cs/Terminal.Gui/releases) - [Commits](gui-cs/Terminal.Gui@v1.13.4...v1.13.5) --- updated-dependencies: - dependency-name: Terminal.Gui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…rminal.Gui-1.13.5
Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](svenstaro/upload-release-action@2.6.1...2.7.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…venstaro/upload-release-action-2.7.0
Bumps [NLog](https://github.com/NLog/NLog) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/NLog/NLog/releases) - [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md) - [Commits](NLog/NLog@v5.2.2...v5.2.3) --- updated-dependencies: - dependency-name: NLog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.3 to 17.7.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.6.3...v17.7.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…crosoft.NET.Test.Sdk-17.7.0
* Automated formatting and syntax clean * Match docs to source; whitespace unit test cleanup
Bumps [Moq](https://github.com/moq/moq) from 4.18.4 to 4.20.1. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/moq/moq/blob/main/CHANGELOG.md) - [Commits](moq/moq.spikes@v4.18.4...v4.20.1) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.23.0 to 1.23.1. - [Release notes](https://github.com/shogo82148/actions-setup-perl/releases) - [Commits](shogo82148/actions-setup-perl@v1.23.0...v1.23.1) --- updated-dependencies: - dependency-name: shogo82148/actions-setup-perl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
* make external serverremovable * no longer throwing out errors * add catalogue fix * added todo reminder * working startup option * remove fk drop * fix creation issue * add todo * working delete * invert checkbox ui * add throw for unexpected no logging server * rename variables to match descriptions * fix bad merge * fix autosave issue
Bumps [Moq](https://github.com/moq/moq) from 4.20.1 to 4.20.2. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/moq/moq/blob/main/CHANGELOG.md) - [Commits](moq/moq.spikes@v4.20.1...v4.20.2) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
* Add Clear User Settings button, command and unit test * Update SelfCertifyingDataAccessPoint.cs - Fix typo --------- Co-authored-by: jas88 <[email protected]>
Merge fixup
Bumps [Moq](https://github.com/moq/moq) from 4.20.2 to 4.20.69. - [Release notes](https://github.com/moq/moq/releases) - [Changelog](https://github.com/moq/moq/blob/main/CHANGELOG.md) - [Commits](moq/moq.spikes@v4.20.2...v4.20.69) --- updated-dependencies: - dependency-name: Moq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v3.7.0...v3.8.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.1.1 to 13.2.0. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](aaubry/YamlDotNet@v13.1.1...v13.2.0) --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 1.0.0-beta15 to 1.0.0. - [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases) - [Commits](SixLabors/ImageSharp.Drawing@v1.0.0-beta15...v1.0.0) --- updated-dependencies: - dependency-name: SixLabors.ImageSharp.Drawing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…ctions/setup-node-3.8.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v3.8.0...v3.8.1) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.7.0 to 17.7.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.7.0...v17.7.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [Autoupdater.NET.Official](https://github.com/ravibpatel/AutoUpdater.NET) from 1.8.3 to 1.8.4. - [Release notes](https://github.com/ravibpatel/AutoUpdater.NET/releases) - [Commits](ravibpatel/AutoUpdater.NET@v1.8.3...v1.8.4) --- updated-dependencies: - dependency-name: Autoupdater.NET.Official dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
* Update DataLoadInfo.cs - Implement worker thread for writing ProgressLog entries in background --------- Co-authored-by: James A Sutherland <> Co-authored-by: James Friel <[email protected]>
Bumps [VPKSoft.ScintillaLexers.NET](https://github.com/VPKSoft/ScintillaLexers) from 1.1.15 to 1.1.16. - [Release notes](https://github.com/VPKSoft/ScintillaLexers/releases) - [Commits](https://github.com/VPKSoft/ScintillaLexers/commits) --- updated-dependencies: - dependency-name: VPKSoft.ScintillaLexers.NET dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Fix typo
* start to update tests * compiling tests * tidy up unused * attempt to fix some tests * update tests * update ui tests * remove moq * fix up tests * fix up test * fix test * update tests * tidy up code * backout incorrect change --------- Co-authored-by: James A Sutherland <[email protected]>
* partial fix * add row peaker update * fix up whitespace * add a lot of daat begin loads * more data load * fix typo
* add message length check * fix tabbing * fix codescan alert * update max length and add env config * attempt to allow RDMP_ * fix typo * add codeql update * Update ToLoggingDatabaseDataLoadEventListener.cs Adjust string trimming logic, handle ultra-short limits, only parse the environment variable once instead of per logging, avoid double-lookup in OnProgress handler --------- Co-authored-by: James A Sutherland <[email protected]>
Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.2.0 to 13.3.1. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](aaubry/YamlDotNet@v13.2.0...v13.3.1) --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.7.1 to 17.7.2. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](microsoft/vstest@v17.7.1...v17.7.2) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/SixLabors/ImageSharp/releases) - [Commits](SixLabors/ImageSharp@v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: SixLabors.ImageSharp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.13.5 to 1.14.0. - [Release notes](https://github.com/gui-cs/Terminal.Gui/releases) - [Commits](gui-cs/Terminal.Gui@v1.13.5...v1.14.0) --- updated-dependencies: - dependency-name: Terminal.Gui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…sk/fix-develop-merge-issues
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
branch of rc4 that pulls in the develop merge issues