Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/windowsforms/datagridview/C…
Browse files Browse the repository at this point in the history
…SWinFormDataGridView/System.Data.SqlClient-4.8.6
  • Loading branch information
IEvangelist authored Feb 14, 2024
2 parents 7b0b8da + 05f9096 commit be916a8
Show file tree
Hide file tree
Showing 56 changed files with 270 additions and 418 deletions.
259 changes: 0 additions & 259 deletions .github/fabricbot.json

This file was deleted.

106 changes: 106 additions & 0 deletions .github/policies/resourceManagement.yml
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:
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
</ItemGroup>

Expand Down
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>
Loading

0 comments on commit be916a8

Please sign in to comment.