Skip to content

Commit bb98792

Browse files
committed
Merge from main
2 parents 8d3191b + 7b20a9a commit bb98792

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

.github/mergify.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
pull_request_rules:
2+
- name: Automatic merge on approval
3+
conditions:
4+
- "#approved-reviews-by>=1"
5+
actions:
6+
merge:
7+
method: squash
8+
commit_message_template: |-
9+
{{ title }} (#{{ number }})
10+
{{ body }}
11+
- name: Automatic merge for Renovate pull requests
12+
conditions:
13+
- author=renovate[bot]
14+
actions:
15+
merge:
16+
method: squash

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ItemGroup>
88
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
99
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
10-
<PackageVersion Include="TestableIO.System.IO.Abstractions" Version="19.2.61" />
11-
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="19.2.61" />
10+
<PackageVersion Include="TestableIO.System.IO.Abstractions" Version="19.2.64" />
11+
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="19.2.64" />
1212
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
1313
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
1414
</ItemGroup>

0 commit comments

Comments
 (0)