added more async everywhere (#55)

Author: dalenewman

docker.sh

@@ -2,7 +2,7 @@
 
 # docker buildx create --driver=docker-container --name=container
 
-version="0.17.8"
+version="0.18.0"
 build="mcr.microsoft.com/dotnet/sdk:8.0"
 base="mcr.microsoft.com/dotnet/aspnet:8.0"
 name="transformalize.orchard"

src/OrchardCore.BootswatchTheme.Settings/OrchardCore.BootswatchTheme.Settings.csproj

@@ -5,9 +5,9 @@
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <Nullable>enable</Nullable>
       <ImplicitUsings>enable</ImplicitUsings>
-      <Version>0.17.8</Version>
-      <FileVersion>0.17.8</FileVersion>
-      <AssemblyVersion>0.17.8</AssemblyVersion>
+      <Version>0.18.0</Version>
+      <FileVersion>0.18.0</FileVersion>
+      <AssemblyVersion>0.18.0</AssemblyVersion>
    </PropertyGroup>
 
    <ItemGroup>

src/OrchardCore.BootswatchTheme/OrchardCore.BootswatchTheme.csproj

@@ -5,10 +5,10 @@
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <Nullable>enable</Nullable>
       <ImplicitUsings>enable</ImplicitUsings>
-      <Version>0.17.8</Version>
+      <Version>0.18.0</Version>
       <AssemblyName>BootswatchTheme</AssemblyName>
-      <FileVersion>0.17.8</FileVersion>
-      <AssemblyVersion>0.17.8</AssemblyVersion>
+      <FileVersion>0.18.0</FileVersion>
+      <AssemblyVersion>0.18.0</AssemblyVersion>
    </PropertyGroup>
 
    <ItemGroup>

src/OrchardCore.Proxy/Migrations.cs

@@ -68,19 +68,6 @@ public int Create() {
          return 1;
       }
 
-      private async Task EnableFeature(string id) {
 
-         var availableFeatures = await _moduleService.GetAvailableFeaturesAsync();
-
-         var contentFields = availableFeatures.FirstOrDefault(f => f.Descriptor.Id == id);
-         if (contentFields != null) {
-            if (!contentFields.IsEnabled) {
-               _logger.LogInformation($"Enabling {id}");
-               await _moduleService.EnableFeaturesAsync(new[] { id });
-            }
-         } else {
-            _logger.LogError($"Unable to find {id} features required for Proxy.");
-         }
-      }
    }
 }

src/OrchardCore.Proxy/OrchardCore.Proxy.csproj

@@ -4,9 +4,9 @@
       <TargetFramework>net8.0</TargetFramework>
       <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
       <RootNamespace>ProxyModule</RootNamespace>
-      <Version>0.17.8</Version>
-      <FileVersion>0.17.8</FileVersion>
-      <AssemblyVersion>0.17.8</AssemblyVersion>
+      <Version>0.18.0</Version>
+      <FileVersion>0.18.0</FileVersion>
+      <AssemblyVersion>0.18.0</AssemblyVersion>
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
       <Authors>Dale Newman</Authors>
       <Copyright>Copyright © 2023-2026</Copyright>
@@ -35,7 +35,7 @@
       <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.2.1" />
       <PackageReference Include="OrchardCore.DisplayManagement" Version="2.2.1" />
 
-      <PackageReference Include="OrchardCoreContrib.ContentPermissions" Version="1.0.0" />
+      <PackageReference Include="OrchardCoreContrib.ContentPermissions" Version="1.1.0" />
    </ItemGroup>
 
 </Project>

src/OrchardCore.Transformalize/Controllers/ArrangementController.cs

@@ -41,7 +41,7 @@ public async Task<ActionResult> TransformalizeParameters(string contentItemId) {
             arrangement = item.ContentItem.Content.TransformalizeReportPart.Arrangement.Arrangement.Value;
          }
 
