-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/nuget/windowsforms/datagridview/C…
…SWinFormDataGridView/System.Data.SqlClient-4.8.6
- Loading branch information
Showing
56 changed files
with
270 additions
and
418 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
id: | ||
name: GitOps.PullRequestIssueManagement | ||
description: GitOps.PullRequestIssueManagement primitive | ||
owner: | ||
resource: repository | ||
disabled: false | ||
where: | ||
configuration: | ||
resourceManagementConfiguration: | ||
scheduledSearches: | ||
- description: Push to live branch (publish) | ||
frequencies: | ||
- weekday: | ||
day: Monday | ||
time: 22:0 | ||
- weekday: | ||
day: Tuesday | ||
time: 22:0 | ||
- weekday: | ||
day: Wednesday | ||
time: 22:0 | ||
- weekday: | ||
day: Thursday | ||
time: 22:0 | ||
- weekday: | ||
day: Friday | ||
time: 22:0 | ||
filters: [] | ||
actions: | ||
- createPullRequest: | ||
head: main | ||
base: live | ||
title: Merge main into live | ||
body: Please don't squash-merge this PR. | ||
eventResponderTasks: | ||
- if: | ||
- payloadType: Pull_Request | ||
- isAction: | ||
action: Opened | ||
- and: | ||
- not: | ||
activitySenderHasPermission: | ||
permission: Admin | ||
- not: | ||
activitySenderHasPermission: | ||
permission: Write | ||
- not: | ||
activitySenderHasPermission: | ||
permission: Write | ||
- not: | ||
isActivitySender: | ||
user: github-actions[bot] | ||
issueAuthor: False | ||
- not: | ||
isActivitySender: | ||
user: github-actions | ||
issueAuthor: False | ||
- not: | ||
isActivitySender: | ||
user: azure-sdk | ||
issueAuthor: False | ||
- not: | ||
isActivitySender: | ||
user: dependabot | ||
issueAuthor: False | ||
then: | ||
- addLabel: | ||
label: community-contribution | ||
description: Label community PRs | ||
- if: | ||
- payloadType: Pull_Request | ||
- hasLabel: | ||
label: dependencies | ||
- isActivitySender: | ||
user: dependabot | ||
issueAuthor: False | ||
then: | ||
- addReply: | ||
reply: '@dependabot squash and merge' | ||
description: Reply to dependabot PRs with automation command to squash and merge | ||
- if: | ||
- payloadType: Pull_Request | ||
- isActivitySender: | ||
user: azure-sdk | ||
issueAuthor: False | ||
then: | ||
- addLabel: | ||
label: azure-sdk-shipit | ||
description: Label PRs from the Azure SDK bot | ||
- if: | ||
- payloadType: Pull_Request | ||
- hasLabel: | ||
label: azure-sdk-shipit | ||
then: | ||
- enableAutoMerge: | ||
mergeMethod: Squash | ||
description: Auto-merge Azure SDK PRs with green builds | ||
- if: | ||
- payloadType: Pull_Request | ||
- labelRemoved: | ||
label: azure-sdk-shipit | ||
then: | ||
- disableAutoMerge | ||
description: Auto-merge Azure SDK PRs with green builds | ||
onFailure: | ||
onSuccess: |
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
4 changes: 2 additions & 2 deletions
4
core/diagnostics/DiagnosticScenarios/DiagnosticScenarios.csproj
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
<Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>net7.0</TargetFramework> | ||
<TargetFramework>net8.0</TargetFramework> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" /> | ||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" /> | ||
</ItemGroup> | ||
|
||
</Project> |
Oops, something went wrong.