Version bump with new fixes

.gitea/workflows/nuget-pkg-build.yml

@@ -11,16 +11,21 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.x
+          dotnet-version: |
+            10.x
+            9.x
+            8.x
       - name: Build
         run: dotnet build Syrette -c Release
       #- name: Test
       #  run: dotnet test -c Release --no-build
       - name: Pack nugets
-        run: dotnet pack Syrette -c Release --no-build --output . --include-symbols --include-source
+        run: dotnet pack Syrette -c Release --no-build --output . --include-symbols --include-source -p:SymbolPackageFormat=snupkg
       - name: Push to NuGet
-        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.NUGETAPIKEY}} --source https://api.nuget.org/v3/index.json
+        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.NUGETAPIKEY}} --skip-duplicate --source https://api.nuget.org/v3/index.json
+      - name: Push to Gitea
+        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.NUGETGITEA}} --skip-duplicate --source https://git.r3d.codes/api/packages/REDCODE/nuget/index.json

DISandbox/Program.cs

@@ -12,6 +12,12 @@ class Service : IService {
     }
 }
 
+class AnotherService : IService {
+    public void Log(string message) {
+        Console.WriteLine($"[AnotherService] {message}");
+    }
+}
+
 interface IOtherService {
     public Guid Id { get; }
     
@@ -39,7 +45,7 @@ class GuidDependantService {
     }
 
     public void LogWithId(string message) {
-        logService.Log($"[GuidDependantService] {message} (ID: {guidService.Id})");
+        logService.Log($"[GuidDependantService] {message} (ID: {guidService?.Id})");
     }
 }
 