-         var process = new Process(_modifier.Modify(arrangement, item.ContentItem.Id, _parameterService.GetParameters()));
+         var process = new Process(await _modifier.ModifyAsync(arrangement, item.ContentItem.Id, _parameterService.GetParameters()));
          process.Connections.Clear();
 
          if (item.Fails()) {

src/OrchardCore.Transformalize/Controllers/BulkActionController.cs

@@ -142,7 +142,7 @@ public async Task<ActionResult> Create(BulkActionRequest request) {
             }
 
             if (request.ActionCount == 0) {
-               var batchProcess = _reportService.LoadForBatch(report.ContentItem);
+               var batchProcess = await _reportService.LoadForBatchAsync(report.ContentItem);
 
                await _taskService.RunAsync(batchProcess);
                foreach (var batchRow in batchProcess.Entities.First().Rows) {

src/OrchardCore.Transformalize/Controllers/FormController.cs

@@ -57,7 +57,7 @@ public async Task<ActionResult> Index(string contentItemId) {
                return View(form);
             }
 
-            var scope = _container.CreateScope(form.Process, _logger, null);
+            var scope = await _container.CreateScopeAsync(form.Process, _logger, null);
 
             if (!scope.IsRegistered<AdoFormCommandWriter>()) {
                _logger.Error(() => "The form command writer isn't registered.");

src/OrchardCore.Transformalize/Drivers/TransformalizeFormPartDisplayDriver.cs

@@ -48,14 +48,15 @@ ISettingsService settings
          _settings = settings;
       }
 
-      public override IDisplayResult Edit(TransformalizeFormPart part, BuildPartEditorContext context) {
+      public override async Task<IDisplayResult> EditAsync(TransformalizeFormPart part, BuildPartEditorContext context) {
 
          var commands = new AdoFormCommands();
-         var process = _configurationContainer.CreateScope(part.Arrangement.Text, part.ContentItem, new Dictionary<string, string>(), false).Resolve<Process>();
+         var initial = await _configurationContainer.CreateScopeAsync(part.Arrangement.Text, part.ContentItem, new Dictionary<string, string>(), false);
+         var process = initial.Resolve<Process>();
 
          _settings.ApplyCommonSettings(process);
 
-         using (var scope = _container.CreateScope(process, _logger, null)) {
+         await using (var scope = await _container.CreateScopeAsync(process, _logger, null)) {
             if (scope.IsRegistered<AdoFormCommandWriter>()) {
                commands = scope.Resolve<AdoFormCommandWriter>().Write();
             }
@@ -89,7 +90,8 @@ public override async Task<IDisplayResult> UpdateAsync(TransformalizeFormPart pa
 
          try {
             var logger = new MemoryLogger(LogLevel.Error);
-            var process = _configurationContainer.CreateScope(model.Arrangement.Text, part.ContentItem, new Dictionary<string, string>(), false).Resolve<Process>();
+            var final = await _configurationContainer.CreateScopeAsync(model.Arrangement.Text, part.ContentItem, new Dictionary<string, string>(), false);
+            var process = final.Resolve<Process>();
             if (process.Errors().Any()) {
                foreach (var error in process.Errors()) {
                   context.Updater.ModelState.AddModelError(Prefix, S[error]);

src/OrchardCore.Transformalize/Drivers/TransformalizeReportPartDisplayDriver.cs

@@ -136,7 +136,8 @@ public override async Task<IDisplayResult> UpdateAsync(TransformalizeReportPart
 
          try {
             var logger = new MemoryLogger(LogLevel.Error);
-            var process = _container.CreateScope(model.Arrangement.Text, part.ContentItem, new Dictionary<string, string>(), false).Resolve<Process>();
+            var scope = await _container.CreateScopeAsync(model.Arrangement.Text, part.ContentItem, new Dictionary<string, string>(), false);
+            var process = scope.Resolve<Process>();
             if (process.Errors().Any()) {
                foreach (var error in process.Errors()) {
                   context.Updater.ModelState.AddModelError(Prefix, S[error]);