support keyed services

loresoft · Nov 16, 2023 · 9a56fd7 · 9a56fd7
1 parent a25206e
commit 9a56fd7
Show file tree

Hide file tree

Showing 18 changed files with 452 additions and 391 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -28,10 +28,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core
+    - name: Install .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Calculate Version
       run: |

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Injectio.Attributes/Injectio.Attributes.csproj b/src/Injectio.Attributes/Injectio.Attributes.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Injectio.Attributes/RegisterAttribute.cs b/src/Injectio.Attributes/RegisterAttribute.cs
@@ -29,6 +29,14 @@ protected RegisterAttribute()
     /// <seealso cref="P:Microsoft.Extensions.DependencyInjection.ServiceDescriptor.ServiceType"/>
     public Type? ServiceType { get; set; }
 
+#if NET8_0_OR_GREATER
+    /// <summary>
+    /// Gets or sets the key of the service.
+    /// </summary>
+    /// <value>The service key.</value>
+    /// <seealso cref="P:Microsoft.Extensions.DependencyInjection.ServiceDescriptor.ServiceKey "/>
+    public object? ServiceKey { get; set; }
+#endif
 
     /// <summary>
     /// Name of a factory method to create new instances of the service implementation

diff --git a/src/Injectio.Generators/EquatableArray.cs b/src/Injectio.Generators/EquatableArray.cs
@@ -2,7 +2,7 @@
 
 namespace Injectio.Generators;
 
-public readonly struct EquatableArray<T> : IEquatable<EquatableArray<T>>, IEnumerable<T>
+public readonly struct EquatableArray<T> : IReadOnlyCollection<T>, IEquatable<EquatableArray<T>>
     where T : IEquatable<T>
 {
     public static readonly EquatableArray<T> Empty = new(Array.Empty<T>());
@@ -27,20 +27,15 @@ public bool Equals(EquatableArray<T> array)
 
     public override bool Equals(object obj)
     {
-        return obj is EquatableArray<T> array && Equals(array);
+        return obj is EquatableArray<T> array && Equals(this, array);
     }
 
     public override int GetHashCode()
     {
         if (_array is null)
             return 0;
 
-        HashCode hashCode = default;
-
-        foreach (T item in _array)
-            hashCode.Add(item);
-
-        return hashCode.ToHashCode();
+        return HashCode.Seed.CombineAll(_array);
     }
 
     public ReadOnlySpan<T> AsSpan()