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

Merge release/7.x to main #4715

Merged
merged 112 commits into from
Jun 23, 2023
Merged

Conversation

jander-msft
Copy link
Member

@jander-msft jander-msft commented Jun 22, 2023

dotnet-maestro bot and others added 30 commits March 16, 2023 09:12
…uild 20230315.3 (dotnet#3970)

System.CommandLine
 From Version 2.0.0-beta4.23165.2 -> To Version 2.0.0-beta4.23165.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…t#3988)

* Update dependencies from https://github.com/dotnet/command-line-api build 20230316.2

System.CommandLine
 From Version 2.0.0-beta4.23165.3 -> To Version 2.0.0-beta4.23166.2

* Update dependencies from https://github.com/dotnet/command-line-api build 20230318.1

System.CommandLine
 From Version 2.0.0-beta4.23165.3 -> To Version 2.0.0-beta4.23168.1

* Adjustments for API breaking changes

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Justin Anderson <jander@microsoft.com>
…uild 20230320.1 (dotnet#4011)

System.CommandLine
 From Version 2.0.0-beta4.23168.1 -> To Version 2.0.0-beta4.23170.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…uild 20230322.1 (dotnet#4022)

System.CommandLine
 From Version 2.0.0-beta4.23170.1 -> To Version 2.0.0-beta4.23172.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…4043)

Bumps [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web) from 2.5.0 to 2.6.1.
- [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases)
- [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md)
- [Commits](AzureAD/microsoft-identity-web@2.5.0...2.6.1)

---
updated-dependencies:
- dependency-name: Microsoft.Identity.Web
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
…t#4050)

* Update dependencies from https://github.com/dotnet/command-line-api build 20230324.1

System.CommandLine
 From Version 2.0.0-beta4.23172.1 -> To Version 2.0.0-beta4.23174.1

* Adjust to API breaking changes

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Justin Anderson <jander@microsoft.com>
…uild 20230327.7 (dotnet#4076)

Microsoft.CodeAnalysis.NetAnalyzers
 From Version 7.0.1-preview1.23160.1 -> To Version 7.0.2-preview1.23177.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Bumps [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) from 12.15.0 to 12.15.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-net/releases)
- [Commits](Azure/azure-sdk-for-net@Azure.Storage.Blobs_12.15.0...Azure.Storage.Blobs_12.15.1)

---
updated-dependencies:
- dependency-name: Azure.Storage.Blobs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Azure.Storage.Queues](https://github.com/Azure/azure-sdk-for-net) from 12.13.0 to 12.13.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-net/releases)
- [Commits](Azure/azure-sdk-for-net@Azure.Storage.Queues_12.13.0...Azure.Storage.Queues_12.13.1)

---
updated-dependencies:
- dependency-name: Azure.Storage.Queues
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Justin Anderson <jander-msft@users.noreply.github.com>
…net#4100)

Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
…t#4091)

* Update dependencies from https://github.com/dotnet/command-line-api build 20230329.1

System.CommandLine
 From Version 2.0.0-beta4.23174.1 -> To Version 2.0.0-beta4.23179.1

* Update dependencies from https://github.com/dotnet/command-line-api build 20230329.4

System.CommandLine
 From Version 2.0.0-beta4.23174.1 -> To Version 2.0.0-beta4.23179.4

* Adjust to API breaking changes

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Justin Anderson <jander@microsoft.com>
…#4111) (dotnet#4112)

This reverts commit e2dcea2.

Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com>
…4104)

Bumps [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases)
- [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md)
- [Commits](https://github.com/AzureAD/microsoft-identity-web/commits)

---
updated-dependencies:
- dependency-name: Microsoft.Identity.Web
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
…otnet#4130)

Bumps [Microsoft.IdentityModel.Tokens](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) from 6.27.0 to 6.28.0.
- [Release notes](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/releases)
- [Changelog](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/dev/CHANGELOG.md)
- [Commits](AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet@6.27.0...6.28.0)

---
updated-dependencies:
- dependency-name: Microsoft.IdentityModel.Tokens
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…otnet#4147)

Bumps [Microsoft.IdentityModel.Tokens](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) from 6.28.0 to 6.28.1.
- [Release notes](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/releases)
- [Changelog](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/dev/CHANGELOG.md)
- [Commits](AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet@6.28.0...6.28.1)

---
updated-dependencies:
- dependency-name: Microsoft.IdentityModel.Tokens
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ication (dotnet#4144)

* Allow per provider interval specification (dotnet#3591)

* Allow per provider interval specification

* Update src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Pr feedback

* pr feedback

* pr feedback

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fixup merge

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
…t#4168)

* Update dependencies from https://github.com/dotnet/command-line-api build 20230405.1

System.CommandLine
 From Version 2.0.0-beta4.23179.4 -> To Version 2.0.0-beta4.23205.1

* Adjust to API breaking changes

* Adjust to API breaking changes

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Justin Anderson <jander@microsoft.com>
Co-authored-by: github-actions <github-actions@github.com>
…uild 20230410.1 (dotnet#4188)

System.CommandLine
 From Version 2.0.0-beta4.23205.1 -> To Version 2.0.0-beta4.23210.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Bumps [Microsoft.NETCore.App.Runtime.win-x64](https://github.com/dotnet/runtime) from 6.0.15 to 6.0.16.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

---
updated-dependencies:
- dependency-name: Microsoft.NETCore.App.Runtime.win-x64
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Microsoft.NETCore.App.Runtime.win-x64](https://github.com/dotnet/runtime) from 7.0.4 to 7.0.5.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

---
updated-dependencies:
- dependency-name: Microsoft.NETCore.App.Runtime.win-x64
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…411.2 (dotnet#4204)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitExtensions
 From Version 7.0.0-beta.23164.3 -> To Version 7.0.0-beta.23211.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…uild 20230411.1 (dotnet#4212)

System.CommandLine
 From Version 2.0.0-beta4.23210.1 -> To Version 2.0.0-beta4.23211.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@jander-msft jander-msft requested a review from a team as a code owner June 22, 2023 22:38
@ghost ghost added the needs-review label Jun 22, 2023
wiktork
wiktork previously approved these changes Jun 23, 2023
schmittjoseph
schmittjoseph previously approved these changes Jun 23, 2023
@ghost ghost removed the needs-review label Jun 23, 2023
@ghost ghost removed the needs-review label Jun 23, 2023
@jander-msft jander-msft merged commit 255d023 into dotnet:main Jun 23, 2023
23 checks passed
@jander-msft jander-msft deleted the merge-7.x-to-main branch June 23, 2023 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants