Cleanup

Author: usercode

DragonFly.Proxy.Generators/DragonFly.Proxy.Generators.csproj

@@ -2,10 +2,11 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
+using System;
+using System.Threading.Tasks;
 using DragonFly;
 using DragonFly.AspNet.Options;
 using DragonFly.AspNetCore;
-using DragonFly.Assets.Query;
 using DragonFly.MongoDB;
 using ImageWizard;
 using ImageWizard.Caches;
@@ -56,6 +57,24 @@
 //init DragonFly
 await app.InitDragonFly();
 
+//demo tasks
+IBackgroundTaskManager taskManager = app.Services.GetRequiredService<IBackgroundTaskManager>();
+taskManager.StartNew("Test", static async ctx => { await Task.Delay(TimeSpan.FromSeconds(60), ctx.CancellationToken); });
+taskManager.StartNew("Import", static async ctx =>
+{
+    while (ctx.CancellationToken.IsCancellationRequested == false)
+    {
+        await Task.Delay(TimeSpan.FromSeconds(1));
+
+        ctx.Task.ProgressValue += 2;
+
+        if (ctx.Task.ProgressValue >= ctx.Task.ProgressMaxValue)
+        {
+            break;
+        }
+    }
+});
+
 IHostEnvironment env = app.Services.GetRequiredService<IHostEnvironment>();
 
 if (env.IsDevelopment())

DragonFly.Proxy.Generators/Generators/Test.cs

@@ -67,25 +67,7 @@ public static IDragonFlyBuilder AddDragonFly(this IServiceCollection services)
     public static async Task InitDragonFly(this IHost host)
     {
         IDragonFlyApi api = host.Services.GetRequiredService<IDragonFlyApi>();
-        await api.InitAsync();
-
-        ////demo tasks
-        //IBackgroundTaskManager taskManager = host.Services.GetRequiredService<IBackgroundTaskManager>();
-        //taskManager.StartNew("Test", static async ctx => { await Task.Delay(TimeSpan.FromSeconds(60), ctx.CancellationToken); });
-        //taskManager.StartNew("Import", static async ctx => 
-        //{
-        //    while (ctx.CancellationToken.IsCancellationRequested == false)
-        //    {
-        //        await Task.Delay(TimeSpan.FromSeconds(1));
-
-        //        ctx.Task.ProgressValue += 2;
-
-        //        if (ctx.Task.ProgressValue >= ctx.Task.ProgressMaxValue)
-        //        {
-        //            break;
-        //        }
-        //    }
-        //});
+        await api.InitAsync();        
     }
 
     /// <summary>

src/DragonFly.App.Server/Program.cs

@@ -25,7 +25,7 @@ public static async Task AuthorizeAsync(this IDragonFlyApi api, string permissio
         IHttpContextAccessor httpContextAccessor = api.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
         IAuthorizationService permissionService = api.ServiceProvider.GetRequiredService<IAuthorizationService>();
 
-        //temporary fix
+        //temporary fix for background tasks
         if (httpContextAccessor.HttpContext == null)
         {
             return;

src/DragonFly.AspNetCore/DragonFlyBuilderExtensions.cs

@@ -16,8 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\DragonFly.Proxy.Generators\DragonFly.Proxy.Generators.csproj"
-                      OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\DragonFly.Proxy\DragonFly.Proxy.csproj" />
   </ItemGroup>
 </Project>

src/DragonFly.Permissions/Api/DragonFlyApiExtensions.cs

@@ -92,8 +92,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Proxy", "Proxy", "{73422C53
 EndProject
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{8D4355AF-19A7-471A-AA20-42052FCD042A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragonFly.Proxy.Generators", "..\DragonFly.Proxy.Generators\DragonFly.Proxy.Generators.csproj", "{B053FFE1-55BE-48FB-A189-6722B9E4C1E4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -212,10 +210,6 @@ Global
 		{8D4355AF-19A7-471A-AA20-42052FCD042A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D4355AF-19A7-471A-AA20-42052FCD042A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D4355AF-19A7-471A-AA20-42052FCD042A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B053FFE1-55BE-48FB-A189-6722B9E4C1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B053FFE1-55BE-48FB-A189-6722B9E4C1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B053FFE1-55BE-48FB-A189-6722B9E4C1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B053FFE1-55BE-48FB-A189-6722B9E4C1E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -257,7 +251,6 @@ Global
 		{CA8FEA67-C9C2-4B21-9FD9-31BF3A813122} = {73422C53-BD4F-4D9F-84D1-A41F12AF0B91}
 		{E9AFBCFA-1DA9-475A-8F7C-4733EEB102AC} = {551D7A23-7864-4CA8-B1F1-A58B25EA210E}
 		{73422C53-BD4F-4D9F-84D1-A41F12AF0B91} = {551D7A23-7864-4CA8-B1F1-A58B25EA210E}
-		{B053FFE1-55BE-48FB-A189-6722B9E4C1E4} = {73422C53-BD4F-4D9F-84D1-A41F12AF0B91}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {069E83C9-3430-4D62-843B-B52982C42093}