dotnet7

eamon-cai · Sep 17, 2022 · 2a6289e · 2a6289e
1 parent 0ddc22a
commit 2a6289e
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 44 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<Version>2.1.4</Version>	
 		<Nullable>enable</Nullable>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<IsWebConfigTransformDisabled>true</IsWebConfigTransformDisabled> 		
 		<Description>github加速神器</Description>
 		<Copyright>https://github.com/dotnetcore/FastGithub</Copyright>

diff --git a/FastGithub.Configuration/FastGithub.Configuration.csproj b/FastGithub.Configuration/FastGithub.Configuration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 	</ItemGroup>
 

diff --git a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
-		<PackageReference Include="PInvoke.AdvApi32" Version="0.7.104" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
-		<PackageReference Include="DNS" Version="6.1.0" />
-		<PackageReference Include="Tommy" Version="3.0.1" />
+		<PackageReference Include="PInvoke.AdvApi32" Version="0.7.124" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+		<PackageReference Include="DNS" Version="7.0.0" />
+		<PackageReference Include="Tommy" Version="3.1.2" />
 		<ProjectReference Include="..\FastGithub.Configuration\FastGithub.Configuration.csproj" />
 	</ItemGroup>
 

diff --git a/FastGithub.Http/FastGithub.Http.csproj b/FastGithub.Http/FastGithub.Http.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<ItemGroup>
-		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
+	<ItemGroup> 
 		<ProjectReference Include="..\FastGithub.DomainResolve\FastGithub.DomainResolve.csproj" />
 	</ItemGroup>
 

diff --git a/FastGithub.Http/HttpClientHandler.cs b/FastGithub.Http/HttpClientHandler.cs
@@ -1,7 +1,6 @@
 using FastGithub.Configuration;
 using FastGithub.DomainResolve;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -200,32 +199,15 @@ private async IAsyncEnumerable<IPEndPoint> GetIPEndPointsAsync(DnsEndPoint dnsEn
         /// <returns></returns>
         private static IEnumerable<string> ReadDnsNames(X509Certificate? cert)
         {
-            if (cert == null)
+            if (cert is X509Certificate2 x509)
             {
-                yield break;
-            }
-            var parser = new Org.BouncyCastle.X509.X509CertificateParser();
-            var x509Cert = parser.ReadCertificate(cert.GetRawCertData());
-            var subjects = x509Cert.GetSubjectAlternativeNames();
-            if (subjects == null)
-            {
-                yield break;
-            }
-
-            foreach (var subject in subjects)
-            {
-                if (subject is IList list)
+                var extension = x509.Extensions.OfType<X509SubjectAlternativeNameExtension>().FirstOrDefault();
+                if (extension != null)
                 {
-                    if (list.Count >= 2 && list[0] is int nameType && nameType == 2)
-                    {
-                        var dnsName = list[1]?.ToString();
-                        if (dnsName != null)
-                        {
-                            yield return dnsName;
-                        }
-                    }
+                    return extension.EnumerateDnsNames();
                 }
             }
+            return Array.Empty<string>();
         }
 
         /// <summary>

diff --git a/FastGithub.HttpServer/Certs/CertService.cs b/FastGithub.HttpServer/Certs/CertService.cs
@@ -70,12 +70,10 @@ public bool CreateCaCertIfNotExists()
             var subjectName = new X500DistinguishedName($"CN={nameof(FastGithub)}");
             this.caCert = CertGenerator.CreateCACertificate(subjectName, notBefore, notAfter);
 
-            var privateKey = this.caCert.GetRSAPrivateKey()?.ExportRSAPrivateKey();
-            var privateKeyPem = PemEncoding.Write("RSA PRIVATE KEY", privateKey);
+            var privateKeyPem = this.caCert.GetRSAPrivateKey()?.ExportRSAPrivateKeyPem();
             File.WriteAllText(this.CaKeyFilePath, new string(privateKeyPem), Encoding.ASCII);
 
-            var cert = this.caCert.Export(X509ContentType.Cert);
-            var certPem = PemEncoding.Write("CERTIFICATE", cert);
+            var certPem = this.caCert.ExportCertificatePem();
             File.WriteAllText(this.CaCerFilePath, new string(certPem), Encoding.ASCII);
 
             return true;

diff --git a/FastGithub.HttpServer/FastGithub.HttpServer.csproj b/FastGithub.HttpServer/FastGithub.HttpServer.csproj
@@ -6,7 +6,7 @@
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="Yarp.ReverseProxy" Version="1.1.0" />
+		<PackageReference Include="Yarp.ReverseProxy" Version="1.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/FastGithub.PacketIntercept/FastGithub.PacketIntercept.csproj b/FastGithub.PacketIntercept/FastGithub.PacketIntercept.csproj
@@ -6,8 +6,7 @@
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="DNS" Version="6.1.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+		<PackageReference Include="DNS" Version="7.0.0" />
 		<PackageReference Include="FastGithub.WinDiverts" Version="1.4.1" />
 	</ItemGroup>
 

diff --git a/FastGithub/FastGithub.csproj b/FastGithub/FastGithub.csproj
@@ -9,19 +9,19 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0-rc*" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-rc*" />
 		<PackageReference Include="Serilog.Sinks.Network" Version="2.0.2.68" />
 		<ProjectReference Include="..\FastGithub.DomainResolve\FastGithub.DomainResolve.csproj" />
 		<ProjectReference Include="..\FastGithub.HttpServer\FastGithub.HttpServer.csproj" />
 		<ProjectReference Include="..\FastGithub.PacketIntercept\FastGithub.PacketIntercept.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+		<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-		<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>