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

Bump System.Diagnostics.DiagnosticSource from 6.0.0 to 6.0.1 #245

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jul 3, 2023

Bumps System.Diagnostics.DiagnosticSource from 6.0.0 to 6.0.1.

Release notes

Sourced from System.Diagnostics.DiagnosticSource's releases.

.NET 6.0.1

Release

Commits
  • 3a25a7f Merge in 'release/6.0' changes
  • e9036b0 [release/6.0] Add packaging changes for System.Text.Json (#61703)
  • bfdc5e9 Merge branch 'internal/release/6.0' of https://dev.azure.com/dnceng/internal/...
  • 756a3c0 Merge remote-tracking branch 'upstream/release/6.0' into internal/release/6.0
  • 479322e Merge in 'release/6.0' changes
  • f35d5b0 Merge in 'release/6.0' changes
  • c1e9122 [release/6.0] Disable native ports package validation (#61697)
  • c91170a HostFactoryResolver - Increase default timeout and add env var option (#61688)
  • 32a62c9 Merge in 'release/6.0' changes
  • 1aaf3bf [release/6.0] Disable activation host tests that fail with a 6.0 RC2 or newer...
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [System.Diagnostics.DiagnosticSource](https://github.com/dotnet/runtime) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: System.Diagnostics.DiagnosticSource
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependabot dependencies Pull requests that update a dependency file labels Jul 3, 2023
Signed-off-by: dependabot[bot] <support@github.com>
@Xtansia Xtansia merged commit f86fbd5 into main Jul 3, 2023
30 checks passed
@dependabot dependabot bot deleted the dependabot/nuget/System.Diagnostics.DiagnosticSource-6.0.1 branch July 3, 2023 11:13
@Xtansia Xtansia added the backport 1.x Backport to 1.x branch label Jul 3, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-245-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f86fbd5ef15fc80f8e5afdc46a0c38d13ce2eae3
# Push it to GitHub
git push --set-upstream origin backport/backport-245-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-245-to-1.x.

Xtansia pushed a commit to Xtansia/opensearch-net that referenced this pull request Jul 3, 2023
…rch-project#245)

* Bump System.Diagnostics.DiagnosticSource from 6.0.0 to 6.0.1

Bumps [System.Diagnostics.DiagnosticSource](https://github.com/dotnet/runtime) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v6.0.0...v6.0.1)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---
updated-dependencies:
- dependency-name: System.Diagnostics.DiagnosticSource
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Update changelog & packages.lock.json

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

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit f86fbd5)
Xtansia added a commit that referenced this pull request Jul 4, 2023
…246)

* Bump System.Diagnostics.DiagnosticSource from 6.0.0 to 6.0.1

Bumps [System.Diagnostics.DiagnosticSource](https://github.com/dotnet/runtime) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v6.0.0...v6.0.1)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>

---
updated-dependencies:
- dependency-name: System.Diagnostics.DiagnosticSource
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Update changelog & packages.lock.json

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

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit f86fbd5)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x Backport to 1.x branch dependabot dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant