Add .NET 10 support via NativeAOT-LLVM along side .NET 8 support

.github/workflows/ci.yml

@@ -184,7 +184,13 @@ jobs:
           cd modules
           # the sdk-manifests on windows-latest are messed up, so we need to update them
           dotnet workload config --update-mode manifests
-          dotnet workload update
+          dotnet workload update --from-previous-sdk
+          # Explicitly install wasi-experimental for .NET 8 SDK (needed for test_build_csharp_module)
+          # Create temp global.json to target .NET 8 SDK for workload install
+          $sdk8Json = '{"sdk":{"version":"8.0.400","rollForward":"latestFeature"}}'
+          $sdk8Json | Out-File -FilePath global.json -Encoding utf8
+          dotnet workload install wasi-experimental
+          Remove-Item global.json
 
       - name: Override NuGet packages
         shell: bash
@@ -1075,6 +1081,16 @@ jobs:
         with:
           global-json-file: global.json
 
+      - name: Install .NET workloads
+        run: |
+          dotnet workload config --update-mode manifests
+          dotnet workload update --from-previous-sdk
+          # Explicitly install wasi-experimental for .NET 8 SDK (needed for test_build_csharp_module)
+          # Create temp global.json to target .NET 8 SDK for workload install
+          echo '{"sdk":{"version":"8.0.100","rollForward":"latestFeature"}}' > global.json
+          dotnet workload install wasi-experimental
+          rm global.json
+
       - name: Override NuGet packages
         run: |
           dotnet pack crates/bindings-csharp/BSATN.Runtime
@@ -1146,9 +1162,11 @@ jobs:
 
       - name: Check quickstart-chat bindings are up to date
         run: |
-          bash sdks/csharp/tools~/gen-quickstart.sh
+          for dotnet_version in 8 10; do
+            bash sdks/csharp/tools~/gen-quickstart.sh "$dotnet_version"
+          done
           tools/check-diff.sh templates/chat-console-cs/module_bindings || {
-              echo 'Error: quickstart-chat bindings have changed. Please run `sdks/csharp/tools~/gen-quickstart.sh`.'
+              echo 'Error: quickstart-chat bindings have changed. Please run `sdks/csharp/tools~/gen-quickstart.sh 10`.'
               exit 1
           }
 
@@ -1170,6 +1188,21 @@ jobs:
       - name: Run regression tests
         run: |
           bash sdks/csharp/tools~/run-regression-tests.sh
+          # Restore global.json symlinks (we replaced them with files to work around .NET 10 SDK bug)
+          # server is 5 levels deep from root, republishing dirs are 6 levels deep
+          if [ -f sdks/csharp/examples~/regression-tests/server/global.json ] && [ ! -L sdks/csharp/examples~/regression-tests/server/global.json ]; then
+            echo "Restoring symlink at server/global.json"
+            rm -f sdks/csharp/examples~/regression-tests/server/global.json
+            ln -s ../../../../../global.json sdks/csharp/examples~/regression-tests/server/global.json
+          fi
+          for dir in sdks/csharp/examples~/regression-tests/republishing/server-initial \
+                     sdks/csharp/examples~/regression-tests/republishing/server-republish; do
+            if [ -f "$dir/global.json" ] && [ ! -L "$dir/global.json" ]; then
+              echo "Restoring symlink at $dir/global.json"
+              rm -f "$dir/global.json"
+              ln -s ../../../../../../global.json "$dir/global.json"
+            fi
+          done
           tools/check-diff.sh sdks/csharp/examples~/regression-tests || {
               echo 'Error: Bindings are dirty. Please run `sdks/csharp/tools~/gen-regression-tests.sh`.'
               exit 1

crates/bindings-csharp/BSATN.Codegen/BSATN.Codegen.csproj

@@ -20,6 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Keep the shipped analyzer loadable by the .NET 8 compiler host. -->
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
   </ItemGroup>
 

crates/bindings-csharp/BSATN.Codegen/Diag.cs

@@ -164,13 +164,16 @@ EnumDeclarationSyntax @enum
             @enum => @enum.Members[256]
         );
 
-    public static readonly ErrorDescriptor<INamedTypeSymbol> TaggedEnumInlineTuple =
+    public static readonly ErrorDescriptor<(
+        INamedTypeSymbol baseType,
+        SyntaxNode location
+    )> TaggedEnumInlineTuple =
         new(
             group,
             "Tagged enum variants must be declared with inline tuples",
-            baseType =>
-                $"{baseType} does not have the expected format SpacetimeDB.TaggedEnum<(TVariant1 v1, ..., TVariantN vN)>.",
-            baseType => baseType
+            ctx =>
+                $"{ctx.baseType} does not have the expected format SpacetimeDB.TaggedEnum<(TVariant1 v1, ..., TVariantN vN)>.",
+            ctx => ctx.location
         );
 
     public static readonly ErrorDescriptor<IFieldSymbol> TaggedEnumField =

crates/bindings-csharp/BSATN.Codegen/Type.cs

@@ -563,7 +563,13 @@
                 is not INamedTypeSymbol { IsTupleType: true, TupleElements: var taggedEnumVariants }
             )
             {
-                diag.Report(ErrorDescriptor.TaggedEnumInlineTuple, type.BaseType);
+                diag.Report(
+                    ErrorDescriptor.TaggedEnumInlineTuple,
+                    (
+                        type.BaseType,
+                        (SyntaxNode?)typeSyntax.BaseList?.Types.FirstOrDefault()?.Type ?? typeSyntax
+                    )
+                );
             }
 
             if (fields.FirstOrDefault() is { } field)
@@ -734,7 +740,7 @@
 
             write = "value.WriteFields(writer);";
 
             var declHashName = (MemberDeclaration decl) => $"___hash{decl.Name}";
 
             getHashCode = $$"""
                 {{string.Join("\n", bsatnDecls.Select(decl => decl.Type.GetHashCodeStatement(decl.Identifier, declHashName(decl))))}}
@@ -783,7 +789,7 @@
             // If we are a reference type, various equality methods need to take nullable references.
             // If we are a value type, everything is pleasantly by-value.
             var fullNameMaybeRef = $"{FullName}{(Scope.IsStruct ? "" : "?")}";
             var declEqualsName = (MemberDeclaration decl) => $"___eq{decl.Name}";
 
             extensions.Contents.Append(
                 $$"""

crates/bindings-csharp/BSATN.Runtime.Tests/BSATN.Runtime.Tests.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <RootNamespace>SpacetimeDB</RootNamespace>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>

crates/bindings-csharp/BSATN.Runtime/BSATN.Runtime.csproj

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Note: the binary produced by this package is used in Unity too, which is limited to .NET Standard 2.1. -->
-    <TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net8.0;net10.0</TargetFrameworks>
     <RootNamespace>SpacetimeDB</RootNamespace>
     <!-- You can enable this when debugging codegen problems. Outputs in obj/debug/[version]/generated. -->
     <!-- <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles> -->

crates/bindings-csharp/Codegen.Tests/Codegen.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <RootNamespace>SpacetimeDB.Codegen.Tests</RootNamespace>
     <DefaultItemExcludes>$(DefaultItemExcludes);fixtures/**/*</DefaultItemExcludes>
   </PropertyGroup>
@@ -18,17 +18,29 @@
 
   <ItemGroup>
     <PackageReference Include="CSharpier.Core" Version="0.28.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="Verify.SourceGenerators" Version="2.4.3" />
     <PackageReference Include="Verify.XUnit" Version="26.4.5" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net8.'))">
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.9" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net10.'))">
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="../Codegen/Codegen.csproj" />
   </ItemGroup>

crates/bindings-csharp/Codegen.Tests/Tests.cs

@@ -26,19 +26,19 @@ public static class GeneratorSnapshotTests
 
     record struct StepOutput(string Key, IncrementalStepRunReason Reason, object Value);
 
-    class Fixture
+    private class Fixture
     {
         private readonly string projectDir;
-        private readonly CSharpCompilation sampleCompilation;
+        public CSharpCompilation SampleCompilation { get; }
+        public CSharpParseOptions ParseOptions { get; }
 
         public Fixture(string projectDir, CSharpCompilation sampleCompilation)
         {
             this.projectDir = projectDir;
-            this.sampleCompilation = sampleCompilation;
+            SampleCompilation = sampleCompilation;
+            ParseOptions = (CSharpParseOptions)sampleCompilation.SyntaxTrees.First().Options;
         }
 
-        public CSharpCompilation SampleCompilation => sampleCompilation;
-
         public static async Task<Fixture> Compile(string name)
         {
             var projectDir = Path.Combine(GetProjectDir(), "fixtures", name);
@@ -53,7 +53,7 @@ public Task Verify(string fileName, object target) =>
 
         private static CSharpGeneratorDriver CreateDriver(
             IIncrementalGenerator generator,
-            LanguageVersion languageVersion
+            CSharpParseOptions parseOptions
         )
         {
             return CSharpGeneratorDriver.Create(
@@ -62,39 +62,39 @@ LanguageVersion languageVersion
                     disabledOutputs: IncrementalGeneratorOutputKind.None,
                     trackIncrementalGeneratorSteps: true
                 ),
-                // Make sure that generated files are parsed with the same language version.
-                parseOptions: new(languageVersion)
+                // Make sure generated files are parsed with the same language version and feature flags.
+                parseOptions: parseOptions
             );
         }
 
         private async Task<IEnumerable<SyntaxTree>> RunAndCheckGenerator(
             IIncrementalGenerator generator
         )
         {
-            var driver = CreateDriver(generator, sampleCompilation.LanguageVersion);
+            var driver = CreateDriver(generator, ParseOptions);
 
             // Store the new driver instance - it contains the results and the cache.
-            var driverAfterGen = driver.RunGenerators(sampleCompilation);
+            var driverAfterGen = driver.RunGenerators(SampleCompilation);
             var genResult = driverAfterGen.GetRunResult();
 
             // Verify the generated code against the snapshots.
             await Verify(generator.GetType().Name, genResult);
 
-            CheckCacheWorking(sampleCompilation, driverAfterGen);
+            CheckCacheWorking(SampleCompilation, driverAfterGen);
 
             return genResult.GeneratedTrees;
         }
 
         public GeneratorDriverRunResult RunGeneratorAndGetResult(IIncrementalGenerator generator)
         {
-            var driver = CreateDriver(generator, sampleCompilation.LanguageVersion);
-            return driver.RunGenerators(sampleCompilation).GetRunResult();
+            var driver = CreateDriver(generator, ParseOptions);
+            return driver.RunGenerators(SampleCompilation).GetRunResult();
         }
 
         public async Task<CSharpCompilation> RunAndCheckGenerators(
             params IIncrementalGenerator[] generators
         ) =>
-            sampleCompilation.AddSyntaxTrees(
+            SampleCompilation.AddSyntaxTrees(
                 (await Task.WhenAll(generators.Select(RunAndCheckGenerator))).SelectMany(output =>
                     output
                 )
@@ -241,10 +241,7 @@ public static async Task TypeAndModuleGeneratorsOnServer()
         // make sure a downstream "user" file that references SpacetimeDB.Local doesn't trigger CS0436.
         var userCode =
             "namespace User; public sealed class UseLocal { public SpacetimeDB.Local Db; }";
-        var userTree = CSharpSyntaxTree.ParseText(
-            userCode,
-            new CSharpParseOptions(compilationAfterGen.LanguageVersion)
-        );
+        var userTree = CSharpSyntaxTree.ParseText(userCode, fixture.ParseOptions);
         var compilationWithUserCode = compilationAfterGen.AddSyntaxTrees(userTree);
         AssertNoCs0436Diagnostics(compilationWithUserCode);
     }
@@ -332,8 +329,11 @@ public static void @params(ProcedureContext ctx)
             }
             """;
 
-        var parseOptions = new CSharpParseOptions(fixture.SampleCompilation.LanguageVersion);
-        var tree = CSharpSyntaxTree.ParseText(source, parseOptions, path: "KeywordNames.cs");
+        var tree = CSharpSyntaxTree.ParseText(
+            source,
+            fixture.ParseOptions,
+            path: "KeywordNames.cs"
+        );
         var compilation = fixture.SampleCompilation.AddSyntaxTrees(tree);
 
         var driver = CSharpGeneratorDriver.Create(
@@ -345,7 +345,7 @@ public static void @params(ProcedureContext ctx)
                 disabledOutputs: IncrementalGeneratorOutputKind.None,
                 trackIncrementalGeneratorSteps: true
             ),
-            parseOptions: parseOptions
+            parseOptions: fixture.ParseOptions
         );
 
         var runResult = driver.RunGenerators(compilation).GetRunResult();

crates/bindings-csharp/Codegen.Tests/fixtures/diag/diag.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

crates/bindings-csharp/Codegen.Tests/fixtures/explicitnames/explicitnames.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

crates/bindings-csharp/Codegen.Tests/fixtures/explicitnames/snapshots/Module#FFI.verified.cs

@@ -559,7 +559,7 @@ public static List<T> ToListOrEmpty<T>(T? value)
     public static List<T> ToListOrEmpty<T>(T? value)
         where T : class => value is null ? new List<T>() : new List<T> { value };
 
-#if EXPERIMENTAL_WASM_AOT
+#if EXPERIMENTAL_WASM_AOT || NET10_0_OR_GREATER
     // In AOT mode we're building a library.
     // Main method won't be called automatically, so we need to export it as a preinit function.
     [UnmanagedCallersOnly(EntryPoint = "__preinit__10_init_csharp")]
@@ -628,7 +628,7 @@ public static void Main()
     }
 
     // Exports only work from the main assembly, so we need to generate forwarding methods.
-#if EXPERIMENTAL_WASM_AOT
+#if EXPERIMENTAL_WASM_AOT || NET10_0_OR_GREATER
     [UnmanagedCallersOnly(EntryPoint = "__describe_module__")]
     public static void __describe_module__(SpacetimeDB.Internal.BytesSink d) =>
         SpacetimeDB.Internal.Module.__describe_module__(d);

crates/bindings-csharp/Codegen.Tests/fixtures/server/server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#FFI.verified.cs

@@ -2467,7 +2467,7 @@ public static List<T> ToListOrEmpty<T>(T? value)
     public static List<T> ToListOrEmpty<T>(T? value)
         where T : class => value is null ? new List<T>() : new List<T> { value };
 
-#if EXPERIMENTAL_WASM_AOT
+#if EXPERIMENTAL_WASM_AOT || NET10_0_OR_GREATER
     // In AOT mode we're building a library.
     // Main method won't be called automatically, so we need to export it as a preinit function.
     [UnmanagedCallersOnly(EntryPoint = "__preinit__10_init_csharp")]
@@ -2556,7 +2556,7 @@ public static void Main()
     }
 
     // Exports only work from the main assembly, so we need to generate forwarding methods.
-#if EXPERIMENTAL_WASM_AOT
+#if EXPERIMENTAL_WASM_AOT || NET10_0_OR_GREATER
     [UnmanagedCallersOnly(EntryPoint = "__describe_module__")]
     public static void __describe_module__(SpacetimeDB.Internal.BytesSink d) =>
         SpacetimeDB.Internal.Module.__describe_module__(d);

crates/bindings-csharp/Codegen/Codegen.csproj

@@ -21,10 +21,11 @@
   <ItemGroup>
     <!-- This analyzer uses some shared helpers from the BSATN.Codegen one, so include it as a regular dependency -->
     <!-- (*not* with OutputItemType=analyzer because we don't want to use that source generator on source of Codegen itself) -->
-    <ProjectReference Include="../BSATN.Codegen/BSATN.Codegen.csproj" />
+    <ProjectReference Include="../BSATN.Codegen/BSATN.Codegen.csproj" GlobalPropertiesToRemove="RuntimeIdentifier;SelfContained" />
   </ItemGroup>
 
   <ItemGroup>
+    <!-- Keep the shipped analyzer loadable by the .NET 8 compiler host. -->
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
   </ItemGroup>