housekeeping: Update to .net6.0

HMBSbige · Nov 9, 2021 · e9ba240 · e9ba240
1 parent 91ac671
commit e9ba240
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 29 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -9,16 +9,13 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
-
-      - name: Install dotnet-format
-        run: dotnet tool update -g dotnet-format
+          dotnet-version: 6.0.x
 
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: Run dotnet format check
-        run: dotnet format -wsa -v diag --check
+        run: dotnet format -v diag --verify-no-changes
 
   test:
     name: Test
@@ -34,7 +31,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Test
         shell: pwsh
@@ -63,7 +60,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Build
         shell: pwsh

diff --git a/HttpProxy/HttpProxy.csproj b/HttpProxy/HttpProxy.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
   </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.0.63" />
-    <PackageReference Include="System.IO.Pipelines" Version="5.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.0.64" />
+    <PackageReference Include="System.IO.Pipelines" Version="6.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.5.1" />
+    <PackageReference Include="CryptoBase" Version="1.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Shadowsocks.Protocol/ListenServices/UdpListenService.cs b/Shadowsocks.Protocol/ListenServices/UdpListenService.cs
@@ -40,10 +40,9 @@ public async ValueTask StartAsync()
 				UdpListener.Client.Bind(_local);
 				_logger.LogInformation(@"{LoggerHeader} {Local} Start", LoggerHeader, UdpListener.Client.LocalEndPoint);
 
-				while (!_cts.IsCancellationRequested)
+				while (true)
 				{
-					//TODO .NET6.0
-					var message = await UdpListener.ReceiveAsync();
+					var message = await UdpListener.ReceiveAsync(_cts.Token);
 #if DEBUG
 					_logger.LogDebug(
 						@"{LoggerHeader}: {ReceiveLength} bytes {Remote} => {Local}",

diff --git a/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs b/Shadowsocks.Protocol/LocalUdpServices/Socks5UdpService.cs
@@ -88,11 +88,11 @@ public async ValueTask HandleAsync(UdpReceiveResult receiveResult, UdpClient inc
 					var receiveLength = await client.ReceiveAsync(receiveBuffer.AsMemory(3), cancellationToken);
 					receiveBuffer.AsSpan(0, 3).Clear();
 
-					//TODO .NET6.0
 					await incoming.Client.SendToAsync(
-						new ArraySegment<byte>(receiveBuffer, 0, 3 + receiveLength),
+						receiveBuffer.AsMemory(0, 3 + receiveLength),
 						SocketFlags.None,
-						receiveResult.RemoteEndPoint
+						receiveResult.RemoteEndPoint,
+						cancellationToken
 					);
 				}
 				finally

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

diff --git a/Socks5/Servers/SimpleSocks5UdpServer.cs b/Socks5/Servers/SimpleSocks5UdpServer.cs
@@ -37,10 +37,9 @@ public async ValueTask StartAsync()
 		{
 			try
 			{
-				while (!_cts.IsCancellationRequested)
+				while (true)
 				{
-					//TODO .NET6.0
-					var message = await UdpListener.ReceiveAsync();
+					var message = await UdpListener.ReceiveAsync(_cts.Token);
 					if (Equals(message.RemoteEndPoint.Address, _remoteEndpoint.Address))
 					{
 						await HandleAsync(message, _cts.Token);
@@ -88,11 +87,11 @@ private async ValueTask HandleAsync(UdpReceiveResult result, CancellationToken t
 				var receiveLength = await client.Client.ReceiveAsync(receiveBuffer.AsMemory(headerLength), SocketFlags.None, token);
 				result.Buffer.AsSpan(0, headerLength).CopyTo(receiveBuffer);
 
-				//TODO .NET6.0
 				await UdpListener.Client.SendToAsync(
-					new ArraySegment<byte>(receiveBuffer, 0, headerLength + receiveLength),
+					receiveBuffer.AsMemory(0, headerLength + receiveLength),
 					SocketFlags.None,
-					result.RemoteEndPoint
+					result.RemoteEndPoint,
+					token
 				);
 			}
 			finally

diff --git a/TestConsoleApp/TestConsoleApp.csproj b/TestConsoleApp/TestConsoleApp.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
+    <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="Serilog.Sinks.Async" Version="1.5.0" />

diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" PrivateAssets="all" />

diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <Authors>HMBSbige</Authors>