Improved code-generation for Dispose and DisposeAsync

DevTeam · Apr 26, 2024 · d21df46 · d21df46
1 parent 0e8ee70
commit d21df46
Show file tree

Hide file tree

Showing 20 changed files with 137 additions and 156 deletions.
diff --git a/readme/Avalonia.md b/readme/Avalonia.md
@@ -107,7 +107,7 @@ The [project file](/samples/AvaloniaApp/AvaloniaApp.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md
@@ -68,7 +68,7 @@ The [project file](/samples/BlazorServerApp/BlazorServerApp.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md
@@ -67,7 +67,7 @@ The [project file](/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj) lo
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/Console.md b/readme/Console.md
@@ -90,7 +90,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/ConsoleNativeAOT.md b/readme/ConsoleNativeAOT.md
@@ -16,7 +16,7 @@ The [project file](/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.cs
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md
@@ -78,7 +78,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/GrpcService.md b/readme/GrpcService.md
@@ -53,7 +53,7 @@ The [project file](/samples/GrpcService/GrpcService.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/Maui.md b/readme/Maui.md
@@ -208,7 +208,7 @@ The [project file](/samples/MAUIApp/MAUIApp.csproj) looks like this:
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0"/>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/MinimalWebAPI.md b/readme/MinimalWebAPI.md
@@ -76,7 +76,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/WebAPI.md b/readme/WebAPI.md
@@ -51,7 +51,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/WebApp.md b/readme/WebApp.md
@@ -51,7 +51,7 @@ The [project file](/samples/WebApp/WebApp.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/WinFormsApp.md b/readme/WinFormsApp.md
@@ -55,7 +55,7 @@ The [project file](/samples/WinFormsApp/WinFormsApp.csproj) looks like this:
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/WinFormsAppNetCore.md b/readme/WinFormsAppNetCore.md
@@ -62,7 +62,7 @@ The [project file](/samples/WinFormsAppNetCore/WinFormsAppNetCore.csproj) looks
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/Wpf.md b/readme/Wpf.md
@@ -68,7 +68,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.10">
+        <PackageReference Include="Pure.DI" Version="2.1.11">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/readme/async-disposable-scope.md b/readme/async-disposable-scope.md
@@ -266,23 +266,9 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
       _disposablesM04D26di = new object[1];
       _scopedM04D26di36_Dependency = null;
     }
-
     while (disposeIndex > 0)
     {
       var instance = disposables[--disposeIndex];
-      var disposableInstance = instance as global::System.IDisposable;
-      if (disposableInstance != null)
-      {
-        try
-        {
-          disposableInstance.Dispose();
-        }
-        catch (Exception exception)
-        {
-          OnDisposeException(disposableInstance, exception);
-        }
-        continue;
-      }
 
       var asyncDisposableInstance = instance as global::System.IAsyncDisposable;
       if (asyncDisposableInstance != null)
@@ -299,11 +285,13 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
         {
           OnAsyncDisposeException(asyncDisposableInstance, exception);
         }
-      continue;
+        continue;
       }
     }
-
   }
+
+  partial void OnDisposeException<T>(T disposableInstance, Exception exception) where T : global::System.IDisposable;
+
   public async global::System.Threading.Tasks.ValueTask DisposeAsync()
   {
     int disposeIndex;
@@ -316,11 +304,9 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
       _disposablesM04D26di = new object[1];
       _scopedM04D26di36_Dependency = null;
     }
-
     while (disposeIndex > 0)
     {
       var instance = disposables[--disposeIndex];
-
       var asyncDisposableInstance = instance as global::System.IAsyncDisposable;
       if (asyncDisposableInstance != null)
       {
@@ -332,28 +318,11 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
         {
           OnAsyncDisposeException(asyncDisposableInstance, exception);
         }
-      continue;
-      }
-      var disposableInstance = instance as global::System.IDisposable;
-      if (disposableInstance != null)
-      {
-        try
-        {
-          disposableInstance.Dispose();
-        }
-        catch (Exception exception)
-        {
-          OnDisposeException(disposableInstance, exception);
-        }
         continue;
       }
     }
-
   }
 
-  partial void OnDisposeException<T>(T disposableInstance, Exception exception) where T : global::System.IDisposable;
-
-
   partial void OnAsyncDisposeException<T>(T asyncDisposableInstance, Exception exception) where T : global::System.IAsyncDisposable;
 
   public override string ToString()

diff --git a/readme/async-disposable-singleton.md b/readme/async-disposable-singleton.md
@@ -201,23 +201,9 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
       _disposablesM04D26di = new object[1];
       _singletonM04D26di36_Dependency = null;
     }
-
     while (disposeIndex > 0)
     {
       var instance = disposables[--disposeIndex];
-      var disposableInstance = instance as global::System.IDisposable;
-      if (disposableInstance != null)
-      {
-        try
-        {
-          disposableInstance.Dispose();
-        }
-        catch (Exception exception)
-        {
-          OnDisposeException(disposableInstance, exception);
-        }
-        continue;
-      }
 
       var asyncDisposableInstance = instance as global::System.IAsyncDisposable;
       if (asyncDisposableInstance != null)
@@ -234,11 +220,13 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
         {
           OnAsyncDisposeException(asyncDisposableInstance, exception);
         }
-      continue;
+        continue;
       }
     }
-
   }
+
+  partial void OnDisposeException<T>(T disposableInstance, Exception exception) where T : global::System.IDisposable;
+
   public async global::System.Threading.Tasks.ValueTask DisposeAsync()
   {
     int disposeIndex;
@@ -251,11 +239,9 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
       _disposablesM04D26di = new object[1];
       _singletonM04D26di36_Dependency = null;
     }
-
     while (disposeIndex > 0)
     {
       var instance = disposables[--disposeIndex];
-
       var asyncDisposableInstance = instance as global::System.IAsyncDisposable;
       if (asyncDisposableInstance != null)
       {
@@ -267,28 +253,11 @@ partial class Composition: global::System.IDisposable, global::System.IAsyncDisp
         {
           OnAsyncDisposeException(asyncDisposableInstance, exception);
         }
-      continue;
-      }
-      var disposableInstance = instance as global::System.IDisposable;
-      if (disposableInstance != null)
-      {
-        try
-        {
-          disposableInstance.Dispose();
-        }
-        catch (Exception exception)
-        {
-          OnDisposeException(disposableInstance, exception);
-        }
         continue;
       }
     }
-
   }
 
-  partial void OnDisposeException<T>(T disposableInstance, Exception exception) where T : global::System.IDisposable;
-
-
   partial void OnAsyncDisposeException<T>(T asyncDisposableInstance, Exception exception) where T : global::System.IAsyncDisposable;
 
   public override string ToString()

diff --git a/readme/disposable-singleton.md b/readme/disposable-singleton.md
@@ -195,7 +195,6 @@ partial class Composition: global::System.IDisposable
       _disposablesM04D26di = new object[1];
       _singletonM04D26di36_Dependency = null;
     }
-
     while (disposeIndex > 0)
     {
       var instance = disposables[--disposeIndex];
@@ -212,31 +211,43 @@ partial class Composition: global::System.IDisposable
         }
         continue;
       }
+    }
+  }
+
+  partial void OnDisposeException<T>(T disposableInstance, Exception exception) where T : global::System.IDisposable;
+
+  public async global::System.Threading.Tasks.ValueTask DisposeAsync()
+  {
+    int disposeIndex;
+    object[] disposables;
+    lock (_lockM04D26di)
+    {
+      disposeIndex = _disposeIndexM04D26di;
+      _disposeIndexM04D26di = 0;
+      disposables = _disposablesM04D26di;
+      _disposablesM04D26di = new object[1];
+      _singletonM04D26di36_Dependency = null;
+    }
+    while (disposeIndex > 0)
+    {
+      var instance = disposables[--disposeIndex];
 
-      var asyncDisposableInstance = instance as global::System.IAsyncDisposable;
-      if (asyncDisposableInstance != null)
+      var disposableInstance = instance as global::System.IDisposable;
+      if (disposableInstance != null)
       {
         try
         {
-          var valueTask = asyncDisposableInstance.DisposeAsync();
-          if (!valueTask.IsCompleted)
-          {
-            valueTask.AsTask().Wait();
-          }
+          disposableInstance.Dispose();
         }
         catch (Exception exception)
         {
-          OnAsyncDisposeException(asyncDisposableInstance, exception);
+          OnDisposeException(disposableInstance, exception);
         }
-      continue;
+        continue;
       }
     }
-
   }
 
-  partial void OnDisposeException<T>(T disposableInstance, Exception exception) where T : global::System.IDisposable;
-
-
   partial void OnAsyncDisposeException<T>(T asyncDisposableInstance, Exception exception) where T : global::System.IAsyncDisposable;
 
   public override string ToString()