collapse project

lsfera · Jul 16, 2024 · ca28054 · ca28054
1 parent 645ec1a
commit ca28054
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/Blumchen.sln b/Blumchen.sln
@@ -43,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "postgres", "postgres", "{8A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{A4044484-FE08-4399-8239-14AABFA30AD7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blumchen.DependencyInjection", "src\Blumchen.DependencyInjection\Blumchen.DependencyInjection.csproj", "{A07167E3-4CF7-40EF-8E55-A37A0F57B89D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SubscriberWorker", "src\SubscriberWorker\SubscriberWorker.csproj", "{DB58DB36-0366-4ABA-BC06-FCA9BB10EB92}"
 EndProject
 Global
@@ -73,10 +71,6 @@ Global
 		{2BBDA071-FB1C-4D62-A954-B22EA6B1C738}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BBDA071-FB1C-4D62-A954-B22EA6B1C738}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2BBDA071-FB1C-4D62-A954-B22EA6B1C738}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A07167E3-4CF7-40EF-8E55-A37A0F57B89D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A07167E3-4CF7-40EF-8E55-A37A0F57B89D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A07167E3-4CF7-40EF-8E55-A37A0F57B89D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A07167E3-4CF7-40EF-8E55-A37A0F57B89D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB58DB36-0366-4ABA-BC06-FCA9BB10EB92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB58DB36-0366-4ABA-BC06-FCA9BB10EB92}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB58DB36-0366-4ABA-BC06-FCA9BB10EB92}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/Blumchen.DependencyInjection/Blumchen.DependencyInjection.csproj b/src/Blumchen.DependencyInjection/Blumchen.DependencyInjection.csproj
@@ -38,7 +38,7 @@
     </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" >
+      <PackageReference Include="JetBrains.Annotations" Version="2023.3.0">
           <PrivateAssets>all</PrivateAssets>
           <ExcludeAssets>none</ExcludeAssets>
           <IncludeAssets>all</IncludeAssets>

diff --git a/src/Blumchen/Blumchen.csproj b/src/Blumchen/Blumchen.csproj
@@ -45,13 +45,15 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" >
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0">
             <PrivateAssets>all</PrivateAssets>
             <ExcludeAssets>none</ExcludeAssets>
             <IncludeAssets>all</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
         <PackageReference Include="Npgsql" Version="8.0.3" />
+        <PackageReference Include="Polly.Core" Version="8.4.1" />
     </ItemGroup>
 
 </Project>
diff --git a/...on/Workers/ServiceCollectionExtensions.cs → ...en/Workers/ServiceCollectionExtensions.cs b/...on/Workers/ServiceCollectionExtensions.cs → ...en/Workers/ServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
 using Blumchen.Subscriptions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Polly;
 
 #pragma warning disable IL2091
 
@@ -18,7 +17,7 @@ public static IServiceCollection AddBlumchen<T>(
             .AddKeyedSingleton(typeof(T), (provider, _) => workerOptions(provider, new WorkerOptionsBuilder()).Build())
             .AddHostedService(provider =>
                 new Worker<T>(workerOptions(provider, new WorkerOptionsBuilder()).Build(),
-                    provider.GetRequiredService<ILogger<Worker<T>>>()));
+                    ServiceProviderServiceExtensions.GetRequiredService<ILogger<Worker<T>>>(provider)));
 
 
 }
diff --git a/...hen.DependencyInjection/Workers/Worker.cs → src/Blumchen/Workers/Worker.cs b/...hen.DependencyInjection/Workers/Worker.cs → src/Blumchen/Workers/Worker.cs
diff --git a/...Injection/Workers/WorkerOptionsBuilder.cs → src/Blumchen/Workers/WorkerOptionsBuilder.cs b/...Injection/Workers/WorkerOptionsBuilder.cs → src/Blumchen/Workers/WorkerOptionsBuilder.cs
diff --git a/src/SubscriberWorker/Program.cs b/src/SubscriberWorker/Program.cs
@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 using Blumchen.Serialization;
 using Blumchen.Subscriptions;
-using Blumchen.Workers;
 using Commons;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -11,6 +10,7 @@
 using SubscriberWorker;
 using Npgsql;
 using Blumchen.Subscriptions.Management;
+using Blumchen.Workers;
 using Polly.Registry;
 
 

diff --git a/src/SubscriberWorker/SubscriberWorker.csproj b/src/SubscriberWorker/SubscriberWorker.csproj
@@ -16,7 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Blumchen.DependencyInjection\Blumchen.DependencyInjection.csproj" />
     <ProjectReference Include="..\Commons\Commons.csproj" />
   </ItemGroup>