Not sure if less janky.

outfox · Nov 14, 2024 · 9f82389 · 9f82389
1 parent 546ee7e
commit 9f82389
Show file tree

Hide file tree

Showing 17 changed files with 2,993 additions and 665 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,5 @@ Library
 Temp
 *.DotSettings.user
 *.Artifacts
-s3/
 .dist
-*.old
-
-generated/
+*.old
diff --git a/fennecs.generators/Properties/launchSettings.json b/fennecs.generators/Properties/launchSettings.json
diff --git a/fennecs.generators/fennecs.generators.csproj b/fennecs.generators/fennecs.generators.csproj
diff --git a/fennecs.tests/Stream/Stream.3.Tests.cs b/fennecs.tests/Stream/Stream.3.Tests.cs
@@ -8,20 +8,20 @@ namespace fennecs.tests.Stream;
 public class Stream3Tests(ITestOutputHelper output)
 {
 
-    [Fact] public void Can_Use_RW_Inferred()
+    [Fact] public void Can_Use_RWR_Inferred()
     {
         using var world = new World();
         var entity = world.Spawn();
         entity.Add(123).Add(890f).Add("ramen");
 
         var stream = world.Stream<int, float, string>();
 
-
         stream.For(static (a, b, s) =>
         {
             Assert.Equal(123, a.read);
             Assert.Equal(890f, b.read);
             b.write = 456f;
+            s.write = "dieter";
         });
 
     }
@@ -37,6 +37,7 @@ public void Can_Enumerate_Stream()
         List<(Entity, string, int, float)> list = [(arnold, "Arnold", 1, 7.0f), (dolph, "Dolph", 2, 8.0f)];
 
         var stream = world.Stream<string, int, float>();
+
         foreach (var row in stream)
         {
             Assert.True(list.Remove(row));

diff --git a/fennecs/Delegates.0.cs b/fennecs/Delegates.0.cs
diff --git a/fennecs/Delegates.1.cs b/fennecs/Delegates.1.cs
diff --git a/fennecs/Delegates.2.cs b/fennecs/Delegates.2.cs
diff --git a/fennecs/Delegates.3.cs b/fennecs/Delegates.3.cs
diff --git a/fennecs/fennecs.csproj b/fennecs/fennecs.csproj
@@ -31,16 +31,13 @@
         <Nullable>enable</Nullable>
         <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-        <CompilerGeneratedFilesOutputPath>generated</CompilerGeneratedFilesOutputPath>
+
     </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Remove="generated\**" />
-        <Content Include="generated\**" />
-    </ItemGroup>
-
+    <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+        <Exec Command="dotnet-codegencs.exe template run .\generators\Streams.csx -o generated" />
+    </Target>
+
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <EnablePackageValidation>true</EnablePackageValidation>
@@ -62,7 +59,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="../nuget/nuget.md" Pack="true" PackagePath="\"/>
+        <None Include="../nuget/nuget.md" Pack="true" PackagePath="\" />
         <None Include="../nuget/fennecs-icon-nuget.png">
             <PackagePath>.</PackagePath>
             <Pack>True</Pack>
@@ -71,11 +68,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Numerics.Tensors" Version="9.0.0"/>
+      <Folder Include="generated\" />
     </ItemGroup>
 
+    <!-- Waiting on https://github.com/Drizin/CodegenCS/issues/36
     <ItemGroup>
-        <ProjectReference Include="..\fennecs.generators\fennecs.generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetTargetFramework="TargetFramework=netstandard2.0" />
+        <PackageReference Include="CodegenCS.MSBuild" Version="3.5.2" PrivateAssets="All">
+        </PackageReference>
     </ItemGroup>
+    -->
 
 </Project>
diff --git a/fennecs/fennecs.csproj.DotSettings b/fennecs/fennecs.csproj.DotSettings
@@ -3,4 +3,5 @@
 	<s:String x:Key="/Default/CodeInspection/Daemon/ConfigureAwaitAnalysisMode/@EntryValue">Library</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=expressions/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=generated/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=generators/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=streams/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>