Release/v1.0.0 rc1 hotfix4

.github/workflows/ci.yml

@@ -120,49 +120,26 @@ jobs:
         run: |
           sudo mkdir /stdb
           sudo chmod 777 /stdb
+
       - name: Checkout C# SDK
         uses: actions/checkout@v4
         with:
           repository: clockworklabs/spacetimedb-csharp-sdk
           ref: staging
           path: spacetimedb-csharp-sdk
 
-      - name: C# SDK tests
+      - name: Setup NuGet override for C# SDK
+        working-directory: spacetimedb-csharp-sdk
         run: |
-          ( cd crates/bindings-csharp/BSATN.Runtime && dotnet pack )
-          cd spacetimedb-csharp-sdk
-
-          # Write out the nuget config file to `nuget.config`. This causes the spacetimedb-csharp-sdk repository
-          # to be aware of the local versions of the `bindings-csharp` packages in SpacetimeDB, and use them if
-          # available. Otherwise, `spacetimedb-csharp-sdk` will use the NuGet versions of the packages.
-          # This means that (if version numbers match) we will test the local versions of the C# packages, even
-          # if they're not pushed to NuGet.
-          # See https://learn.microsoft.com/en-us/nuget/reference/nuget-config-file for more info on the config file,
-          # and https://tldp.org/LDP/abs/html/here-docs.html for more info on this bash feature.
-          cat >nuget.config <<EOF
-          <?xml version="1.0" encoding="utf-8"?>
-          <configuration>
-            <packageSources>
-              <!-- Local NuGet repositories -->
-              <add key="Local SpacetimeDB.BSATN.Runtime" value="../crates/bindings-csharp/BSATN.Runtime/bin/Release" />
-            </packageSources>
-            <packageSourceMapping>
-              <!-- Ensure that SpacetimeDB.BSATN.Runtime is used from the local folder. -->
-              <!-- Otherwise we risk an outdated version being quietly pulled from NuGet for testing. -->
-              <packageSource key="Local SpacetimeDB.BSATN.Runtime">
-                <package pattern="SpacetimeDB.BSATN.Runtime" />
-              </packageSource>
-              <!-- Fallback to NuGet for other packages. -->
-              <packageSource key="nuget.org">
-                <package pattern="*" />
-              </packageSource>
-            </packageSourceMapping>
-          </configuration>
-          EOF
+          dotnet pack ../crates/bindings-csharp/BSATN.Runtime
+          ./tools~/write-nuget-config.sh ..
 
           # clear package caches, so we get fresh ones even if version numbers haven't changed
           dotnet nuget locals all --clear
-          dotnet test
+
+      - name: Run C# SDK tests
+        working-directory: spacetimedb-csharp-sdk
+        run: dotnet test
 
   lints:
     name: Lints

Cargo.toml

@@ -166,7 +166,6 @@ http = "1.0"
 humantime = "2.1.0"
 hyper = "1.0"
 hyper-util = { version = "0.1", features = ["tokio"] }
-im = "15.1"
 imara-diff = "0.1.3"
 indexmap = "2.0.0"
 indicatif = "0.16"

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.BSATN.Codegen</AssemblyName>
-    <Version>1.0.0-rc1</Version>
+    <Version>1.0.0-rc1-hotfix1</Version>
     <Title>SpacetimeDB BSATN Codegen</Title>
     <Description>The SpacetimeDB BSATN Codegen implements the Roslyn incremental generators for BSATN serialization/deserialization in C#.</Description>
   </PropertyGroup>

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

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <RootNamespace>SpacetimeDB</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CSharpier.Core" Version="0.28.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../BSATN.Runtime/BSATN.Runtime.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,162 @@
+namespace SpacetimeDB;
+
+using Xunit;
+
+public static class BSATNRuntimeTests
+{
+    [Fact]
+    public static void AddressRoundtrips()
+    {
+        var str = "00112233445566778899AABBCCDDEEFF";
+        var addr = Address.FromHexString(str);
+
+        Assert.NotNull(addr);
+        Assert.Equal(addr.ToString(), str);
+
+        byte[] bytes =
+        [
+            0x00,
+            0x11,
+            0x22,
+            0x33,
+            0x44,
+            0x55,
+            0x66,
+            0x77,
+            0x88,
+            0x99,
+            0xaa,
+            0xbb,
+            0xcc,
+            0xdd,
+            0xee,
+            0xff,
+        ];
+        var addr2 = Address.FromBigEndian(bytes);
+        Assert.Equal(addr2, addr);
+
+        Array.Reverse(bytes);
+        var addr3 = Address.From(bytes);
+        Assert.Equal(addr3, addr);
+
+        var memoryStream = new MemoryStream();
+        var writer = new BinaryWriter(memoryStream);
+        var bsatn = new Address.BSATN();
+        if (addr is { } addrNotNull)
+        {
+            bsatn.Write(writer, addrNotNull);
+        }
+        else
+        {
+            Assert.Fail("Impossible");
+        }
+        writer.Flush();
+
+        var littleEndianBytes = memoryStream.ToArray();
+        var reader = new BinaryReader(new MemoryStream(littleEndianBytes));
+        var addr4 = bsatn.Read(reader);
+        Assert.Equal(addr4, addr);
+
+        // Note: From = FromLittleEndian
+        var addr5 = Address.From(littleEndianBytes);
+        Assert.Equal(addr5, addr);
+    }
+
+    [Fact]
+    public static void AddressLengthCheck()
+    {
+        for (var i = 0; i < 64; i++)
+        {
+            if (i == 16)
+            {
+                continue;
+            }
+
+            var bytes = new byte[i];
+
+            Assert.ThrowsAny<Exception>(() => Address.From(bytes));
+        }
+    }
+
+    [Fact]
+    public static void IdentityRoundtrips()
+    {
+        var str = "00112233445566778899AABBCCDDEEFF00112233445566778899AABBCCDDEEFF";
+        var ident = Identity.FromHexString(str);
+
+        Assert.Equal(ident.ToString(), str);
+
+        byte[] bytes =
+        [
+            0x00,
+            0x11,
+            0x22,
+            0x33,
+            0x44,
+            0x55,
+            0x66,
+            0x77,
+            0x88,
+            0x99,
+            0xaa,
+            0xbb,
+            0xcc,
+            0xdd,
+            0xee,
+            0xff,
+            0x00,
+            0x11,
+            0x22,
+            0x33,
+            0x44,
+            0x55,
+            0x66,
+            0x77,
+            0x88,
+            0x99,
+            0xaa,
+            0xbb,
+            0xcc,
+            0xdd,
+            0xee,
+            0xff,
+        ];
+        var ident2 = Identity.FromBigEndian(bytes);
+        Assert.Equal(ident2, ident);
+
+        Array.Reverse(bytes);
+        var ident3 = Identity.From(bytes);
+        Assert.Equal(ident3, ident);
+
+        var memoryStream = new MemoryStream();
+        var writer = new BinaryWriter(memoryStream);
+        var bsatn = new Identity.BSATN();
+        bsatn.Write(writer, ident);
+        writer.Flush();
+
+        var littleEndianBytes = memoryStream.ToArray();
+        var reader = new BinaryReader(new MemoryStream(littleEndianBytes));
+        var ident4 = bsatn.Read(reader);
+        Assert.Equal(ident4, ident);
+
+        // Note: From = FromLittleEndian
+        var ident5 = Identity.From(littleEndianBytes);
+        Assert.Equal(ident5, ident);
+    }
+
+    [Fact]
+    public static void IdentityLengthCheck()
+    {
+        for (var i = 0; i < 64; i++)
+        {
+            if (i == 32)
+            {
+                continue;
+            }
+
+            var bytes = new byte[i];
+
+            Assert.ThrowsAny<Exception>(() => Identity.From(bytes));
+        }
+    }
+}

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.BSATN.Runtime</AssemblyName>
-    <Version>1.0.0-rc1</Version>
+    <Version>1.0.0-rc1-hotfix1</Version>
     <Title>SpacetimeDB BSATN Runtime</Title>
     <Description>The SpacetimeDB BSATN Runtime implements APIs for BSATN serialization/deserialization in C#.</Description>
   </PropertyGroup>