Skip to content

Commit 0c16b36

Browse files
committed
dep: Update deps
1 parent c7cb698 commit 0c16b36

File tree

13 files changed

+44
-58
lines changed

13 files changed

+44
-58
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/renovate.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"assignees": [
4+
"HMBSbige"
5+
],
6+
"commitMessagePrefix": "dep:",
7+
"dependencyDashboard": false,
8+
"extends": [
9+
"config:base",
10+
":automergeBranch",
11+
":automergeDigest",
12+
":automergeMinor",
13+
":disableRateLimiting"
14+
],
15+
"labels": [
16+
"Automatic"
17+
]
18+
}

.github/workflows/CI.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Setup .NET
17-
uses: actions/setup-dotnet@v2
17+
uses: actions/setup-dotnet@v3
1818
with:
1919
dotnet-version: 6.0.x
2020

@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@v3
3737

3838
- name: Setup .NET
39-
uses: actions/setup-dotnet@v2
39+
uses: actions/setup-dotnet@v3
4040
with:
4141
dotnet-version: 6.0.x
4242

@@ -65,7 +65,7 @@ jobs:
6565
uses: actions/checkout@v3
6666

6767
- name: Setup .NET
68-
uses: actions/setup-dotnet@v2
68+
uses: actions/setup-dotnet@v3
6969
with:
7070
dotnet-version: 6.0.x
7171

@@ -85,14 +85,9 @@ jobs:
8585
runs-on: ubuntu-latest
8686

8787
steps:
88-
- name: Changelog
89-
uses: glennawatson/ChangeLog@v1
90-
id: changelog
91-
9288
- name: Create Release
9389
uses: ncipollo/release-action@v1
9490
with:
9591
token: ${{ secrets.GITHUB_TOKEN }}
96-
body: ${{ steps.changelog.outputs.commitLog }}
9792
draft: false
9893
prerelease: false

Benchmark/Benchmark.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\common.props" />
44

55
<ItemGroup>
6-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
6+
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
77
</ItemGroup>
88

99
<ItemGroup>

HttpProxy/HttpProxy.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

Pipelines.Extensions/Pipelines.Extensions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.1.46" />
15-
<PackageReference Include="System.IO.Pipelines" Version="6.0.2" />
14+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.6.40" />
15+
<PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

Shadowsocks.Crypto/Shadowsocks.Crypto.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="CryptoBase" Version="1.7.1" />
14+
<PackageReference Include="CryptoBase" Version="1.7.2" />
1515
</ItemGroup>
1616

1717
</Project>

Shadowsocks.Protocol/ListenServices/TcpListenService.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,7 @@ private async Task HandleAsync(Socket socket, CancellationToken token)
6060
ReadResult result = await pipe.Input.ReadAsync(token);
6161
ReadOnlySequence<byte> buffer = result.Buffer;
6262

63-
ILocalTcpService? service = _services.FirstOrDefault(tcpService => tcpService.IsHandle(buffer));
64-
65-
if (service is null)
66-
{
67-
throw new InvalidDataException(@"Cannot handle incoming pipe.");
68-
}
63+
ILocalTcpService service = _services.FirstOrDefault(tcpService => tcpService.IsHandle(buffer)) ?? throw new InvalidDataException(@"Cannot handle incoming pipe.");
6964

7065
pipe.Input.AdvanceTo(buffer.Start, buffer.End);
7166
pipe.Input.CancelPendingRead();

Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Microsoft;
12
using Microsoft.Extensions.Caching.Memory;
23
using Microsoft.Extensions.Logging;
34
using Shadowsocks.Protocol.ServersControllers;
@@ -69,7 +70,7 @@ public async ValueTask HandleAsync(UdpReceiveResult receiveResult, UdpClient inc
6970
_ => socks5UdpPacket.Address!.ToString()
7071
};
7172

72-
if (!_cache.TryGetValue(receiveResult.RemoteEndPoint, out IUdpClient client))
73+
if (!_cache.TryGetValue(receiveResult.RemoteEndPoint, out IUdpClient? client))
7374
{
7475
client = await _serversController.GetServerUdpAsync(target, socks5UdpPacket.Port);
7576
if (client is ConnectionRefusedUdpClient)
@@ -83,6 +84,8 @@ public async ValueTask HandleAsync(UdpReceiveResult receiveResult, UdpClient inc
8384

8485
_logger.LogInformation(@"Udp Send to {Target} via {Client}", target, client);
8586
Memory<byte> sendBuffer = receiveResult.Buffer.AsMemory(3); //TODO Only support ss now
87+
88+
Assumes.NotNull(client);
8689
await client.SendAsync(sendBuffer, cancellationToken);
8790

8891
byte[] receiveBuffer = ArrayPool<byte>.Shared.Rent(0x10000);

Shadowsocks.Protocol/Shadowsocks.Protocol.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
16-
<PackageReference Include="WindowsJobAPI" Version="6.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
16+
<PackageReference Include="WindowsJobAPI" Version="6.1.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)