@@ -47,6 +53,7 @@ static class Program {
     static void Main(string[] args) {
         var container = new ServiceContainer()
             .AddSingleton<IService, Service>()
+            .AddTransient<IService, AnotherService>()
             .AddTransient<IOtherService, GuidService>()
             .AddTransient<GuidDependantService, GuidDependantService>();
 
@@ -55,5 +62,6 @@ static class Program {
         container.GetService<IOtherService>().ShowId();
         container.GetService<GuidDependantService>().LogWithId("Hello, sent from the dependency.");
         container.GetService<IService>().Log("Goodbye, Dependency Injection!");
+        var res = container.GetServices<IService>();
     }
 }

Syrette/ServiceContainer.cs

@@ -14,24 +14,47 @@ public class ServiceContainer {
     /// </summary>
     /// <typeparam name="TServices"></typeparam>
     /// <returns></returns>
-    public List<Type> GetServices<TServices>() => 
+    public List<Type> GetServiceTypes<TServices>() => 
         descriptors.Where(d => d.ServiceType == typeof(TServices))
             .Select(d => d.ImplementationType).ToList();
     
+    /// <summary>
+    /// Get all registered services for a given service type.
+    /// </summary>
+    /// <typeparam name="TService"></typeparam>
+    public List<TService> GetServices<TService>() where TService : class =>
+        descriptors.Where(d => d.ServiceType == typeof(TService))
+            .Select(d => (TService)GetService(d.ImplementationType)).ToList();
+
     /// <summary>
     /// Registers a singleton service with its implementation.
     /// </summary>
     /// <typeparam name="TInterface">Interface the service is implementing</typeparam>
     /// <typeparam name="TImplementation">Implementation type of the service</typeparam>
     public ServiceContainer AddSingleton<TInterface, TImplementation>()
+        where TInterface : class
         where TImplementation : class, TInterface {
-        descriptors.Add(new ServiceDescriptor {
+        descriptors.Add(new () {
             ServiceType = typeof(TInterface),
             ImplementationType = typeof(TImplementation),
             Lifetime = ServiceLifetime.Lifetime
         });
         return this;
     }
+    
+    /// <summary>
+    /// Registers a singleton service where the service type is the same as the implementation type.
+    /// </summary>
+    /// <typeparam name="TClass">Class type of the service</typeparam>
+    public ServiceContainer AddSingleton<TClass>()
+        where TClass : class {
+        descriptors.Add(new () {
+            ServiceType = typeof(TClass),
+            ImplementationType = typeof(TClass),
+            Lifetime = ServiceLifetime.Lifetime
+        });
+        return this;
+    }
 
     /// <summary>
     /// Registers a transient service with its implementation.
@@ -39,8 +62,9 @@ public class ServiceContainer {
     /// <typeparam name="TInterface">Interface the service is implementing</typeparam>
     /// <typeparam name="TImplementation">Implementation type of the service</typeparam>
     public ServiceContainer AddTransient<TInterface, TImplementation>()
+        where TInterface : class
         where TImplementation : class, TInterface {
-        descriptors.Add(new ServiceDescriptor {
+        descriptors.Add(new () {
             ServiceType = typeof(TInterface),
             ImplementationType = typeof(TImplementation),
             Lifetime = ServiceLifetime.Transient
@@ -48,6 +72,20 @@ public class ServiceContainer {
         return this;
     }
     
+    /// <summary>
+    /// Registers a transient service where the service type is the same as the implementation type.
+    /// </summary>
+    /// <typeparam name="TClass">Class type of the service</typeparam>
+    public ServiceContainer AddTransient<TClass>()
+        where TClass : class {
+        descriptors.Add(new () {
+            ServiceType = typeof(TClass),
+            ImplementationType = typeof(TClass),
+            Lifetime = ServiceLifetime.Transient
+        });
+        return this;
+    }
+    
     // you can't call generic methods with an unknown type at compile time
     // so we use reflection to call the generic GetService<T> method with the provided type
     // Basically we build the method GetService<serviceType>() at runtime and then call it.
@@ -62,12 +100,12 @@ public class ServiceContainer {
     /// <summary>
     /// Resolves and returns an instance of the requested service type.
     /// </summary>
-    /// <typeparam name="TInterface">Interface type of the service being requested</typeparam>
+    /// <typeparam name="TService">Interface type of the service being requested</typeparam>
     /// <returns>Resolved service instance</returns>
-    public TInterface GetService<TInterface>() {
+    public TService GetService<TService>() {
-        var descriptor = descriptors.FirstOrDefault(d => d.ServiceType == typeof(TInterface));
+        var descriptor = descriptors.FirstOrDefault(d => d.ServiceType == typeof(TService) || d.ImplementationType == typeof(TService));
         
-        if (descriptor == null) throw new Exception($"Service of type {typeof(TInterface)} not registered.");
+        if (descriptor == null) throw new Exception($"Service of type {typeof(TService)} not registered.");
         
         var ctors = descriptor.ImplementationType.GetConstructors();
         int max = -1;
@@ -85,19 +123,19 @@ public class ServiceContainer {
             }
         }
         if (bestCtor == null)
-            throw new Exception($"Cannot create service of type {typeof(TInterface)}. No suitable constructor found.");
+            throw new Exception($"Cannot create service of type {typeof(TService)}. No suitable constructor found.");
         
         // Transient: create a new instance each time
         if (descriptor.Lifetime != ServiceLifetime.Lifetime) {
-            var service = Instantiate<TInterface>(descriptor, bestCtor);
+            var service = Instantiate<TService>(descriptor, bestCtor);
             return service;
         }
 
         // Singleton: return existing instance
-        if (singletons.TryGetValue(descriptor.ServiceType, out object? singleton)) return (TInterface)singleton;
+        if (singletons.TryGetValue(descriptor.ServiceType, out object? singleton)) return (TService)singleton;
         
         // or create a new one if not yet created.
-        var newSingleton = Instantiate<TInterface>(descriptor);
+        var newSingleton = Instantiate<TService>(descriptor);
         singletons[descriptor.ServiceType] = newSingleton!;
         return newSingleton;
     }

Syrette/Syrette.csproj

@@ -9,7 +9,7 @@
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>0.0.1.2-alpha</Version>
+        <Version>0.0.1.5-alpha</Version>
         <Title>Syrette </Title>
         <Authors>Lorefice Samuele</Authors>
         <Description>Syrette is a minimalistic dependency injection library for C#. It aims to provide a simple and efficient way to achieve dependency injections in your applications without the overhead of larger frameworks.</Description>
@@ -23,7 +23,9 @@
         <Company>Samuele Lorefice</Company>
         <Deterministic>true</Deterministic>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <DebugSymbols>true</DebugSymbols>

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "10.0.0",
     "rollForward": "latestMinor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }