🔖 1.23.10614.11129

BeyondDimension · Jun 14, 2023 · da1410e · da1410e
1 parent 4820a51
commit da1410e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -61,6 +61,7 @@ jobs:
     needs: [ test ]
     if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
     runs-on: windows-latest
+    continue-on-error: true
     strategy:
       matrix:
         ProjectName: [
@@ -159,8 +160,8 @@ jobs:
         shell: pwsh
         run: |
           dotnet nuget push pkg\${{ matrix.ProjectName }}*.nupkg -s https://nuget.pkg.github.com/BeyondDimension -k ${{ secrets.RMBADMIN_TOKEN }} --skip-duplicate
-          dotnet nuget push pkg\${{ matrix.ProjectName }}*.snupkg -s https://nuget.pkg.github.com/BeyondDimension -k ${{ secrets.RMBADMIN_TOKEN }} --skip-duplicate
           dotnet nuget push pkg\${{ matrix.ProjectName }}*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate
+          dotnet nuget push pkg\${{ matrix.ProjectName }}*.snupkg -s https://nuget.pkg.github.com/BeyondDimension -k ${{ secrets.RMBADMIN_TOKEN }} --skip-duplicate
           dotnet nuget push pkg\${{ matrix.ProjectName }}*.snupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate
   release:
     name: Release

diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages
diff --git a/...ies.SourceGenerator.ConsoleTest/BD.Common.Repositories.SourceGenerator.ConsoleTest.csproj b/...ies.SourceGenerator.ConsoleTest/BD.Common.Repositories.SourceGenerator.ConsoleTest.csproj
@@ -6,7 +6,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<!--<Compile Remove="OutputPath\**" />-->
+		<Compile Remove="OutputPath\**" />
+		<EmbeddedResource Remove="OutputPath\**" />
+		<None Remove="OutputPath\**" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/BD.Common/Net/Http/HttpClientServiceBaseImpl.cs b/src/BD.Common/Net/Http/HttpClientServiceBaseImpl.cs
@@ -66,6 +66,12 @@ public HttpClientUseCookiesServiceBaseImpl()
         _client = GetLazyHttpClient();
     }
 
+    public HttpClientUseCookiesServiceBaseImpl(Func<CookieContainer, HttpHandlerType> func)
+    {
+        Handler = func(cookieContainer);
+        _client = GetLazyHttpClient();
+    }
+
     static HttpHandlerType CreateHandler(CookieContainer cookieContainer)
     {
         var handler = new HttpHandlerType

diff --git a/src/BD.Common/Net/Http/HttpClientUseCookiesWithProxyServiceImpl.cs b/src/BD.Common/Net/Http/HttpClientUseCookiesWithProxyServiceImpl.cs
@@ -47,6 +47,11 @@ public HttpClientUseCookiesWithProxyServiceImpl(Func<HttpHandlerType, HttpClient
         this.logger = logger;
     }
 
+    public HttpClientUseCookiesWithProxyServiceImpl(Func<CookieContainer, HttpHandlerType> func, ILogger logger) : base(func)
+    {
+        this.logger = logger;
+    }
+
     protected override HttpClient GetHttpClient()
         => func == null ? base.GetHttpClient() : func(Handler);
 
@@ -97,12 +102,14 @@ public abstract class HttpClientUseCookiesWithDynamicProxyServiceImpl : HttpClie
 {
     readonly DynamicWebProxy? proxy;
     readonly IDisposable? options_disposable;
+    readonly bool useProxy;
 
-    public HttpClientUseCookiesWithDynamicProxyServiceImpl(IServiceProvider? s, ILogger logger) : base(null, logger)
+    public HttpClientUseCookiesWithDynamicProxyServiceImpl(IServiceProvider? s, ILogger logger) : base((Func<HttpHandlerType, HttpClient>?)null, logger)
     {
         if (s == null) return;
         var o = s.GetService<IOptionsMonitor<IAppSettings>>();
         var options = o == null ? default : o.CurrentValue;
+        useProxy = true;
         proxy = new DynamicWebProxy()
         {
             InnerProxy = GetWebProxy(options),
@@ -115,14 +122,21 @@ public HttpClientUseCookiesWithDynamicProxyServiceImpl(IServiceProvider? s, ILog
         });
     }
 
+    public HttpClientUseCookiesWithDynamicProxyServiceImpl(Func<CookieContainer, HttpHandlerType> func, ILogger logger) : base(func, logger)
+    {
+
+    }
+
     void SetHandler()
     {
+        if (!useProxy) return;
         Handler.UseProxy = true;
         Handler.Proxy = proxy;
     }
 
     public override void Reset()
     {
+        if (!useProxy) return;
         base.Reset();
         SetHandler();
     }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,7 +9,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<IsTrimmable>true</IsTrimmable>
 		<!--<Version>1.yy.1MMdd.1hhmm</Version>-->
-		<Version>1.23.10613.11501</Version>
+		<Version>1.23.10614.11129</Version>
 		<PackageIconUrl>https://avatars.githubusercontent.com/u/79355691?s=200&amp;v=4</PackageIconUrl>
 		<Company>长沙次元超越科技有限公司</Company>
 		<Copyright>©️ $(Company). All rights reserved.</Copyright>