From 282eef74d827ef8e2e564fe880b3b978f3ff63b7 Mon Sep 17 00:00:00 2001 From: wagsn Date: Thu, 18 Jan 2024 00:09:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FastGithub.Configuration.csproj | 4 ++-- .../FastGithub.DomainResolve.csproj | 4 ++-- FastGithub.HttpServer/FastGithub.HttpServer.csproj | 2 +- FastGithub.UI/FastGithub.UI.csproj | 3 ++- FastGithub/FastGithub.csproj | 11 ++++++----- FastGithub/ProductionVersion.cs | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/FastGithub.Configuration/FastGithub.Configuration.csproj b/FastGithub.Configuration/FastGithub.Configuration.csproj index c18dd9e7..c01d4a98 100644 --- a/FastGithub.Configuration/FastGithub.Configuration.csproj +++ b/FastGithub.Configuration/FastGithub.Configuration.csproj @@ -1,8 +1,8 @@  - - + + diff --git a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj index 7ae4c7a0..8b5b5961 100644 --- a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj +++ b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj @@ -2,8 +2,8 @@ - - + + diff --git a/FastGithub.HttpServer/FastGithub.HttpServer.csproj b/FastGithub.HttpServer/FastGithub.HttpServer.csproj index 339d9569..278ec62d 100644 --- a/FastGithub.HttpServer/FastGithub.HttpServer.csproj +++ b/FastGithub.HttpServer/FastGithub.HttpServer.csproj @@ -6,7 +6,7 @@ - + diff --git a/FastGithub.UI/FastGithub.UI.csproj b/FastGithub.UI/FastGithub.UI.csproj index ed3d783a..342fa276 100644 --- a/FastGithub.UI/FastGithub.UI.csproj +++ b/FastGithub.UI/FastGithub.UI.csproj @@ -26,9 +26,10 @@ all - + all + diff --git a/FastGithub/FastGithub.csproj b/FastGithub/FastGithub.csproj index 57ea9e41..413e1b35 100644 --- a/FastGithub/FastGithub.csproj +++ b/FastGithub/FastGithub.csproj @@ -6,11 +6,12 @@ MIT app.manifest true + net8.0 - - + + @@ -18,10 +19,10 @@ - - + + - + diff --git a/FastGithub/ProductionVersion.cs b/FastGithub/ProductionVersion.cs index 2b8fb70d..c16e49b6 100644 --- a/FastGithub/ProductionVersion.cs +++ b/FastGithub/ProductionVersion.cs @@ -94,7 +94,7 @@ public override string ToString() /// public static ProductionVersion Parse(string productionVersion) { - const string VERSION = @"^\d+\.(\d+.){0,2}\d+"; + const string VERSION = @"^\d+\.(\d+\.){0,2}\d+(?=\+[0-9a-f].)?"; var verion = Regex.Match(productionVersion, VERSION).Value; var subVersion = productionVersion[verion.Length..]; return new ProductionVersion(Version.Parse(verion), subVersion); From ec09bea077ca5a2d1a25082b9967c1c1581c78e3 Mon Sep 17 00:00:00 2001 From: wagsn Date: Wed, 11 Jun 2025 19:27:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0nuget=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FastGithub.Configuration.csproj | 8 ++++++-- .../FastGithub.DomainResolve.csproj | 8 ++++++-- .../FastGithub.FlowAnalyze.csproj | 4 ++++ FastGithub.Http/FastGithub.Http.csproj | 4 ++++ FastGithub.HttpServer/FastGithub.HttpServer.csproj | 3 ++- .../FastGithub.PacketIntercept.csproj | 1 + FastGithub.UI/FastGithub.UI.csproj | 2 +- FastGithub/FastGithub.csproj | 14 +++++++------- 8 files changed, 31 insertions(+), 13 deletions(-) diff --git a/FastGithub.Configuration/FastGithub.Configuration.csproj b/FastGithub.Configuration/FastGithub.Configuration.csproj index c01d4a98..a6754a4c 100644 --- a/FastGithub.Configuration/FastGithub.Configuration.csproj +++ b/FastGithub.Configuration/FastGithub.Configuration.csproj @@ -1,8 +1,12 @@  + + net8.0 + + - - + + diff --git a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj index 8b5b5961..9625ca42 100644 --- a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj +++ b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj @@ -1,9 +1,13 @@  + + net8.0 + + - - + + diff --git a/FastGithub.FlowAnalyze/FastGithub.FlowAnalyze.csproj b/FastGithub.FlowAnalyze/FastGithub.FlowAnalyze.csproj index 65cbe964..59baa239 100644 --- a/FastGithub.FlowAnalyze/FastGithub.FlowAnalyze.csproj +++ b/FastGithub.FlowAnalyze/FastGithub.FlowAnalyze.csproj @@ -1,5 +1,9 @@ + + net8.0 + + diff --git a/FastGithub.Http/FastGithub.Http.csproj b/FastGithub.Http/FastGithub.Http.csproj index e621b9ac..0a5cca2a 100644 --- a/FastGithub.Http/FastGithub.Http.csproj +++ b/FastGithub.Http/FastGithub.Http.csproj @@ -1,5 +1,9 @@  + + net8.0 + + diff --git a/FastGithub.HttpServer/FastGithub.HttpServer.csproj b/FastGithub.HttpServer/FastGithub.HttpServer.csproj index 278ec62d..324fbbb7 100644 --- a/FastGithub.HttpServer/FastGithub.HttpServer.csproj +++ b/FastGithub.HttpServer/FastGithub.HttpServer.csproj @@ -2,11 +2,12 @@ true + net8.0 - + diff --git a/FastGithub.PacketIntercept/FastGithub.PacketIntercept.csproj b/FastGithub.PacketIntercept/FastGithub.PacketIntercept.csproj index d4128bc6..c01fcdac 100644 --- a/FastGithub.PacketIntercept/FastGithub.PacketIntercept.csproj +++ b/FastGithub.PacketIntercept/FastGithub.PacketIntercept.csproj @@ -2,6 +2,7 @@ true + net8.0 diff --git a/FastGithub.UI/FastGithub.UI.csproj b/FastGithub.UI/FastGithub.UI.csproj index 342fa276..55247db1 100644 --- a/FastGithub.UI/FastGithub.UI.csproj +++ b/FastGithub.UI/FastGithub.UI.csproj @@ -29,7 +29,7 @@ all - + diff --git a/FastGithub/FastGithub.csproj b/FastGithub/FastGithub.csproj index 413e1b35..3c40328b 100644 --- a/FastGithub/FastGithub.csproj +++ b/FastGithub/FastGithub.csproj @@ -10,19 +10,19 @@ - - - + + + - - - - + + + + From 4bb09bd4b1dc4615a470ca46112b5415155e1226 Mon Sep 17 00:00:00 2001 From: wagsn Date: Wed, 11 Jun 2025 19:48:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0nuget=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FastGithub.Configuration/FastGithub.Configuration.csproj | 4 ++-- FastGithub.DomainResolve/DnsClient.cs | 2 +- FastGithub.DomainResolve/FastGithub.DomainResolve.csproj | 4 ++-- FastGithub.DomainResolve/IPAddressService.cs | 2 +- .../HttpMiddlewares/HttpProxyPacMiddleware.cs | 2 +- FastGithub/FastGithub.csproj | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FastGithub.Configuration/FastGithub.Configuration.csproj b/FastGithub.Configuration/FastGithub.Configuration.csproj index a6754a4c..f2e903d5 100644 --- a/FastGithub.Configuration/FastGithub.Configuration.csproj +++ b/FastGithub.Configuration/FastGithub.Configuration.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/FastGithub.DomainResolve/DnsClient.cs b/FastGithub.DomainResolve/DnsClient.cs index e96bc886..6e521cf5 100644 --- a/FastGithub.DomainResolve/DnsClient.cs +++ b/FastGithub.DomainResolve/DnsClient.cs @@ -163,7 +163,7 @@ private async Task> LookupAsync(IPEndPoint dns, DnsEndPoint end { if (this.dnsLookupCache.TryGetValue>(key, out var value)) { - return value; + return value!; } var result = await this.LookupCoreAsync(dns, endPoint, fastSort, cancellationToken); return this.dnsLookupCache.Set(key, result.Addresses, result.TimeToLive); diff --git a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj index 9625ca42..8de11b58 100644 --- a/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj +++ b/FastGithub.DomainResolve/FastGithub.DomainResolve.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/FastGithub.DomainResolve/IPAddressService.cs b/FastGithub.DomainResolve/IPAddressService.cs index 95ad36fb..539dead0 100644 --- a/FastGithub.DomainResolve/IPAddressService.cs +++ b/FastGithub.DomainResolve/IPAddressService.cs @@ -95,7 +95,7 @@ private async Task GetAddressElapsedAsync(IPEndPoint endPoint, C { if (this.addressElapsedCache.TryGetValue(endPoint, out var addressElapsed)) { - return addressElapsed; + return addressElapsed!; } var stopWatch = Stopwatch.StartNew(); diff --git a/FastGithub.HttpServer/HttpMiddlewares/HttpProxyPacMiddleware.cs b/FastGithub.HttpServer/HttpMiddlewares/HttpProxyPacMiddleware.cs index 3bf01b42..f896ca46 100644 --- a/FastGithub.HttpServer/HttpMiddlewares/HttpProxyPacMiddleware.cs +++ b/FastGithub.HttpServer/HttpMiddlewares/HttpProxyPacMiddleware.cs @@ -37,7 +37,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next) { var proxyPac = this.CreateProxyPac(context.Request.Host); context.Response.ContentType = "application/x-ns-proxy-autoconfig"; - context.Response.Headers.Add("Content-Disposition", $"attachment;filename=proxy.pac"); + context.Response.Headers["Content-Disposition"] = $"attachment;filename=proxy.pac"; await context.Response.WriteAsync(proxyPac); } else diff --git a/FastGithub/FastGithub.csproj b/FastGithub/FastGithub.csproj index 3c40328b..75b30210 100644 --- a/FastGithub/FastGithub.csproj +++ b/FastGithub/FastGithub.csproj @@ -10,8 +10,8 @@ - - + +