Merge pull request #14 from westermo/support-netstandard

Move to netstandard 2.0
westermo · Apr 30, 2024 · 57943a1 · 57943a1
2 parents 3a6ba07 + b979433
commit 57943a1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/FactoryGenerator.Attributes/FactoryGenerator.Attributes.csproj b/FactoryGenerator.Attributes/FactoryGenerator.Attributes.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>FactoryGenerator</RootNamespace>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/FactoryGenerator.Attributes/IContainer.cs b/FactoryGenerator.Attributes/IContainer.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
 
 namespace FactoryGenerator;
 #nullable enable
@@ -9,13 +7,13 @@ public interface ILifetimeScope : IDisposable
     T Resolve<T>();
     object Resolve(Type type);
 
-    bool TryResolve(Type type, [NotNullWhen(true)] out object? resolved);
+    bool TryResolve(Type type, out object? resolved);
 
 
-    bool TryResolve<T>([NotNullWhen(true)] out T? resolved);
+    bool TryResolve<T>(out T? resolved);
 
-    bool IsRegistered(Type type) => TryResolve(type, out _);
-    bool IsRegistered<T>() => IsRegistered(typeof(T));
+    bool IsRegistered(Type type);
+    bool IsRegistered<T>();
     public ILifetimeScope BeginLifetimeScope();
 }
 

diff --git a/FactoryGenerator/FactoryGenerator.cs b/FactoryGenerator/FactoryGenerator.cs
@@ -209,6 +209,11 @@ public bool TryResolve<T>(out T resolved)
         resolved = default;
         return false;
     }}
+    public bool IsRegistered(Type type)
+    {{
+        return m_lookup.ContainsKey(type);
+    }}
+    public bool IsRegistered<T>() => IsRegistered(typeof(T));
 }}";
 
             var booleans = dataInjections.Select(inj => inj.BooleanInjection).Where(b => b is not null)
@@ -452,6 +457,11 @@ public bool TryResolve<T>(out T resolved)
         resolved = default;
         return false;
     }}
+    public bool IsRegistered(Type type)
+    {{
+        return m_lookup.ContainsKey(type);
+    }}
+    public bool IsRegistered<T>() => IsRegistered(typeof(T));
 }}
 ";
             yield return Constructor(usingStatements, constructorFields,
@@ -469,7 +479,7 @@ private static void CheckForCycles(ImmutableArray<Injection> dataInjections)
             foreach (var injection in dataInjections)
             {
                 //Methods can sort themselves out, and may include logic that makes it unsuitable to cycle-detect.
-                if(injection.Lambda != null) continue;
+                if (injection.Lambda != null) continue;
                 var node = new List<INamedTypeSymbol>();
                 foreach (var iface in injection.Interfaces)
                 {