Merge pull request #201 from seesharper/bump-deps-and-async-disposabl…

…e-fixes Bump deps and async disposable fixes
seesharper · Dec 30, 2022 · 415dc63 · 415dc63
2 parents 79ae9f5 + eb835a3
commit 415dc63
Show file tree

Hide file tree

Showing 7 changed files with 401 additions and 377 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Install .Net Core
         uses: actions/setup-dotnet@v2.0.0
         with:
-          dotnet-version: 6.0.300
+          dotnet-version: 7.0.100
       - name: Install dotnet-script
         run: dotnet tool install dotnet-script --tool-path dotnet-script-tool
 
@@ -20,4 +20,4 @@ jobs:
         env: # Or as an environment variable
           GITHUB_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IS_SECURE_BUILDENVIRONMENT: ${{ secrets.IS_SECURE_BUILDENVIRONMENT }}
-          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
+          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
diff --git a/omnisharp.json b/omnisharp.json
@@ -9,6 +9,6 @@
   },
   "script": {
     "enableScriptNuGetReferences": true,
-    "defaultTargetFramework": "net6.0"
+    "defaultTargetFramework": "net7.0"
   }
 }
diff --git a/...ependencyInjection.Benchmarks/LightInject.Microsoft.DependencyInjection.Benchmarks.csproj b/...ependencyInjection.Benchmarks/LightInject.Microsoft.DependencyInjection.Benchmarks.csproj
@@ -2,13 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LightInject.Microsoft.DependencyInjection\LightInject.Microsoft.DependencyInjection.csproj" />

diff --git a/src/LightInject.Microsoft.DependencyInjection.Tests/AsyncDisposableTests.cs b/src/LightInject.Microsoft.DependencyInjection.Tests/AsyncDisposableTests.cs
@@ -25,6 +25,23 @@ await using (var scope = serviceProvider.CreateAsyncScope())
 
             Assert.Contains(asyncDisposable, disposedObjects);
         }
+
+        [Fact]
+        public async Task ShouldDisposeAsyncDisposableFromRootScope()
+        {
+            var serviceCollection = new ServiceCollection();
+            List<object> disposedObjects = new();
+            serviceCollection.AddSingleton<AsyncDisposable>(sp => new AsyncDisposable(disposedObject => disposedObjects.Add(disposedObject)));
+
+            var serviceProvider = serviceCollection.CreateLightInjectServiceProvider();
+
+            AsyncDisposable asyncDisposable = null;
+
+            asyncDisposable = serviceProvider.GetService<AsyncDisposable>();
+            await ((IAsyncDisposable)serviceProvider).DisposeAsync();
+
+            Assert.Contains(asyncDisposable, disposedObjects);
+        }
     }
 
     public class AsyncDisposable : IAsyncDisposable

diff --git a/...icrosoft.DependencyInjection.Tests/LightInject.Microsoft.DependencyInjection.Tests.csproj b/...icrosoft.DependencyInjection.Tests/LightInject.Microsoft.DependencyInjection.Tests.csproj
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>