dep: Update deps

HMBSbige · Jun 16, 2023 · 0c16b36 · 0c16b36
1 parent c7cb698
commit 0c16b36
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 58 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -0,0 +1,18 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"assignees": [
+		"HMBSbige"
+	],
+	"commitMessagePrefix": "dep:",
+	"dependencyDashboard": false,
+	"extends": [
+		"config:base",
+		":automergeBranch",
+		":automergeDigest",
+		":automergeMinor",
+		":disableRateLimiting"
+	],
+	"labels": [
+		"Automatic"
+	]
+}
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 
@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 6.0.x
 
@@ -85,14 +85,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Changelog
-        uses: glennawatson/ChangeLog@v1
-        id: changelog
-
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          body: ${{ steps.changelog.outputs.commitLog }}
           draft: false
           prerelease: false
diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\common.props" />
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/HttpProxy/HttpProxy.csproj b/HttpProxy/HttpProxy.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Pipelines.Extensions/Pipelines.Extensions.csproj b/Pipelines.Extensions/Pipelines.Extensions.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.1.46" />
-    <PackageReference Include="System.IO.Pipelines" Version="6.0.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.6.40" />
+    <PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Shadowsocks.Crypto/Shadowsocks.Crypto.csproj b/Shadowsocks.Crypto/Shadowsocks.Crypto.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CryptoBase" Version="1.7.1" />
+    <PackageReference Include="CryptoBase" Version="1.7.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Shadowsocks.Protocol/ListenServices/TcpListenService.cs b/Shadowsocks.Protocol/ListenServices/TcpListenService.cs
@@ -60,12 +60,7 @@ private async Task HandleAsync(Socket socket, CancellationToken token)
 			ReadResult result = await pipe.Input.ReadAsync(token);
 			ReadOnlySequence<byte> buffer = result.Buffer;
 
-			ILocalTcpService? service = _services.FirstOrDefault(tcpService => tcpService.IsHandle(buffer));
-
-			if (service is null)
-			{
-				throw new InvalidDataException(@"Cannot handle incoming pipe.");
-			}
+			ILocalTcpService service = _services.FirstOrDefault(tcpService => tcpService.IsHandle(buffer)) ?? throw new InvalidDataException(@"Cannot handle incoming pipe.");
 
 			pipe.Input.AdvanceTo(buffer.Start, buffer.End);
 			pipe.Input.CancelPendingRead();

diff --git a/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs b/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs
@@ -1,3 +1,4 @@
+using Microsoft;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Shadowsocks.Protocol.ServersControllers;
@@ -69,7 +70,7 @@ public async ValueTask HandleAsync(UdpReceiveResult receiveResult, UdpClient inc
 				_ => socks5UdpPacket.Address!.ToString()
 			};
 
-			if (!_cache.TryGetValue(receiveResult.RemoteEndPoint, out IUdpClient client))
+			if (!_cache.TryGetValue(receiveResult.RemoteEndPoint, out IUdpClient? client))
 			{
 				client = await _serversController.GetServerUdpAsync(target, socks5UdpPacket.Port);
 				if (client is ConnectionRefusedUdpClient)
@@ -83,6 +84,8 @@ public async ValueTask HandleAsync(UdpReceiveResult receiveResult, UdpClient inc
 
 			_logger.LogInformation(@"Udp Send to {Target} via {Client}", target, client);
 			Memory<byte> sendBuffer = receiveResult.Buffer.AsMemory(3); //TODO Only support ss now
+
+			Assumes.NotNull(client);
 			await client.SendAsync(sendBuffer, cancellationToken);
 
 			byte[] receiveBuffer = ArrayPool<byte>.Shared.Rent(0x10000);

diff --git a/Shadowsocks.Protocol/Shadowsocks.Protocol.csproj b/Shadowsocks.Protocol/Shadowsocks.Protocol.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="WindowsJobAPI" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+    <PackageReference Include="WindowsJobAPI" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TestConsoleApp/TestConsoleApp.csproj b/TestConsoleApp/TestConsoleApp.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/common.props b/common.props
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Authors>HMBSbige</Authors>
-    <Copyright>Copyright © 2021-2022 HMBSbige</Copyright>
+    <Copyright>Copyright © 2021-2023 HMBSbige</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/HMBSbige/Shadowsocks.Net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/HMBSbige/Shadowsocks.Net</RepositoryUrl>