Merge pull request #11 from chickensoft-games/chore/updates

fix: update project and start resolution at node's parent, not node itself

.vscode/settings.json

@@ -1,9 +1,9 @@
 {
   "[csharp]": {
     "editor.codeActionsOnSave": {
-      "source.addMissingImports": true,
-      "source.fixAll": true,
-      "source.organizeImports": true
+      "source.addMissingImports": "explicit",
+      "source.fixAll": "explicit",
+      "source.organizeImports": "explicit"
     },
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
@@ -137,12 +137,6 @@
   "markdownlint.ignore": [
     "**/LICENSE"
   ],
-  "omnisharp.enableEditorConfigSupport": true,
-  "omnisharp.enableMsBuildLoadProjectsOnDemand": false,
-  "omnisharp.enableRoslynAnalyzers": true,
-  "omnisharp.maxFindSymbolsItems": 3000,
-  "omnisharp.organizeImportsOnFormat": true,
-  "omnisharp.useModernNet": true,
   // Remove these if you're happy with your terminal profiles.
   "terminal.integrated.defaultProfile.windows": "Git Bash",
   "terminal.integrated.profiles.windows": {
@@ -163,4 +157,4 @@
     }
   },
   "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true
-}
+}

Chickensoft.AutoInject.Tests/Chickensoft.AutoInject.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Godot.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
@@ -14,18 +14,23 @@
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Chickensoft.GoDotTest" Version="1.1.7" />
-    <PackageReference Include="GodotTestDriver" Version="2.1.0" />
+    <Compile Include="../Chickensoft.AutoInject/src/**/*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Chickensoft.GoDotTest" Version="1.4.0" />
+    <PackageReference Include="Chickensoft.GodotTestDriver" Version="3.0.0" />
     <!-- Bring your own assertion library for tests! -->
     <!-- We're using Shouldly for this example, but you can use anything. -->
     <PackageReference Include="Shouldly" Version="4.1.0" />
     <!-- LightMock is a mocking library that can run without reflection. -->
     <PackageReference Include="LightMock.Generator" Version="1.2.2" />
     <!-- LightMoq is a Chickensoft package which makes it more like Moq. -->
     <PackageReference Include="LightMoq" Version="0.1.0" />
-    <PackageReference Include="Chickensoft.SuperNodes" Version="1.2.0" PrivateAssets="all" OutputItemType="analyzer" />
-    <PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.2.0" />
+    <PackageReference Include="Chickensoft.SuperNodes" Version="1.8.0" PrivateAssets="all" OutputItemType="analyzer" />
+    <PackageReference Include="Chickensoft.SuperNodes.Types" Version="1.8.0" />
     <!-- Include project to test. -->
     <!-- <PackageReference Include="Chickensoft.AutoInject" Version="1.0.0" PrivateAssets="all" /> -->
   </ItemGroup>

Chickensoft.AutoInject.Tests/src/Dependent.cs

@@ -411,7 +411,8 @@ ImmutableDictionary<string, ScriptPropertyOrField> dependenciesToResolve
     var shouldResolve = true;
     var remainingDependencies =
       new HashSet<ScriptPropertyOrField>(dependenciesToResolve.Values);
-    var node = (Node)dependent;
+
+    var node = ((Node)dependent).GetParent();
     var foundDependencies = new HashSet<ScriptPropertyOrField>();
     var providersInitializing = 0;
 

Chickensoft.AutoInject.Tests/test/Tests.cs

@@ -1,10 +1,12 @@
 namespace Chickensoft.AutoInject.Tests;
 
 using System.Reflection;
+using Chickensoft.GoDotTest;
 using Godot;
-using GoDotTest;
 
 public partial class Tests : Node2D {
-  public override void _Ready()
-    => _ = GoTest.RunTests(Assembly.GetExecutingAssembly(), this);
+  public override void _Ready() => CallDeferred(MethodName.RunTests);
+
+  public void RunTests() =>
+    GoTest.RunTests(Assembly.GetExecutingAssembly(), this);
 }

Chickensoft.AutoInject.Tests/test/src/MiscTest.cs

@@ -42,7 +42,7 @@ public void DependentStubs() {
   public void DependencyPendingCancels() {
     var provider = new StringProvider();
     var initialized = false;
-    var onInitialized = void (IProvider provider) => initialized = true;
+    void onInitialized(IProvider provider) => initialized = true;
 
     provider.ProviderState.OnInitialized += onInitialized;
 

Chickensoft.AutoInject.Tests/test/src/MultiResolutionTest.cs

@@ -16,9 +16,9 @@ public class MultiResolutionTest : TestClass {
   public MultiResolutionTest(Node testScene) : base(testScene) { }
 
   [Setup]
-  public async Task Setup() {
+  public void Setup() {
     _fixture = new Fixture(TestScene.GetTree());
-    _provider = await _fixture.LoadAndAddScene<MultiProvider>(
+    _provider = _fixture.LoadScene<MultiProvider>(
       "res://test/fixtures/MultiProvider.tscn"
     );
   }
@@ -28,8 +28,9 @@ public async Task Setup() {
 
   [Test]
   public async Task MultiDependentSubscribesToMultiProviderCorrectly() {
+    await _fixture.AddToRoot(_provider);
+    await _provider.WaitForEvents();
     _provider.Child.ReadyCalled.ShouldBeTrue();
-    await TestScene.ProcessFrame(2);
     _provider.Child.OnResolvedCalled.ShouldBeTrue();
   }
 }

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.407",
+    "version": "8.0.100",
     "rollForward": "latestMinor"
   },
   "msbuild-sdks": {
-    "Godot.NET.Sdk": "4.0.4"
+    "Godot.NET.Sdk": "4.2.2"
   }
-}
+}