fake a release

.github/workflows/integration-test-callable-from-server-repo.yml

@@ -1,61 +0,0 @@
-name: Integration Test
-
-on:
-  workflow_call:
-    inputs:
-      speckle-sharp-sdk-ref:
-        required: true
-        type: string
-
-jobs:
-  integration-test:
-    env:
-      CLIENT_DIR: "./client"
-      CLIENT_REPO: "specklesystems/speckle-sharp-sdk"
-      SERVER_DIR: "./server"
-      SERVER_REPO: "specklesystems/speckle-server-internal"
-      SOLUTION: "Speckle.Sdk.sln"
-      SPECKLE_SERVER_IMAGE: "speckle-server:local"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout ${{ env.CLIENT_REPO }}
-        uses: actions/checkout@v6
-        with:
-          path: ${{ env.CLIENT_DIR }}
-          repository: ${{ env.CLIENT_REPO }}
-          ref: ${{ inputs.speckle-sharp-sdk-ref }}
-
-      - name: Checkout ${{ env.SERVER_REPO }}
-        uses: actions/checkout@v6
-        with:
-          repository: ${{ env.SERVER_REPO }}
-          path: ${{ env.SERVER_DIR }}
-
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: 8.x.x
-      #          cache: true
-      #          cache-dependency-path: "**/packages.lock.json"
-
-      - name: 🏗️ Build Server
-        run: docker build --file "./packages/server/Dockerfile" --tag ${{ env.SPECKLE_SERVER_IMAGE }} .
-        working-directory: ${{ env.SERVER_DIR }}
-          
-      - name: ⚙️ Spin up Server
-        run: docker compose --file "../${{ env.CLIENT_DIR }}/docker-compose-internal.yml" up --wait
-        working-directory: ${{ env.SERVER_DIR }}
-        env:
-          SPECKLE_SERVER_IMAGE: ${{ env.SPECKLE_SERVER_IMAGE }}
-
-      - name: 📦 Restore .NET Solution
-        run: dotnet restore ${{ env.SOLUTION }} --locked-mode
-        working-directory: ${{ env.CLIENT_DIR }}
-        
-      - name: 🏗️ Build .NET Solution
-        run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore -warnaserror
-        working-directory: ${{ env.CLIENT_DIR }}
-        
-      - name: 🔨 Run .NET Integration Tests 
-        run: dotnet test ${{ env.SOLUTION }} --filter "(Category=Integration)&(Server!=Public)" --configuration Release --no-build --no-restore --verbosity=normal
-        working-directory: ${{ env.CLIENT_DIR }}

.github/workflows/integration-test.yml

@@ -6,12 +6,10 @@ on:
       docker-compose-file:
         required: true
         type: string
-      use-internal-image:
+      use-github-container-registry:
         default: false
         type: boolean
-    secrets:
-      CODECOV_TOKEN:
-        required: true
+
 jobs:
   integration-test:
     env:
@@ -19,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
@@ -29,7 +27,7 @@ jobs:
           cache-dependency-path: "**/packages.lock.json"
 
       - name: 🔐 Login to Github Container Registry
-        if: ${{ inputs.use-internal-image }}
+        if: ${{ inputs.use-github-container-registry }}
         uses: docker/login-action@v3
         with:
           registry: "ghcr.io"
@@ -37,7 +35,7 @@ jobs:
           password: ${{ github.token }}
 
       - name: ⚙️ Spin up Server
-        run: docker compose --file ${{ inputs.docker-compose-file }} up --wait
+        run: docker compose -f ${{ inputs.docker-compose-file }} up --wait
 
       - name: 📦 Restore
         run: dotnet restore ${{ env.Solution }} --locked-mode
@@ -45,18 +43,11 @@ jobs:
       - name: 🏗️ Build
         run: dotnet build ${{ env.Solution }} --configuration Release --no-restore -warnaserror
 
-      - name: 🔨 Integration Tests against Public Server
-        if: ${{ !inputs.use-internal-image }}
-        run: dotnet test ${{ env.Solution }} --filter "(Category=Integration)&(Server!=Internal)" --configuration Release --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage
-
-      - name: 🔨 Integration Tests against Internal Server
-        if: ${{ inputs.use-internal-image }}
-        run: dotnet test ${{ env.Solution }} --filter "(Category=Integration)&(Server!=Public)" --configuration Release --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage
+      - name: 🔨 Integration Tests
+        run: dotnet test ${{ env.Solution }} --filter "Category=Integration" --configuration Release --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5
-        continue-on-error: true
         with:
-          fail_ci_if_error: true
           files: tests/**/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pr.yml

@@ -1,11 +1,7 @@
 name: PR Test
 
 on:
-  pull_request: {}
-  push: 
-    branches:
-      - "main" # Need to run for codecov to compare against the BASE
-
+  pull_request:
 
 jobs:
   build:
@@ -14,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
@@ -43,9 +39,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5
-        continue-on-error: true
         with:
-          fail_ci_if_error: true
           files: tests/**/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -53,13 +47,9 @@ jobs:
     uses: "./.github/workflows/integration-test.yml"
     with:
       docker-compose-file: "docker-compose-internal.yml"
-      use-internal-image: true
-    secrets: 
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      
+      use-github-container-registry: true
+
   integration-test-public:
     uses: "./.github/workflows/integration-test.yml"
     with:
       docker-compose-file: "docker-compose.yml"
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
@@ -46,6 +46,11 @@ jobs:
           SEMVER: ${{ steps.set-version.outputs.SEMVER }}
           FILE_VERSION: ${{ steps.set-version.outputs.FILE_VERSION }}
 
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/codecov-action@v5
+        with:
+          files: tests/**/coverage.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: NuGet login (OIDC → temp API key)
         uses: NuGet/login@v1

.tool-versions

@@ -1 +0,0 @@
-dotnet 8.0.400

Directory.Packages.props

@@ -15,8 +15,8 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[2.2.0,)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[2.2.0,)" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.4,)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="[2.2.0,)" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="[5.0.0,)" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
     <PackageVersion Include="Open.ChannelExtensions" Version="9.1.0" />

Speckle.Sdk.slnx

@@ -10,7 +10,6 @@
     <File Path="Directory.Build.props" />
     <File Path="Directory.Build.Targets" />
     <File Path="Directory.Packages.props" />
-    <File Path="docker-compose-internal.yml" />
     <File Path="docker-compose.yml" />
     <File Path="global.json" />
     <File Path="README.md" />
@@ -18,8 +17,6 @@
     <File Path=".github\git-commit-instructions.md" />
   </Folder>
   <Folder Name="/config/workflows/">
-    <File Path=".github/workflows/integration-test-callable-from-server-repo.yml" />
-    <File Path=".github/workflows/integration-test.yml" />
     <File Path=".github/workflows/pr.yml" />
     <File Path=".github/workflows/release.yml" />
   </Folder>

build/Program.cs

@@ -180,6 +180,6 @@ Target(
   }
 );
 
-Target("default", dependsOn: [FORMAT, TEST, INTEGRATION], () => Console.WriteLine("Done!"));
+Target("default", dependsOn: [FORMAT, TEST], () => Console.WriteLine("Done!"));
 
 await RunTargetsAndExitAsync(args).ConfigureAwait(true);

docker-compose-internal.yml

@@ -52,7 +52,7 @@ services:
       start_period: 10s
 
   speckle-server:
-    image: ${SPECKLE_SERVER_IMAGE:-ghcr.io/specklesystems/speckle-server:latest}
+    image: ghcr.io/specklesystems/speckle-server:latest
     restart: always
     healthcheck:
       test:
@@ -97,7 +97,10 @@ services:
 
       STRATEGY_LOCAL: "true"
 
-      POSTGRES_URL: 'postgres://speckle:speckle@postgres:5432/speckle'
+      POSTGRES_URL: "postgres"
+      POSTGRES_USER: "speckle"
+      POSTGRES_PASSWORD: "speckle"
+      POSTGRES_DB: "speckle"
       ENABLE_MP: "false"
 
       LOG_PRETTY: "true"

src/Speckle.Automate.Sdk/AutomationContext.cs

@@ -63,7 +63,7 @@ internal sealed class AutomationContext(IOperations operations) : IAutomationCon
       );
     }
 
-    Base rootObject = await operations
+    Base? rootObject = await operations
       .Receive2(
         SpeckleClient.ServerUrl,
         AutomationRunData.ProjectId,
@@ -74,10 +74,6 @@ internal sealed class AutomationContext(IOperations operations) : IAutomationCon
       )
       .ConfigureAwait(false);
 
-    await SpeckleClient
-      .Version.Received(new(version.id, AutomationRunData.ProjectId, "automate_function"), cancellationToken)
-      .ConfigureAwait(false);
-
     Console.WriteLine($"It took {Elapsed.TotalSeconds} seconds to receive the speckle version {versionId}");
     return rootObject;
   }

src/Speckle.Automate.Sdk/packages.lock.json

@@ -281,6 +281,7 @@
         "type": "Project",
         "dependencies": {
           "GraphQL.Client": "[6.0.0, )",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )",
           "Microsoft.CSharp": "[4.7.0, )",
           "Microsoft.Data.Sqlite": "[7.0.5, )",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )",
@@ -291,10 +292,7 @@
         }
       },
       "speckle.sdk.dependencies": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )"
-        }
+        "type": "Project"
       },
       "GraphQL.Client": {
         "type": "CentralTransitive",
@@ -309,9 +307,9 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "CentralTransitive",
-        "requested": "[9.0.4, )",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "requested": "[5.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }

src/Speckle.Objects/Geometry/SolidX.cs

@@ -1,6 +0,0 @@
-using Speckle.Sdk.Models;
-
-namespace Speckle.Objects.Geometry;
-
-[SpeckleType("Objects.Geometry.SolidX")]
-public class SolidX : RawEncodedObject;

src/Speckle.Objects/Other/RawEncoding.cs

@@ -20,6 +20,4 @@ public class RawEncoding : Base // note: at this stage, since we're using this f
 public static class RawEncodingFormats
 {
   public const string RHINO_3DM = "3dm";
-  public const string ACAD_DWG = "dwg";
-  public const string ACAD_SAT = "sat";
 }

src/Speckle.Objects/packages.lock.json

@@ -228,6 +228,7 @@
         "type": "Project",
         "dependencies": {
           "GraphQL.Client": "[6.0.0, )",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )",
           "Microsoft.CSharp": "[4.7.0, )",
           "Microsoft.Data.Sqlite": "[7.0.5, )",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )",
@@ -238,10 +239,7 @@
         }
       },
       "speckle.sdk.dependencies": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )"
-        }
+        "type": "Project"
       },
       "GraphQL.Client": {
         "type": "CentralTransitive",
@@ -256,9 +254,9 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "CentralTransitive",
-        "requested": "[9.0.4, )",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "requested": "[5.0.0, )",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }

src/Speckle.Sdk.Dependencies/ISdkActivity.cs

@@ -5,7 +5,6 @@ public interface ISdkActivity : IDisposable
   void SetTag(string key, object? value);
   void RecordException(Exception e);
   string TraceId { get; }
-  string SpanId { get; }
   void SetStatus(SdkActivityStatusCode code);
 
   void InjectHeaders(Action<string, string> header);

src/Speckle.Sdk.Dependencies/ISdkActivityFactory.cs

@@ -1,20 +1,8 @@
 using System.Runtime.CompilerServices;
-using Speckle.Connectors.Logging;
 
 namespace Speckle.Sdk.Logging;
 
 public interface ISdkActivityFactory : IDisposable
 {
-  ISdkActivity? Start(
-    string? name = null,
-    SdkActivityKind kind = SdkActivityKind.Internal,
-    [CallerMemberName] string source = ""
-  );
-
-  ISdkActivity? StartRemote(
-    string traceContext,
-    SdkActivityKind kind,
-    string? name = null,
-    [CallerMemberName] string source = ""
-  );
+  ISdkActivity? Start(string? name = default, [CallerMemberName] string source = "");
 }

src/Speckle.Sdk.Dependencies/RepackedChannel.cs

@@ -1,49 +0,0 @@
-using System.Threading.Channels;
-
-namespace Speckle.Sdk.Dependencies;
-
-/// <summary>
-/// For various reasons related to our use of ILRepack.FullAuto,
-/// we cannot use Channels from the SDK project.
-/// We have to keep usage of it inside the Sdk.Dependencies project.
-///
-/// For the sake of quick development, I've wrapped the <see cref="Channel"/> class here in a type
-/// that is safe to use from the SDK project.
-///
-/// As and when we need more functions, we can add them here.
-///
-/// And yes... I'm not very happy about the way we've set this up
-/// </summary>
-/// <typeparam name="T"></typeparam>
-public sealed class RepackedChannel<T>
-{
-  private readonly Channel<T> _channel;
-
-  public RepackedChannel(int capacity, bool singleReader, bool singleWriter)
-  {
-    _channel = Channel.CreateBounded<T>(
-      new BoundedChannelOptions(capacity)
-      {
-        FullMode = BoundedChannelFullMode.Wait,
-        SingleReader = singleReader,
-        SingleWriter = singleWriter,
-      }
-    );
-  }
-
-  public void CompleteWriter() => _channel.Writer.Complete();
-
-  public ValueTask WriteAsync(T item, CancellationToken cancellationToken) =>
-    _channel.Writer.WriteAsync(item, cancellationToken);
-
-  public IAsyncEnumerable<T> ReadAllAsync(CancellationToken cancellationToken) =>
-    _channel.Reader.ReadAllAsync(cancellationToken);
-
-  // public async Task ReadAllAsync(Func<T, Task> callback, CancellationToken cancellationToken)
-  // {
-  //   await foreach (T item in _channel.Reader.ReadAllAsync(cancellationToken))
-  //   {
-  //     await callback.Invoke(item).ConfigureAwait(false);
-  //   }
-  // }
-}

src/Speckle.Sdk.Dependencies/Speckle.Sdk.Dependencies.csproj

@@ -28,36 +28,4 @@
     <PackageReference Include="Open.ChannelExtensions" PrivateAssets="all" />
     <PackageReference Include="System.Threading.Channels" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-  </ItemGroup>
-  <Target Name="BeforeILRepackPrepareBuild" BeforeTargets="ILRepackPrepareBuild">
-    <ItemGroup>
-      <!--
-      We're Being selective about which assemblies we're il-repacking
-      Avoiding repacling `Microsoft.Bcl.AsyncInterfaces.dll` because we need types like `ValueTask` and `IAsyncEnumerable` to be external
-      
-      Yes, this does beg the question, why are we using `IlRepack.FullAuto` instead of raw ILRepack. Well the truth is, I'd like to move away from FullAuto
-      since it's unmaintaned and is lagging behind ILRepack version.
-      -->
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Numerics.Vectors.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Runtime.CompilerServices.Unsafe.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Memory.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Open.ChannelExtensions.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Threading.Channels.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)System.Collections.Immutable.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Polly.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Polly.Contrib.WaitAndRetry.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Polly.Extensions.Http.dll" />
-      <_ILRepackIncludeAssemblies_Items Include="$(OutputPath)Microsoft.Extensions.ObjectPool.dll" />
-      <_ILRepackExcludeAssemblies_Items Include="$(OutputPath)*.dll" Exclude="@(_ILRepackIncludeAssemblies_Items)" />
-    </ItemGroup>
-    <Message
-      Text="These are the packages we are NOT ilrepacking '@(_ILRepackExcludeAssemblies_Items)'"
-      Importance="high"
-    />
-    <PropertyGroup>
-      <ILRepackExcludeAssemblies>@(_ILRepackExcludeAssemblies_Items)</ILRepackExcludeAssemblies>
-    </PropertyGroup>
-  </Target>
 </Project>

src/Speckle.Sdk.Dependencies/SpeckleActivityKind.cs

@@ -1,30 +0,0 @@
-namespace Speckle.Connectors.Logging;
-
-public enum SdkActivityKind
-{
-  /// <summary>
-  /// Default value.
-  /// Indicates that the Activity represents an internal operation within an application, as opposed to an operations with remote parents or children.
-  /// </summary>
-  Internal = 0,
-
-  /// <summary>
-  /// Server activity represents request incoming from external component.
-  /// </summary>
-  Server = 1,
-
-  /// <summary>
-  /// Client activity represents outgoing request to the external component.
-  /// </summary>
-  Client = 2,
-
-  /// <summary>
-  /// Producer activity represents output provided to external components.
-  /// </summary>
-  Producer = 3,
-
-  /// <summary>
-  /// Consumer activity represents output received from an external component.
-  /// </summary>
-  Consumer = 4,
-}

src/Speckle.Sdk.Dependencies/packages.lock.json

@@ -11,15 +11,6 @@
           "ILRepack": "2.0.33"
         }
       },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Direct",
-        "requested": "[9.0.4, )",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
       "Microsoft.Extensions.ObjectPool": {
         "type": "Direct",
         "requested": "[9.0.4, )",
@@ -160,6 +151,15 @@
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
+      },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "CentralTransitive",
+        "requested": "[5.0.0, )",
+        "resolved": "9.0.4",
+        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
       }
     },
     "net8.0": {

src/Speckle.Sdk/Api/Blob/BlobApi.cs

@@ -193,7 +193,30 @@ public sealed class BlobApi : IBlobApi
     using var response = await _unauthedClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
     response.EnsureSuccessStatusCode();
 
-    return BlobApiHelpers.ParseEtagHeader(response.Headers);
+    return ParseEtagHeader(response.Headers);
+  }
+
+  private static string ParseEtagHeader(HttpResponseHeaders headers)
+  {
+    if (!headers.TryGetValues("ETag", out var etagValues))
+    {
+      throw new ArgumentException(
+        "Response does not have an ETag attached to it, cannot use this as an upload",
+        nameof(headers)
+      );
+    }
+
+    var etagValuesArray = etagValues.ToArray();
+
+    if (etagValuesArray.Length != 1)
+    {
+      throw new ArgumentException(
+        $"Expected Etag header to have a single value but got {etagValuesArray.Length}",
+        nameof(headers)
+      );
+    }
+
+    return etagValuesArray[0];
   }
 
   /// <summary>

src/Speckle.Sdk/Api/GraphQL/Client.cs

@@ -87,26 +87,6 @@ public sealed class Client : ISpeckleGraphQLClient, IClient
     catch (Exception ex) when (!ex.IsFatal()) { }
   }
 
-  /// <summary>
-  /// Ensure the <see cref="GQLClient"/>'s websocket is fully initialized.
-  /// <br/>
-  /// You don't <i>need</i> to call this function, if you don't, then it will be setup for you when you call <see cref="SubscribeTo"/> (e.g. when you create a <see cref="Subscription"/>),
-  /// but due to <see cref="GraphQL"/>'s WebSocket implementation, it's not awaited (deferred) thus the subscription make take a while to actually be setup.
-  /// </summary>
-  /// <remarks>
-  /// We only use websockets for GraphQL subscriptions, so if you're not using subscriptions, don't call this
-  ///
-  /// Note. due to other sources (potentially on the GraphQL side) you still need a ~100ms delay between setting up the subscription, and being able to relaibly trigger it
-  /// This should only really negatively affect test projects.
-  /// </remarks>
-  public async Task InitializeWebsocket()
-  {
-    if (GQLClient.WebSocketSubProtocol is null)
-    {
-      await GQLClient.InitializeWebsocketConnection().ConfigureAwait(false);
-    }
-  }
-
   internal async Task<T> ExecuteWithResiliencePolicies<T>(Func<Task<T>> func) =>
     await GraphQLRetry
       .ExecuteAsync<T, SpeckleGraphQLInternalErrorException>(

src/Speckle.Sdk/Api/GraphQL/Inputs/FileImportInputs.cs

@@ -2,10 +2,8 @@
 
 public record GenerateFileUploadUrlInput(string projectId, string fileName);
 
-[Obsolete(FileImportInputBase.FILE_IMPORT_DEPRECATION_MESSAGE)]
 public record StartFileImportInput(string projectId, string modelId, string fileId, string etag);
 
-[Obsolete(FileImportInputBase.FILE_IMPORT_DEPRECATION_MESSAGE)]
 public record FileImportResult(
   double durationSeconds,
   double downloadDurationSeconds,
@@ -16,23 +14,14 @@ public record FileImportResult(
 
 public abstract class FileImportInputBase
 {
-  internal const string FILE_IMPORT_DEPRECATION_MESSAGE =
-    "Part of the old API surface and will be removed in the future. Use the new ingestion API instead. Field will be deleted on June 1st, 2026";
-
-  [Obsolete(FileImportInputBase.FILE_IMPORT_DEPRECATION_MESSAGE)]
-  protected FileImportInputBase() { }
-
   public required string projectId { get; init; }
   public required string jobId { get; init; }
   public required IReadOnlyCollection<string> warnings { get; init; }
-
-  [Obsolete(FileImportInputBase.FILE_IMPORT_DEPRECATION_MESSAGE)]
   public required FileImportResult result { get; init; }
 }
 
 #pragma warning disable CA1822 //Mark members as static
 
-[Obsolete(FILE_IMPORT_DEPRECATION_MESSAGE)]
 public sealed class FileImportSuccessInput() : FileImportInputBase()
 {
   public const string TYPE_STATUS = "success";
@@ -40,7 +29,6 @@ public sealed class FileImportSuccessInput() : FileImportInputBase()
   public string status => TYPE_STATUS;
 }
 
-[Obsolete(FILE_IMPORT_DEPRECATION_MESSAGE)]
 public sealed class FileImportErrorInput() : FileImportInputBase()
 {
   public const string TYPE_STATUS = "error";

src/Speckle.Sdk/Api/GraphQL/Inputs/IngestInputs.cs

@@ -1,5 +1,4 @@
-using Speckle.Newtonsoft.Json;
-using Speckle.Sdk.Api.GraphQL.Enums;
+using Speckle.Sdk.Api.GraphQL.Enums;
 
 namespace Speckle.Sdk.Api.GraphQL.Inputs;
 
@@ -14,18 +13,12 @@ public record ModelIngestionCreateInput(
   string modelId,
   string projectId,
   string progressMessage,
-  SourceDataInput sourceData,
-  int? maxIdleTimeoutSeconds = null
+  SourceDataInput sourceData
 );
 
 public record ModelIngestionUpdateInput(string ingestionId, string projectId, string progressMessage, double? progress);
 
-public record ModelIngestionSuccessInput(
-  string ingestionId,
-  string projectId,
-  string rootObjectId,
-  string? versionMessage
-);
+public record ModelIngestionSuccessInput(string ingestionId, string projectId, string rootObjectId);
 
 public record ModelIngestionFailedInput(
   string ingestionId,
@@ -42,26 +35,11 @@ public record ModelIngestionFailedInput(
 
 public record ModelIngestionCancelledInput(string ingestionId, string projectId, string cancellationMessage);
 
-public record ModelIngestionStartProcessingInput(
-  string ingestionId,
-  string projectId,
-  string progressMessage,
-  SourceDataInput sourceData
-);
-
-public record ModelIngestionRequeueInput(string ingestionId, string projectId, string progressMessage);
-
 public record ProjectModelIngestionSubscriptionInput(
   string projectId,
   ModelIngestionReference ingestionReference,
-  [property: JsonIgnore] ProjectModelIngestionUpdatedMessageType messageType
-)
-{
-  // The Newtonsoft serializer is setup to handle SCREAMING_CASE enums.
-  // But the API requires the enum to look exactly like they are
-  [JsonProperty(nameof(messageType))]
-  public string serializedType => messageType.ToString();
-}
+  ProjectModelIngestionUpdatedMessageType messageType
+);
 
 /// <remarks>
 /// <c>@oneOf</c> i.e. server expects <b>either</b> <paramref name="ingestionId"/> or <paramref name="modelId"/>, but not both.

src/Speckle.Sdk/Api/GraphQL/Inputs/VersionInputs.cs

@@ -1,6 +1,4 @@
-using Version = Speckle.Sdk.Api.GraphQL.Models.Version;
-
-namespace Speckle.Sdk.Api.GraphQL.Inputs;
+namespace Speckle.Sdk.Api.GraphQL.Inputs;
 
 public record UpdateVersionInput(string versionId, string projectId, string? message);
 
@@ -18,10 +16,6 @@ public record CreateVersionInput(
   IReadOnlyList<string>? parents = null
 );
 
-/// <param name="versionId"></param>
-/// <param name="projectId"></param>
-/// <param name="sourceApplication">IMPORTANT: this is meant to be the slug of the application that has done the receiving, not to be confused with <see cref="Version.sourceApplication"/></param>
-/// <param name="message"></param>
 public record MarkReceivedVersionInput(
   string versionId,
   string projectId,

src/Speckle.Sdk/Api/GraphQL/Models/ModelIngestion.cs

@@ -6,8 +6,7 @@ public sealed class ModelIngestion
   public required DateTime createdAt { get; init; }
   public required DateTime updatedAt { get; init; }
   public required string modelId { get; init; }
-  public required string projectId { get; init; }
-  public required string userId { get; init; }
   public required bool cancellationRequested { get; init; }
   public required ModelIngestionStatusData statusData { get; init; }
+  // public required LimitedUser user { get; init; }
 }

src/Speckle.Sdk/Api/GraphQL/Models/ModelIngestionStatusData.cs

@@ -6,5 +6,4 @@ public sealed class ModelIngestionStatusData
 {
   public required ModelIngestionStatus status { get; init; }
   public required string? progressMessage { get; init; }
-  public required string? versionId { get; init; }
 }

src/Speckle.Sdk/Api/GraphQL/Models/ModelPermissionChecks.cs

@@ -1,8 +0,0 @@
-namespace Speckle.Sdk.Api.GraphQL.Models;
-
-public sealed class ModelPermissionChecks
-{
-  public PermissionCheckResult canUpdate { get; init; }
-  public PermissionCheckResult canDelete { get; init; }
-  public PermissionCheckResult canCreateVersion { get; init; }
-}

src/Speckle.Sdk/Api/GraphQL/Models/PendingStreamCollaborator.cs

@@ -10,7 +10,7 @@ public sealed class PendingStreamCollaborator
   public string projectName { get; init; }
   public string title { get; init; }
   public string role { get; init; }
-  public LimitedUser? invitedBy { get; init; }
+  public LimitedUser invitedBy { get; init; }
   public LimitedUser? user { get; init; }
   public string? token { get; init; }
 }

src/Speckle.Sdk/Api/GraphQL/Models/ProjectPermissionChecks.cs

@@ -5,7 +5,5 @@ public sealed class ProjectPermissionChecks
   public PermissionCheckResult canCreateModel { get; init; }
   public PermissionCheckResult canDelete { get; init; }
   public PermissionCheckResult canLoad { get; init; }
-
-  [Obsolete("Use ModelPermissionChecks.CanCreateVersion instead", true)]
   public PermissionCheckResult canPublish { get; init; }
 }

src/Speckle.Sdk/Api/GraphQL/Resources/ActiveUserResource.cs

@@ -397,6 +397,11 @@ public sealed class ActiveUserResource
                   authorized
                   message
                 }
+                canPublish {
+                  code
+                  authorized
+                  message
+                }
               }
             }
           }

src/Speckle.Sdk/Api/GraphQL/Resources/FileImportResource.cs

@@ -29,10 +29,8 @@ public sealed class FileImportResource : IDisposable
   /// <remarks>
   /// Only use this if you are writing a file importer, that is responsible for
   /// processing file import jobs.
-  /// Only works on servers version >=2.25.8 but from 3.0.7 onwards has been deprecated and replaced by model ingestion api
-  /// see <see cref="ModelIngestionResource.Complete"/>
+  /// Only works on servers version >=2.25.8
   /// </remarks>
-  [Obsolete(FileImportInputBase.FILE_IMPORT_DEPRECATION_MESSAGE)]
   public async Task<bool> FinishFileImportJob(FileImportInputBase input, CancellationToken cancellationToken)
   {
     //language=graphql
@@ -59,11 +57,7 @@ public sealed class FileImportResource : IDisposable
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
   /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  /// <remarks>
-  /// Only works on servers version >=2.25.8 but from 3.0.7 onwards has been deprecated and replaced by model ingestion api
-  /// see <see cref="ModelIngestionResource.StartProcessing"/>
-  /// </remarks>
-  [Obsolete(FileImportInputBase.FILE_IMPORT_DEPRECATION_MESSAGE)]
+  /// <remarks>Only works on servers version >=2.25.8</remarks>
   public async Task<FileImport> StartFileImportJob(
     StartFileImportInput input,
     CancellationToken cancellationToken = default

src/Speckle.Sdk/Api/GraphQL/Resources/ModelIngestionResource.cs

@@ -5,9 +5,6 @@ using Speckle.Sdk.Api.GraphQL.Models.Responses;
 
 namespace Speckle.Sdk.Api.GraphQL.Resources;
 
-/// <remarks>
-/// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-/// </remarks>
 public sealed class ModelIngestionResource
 {
   private readonly ISpeckleGraphQLClient _client;
@@ -17,14 +14,6 @@ public sealed class ModelIngestionResource
     _client = client;
   }
 
-  /// <summary>
-  /// Create a new model ingestion
-  /// </summary>
-  /// <remarks>
-  /// The model ingestion created will have a <c>processing</c> state (not <c>queued</c>). This mutation is designed to be used
-  /// by client/connectors that are immediately processing
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-  /// </remarks>
   /// <param name="input"></param>
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
@@ -44,8 +33,6 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
-              projectId
-              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -73,169 +60,6 @@ public sealed class ModelIngestionResource
     return res.data.data.data;
   }
 
-  /// <remarks>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-  /// </remarks>
-  /// <param name="modelIngestionId"></param>
-  /// <param name="projectId"></param>
-  /// <param name="cancellationToken"></param>
-  /// <returns></returns>
-  /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<ModelIngestion> Get(
-    string modelIngestionId,
-    string projectId,
-    CancellationToken cancellationToken = default
-  )
-  {
-    //language=graphql
-    const string QUERY = """
-      query Query($projectId: String!, $modelIngestionId: ID!) {
-        data:project(id: $projectId) {
-          data:ingestion(id: $modelIngestionId) {
-            id
-            createdAt
-            updatedAt
-            modelId
-            projectId
-            userId
-            cancellationRequested
-            statusData {
-              ... on HasModelIngestionStatus {
-                status
-              }
-              ... on HasProgressMessage {
-                progressMessage
-              }
-              ... on ModelIngestionSuccessStatus
-              {
-                versionId
-              }
-            }
-          }
-        }
-      }
-      """;
-
-    GraphQLRequest request = new() { Query = QUERY, Variables = new { projectId, modelIngestionId } };
-
-    var res = await _client
-      .ExecuteGraphQLRequest<RequiredResponse<RequiredResponse<ModelIngestion>>>(request, cancellationToken)
-      .ConfigureAwait(false);
-
-    return res.data.data;
-  }
-
-  /// <summary>
-  /// For File Import / Cloud integrations only
-  /// </summary>
-  /// <remarks>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-  /// </remarks>
-  /// <param name="input"></param>
-  /// <param name="cancellationToken"></param>
-  /// <returns></returns>
-  /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<ModelIngestion> StartProcessing(
-    ModelIngestionStartProcessingInput input,
-    CancellationToken cancellationToken = default
-  )
-  {
-    //language=graphql
-    const string QUERY = """
-      mutation IngestionStartProcessing($input: ModelIngestionStartProcessingInput!) {
-        data: projectMutations {
-          data: modelIngestionMutations {
-            data: startProcessing(input: $input) {
-              id
-              createdAt
-              updatedAt
-              modelId
-              projectId
-              userId
-              cancellationRequested
-              statusData {
-                ... on HasModelIngestionStatus {
-                  status
-                }
-                ... on HasProgressMessage {
-                  progressMessage
-                }
-              }
-            }
-          }
-        }
-      }
-      """;
-
-    GraphQLRequest request = new() { Query = QUERY, Variables = new { input } };
-
-    var res = await _client
-      .ExecuteGraphQLRequest<RequiredResponse<RequiredResponse<RequiredResponse<ModelIngestion>>>>(
-        request,
-        cancellationToken
-      )
-      .ConfigureAwait(false);
-
-    return res.data.data.data;
-  }
-
-  /// <summary>
-  /// For File Import / Cloud integrations only
-  /// </summary>
-  /// <remarks>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-  /// </remarks>
-  /// <param name="input"></param>
-  /// <param name="cancellationToken"></param>
-  /// <returns></returns>
-  /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<ModelIngestion> Requeue(
-    ModelIngestionRequeueInput input,
-    CancellationToken cancellationToken = default
-  )
-  {
-    //language=graphql
-    const string QUERY = """
-      mutation IngestionStartProcessing($input: ModelIngestionRequeueInput!) {
-        data: projectMutations {
-          data: modelIngestionMutations {
-            data: requeue(input: $input) {
-              id
-              createdAt
-              updatedAt
-              modelId
-              projectId
-              userId
-              cancellationRequested
-              statusData {
-                ... on HasModelIngestionStatus {
-                  status
-                }
-                ... on HasProgressMessage {
-                  progressMessage
-                }
-              }
-            }
-          }
-        }
-      }
-      """;
-
-    GraphQLRequest request = new() { Query = QUERY, Variables = new { input } };
-
-    var res = await _client
-      .ExecuteGraphQLRequest<RequiredResponse<RequiredResponse<RequiredResponse<ModelIngestion>>>>(
-        request,
-        cancellationToken
-      )
-      .ConfigureAwait(false);
-
-    return res.data.data.data;
-  }
-
-  /// <remarks>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-  /// </remarks>
   /// <param name="input"></param>
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
@@ -257,8 +81,6 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
-              projectId
-              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -290,9 +112,6 @@ public sealed class ModelIngestionResource
   /// Request that the server completes the ingestion by creating a version
   /// If successful, the job will be in a terminal "successful" state.
   /// </summary>
-  /// <remarks>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
-  /// </remarks>
   /// <seealso cref="FailWithError"/>
   /// <seealso cref="FailWithCancel"/>
   /// <param name="input"></param>
@@ -333,8 +152,7 @@ public sealed class ModelIngestionResource
   /// Fail the job with an error.
   /// </summary>
   /// <remarks>
-  /// For requested user cancellation, use <see cref="FailWithCancel"/> instead<br/>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
+  /// For requested user cancellation, use <see cref="FailWithCancel"/> instead
   /// </remarks>
   /// <seealso cref="FailWithCancel"/>
   /// <seealso cref="Complete"/>
@@ -357,8 +175,6 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
-              projectId
-              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -390,8 +206,7 @@ public sealed class ModelIngestionResource
   /// Fail the ingestion with a <c>canceled</c> status.
   /// This should only be done if the user has explicitly requested cancellation
   /// Other forms of cancellation use <see cref="FailWithError"/>.
-  /// The ingestion should then enter a terminal "canceled" state.<br/>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
+  /// The ingestion should then enter a terminal "canceled" state
   /// </summary>
   /// <seealso cref="FailWithError"/>
   /// <seealso cref="Complete"/>
@@ -414,8 +229,6 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
-              projectId
-              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -451,8 +264,7 @@ public sealed class ModelIngestionResource
   /// It's up to the client to observe this cancellation request
   /// via <see cref="SubscriptionResource.CreateProjectModelIngestionCancellationRequestedSubscription"/>
   /// and report it as canceled via  <see cref="ModelIngestionResource.FailWithCancel"/>
-  /// See "cooperative cancellation pattern"<br/>
-  /// Model Ingestion API is available for server versions <c>3.0.3</c> and above
+  /// See "cooperative cancellation pattern"
   /// </remarks>
   /// <seealso cref="FailWithError"/>
   /// <seealso cref="Complete"/>
@@ -475,8 +287,6 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
-              projectId
-              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {

src/Speckle.Sdk/Api/GraphQL/Resources/ModelResource.cs

@@ -312,88 +312,4 @@ public sealed class ModelResource
 
     return res.data.data;
   }
-
-  /// <param name="projectId"></param>
-  /// <param name="cancellationToken"></param>
-  /// <returns></returns>
-  /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<ModelPermissionChecks> GetPermissions(
-    string projectId,
-    string modelId,
-    CancellationToken cancellationToken = default
-  )
-  {
-    //language=graphql
-    const string QUERY = """
-      query ModelPermissions($projectId: String!, $modelId: String!) {
-        data:project(id: $projectId) {
-          data:model(id: $modelId) {
-            data:permissions {
-              canUpdate {
-                authorized
-                code
-                message
-              }
-              canDelete {
-                authorized
-                code
-                message
-              }
-              canCreateVersion {
-                authorized
-                code
-                message
-              }
-            }
-          }
-        }
-      }
-      """;
-    GraphQLRequest request = new() { Query = QUERY, Variables = new { projectId, modelId } };
-
-    var response = await _client
-      .ExecuteGraphQLRequest<RequiredResponse<RequiredResponse<RequiredResponse<ModelPermissionChecks>>>>(
-        request,
-        cancellationToken
-      )
-      .ConfigureAwait(false);
-    return response.data.data.data;
-  }
-
-  /// <param name="projectId"></param>
-  /// <param name="cancellationToken"></param>
-  /// <returns></returns>
-  /// <exception cref="SpeckleGraphQLBadInputException">server versions &lt;3.0.11 do not have <c>canCreateIngestion</c> and will throw this exception</exception>
-  /// <inheritdoc cref="ISpeckleGraphQLClient.ExecuteGraphQLRequest{T}"/>
-  public async Task<PermissionCheckResult> CanCreateModelIngestion(
-    string projectId,
-    string modelId,
-    CancellationToken cancellationToken = default
-  )
-  {
-    //language=graphql
-    const string QUERY = """
-      query ModelPermissions($projectId: String!, $modelId: String!) {
-        data:project(id: $projectId) {
-          data:model(id: $modelId) {
-            data:permissions {
-              data:canCreateIngestion {
-                authorized
-                code
-                message
-              }
-            }
-          }
-        }
-      }
-      """;
-    GraphQLRequest request = new() { Query = QUERY, Variables = new { projectId, modelId } };
-
-    var response = await _client
-      .ExecuteGraphQLRequest<
-        RequiredResponse<RequiredResponse<RequiredResponse<RequiredResponse<PermissionCheckResult>>>>
-      >(request, cancellationToken)
-      .ConfigureAwait(false);
-    return response.data.data.data.data;
-  }
 }

src/Speckle.Sdk/Api/GraphQL/Resources/SubscriptionResource.cs

@@ -222,28 +222,14 @@ public sealed class SubscriptionResource : IDisposable
   {
     //language=graphql
     const string QUERY = """
-      subscription IngestionUpdated($input: ProjectModelIngestionSubscriptionInput!) {
+      subscription IngestionUpdated(
+        $input: ProjectModelIngestionSubscriptionInput!
+      ) {
         data: projectModelIngestionUpdated(input: $input) {
           modelIngestion {
             id
             createdAt
             updatedAt
-            modelId
-            projectId
-            userId
-            cancellationRequested
-            statusData {
-              ... on HasModelIngestionStatus {
-                status
-              }
-              ... on HasProgressMessage {
-                progressMessage
-              }
-              ... on ModelIngestionSuccessStatus
-              {
-                versionId
-              }
-            }
           }
           type
         }

src/Speckle.Sdk/Api/GraphQL/Resources/graphql.config.yml

@@ -1,2 +1,2 @@
-schema: https://latest.speckle.systems/graphql
+schema: http://localhost/graphql
 documents: '**/*.graphql'

src/Speckle.Sdk/Helpers/BlobApiHelpers.cs

@@ -1,29 +0,0 @@
-using System.Net.Http.Headers;
-
-namespace Speckle.Sdk.Helpers;
-
-public static class BlobApiHelpers
-{
-  public static string ParseEtagHeader(HttpResponseHeaders headers)
-  {
-    if (!headers.TryGetValues("ETag", out var etagValues))
-    {
-      throw new ArgumentException(
-        "Response does not have an ETag attached to it, cannot use this as an upload",
-        nameof(headers)
-      );
-    }
-
-    var etagValuesArray = etagValues.ToArray();
-
-    if (etagValuesArray.Length != 1)
-    {
-      throw new ArgumentException(
-        $"Expected Etag header to have a single value but got {etagValuesArray.Length}",
-        nameof(headers)
-      );
-    }
-
-    return etagValuesArray[0];
-  }
-}

src/Speckle.Sdk/Helpers/DisposableFile.cs

@@ -1,34 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace Speckle.Sdk.Helpers;
-
-/// <summary>
-/// <see cref="IDisposable"/> wrapper around the downloaded file to try and delete the file on Dispose
-/// </summary>
-/// <remarks>
-/// We're using a similar pattern in the Rhino File Importer codebase (see <c>ImportJobFile</c>)
-/// </remarks>
-/// <param name="logger"></param>
-/// <param name="file"></param>
-public sealed class DisposableFile(FileInfo file, ILogger logger, bool deleteOnDispose = true) : IDisposable
-{
-  public FileInfo FileInfo => file;
-
-  public void Dispose()
-  {
-    if (!deleteOnDispose)
-    {
-      return;
-    }
-
-    try
-    {
-      file.Delete();
-      logger.LogInformation("Cleaned up {File}", file);
-    }
-    catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
-    {
-      logger.LogWarning(ex, "Failed to clean up {File}", file);
-    }
-  }
-}

src/Speckle.Sdk/Helpers/StopwatchPollyfills.cs

@@ -1,21 +0,0 @@
-using System.Diagnostics;
-
-namespace Speckle.Sdk.Helpers;
-
-public static class StopwatchPolyfills
-{
-#if !NET7_0_OR_GREATER
-  private static readonly double s_tickFrequency = (double)TimeSpan.TicksPerSecond / Stopwatch.Frequency;
-#endif
-
-  public static TimeSpan GetElapsedTime(long startingTimestamp)
-  {
-#if NET7_0_OR_GREATER
-    return Stopwatch.GetElapsedTime(startingTimestamp);
-#else
-
-    long elapsedTicks = Stopwatch.GetTimestamp() - startingTimestamp;
-    return new TimeSpan((long)(elapsedTicks * s_tickFrequency));
-#endif
-  }
-}

src/Speckle.Sdk/Host/TypeLoader.cs

@@ -140,22 +140,7 @@ internal static class TypeLoader
     return typeof(Base);
   }
 
-  /// <summary>
-  /// For testing purposes only
-  /// </summary>
-  internal static void ReInitialize(params Assembly[] assemblies)
-  {
-    lock (s_availableTypes)
-    {
-      Reset();
-      Load(assemblies);
-      s_initialized = true;
-    }
-  }
-
-  /// <summary>
-  /// For testing purposes only
-  /// </summary>
+  //Don't use unless you're testing
   public static void Reset()
   {
     s_availableTypes = new();

src/Speckle.Sdk/Logging/NullActivityFactory.cs

@@ -1,12 +1,8 @@
-using Speckle.Connectors.Logging;
-
-namespace Speckle.Sdk.Logging;
+namespace Speckle.Sdk.Logging;
 
 public sealed class NullActivityFactory : ISdkActivityFactory
 {
   public void Dispose() { }
 
-  public ISdkActivity? Start(string? name, SdkActivityKind kind, string source) => null;
-
-  public ISdkActivity? StartRemote(string traceContext, SdkActivityKind kind, string? name, string source) => null;
+  public ISdkActivity? Start(string? name = default, string source = "") => null;
 }

src/Speckle.Sdk/Models/DynamicBaseMemberType.cs

@@ -17,7 +17,7 @@ public enum DynamicBaseMemberType
   Dynamic = 2,
 
   /// <summary>
-  /// The typed members flagged with ObsoleteAttribute attribute.
+  /// The typed members flagged with <see cref="ObsoleteAttribute"/> attribute.
   /// </summary>
   Obsolete = 4,
 
@@ -27,12 +27,12 @@ public enum DynamicBaseMemberType
   SchemaComputed = 16,
 
   /// <summary>
-  /// All the typed members, including ones with ObsoleteAttribute  attributes.
+  /// All the typed members, including ones with <see cref="ObsoleteAttribute"/>  attributes.
   /// </summary>
   InstanceAll = Instance + Obsolete,
 
   /// <summary>
-  /// All the members, including dynamic and instance members flagged with ObsoleteAttribute attributes
+  /// All the members, including dynamic and instance members flagged with <see cref="ObsoleteAttribute"/> attributes
   /// </summary>
   All = InstanceAll + Dynamic,
 }

src/Speckle.Sdk/Pipelines/Progress/AggregateProgress.cs

@@ -1,12 +0,0 @@
-namespace Speckle.Sdk.Pipelines.Progress;
-
-public sealed class AggregateProgress<T>(params IProgress<T>[] progresses) : IProgress<T>
-{
-  public void Report(T value)
-  {
-    foreach (var progress in progresses)
-    {
-      progress.Report(value);
-    }
-  }
-}

src/Speckle.Sdk/Pipelines/Progress/IngestionProgressManager.cs

@@ -1,89 +0,0 @@
-using System.Diagnostics;
-using Microsoft.Extensions.Logging;
-using Speckle.InterfaceGenerator;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Inputs;
-using Speckle.Sdk.Api.GraphQL.Models;
-using Speckle.Sdk.Helpers;
-
-namespace Speckle.Sdk.Pipelines.Progress;
-
-public partial interface IIngestionProgressManager : IProgress<CardProgress>;
-
-/// <summary>
-/// An <see langword="IProgress{IngestionProgressEventArgs}"/> implementation for the entire client side Ingestion progress update reporting
-/// Will throttles ingestion progress messages and reports their progress
-/// </summary>
-/// <remarks>
-/// Normally we would pick quite a coarse updateInterval to try and spamming the server (1-5s)
-/// </remarks>
-[GenerateAutoInterface]
-public sealed class IngestionProgressManager(
-  ILogger<IngestionProgressManager> logger,
-  IClient speckleClient,
-  ModelIngestion ingestion,
-  TimeSpan updateInterval,
-  CancellationToken cancellationToken
-) : IIngestionProgressManager
-{
-  public Task? LastUpdate { get; private set; }
-
-  private long _lastUpdatedAt;
-  private readonly object _lock = new();
-
-  [AutoInterfaceIgnore]
-  public void Report(CardProgress value)
-  {
-    cancellationToken.ThrowIfCancellationRequested();
-
-    string trimmedMessage;
-    lock (_lock)
-    {
-      if (ShouldIgnoreProgressUpdate())
-      {
-        return;
-      }
-
-      _lastUpdatedAt = Stopwatch.GetTimestamp();
-
-      trimmedMessage = value.Status.TrimEnd('.');
-
-      LastUpdate = speckleClient
-        .Ingestion.UpdateProgress(
-          new ModelIngestionUpdateInput(ingestion.id, ingestion.projectId, trimmedMessage, value.Progress),
-          cancellationToken
-        )
-        .ContinueWith(
-          Continuation,
-          CancellationToken.None,
-          TaskContinuationOptions.ExecuteSynchronously,
-          TaskScheduler.Default
-        );
-    }
-
-    logger.LogInformation("Progress update {Message} {Progress}", trimmedMessage, value.Progress);
-  }
-
-  /// <returns><see langword="true"/> if the update should be ignored, otherwise <see langword="false"/></returns>
-  private bool ShouldIgnoreProgressUpdate()
-  {
-    if (LastUpdate is not null && !LastUpdate.IsCompleted)
-    {
-      return true;
-    }
-
-    TimeSpan msSinceLastUpdate = StopwatchPolyfills.GetElapsedTime(_lastUpdatedAt);
-    return msSinceLastUpdate < updateInterval;
-  }
-
-  private void Continuation(Task updateTask)
-  {
-    // The progress report failed... could be many reasons.
-    // For now, we're not letting this fail the Ingestion in any way
-    // we'll log but otherwise let it slide while leaving no unobserved task exceptions
-    if (updateTask.IsFaulted)
-    {
-      logger.LogWarning(updateTask.Exception, "A progress update failed unexpectedly");
-    }
-  }
-}

src/Speckle.Sdk/Pipelines/Progress/IngestionProgressManagerFactory.cs

@@ -1,21 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Speckle.InterfaceGenerator;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Models;
-
-namespace Speckle.Sdk.Pipelines.Progress;
-
-[GenerateAutoInterface]
-public sealed class IngestionProgressManagerFactory(ILogger<IngestionProgressManager> logger)
-  : IIngestionProgressManagerFactory
-{
-  public IIngestionProgressManager CreateInstance(
-    IClient speckleClient,
-    ModelIngestion ingestion,
-    TimeSpan updateInterval,
-    CancellationToken cancellationToken
-  )
-  {
-    return new IngestionProgressManager(logger, speckleClient, ingestion, updateInterval, cancellationToken);
-  }
-}

src/Speckle.Sdk/Pipelines/Progress/ProgressArgs.cs

@@ -1,6 +0,0 @@
-namespace Speckle.Sdk.Pipelines.Progress;
-
-//TODO: rename PipelineProgressArgs
-public readonly record struct CardProgress(string Status, double? Progress);
-
-public readonly record struct StreamProgressArgs(long BytesStreamed, long ExpectedTotalBytes);

src/Speckle.Sdk/Pipelines/Progress/ProgressStream.cs

@@ -1,103 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace Speckle.Sdk.Pipelines.Progress;
-
-/// <summary>
-/// Wraps <paramref name="innerStream"/> to report streaming progress as bytes are read/written.
-/// </summary>
-public sealed class ProgressStream(Stream innerStream, IProgress<StreamProgressArgs>? progress = null) : Stream
-{
-  private long _bytesStreamed;
-
-  public override bool CanRead => innerStream.CanRead;
-  public override bool CanSeek => innerStream.CanSeek;
-  public override bool CanWrite => innerStream.CanWrite;
-  public override long Length => innerStream.Length;
-
-  public override long Position
-  {
-    get => innerStream.Position;
-    set => innerStream.Position = value;
-  }
-
-  public override int Read(byte[] buffer, int offset, int count)
-  {
-    int bytesRead = innerStream.Read(buffer, offset, count);
-    ReportProgress(bytesRead);
-    return bytesRead;
-  }
-
-  [SuppressMessage(
-    "Performance",
-    "CA1835:Prefer the \'Memory\'-based overloads for \'ReadAsync\' and \'WriteAsync\'",
-    Justification = "Analyser warning forwarded to caller"
-  )]
-  public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-  {
-    int bytesRead = await innerStream.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
-    ReportProgress(bytesRead);
-    return bytesRead;
-  }
-
-#if NET8_0_OR_GREATER
-  public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
-  {
-    int bytesRead = await innerStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
-    ReportProgress(bytesRead);
-    return bytesRead;
-  }
-#endif
-
-  private void ReportProgress(int newBytesProcessed)
-  {
-    _bytesStreamed += newBytesProcessed;
-    progress?.Report(new(_bytesStreamed, Length));
-  }
-
-  public override void Flush() => innerStream.Flush();
-
-  public override Task FlushAsync(CancellationToken cancellationToken) => innerStream.FlushAsync(cancellationToken);
-
-  public override long Seek(long offset, SeekOrigin origin) => innerStream.Seek(offset, origin);
-
-  public override void SetLength(long value) => throw new NotSupportedException(); //intentionally not supporting, as changing length of stream mid-flight will fuck up progress
-
-  public override void Write(byte[] buffer, int offset, int count)
-  {
-    innerStream.Write(buffer, offset, count);
-    ReportProgress(count);
-  }
-
-  [SuppressMessage(
-    "Performance",
-    "CA1835:Prefer the \'Memory\'-based overloads for \'ReadAsync\' and \'WriteAsync\'",
-    Justification = "Analyser warning forwarded to caller"
-  )]
-  public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-  {
-    await innerStream.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
-    ReportProgress(count);
-  }
-
-#if NET6_0_OR_GREATER
-  public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
-  {
-    await innerStream.WriteAsync(buffer, cancellationToken).ConfigureAwait(false);
-    ReportProgress(buffer.Length);
-  }
-#endif
-
-  protected override void Dispose(bool disposing)
-  {
-    innerStream.Dispose();
-    base.Dispose(disposing);
-  }
-
-#if NET6_0_OR_GREATER
-  public override async ValueTask DisposeAsync()
-  {
-    await innerStream.DisposeAsync().ConfigureAwait(false);
-    await base.DisposeAsync().ConfigureAwait(false);
-  }
-#endif
-}

src/Speckle.Sdk/Pipelines/Progress/RenderedStreamProgress.cs

@@ -1,40 +0,0 @@
-namespace Speckle.Sdk.Pipelines.Progress;
-
-/// <summary>
-/// Renders "low level" data stream updates
-/// into "high level" <see cref="CardProgress"/> that is expected by Ingestion progress and DUI3
-/// </summary>
-/// <param name="progress"></param>
-public sealed class RenderedStreamProgress(IProgress<CardProgress> progress) : IProgress<StreamProgressArgs>
-{
-  public void Report(StreamProgressArgs value)
-  {
-    var (suffix, scaleFactor) = GetFileSizeRendering(value.ExpectedTotalBytes);
-    progress.Report(
-      new(
-        $"Uploading data... ({value.BytesStreamed * scaleFactor:F1}/{value.ExpectedTotalBytes * scaleFactor:F1} {suffix})",
-        (double)value.BytesStreamed / value.ExpectedTotalBytes
-      )
-    );
-  }
-
-  private static readonly string[] s_suffixes = ["B", "KB", "MB", "GB", "TB", "PB"];
-
-  internal static (string suffix, double scaleFactor) GetFileSizeRendering(long value)
-  {
-    if (value <= 0)
-    {
-      return (s_suffixes[0], 1d);
-    }
-
-    for (int i = 0; i < s_suffixes.Length; i++)
-    {
-      if (value <= Math.Pow(1024, i + 1))
-      {
-        return (s_suffixes[i], 1 / Math.Pow(1024, i));
-      }
-    }
-
-    throw new ArgumentOutOfRangeException(nameof(value), "Value is too large to convert to a file size");
-  }
-}

src/Speckle.Sdk/Pipelines/Send/DiskStore.cs

@@ -1,85 +0,0 @@
-using System.IO.Compression;
-using Microsoft.Extensions.Logging;
-using Speckle.InterfaceGenerator;
-using Speckle.Sdk.Dependencies;
-using Speckle.Sdk.Helpers;
-using Speckle.Sdk.Logging;
-
-namespace Speckle.Sdk.Pipelines.Send;
-
-[GenerateAutoInterface]
-public sealed class DiskStoreFactory(ILogger<DiskStore> logger, ISdkActivityFactory activityFactory) : IDiskStoreFactory
-{
-  public DiskStore CreateInstance(CancellationToken cancellationToken) =>
-    new(logger, activityFactory, cancellationToken);
-}
-
-public sealed class DiskStore
-{
-  private readonly RepackedChannel<UploadItem> _channel;
-  private readonly Task<DisposableFile> _writeToDiskTask;
-  private readonly ILogger<DiskStore> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
-  private readonly CancellationToken _cancellationToken;
-
-  internal DiskStore(
-    ILogger<DiskStore> logger,
-    ISdkActivityFactory activityFactory,
-    CancellationToken cancellationToken
-  )
-  {
-    _logger = logger;
-    _activityFactory = activityFactory;
-    _cancellationToken = cancellationToken;
-
-    _channel = new RepackedChannel<UploadItem>(1000, true, false);
-    _writeToDiskTask = Task.Run(WriteFile, cancellationToken);
-  }
-
-  public async Task PushAsync(UploadItem item) =>
-    await _channel.WriteAsync(item, _cancellationToken).ConfigureAwait(false);
-
-  public async Task<DisposableFile> CompleteAsync()
-  {
-    using var a = _activityFactory.Start("Waiting for DiskStore to complete");
-    _channel.CompleteWriter();
-    return await _writeToDiskTask.ConfigureAwait(false);
-  }
-
-  /// <summary>
-  /// Reads from the Channel and streams the <see cref="UploadItem"/>s to a temporary file on disk.
-  /// Will keep reading until <see cref="CompleteAsync"/> is called.
-  /// </summary>
-  /// <returns>the file that was written</returns>
-  private async Task<DisposableFile> WriteFile()
-  {
-    string tempFilePath = Path.GetTempFileName();
-    var tempFile = new DisposableFile(new FileInfo(tempFilePath), _logger);
-    _logger.LogInformation("Writing temp file to {TempFilePath}", tempFilePath);
-
-    try
-    {
-      using var fileStream = new FileStream(tempFilePath, FileMode.Create, FileAccess.Write, FileShare.None);
-      using var gzip = new GZipStream(fileStream, CompressionLevel.Optimal);
-      using var writer = new StreamWriter(gzip);
-
-      await foreach (var item in _channel.ReadAllAsync(_cancellationToken).ConfigureAwait(false))
-      {
-        await writer.WriteLineAsync($"{item.Id}\t{item.SpeckleType}\t{item.Json}").ConfigureAwait(false);
-      }
-#if NET8_0_OR_GREATER
-      await writer.FlushAsync(_cancellationToken).ConfigureAwait(false);
-#else
-      await writer.FlushAsync().ConfigureAwait(false);
-#endif
-      tempFile.FileInfo.Refresh();
-
-      return tempFile;
-    }
-    catch
-    {
-      tempFile.Dispose();
-      throw;
-    }
-  }
-}

src/Speckle.Sdk/Pipelines/Send/SendPipeline.cs

@@ -1,74 +0,0 @@
-using Speckle.InterfaceGenerator;
-using Speckle.Sdk.Credentials;
-using Speckle.Sdk.Helpers;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Pipelines.Progress;
-
-namespace Speckle.Sdk.Pipelines.Send;
-
-[GenerateAutoInterface]
-public sealed class SendPipelineFactory(IUploaderFactory uploaderFactory, IDiskStoreFactory diskStoreFactory)
-  : ISendPipelineFactory
-{
-  public SendPipeline CreateInstance(
-    string projectId,
-    string ingestionId,
-    Account account,
-    IProgress<StreamProgressArgs> uploadProgress,
-    CancellationToken cancellationToken
-  )
-  {
-    var uploader = uploaderFactory.CreateInstance(projectId, ingestionId, account, uploadProgress, cancellationToken);
-    var diskStore = diskStoreFactory.CreateInstance(cancellationToken);
-    return new SendPipeline(uploader, diskStore);
-  }
-}
-
-public sealed class SendPipeline : IDisposable
-{
-  private readonly Serializer _serializer = new();
-  private readonly Uploader _uploader;
-  private readonly DiskStore _diskStore;
-
-  internal SendPipeline(Uploader uploader, DiskStore diskStore)
-  {
-    _uploader = uploader;
-    _diskStore = diskStore;
-  }
-
-  private UploadItem _lastItem;
-
-  public async Task<ObjectReference> Process(Base @base)
-  {
-    var results = _serializer.Serialize(@base).ToArray();
-    var first = results.First();
-    foreach (var item in results)
-    {
-      // we're not doing fire and forget here so that we get the backpressure from the uploader
-      await _diskStore.PushAsync(item).ConfigureAwait(false);
-    }
-
-    // NOTE: this is important to keep track of. When we serialze an object, we get back a list of objects, with the first one being the original root.
-    // In the case of the commit root object, this means the last object is not necessarily the root; we therefore need to manually track its existance here
-    // and ensure it's the last one through in the uploader's stream. See WaitForUpload down below.
-    _lastItem = first;
-    return first.Reference;
-  }
-
-  public async Task WaitForUpload()
-  {
-    await _diskStore.PushAsync(_lastItem).ConfigureAwait(false);
-    using DisposableFile tempFile = await _diskStore.CompleteAsync().ConfigureAwait(false);
-
-    using Stream fileStreamUpload = new FileStream(
-      tempFile.FileInfo.FullName,
-      FileMode.Open,
-      FileAccess.Read,
-      FileShare.Read
-    );
-
-    await _uploader.Send(fileStreamUpload).ConfigureAwait(false);
-  }
-
-  public void Dispose() => _uploader.Dispose();
-}

src/Speckle.Sdk/Pipelines/Send/Serializer.cs

@@ -1,351 +0,0 @@
-using System.Collections;
-using System.Drawing;
-using System.Globalization;
-using System.Reflection;
-using Speckle.DoubleNumerics;
-using Speckle.Newtonsoft.Json;
-using Speckle.Sdk.Dependencies;
-using Speckle.Sdk.Helpers;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Serialisation;
-
-namespace Speckle.Sdk.Pipelines.Send;
-
-/// <summary>
-/// Another serializer, cleaner and meaner. Provides methods for serializing Speckle objects into a format suitable for upload or storage.
-/// This class handles the conversion of <see cref="Speckle.Sdk.Models.Base"/> and its derivatives
-/// into serialized JSON structures along with associated metadata, closures, and references.
-/// <para>Any reference objects coming through are being "passed through" serialized - they do not get double encoded.</para>
-/// </summary>
-internal sealed class Serializer
-{
-  private readonly record struct PropertyInfo(string Name, object? Value, bool IsDetachable);
-
-  public IEnumerable<UploadItem> Serialize(Base root)
-  {
-    // Special case: if root is already an ObjectReference, serialize it verbatim
-    if (root is ObjectReference existingRef)
-    {
-      var uploadItem = ReferenceToUploadItem(existingRef);
-      yield return uploadItem;
-      yield break;
-    }
-
-    var detachedObjects = new List<(Id, Json, Dictionary<string, int>, Base, string)>();
-    var rootClosures = new Dictionary<string, int>();
-
-    var (rootId, rootJson) = SerializeBase(root, false, rootClosures, detachedObjects);
-
-    var rootReference = new ObjectReference
-    {
-      referencedId = rootId.Value,
-      applicationId = root.applicationId,
-      closure = rootClosures.Count > 0 ? rootClosures : null,
-    };
-
-    yield return new UploadItem(rootId.Value, rootJson, root.speckle_type, rootReference);
-
-    foreach (var (id, json, closures, baseObj, speckleType) in detachedObjects)
-    {
-      var reference = new ObjectReference
-      {
-        referencedId = id.Value,
-        applicationId = baseObj.applicationId,
-        closure = closures.Count > 0 ? closures : null,
-      };
-
-      yield return new UploadItem(id.Value, json, speckleType, reference);
-    }
-  }
-
-  private IEnumerable<PropertyInfo> ExtractProperties(Base baseObj)
-  {
-    var typedProperties = baseObj.GetInstanceMembers();
-    foreach (var prop in typedProperties)
-    {
-      if (prop.Name == "id" || prop.Name.StartsWith("__"))
-      {
-        continue;
-      }
-
-      if (prop.IsDefined(typeof(JsonIgnoreAttribute), false))
-      {
-        continue;
-      }
-
-      var value = prop.GetValue(baseObj);
-      var isDetachable = prop.GetCustomAttribute<DetachPropertyAttribute>(true)?.Detachable ?? false;
-
-      yield return new PropertyInfo(prop.Name, value, isDetachable);
-    }
-
-    foreach (var propName in baseObj.DynamicPropertyKeys)
-    {
-      if (propName.StartsWith("__"))
-      {
-        continue;
-      }
-
-      var value = baseObj[propName];
-
-#pragma warning disable CA1866
-      var isDetachable = propName.StartsWith("@");
-#pragma warning restore CA1866
-
-      yield return new PropertyInfo(propName, value, isDetachable);
-    }
-  }
-
-  private (Id, Json) SerializeBase(
-    Base baseObj,
-    bool forceDetach,
-    Dictionary<string, int> closures,
-    List<(Id, Json, Dictionary<string, int>, Base, string)> detachedObjects
-  )
-  {
-    var childClosures = new Dictionary<string, int>();
-
-    var sb = Pools.StringBuilders.Get();
-    try
-    {
-      using var stringWriter = new StringWriter(sb);
-      using var jsonWriter = new JsonTextWriter(stringWriter);
-      using var idWriter = new SerializerIdWriter(jsonWriter);
-
-      idWriter.WriteStartObject();
-
-      foreach (var prop in ExtractProperties(baseObj))
-      {
-        idWriter.WritePropertyName(prop.Name);
-        SerializeValue(prop.Value, idWriter, prop.IsDetachable, childClosures, detachedObjects);
-      }
-
-      var (jsonForId, finalWriter) = idWriter.FinishIdWriter();
-      var id = IdGenerator.ComputeId(jsonForId);
-
-      finalWriter.WritePropertyName("id");
-      finalWriter.WriteValue(id.Value);
-
-      baseObj.id = id.Value;
-
-      if ((forceDetach || childClosures.Count > 0) && childClosures.Count > 0)
-      {
-        finalWriter.WritePropertyName("__closure");
-        finalWriter.WriteStartObject();
-        foreach (var kvp in childClosures)
-        {
-          finalWriter.WritePropertyName(kvp.Key);
-          finalWriter.WriteValue(kvp.Value);
-        }
-        finalWriter.WriteEndObject();
-
-        foreach (var kvp in childClosures)
-        {
-          closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existing) ? existing + kvp.Value : kvp.Value;
-        }
-      }
-
-      finalWriter.WriteEndObject();
-      finalWriter.Flush();
-
-      var json = new Json(stringWriter.ToString());
-      return (id, json);
-    }
-    finally
-    {
-      Pools.StringBuilders.Return(sb);
-    }
-  }
-
-  private void SerializeValue(
-    object? value,
-    JsonWriter writer,
-    bool isDetachable,
-    Dictionary<string, int> closures,
-    List<(Id, Json, Dictionary<string, int>, Base, string)> detachedObjects
-  )
-  {
-    switch (value)
-    {
-      case Enum:
-        writer.WriteValue((int)value);
-        return;
-      case Guid g:
-        writer.WriteValue(g.ToString());
-        return;
-      case Color c:
-        writer.WriteValue(c.ToArgb());
-        return;
-      case DateTime dt:
-        writer.WriteValue(dt.ToString("o", CultureInfo.InvariantCulture));
-        return;
-      case Matrix4x4 md:
-        writer.WriteStartArray();
-        writer.WriteValue(md.M11);
-        writer.WriteValue(md.M12);
-        writer.WriteValue(md.M13);
-        writer.WriteValue(md.M14);
-        writer.WriteValue(md.M21);
-        writer.WriteValue(md.M22);
-        writer.WriteValue(md.M23);
-        writer.WriteValue(md.M24);
-        writer.WriteValue(md.M31);
-        writer.WriteValue(md.M32);
-        writer.WriteValue(md.M33);
-        writer.WriteValue(md.M34);
-        writer.WriteValue(md.M41);
-        writer.WriteValue(md.M42);
-        writer.WriteValue(md.M43);
-        writer.WriteValue(md.M44);
-        writer.WriteEndArray();
-        return;
-      // Handle ObjectReference before Base (since ObjectReference extends Base)
-      // This prevents double-serialization and properly propagates closures
-      case ObjectReference objRef:
-      {
-        writer.WriteStartObject();
-        writer.WritePropertyName("speckle_type");
-        writer.WriteValue("reference");
-        writer.WritePropertyName("referencedId");
-        writer.WriteValue(objRef.referencedId);
-        writer.WriteEndObject();
-
-        // Propagate closure: add the referenced ID
-        closures[objRef.referencedId] = closures.TryGetValue(objRef.referencedId, out var existing) ? existing + 1 : 1;
-
-        // Propagate nested closures from the ObjectReference.closure dictionary
-        if (objRef.closure != null)
-        {
-          foreach (var kvp in objRef.closure)
-          {
-            closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existingDepth)
-              ? existingDepth + kvp.Value
-              : kvp.Value;
-          }
-        }
-
-        return;
-      }
-      case Base baseObj:
-      {
-        if (isDetachable)
-        {
-          var childClosures = new Dictionary<string, int>();
-          var (childId, childJson) = SerializeBase(baseObj, true, childClosures, detachedObjects);
-
-          detachedObjects.Add((childId, childJson, childClosures, baseObj, baseObj.speckle_type));
-
-          writer.WriteStartObject();
-          writer.WritePropertyName("speckle_type");
-          writer.WriteValue("reference");
-          writer.WritePropertyName("referencedId");
-          writer.WriteValue(childId.Value);
-          writer.WriteEndObject();
-
-          closures[childId.Value] = closures.TryGetValue(childId.Value, out var existing) ? existing + 1 : 1;
-
-          foreach (var kvp in childClosures)
-          {
-            closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existingDepth)
-              ? existingDepth + kvp.Value
-              : kvp.Value;
-          }
-        }
-        else
-        {
-          var inlineClosures = new Dictionary<string, int>();
-          var (_, inlineJson) = SerializeBase(baseObj, false, inlineClosures, detachedObjects);
-
-          writer.WriteRawValue(inlineJson.Value);
-
-          foreach (var kvp in inlineClosures)
-          {
-            closures[kvp.Key] = closures.TryGetValue(kvp.Key, out var existingDepth)
-              ? existingDepth + kvp.Value
-              : kvp.Value;
-          }
-        }
-        return;
-      }
-      case IDictionary dict:
-      {
-        writer.WriteStartObject();
-        foreach (DictionaryEntry kvp in dict)
-        {
-          if (kvp.Key is not string key)
-          {
-            throw new ArgumentException("Dictionary keys must be strings", nameof(value));
-          }
-
-          writer.WritePropertyName(key);
-          SerializeValue(kvp.Value, writer, false, closures, detachedObjects);
-        }
-        writer.WriteEndObject();
-        return;
-      }
-      case ICollection collection:
-      {
-        writer.WriteStartArray();
-        foreach (var item in collection)
-        {
-          SerializeValue(item, writer, isDetachable, closures, detachedObjects);
-        }
-        writer.WriteEndArray();
-        return;
-      }
-      default:
-        // This case will handle primitives and `null`
-        // Will throw JsonWriterException if not supported
-        writer.WriteValue(value);
-        return;
-    }
-  }
-
-  private UploadItem ReferenceToUploadItem(ObjectReference existingRef)
-  {
-    var sb = Pools.StringBuilders.Get();
-    try
-    {
-      using var stringWriter = new StringWriter(sb);
-      using var jsonWriter = new JsonTextWriter(stringWriter);
-
-      jsonWriter.WriteStartObject();
-      jsonWriter.WritePropertyName("speckle_type");
-      jsonWriter.WriteValue("reference");
-      jsonWriter.WritePropertyName("referencedId");
-      jsonWriter.WriteValue(existingRef.referencedId);
-      jsonWriter.WritePropertyName("__closure");
-
-      if (existingRef.closure != null && existingRef.closure.Count > 0)
-      {
-        jsonWriter.WriteStartObject();
-        foreach (var kvp in existingRef.closure)
-        {
-          jsonWriter.WritePropertyName(kvp.Key);
-          jsonWriter.WriteValue(kvp.Value);
-        }
-        jsonWriter.WriteEndObject();
-      }
-      else
-      {
-        jsonWriter.WriteNull();
-      }
-
-      jsonWriter.WriteEndObject();
-      jsonWriter.Flush();
-
-      var refJson = new Json(stringWriter.ToString());
-
-      return new UploadItem(
-        existingRef.referencedId,
-        refJson,
-        existingRef.speckle_type,
-        existingRef // Pass through the original ObjectReference
-      );
-    }
-    finally
-    {
-      Pools.StringBuilders.Return(sb);
-    }
-  }
-}

src/Speckle.Sdk/Pipelines/Send/Uploader.cs

@@ -1,132 +0,0 @@
-using System.Net.Http.Headers;
-using System.Text;
-using Speckle.InterfaceGenerator;
-using Speckle.Newtonsoft.Json;
-using Speckle.Sdk.Credentials;
-using Speckle.Sdk.Helpers;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Pipelines.Progress;
-
-namespace Speckle.Sdk.Pipelines.Send;
-
-[GenerateAutoInterface]
-public sealed class UploaderFactory(ISpeckleHttp httpClientFactory, ISdkActivityFactory activityFactory)
-  : IUploaderFactory
-{
-  public Uploader CreateInstance(
-    string projectId,
-    string ingestionId,
-    Account account,
-    IProgress<StreamProgressArgs> progress,
-    CancellationToken cancellationToken
-  ) => new(projectId, ingestionId, activityFactory, httpClientFactory, account, progress, cancellationToken);
-}
-
-public sealed class Uploader : IDisposable
-{
-  private readonly string _projectId;
-  private readonly string _ingestionId;
-  private readonly CancellationToken _cancellationToken;
-  private readonly HttpClient _speckleClient;
-  private readonly HttpClient _s3Client;
-  private readonly ISdkActivityFactory _activity;
-  private readonly IProgress<StreamProgressArgs> _progress;
-
-  internal Uploader(
-    string projectId,
-    string ingestionId,
-    ISdkActivityFactory activity,
-    ISpeckleHttp httpClientFactory,
-    Account speckleAccount,
-    IProgress<StreamProgressArgs> progress,
-    CancellationToken cancellationToken
-  )
-  {
-    _projectId = projectId;
-    _ingestionId = ingestionId;
-    _activity = activity;
-    _cancellationToken = cancellationToken;
-    _progress = progress;
-    _speckleClient = httpClientFactory.CreateHttpClient(authorizationToken: speckleAccount.token);
-    _speckleClient.BaseAddress = new(new(speckleAccount.serverInfo.url), "/api/v1/");
-
-    _s3Client = httpClientFactory.CreateHttpClient();
-  }
-
-  public async Task Send(Stream fileStream)
-  {
-    PresignedUploadResponse presignedUploadResponse = await GetPresignedUrl().ConfigureAwait(false);
-    var etag = await UploadToS3(fileStream, presignedUploadResponse).ConfigureAwait(false);
-
-    await TriggerProcessing(new() { Etag = etag }).ConfigureAwait(false);
-  }
-
-  private async Task<PresignedUploadResponse> GetPresignedUrl()
-  {
-    using var a = _activity.Start("Get Presigned Url");
-
-    var signUri = new Uri($"projects/{_projectId}/modelingestion/{_ingestionId}/uploads/sign", UriKind.Relative);
-
-    using var signResponse = await _speckleClient.PostAsync(signUri, null, _cancellationToken).ConfigureAwait(false);
-    signResponse.EnsureSuccessStatusCode();
-
-#if NET5_0_OR_GREATER
-    string signResponseString = await signResponse.Content.ReadAsStringAsync(_cancellationToken).ConfigureAwait(false);
-#else
-    string signResponseString = await signResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-#endif
-    PresignedUploadResponse presignedUpload =
-      JsonConvert.DeserializeObject<PresignedUploadResponse>(signResponseString)
-      ?? throw new InvalidOperationException("Failed to get presigned upload URL");
-    return presignedUpload;
-  }
-
-  private async Task<string> UploadToS3(Stream fileStream, PresignedUploadResponse presignedUploadResponse)
-  {
-    using var a = _activity.Start("Uploading file to pre-signed url");
-
-    Stream progressStream = new ProgressStream(fileStream, _progress);
-
-    using var streamContent = new StreamContent(progressStream);
-    streamContent.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
-    streamContent.Headers.ContentLength = fileStream.Length;
-
-    using var uploadRequest = new HttpRequestMessage(HttpMethod.Put, presignedUploadResponse.Url);
-    foreach (var kvp in presignedUploadResponse.AdditionalRequestHeaders)
-    {
-      uploadRequest.Headers.Add(kvp.Key, kvp.Value);
-    }
-
-    uploadRequest.Content = streamContent;
-
-    using var uploadResponse = await _s3Client
-      .SendAsync(uploadRequest, HttpCompletionOption.ResponseHeadersRead, _cancellationToken)
-      .ConfigureAwait(false);
-
-    uploadResponse.EnsureSuccessStatusCode();
-
-    return BlobApiHelpers.ParseEtagHeader(uploadResponse.Headers);
-  }
-
-  private async Task TriggerProcessing(TriggerUploadRequest request)
-  {
-    using var a = _activity.Start("Triggering Processing");
-
-    Uri processUri = new($"projects/{_projectId}/modelingestion/{_ingestionId}/uploads/process", UriKind.Relative);
-    string requestBody = JsonConvert.SerializeObject(request);
-    using var content = new StringContent(requestBody, Encoding.UTF8, "application/json");
-
-    using HttpResponseMessage processResponse = await _speckleClient
-      .PostAsync(processUri, content, _cancellationToken)
-      .ConfigureAwait(false);
-
-    string body = await processResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-    processResponse.EnsureSuccessStatusCode();
-  }
-
-  public void Dispose()
-  {
-    _speckleClient.Dispose();
-    _s3Client.Dispose();
-  }
-}

src/Speckle.Sdk/Pipelines/Send/UploaderDTOs.cs

@@ -1,20 +0,0 @@
-using Speckle.Newtonsoft.Json;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Serialisation;
-
-namespace Speckle.Sdk.Pipelines.Send;
-
-public record UploadItem(string Id, Json Json, string SpeckleType, ObjectReference Reference);
-
-internal record PresignedUploadResponse
-{
-  public required Uri Url { get; init; }
-  public required string Key { get; init; }
-  public Dictionary<string, string> AdditionalRequestHeaders { get; init; } = new();
-}
-
-internal readonly struct TriggerUploadRequest
-{
-  [JsonProperty("etag")]
-  public required string Etag { get; init; }
-}

src/Speckle.Sdk/Serialisation/V2/Send/BaseItem.cs

@@ -2,13 +2,7 @@ using System.Text;
 
 namespace Speckle.Sdk.Serialisation.V2.Send;
 
-public sealed record BaseItem(
-  Id Id,
-  Json Json,
-  bool NeedsStorage,
-  Dictionary<Id, int>? Closures,
-  bool? IsReference = false
-) : IHasByteSize
+public sealed record BaseItem(Id Id, Json Json, bool NeedsStorage, Dictionary<Id, int>? Closures) : IHasByteSize
 {
   public int ByteSize { get; } = Encoding.UTF8.GetByteCount(Json.Value);
 

src/Speckle.Sdk/Serialisation/V2/Send/SerializeProcess.cs

@@ -113,6 +113,16 @@ public sealed class SerializeProcess(
         _processSource.Token
       );
       var findTotalObjectsTask = Task.CompletedTask;
+      if (!options.SkipFindTotalObjects)
+      {
+        ThrowIfFailed();
+        findTotalObjectsTask = Task.Factory.StartNew(
+          () => TraverseTotal(root),
+          _processSource.Token,
+          TaskCreationOptions.AttachedToParent | TaskCreationOptions.PreferFairness,
+          _highest
+        );
+      }
 
       await Traverse(root).ConfigureAwait(false);
       ThrowIfFailed();
@@ -123,7 +133,6 @@ public sealed class SerializeProcess(
       ThrowIfFailed();
       await WaitForSchedulerCompletion().ConfigureAwait(false);
       ThrowIfFailed();
-
       return new(root.id.NotNull(), baseSerializer.ObjectReferences.Freeze());
     }
     catch (OperationCanceledException)

src/Speckle.Sdk/ServiceRegistration.cs

@@ -8,7 +8,6 @@ using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Host;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models.GraphTraversal;
-using Speckle.Sdk.Pipelines.Progress;
 using Speckle.Sdk.Serialisation.V2;
 using Speckle.Sdk.Serialisation.V2.Receive;
 using Speckle.Sdk.Serialisation.V2.Send;
@@ -97,8 +96,7 @@ public static class ServiceRegistration
       typeof(DeserializeProcess),
       typeof(ObjectLoader),
       typeof(TraversalRule),
-      typeof(Client),
-      typeof(IngestionProgressManager)
+      typeof(Client)
     );
     serviceCollection.AddMatchingInterfacesAsTransient(typeof(GraphQLRetry).Assembly);
     return serviceCollection;

src/Speckle.Sdk/Speckle.Sdk.csproj

@@ -35,6 +35,7 @@
     <PackageReference Include="Microsoft.CSharp" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Speckle.Sdk.Dependencies\Speckle.Sdk.Dependencies.csproj" />

src/Speckle.Sdk/packages.lock.json

@@ -13,6 +13,15 @@
           "System.Reactive": "5.0.0"
         }
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Direct",
+        "requested": "[5.0.0, )",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.CSharp": {
         "type": "Direct",
         "requested": "[4.7.0, )",
@@ -282,19 +291,7 @@
         }
       },
       "speckle.sdk.dependencies": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )"
-        }
-      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "CentralTransitive",
-        "requested": "[9.0.4, )",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
+        "type": "Project"
       }
     },
     "net8.0": {

src/graphql.config.yml

@@ -1,2 +1,2 @@
-schema: https://app.speckle.systems/graphql
+schema: http://localhost/graphql
 documents: '**/*.graphql'

tests/Speckle.Sdk.Serialization.Testing/packages.lock.json

@@ -382,7 +382,7 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "CentralTransitive",
-        "requested": "[9.0.4, )",
+        "requested": "[5.0.0, )",
         "resolved": "1.1.0",
         "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
       },

tests/Speckle.Sdk.Serialization.Tests/SerializationTests.cs

@@ -184,7 +184,7 @@ public class SerializationTests
     idToBase.Count.Should().Be(count);
   }
 
-  [Theory(Skip = "Takes too long")]
+  [Theory]
   [InlineData(1)]
   [InlineData(4)]
   public async Task Roundtrip_Test_New(int concurrency)

tests/Speckle.Sdk.Serialization.Tests/ServerObjectManagerTests.cs

@@ -52,7 +52,7 @@ public class ServerObjectManagerTests : MoqTest
     http.Setup(x => x.CreateHttpClient(It.IsAny<HttpClientHandler>(), timeout, token)).Returns(httpClient);
 
     var activityFactory = Create<ISdkActivityFactory>();
-    activityFactory.Setup(x => x.Start(null, default, "DownloadObjects")).Returns((ISdkActivity?)null);
+    activityFactory.Setup(x => x.Start(null, "DownloadObjects")).Returns((ISdkActivity?)null);
 
     var serverObjectManager = new ServerObjectManager(
       http.Object,
@@ -91,7 +91,7 @@ public class ServerObjectManagerTests : MoqTest
     http.Setup(x => x.CreateHttpClient(It.IsAny<HttpClientHandler>(), timeout, token)).Returns(httpClient);
 
     var activityFactory = Create<ISdkActivityFactory>();
-    activityFactory.Setup(x => x.Start(null, default, "DownloadSingleObject")).Returns((ISdkActivity?)null);
+    activityFactory.Setup(x => x.Start(null, "DownloadSingleObject")).Returns((ISdkActivity?)null);
 
     var serverObjectManager = new ServerObjectManager(
       http.Object,
@@ -132,7 +132,7 @@ public class ServerObjectManagerTests : MoqTest
     http.Setup(x => x.CreateHttpClient(It.IsAny<HttpClientHandler>(), timeout, token)).Returns(httpClient);
 
     var activityFactory = Create<ISdkActivityFactory>();
-    activityFactory.Setup(x => x.Start(null, default, "HasObjects")).Returns((ISdkActivity?)null);
+    activityFactory.Setup(x => x.Start(null, "HasObjects")).Returns((ISdkActivity?)null);
 
     var serverObjectManager = new ServerObjectManager(
       http.Object,
@@ -171,7 +171,7 @@ public class ServerObjectManagerTests : MoqTest
     http.Setup(x => x.CreateHttpClient(It.IsAny<HttpClientHandler>(), timeout, token)).Returns(httpClient);
 
     var activityFactory = Create<ISdkActivityFactory>();
-    activityFactory.Setup(x => x.Start(null, default, "UploadObjects")).Returns((ISdkActivity?)null);
+    activityFactory.Setup(x => x.Start(null, "UploadObjects")).Returns((ISdkActivity?)null);
 
     var serverObjectManager = new ServerObjectManager(
       http.Object,

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelIngestionResourceExceptionalTests.CancelNonExistentIngestion.verified.json

@@ -0,0 +1,8 @@
+{
+  "Type": "AggregateException",
+  "InnerException": {
+    "Data": {},
+    "Message": "NOT_FOUND_ERROR: Model ingestion was not found",
+    "Type": "SpeckleGraphQLException"
+  }
+}

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelIngestionResourceExceptionalTests.CreateIngestionNonExistentProject.verified.json

@@ -0,0 +1,8 @@
+{
+  "Type": "AggregateException",
+  "InnerException": {
+    "Data": {},
+    "Message": "STREAM_NOT_FOUND: Project not found",
+    "Type": "SpeckleGraphQLStreamNotFoundException"
+  }
+}

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelIngestionResourceExceptionalTests.UpdateNonExistentNonExistent.verified.json

@@ -0,0 +1,8 @@
+{
+  "Type": "AggregateException",
+  "InnerException": {
+    "Data": {},
+    "Message": "NOT_FOUND_ERROR: Model ingestion was not found",
+    "Type": "SpeckleGraphQLException"
+  }
+}

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelIngestionResourceExceptionalTests.cs

@@ -1,11 +1,13 @@
+using System.Reflection;
 using Speckle.Sdk.Api;
 using Speckle.Sdk.Api.GraphQL.Inputs;
 using Speckle.Sdk.Api.GraphQL.Models;
 using Speckle.Sdk.Api.GraphQL.Resources;
+using Speckle.Sdk.Host;
+using Speckle.Sdk.Models;
 
 namespace Speckle.Sdk.Tests.Integration.API.GraphQL.Resources;
 
-[Trait("Server", "Internal")]
 public sealed class ModelIngestionResourceExceptionalTests : IAsyncLifetime
 {
   private IClient _testUser;
@@ -17,6 +19,9 @@ public sealed class ModelIngestionResourceExceptionalTests : IAsyncLifetime
 
   public async Task InitializeAsync()
   {
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
+
     _testUser = await Fixtures.SeedUserWithClient();
     _project = await _testUser.Project.Create(new("Test project", "", null));
     _model = await _testUser.Model.Create(new("Test Model 1", "", _project.id));
@@ -36,8 +41,7 @@ public sealed class ModelIngestionResourceExceptionalTests : IAsyncLifetime
     {
       _ = await Sut.Create(createInput);
     });
-    Assert.Single(ex.InnerExceptions);
-    Assert.All(ex.InnerExceptions, item => Assert.IsType<SpeckleGraphQLStreamNotFoundException>(item));
+    await Verify(ex);
   }
 
   [Fact]
@@ -49,8 +53,7 @@ public sealed class ModelIngestionResourceExceptionalTests : IAsyncLifetime
     {
       _ = await Sut.UpdateProgress(updateInput);
     });
-    Assert.Single(ex.InnerExceptions);
-    Assert.All(ex.InnerExceptions, item => Assert.IsType<SpeckleGraphQLException>(item));
+    await Verify(ex);
   }
 
   [Fact]
@@ -65,7 +68,6 @@ public sealed class ModelIngestionResourceExceptionalTests : IAsyncLifetime
     {
       _ = await Sut.FailWithCancel(input);
     });
-    Assert.Single(ex.InnerExceptions);
-    Assert.All(ex.InnerExceptions, item => Assert.IsType<SpeckleGraphQLException>(item));
+    await Verify(ex);
   }
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelIngestionResourceTests.cs

@@ -1,16 +1,17 @@
-using Microsoft.Extensions.DependencyInjection;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 using Speckle.Sdk.Api;
 using Speckle.Sdk.Api.GraphQL.Enums;
 using Speckle.Sdk.Api.GraphQL.Inputs;
 using Speckle.Sdk.Api.GraphQL.Models;
 using Speckle.Sdk.Api.GraphQL.Resources;
+using Speckle.Sdk.Host;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Transports;
 using Version = Speckle.Sdk.Api.GraphQL.Models.Version;
 
 namespace Speckle.Sdk.Tests.Integration.API.GraphQL.Resources;
 
-[Trait("Server", "Internal")]
 public sealed class ModelIngestionResourceTests : IAsyncLifetime
 {
   private IClient _testUser;
@@ -23,6 +24,8 @@ public sealed class ModelIngestionResourceTests : IAsyncLifetime
 
   public async Task InitializeAsync()
   {
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
 
@@ -126,71 +129,10 @@ public sealed class ModelIngestionResourceTests : IAsyncLifetime
       new(true, true)
     );
 
-    ModelIngestionSuccessInput finish = new(ingest.id, _project.id, sendResult.RootId, "yay!");
+    ModelIngestionSuccessInput finish = new(ingest.id, _project.id, sendResult.RootId);
     string versionId = await Sut.Complete(finish);
     Version version = await _testUser.Version.Get(versionId, _project.id);
-    ModelIngestion finalIngestion = await _testUser.Ingestion.Get(ingest.id, _project.id);
     Assert.Equal(version.id, versionId);
     Assert.Equal(sendResult.RootId, version.referencedObject);
-    Assert.Equal(finalIngestion.statusData.versionId, versionId);
-  }
-
-  [Fact]
-  public async Task CreateAndGet()
-  {
-    var createInput = new ModelIngestionCreateInput(
-      _model.id,
-      _project.id,
-      "Starting processing",
-      new(".NET test runner", "0.0.0", null, null)
-    );
-    ModelIngestion ingest = await Sut.Create(createInput);
-
-    ModelIngestion res = await Sut.Get(ingest.id, _project.id);
-    Assert.Equal(ingest.id, res.id);
-    Assert.Equal(ingest.statusData.status, res.statusData.status);
-    Assert.Equal(ingest.statusData.versionId, res.statusData.versionId);
-    Assert.Null(res.statusData.versionId);
-    Assert.Equal(_model.id, res.modelId);
-    Assert.Equal(_project.id, res.projectId);
-    Assert.Equal(_testUser.Account.userInfo.id, res.userId);
-  }
-
-  [Fact]
-  public async Task TestRequeue()
-  {
-    //Not sure if is desirable that ingestions created by the modelIngestionMutations.create mutation can be re-queued
-    //But the server allows it, so we test it
-    var createInput = new ModelIngestionCreateInput(
-      _model.id,
-      _project.id,
-      "Starting processing",
-      new(".NET test runner", "0.0.0", null, null)
-    );
-    var ingestion = await Sut.Create(createInput);
-    var res = await Sut.Requeue(new(ingestion.id, _project.id, "we'll try and requeue this ingestion"));
-
-    Assert.Equal(ingestion.id, res.id);
-    Assert.Equal(ModelIngestionStatus.queued, res.statusData.status);
-  }
-
-  [Fact]
-  public async Task TestStartProcessing()
-  {
-    //Not sure if is desirable that StartProcessing can be used by ingestions created by the modelIngestionMutations.create mutation
-    //But the server allows it, so we test it
-    var createInput = new ModelIngestionCreateInput(
-      _model.id,
-      _project.id,
-      "Starting processing",
-      new(".NET test runner", "0.0.0", null, null)
-    );
-    var ingestion = await Sut.Create(createInput);
-    var res = await Sut.StartProcessing(
-      new(ingestion.id, _project.id, "", new SourceDataInput("what", "happens", "now", 0))
-    );
-
-    Assert.Equal(ingestion.id, res.id);
-    Assert.Equal(ModelIngestionStatus.processing, res.statusData.status);
   }
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelResourceTests.cs

@@ -1,6 +1,5 @@
 using FluentAssertions;
 using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Enums;
 using Speckle.Sdk.Api.GraphQL.Inputs;
 using Speckle.Sdk.Api.GraphQL.Models;
 using Speckle.Sdk.Api.GraphQL.Resources;
@@ -18,7 +17,7 @@ public class ModelResourceTests : IAsyncLifetime
   {
     // Runs instead of [SetUp] in NUnit
     _testUser = await Fixtures.SeedUserWithClient();
-    _project = await _testUser.Project.Create(new("Test project", "", ProjectVisibility.Public));
+    _project = await _testUser.Project.Create(new("Test project", "", null));
     _model = await _testUser.Model.Create(new("Test Model", "", _project.id));
   }
 
@@ -124,40 +123,4 @@ public class ModelResourceTests : IAsyncLifetime
     var delEx = await FluentActions.Invoking(() => Sut.Delete(input)).Should().ThrowAsync<AggregateException>();
     getEx.WithInnerExceptionExactly<SpeckleGraphQLException>();
   }
-
-  [Fact]
-  public async Task TestUserHasModelPermissions()
-  {
-    var ownerResult = await Sut.GetPermissions(_project.id, _model.id);
-    ownerResult.canUpdate.authorized.Should().Be(true);
-    ownerResult.canCreateVersion.authorized.Should().Be(true);
-    ownerResult.canDelete.authorized.Should().Be(true);
-
-    // Test with another user
-    var guest = await Fixtures.SeedUserWithClient();
-
-    var guestResult = await guest.Model.GetPermissions(_project.id, _model.id);
-    guestResult.canUpdate.authorized.Should().Be(false);
-    guestResult.canCreateVersion.authorized.Should().Be(false);
-    guestResult.canDelete.authorized.Should().Be(false);
-  }
-
-  [Fact]
-  [Trait("Server", "Internal")]
-  public async Task TestCanCreateModelIngestion_InternalServer()
-  {
-    var ownerResult = await Sut.CanCreateModelIngestion(_project.id, _model.id);
-    ownerResult.authorized.Should().Be(true);
-  }
-
-  [Fact]
-  [Trait("Server", "Public")]
-  public async Task TestCanCreateModelIngestion_PublicServer_Throws()
-  {
-    var ex = await Assert.ThrowsAsync<AggregateException>(async () =>
-      await Sut.CanCreateModelIngestion(_project.id, _model.id)
-    );
-    ex.InnerExceptions.Should().HaveCount(1);
-    ex.InnerExceptions.Should().AllBeOfType<SpeckleGraphQLInvalidQueryException>();
-  }
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ProjectResourceExceptionalTests.cs

@@ -106,7 +106,7 @@ public class ProjectResourceExceptionalTests : IAsyncLifetime
     ProjectUpdateRoleInput input = new(_secondUser.Account.id.NotNull(), "NonExistentProject", newRole);
 
     var ex = await Assert.ThrowsAsync<AggregateException>(async () => _ = await Sut.UpdateRole(input));
-    ex.InnerExceptions.Single().Should().BeAssignableTo<SpeckleGraphQLException>(); //v3 server responds with SpeckleGraphQLStreamNotFoundException exception, v2 reponds with SpeckleGraphQLForbiddenException
+    ex.InnerExceptions.Single().Should().BeOfType<SpeckleGraphQLForbiddenException>();
   }
 
   [Theory]

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ProjectResourceTests.cs

@@ -103,30 +103,8 @@ public class ProjectResourceTests
   [Fact]
   public async Task TestUserHasProjectPermissions()
   {
-    var privateProject = await _testUser.Project.Create(
-      new ProjectCreateInput("asdfasdf", "desc", ProjectVisibility.Private)
-    );
-
-    var resp = await Sut.GetPermissions(privateProject.id);
-    resp.canCreateModel.authorized.Should().Be(true);
-    resp.canDelete.authorized.Should().Be(true);
-    resp.canLoad.authorized.Should().Be(true);
-
-    var publicProject = await _testUser.Project.Create(
-      new ProjectCreateInput("asdfasdf", "desc", ProjectVisibility.Public)
-    );
-
-    var res = await Sut.GetPermissions(publicProject.id);
+    var res = await Sut.GetPermissions(_testProject.id);
     res.canCreateModel.authorized.Should().Be(true);
     res.canDelete.authorized.Should().Be(true);
-    res.canLoad.authorized.Should().Be(true);
-
-    // Test with another user
-    var guest = await Fixtures.SeedUserWithClient();
-
-    var guestResult = await guest.Project.GetPermissions(publicProject.id);
-    guestResult.canCreateModel.authorized.Should().Be(false);
-    guestResult.canDelete.authorized.Should().Be(false);
-    guestResult.canLoad.authorized.Should().Be(false);
   }
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/SubscriptionResourceTests.cs

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using Speckle.Sdk.Api;
 using Speckle.Sdk.Api.GraphQL.Enums;
 using Speckle.Sdk.Api.GraphQL.Inputs;
@@ -13,9 +13,9 @@ public class SubscriptionResourceTests : IAsyncLifetime
 #if DEBUG
   private const int WAIT_PERIOD = 3000; // WSL is slow AF, so for local runs, we're being extra generous
 #else
-  private const int WAIT_PERIOD = 600; // For CI runs, a much smaller wait time is acceptable
+  private const int WAIT_PERIOD = 400; // For CI runs, a much smaller wait time is acceptable
 #endif
-  private const int TIMEOUT = WAIT_PERIOD + WAIT_PERIOD + 600;
+  private const int TIMEOUT = WAIT_PERIOD + WAIT_PERIOD + 400;
   private IClient _testUser;
   private Project _testProject;
   private Model _testModel;
@@ -32,7 +32,6 @@ public class SubscriptionResourceTests : IAsyncLifetime
   public async Task InitializeAsync()
   {
     _testUser = await Fixtures.SeedUserWithClient();
-    await _testUser.InitializeWebsocket();
     _testProject = await _testUser.Project.Create(new("test project123", "desc", null));
     _testModel = await _testUser.Model.Create(new("test model", "desc", _testProject.id));
     _testVersion = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
@@ -137,15 +136,14 @@ public class SubscriptionResourceTests : IAsyncLifetime
     subscriptionMessage.comment.Should().NotBeNull();
   }
 
-  [Fact(Timeout = TIMEOUT), Trait("Server", "Internal")]
+  [Fact(Timeout = TIMEOUT)]
   public async Task ProjectModelIngestionCancellationRequested_SubscriptionIsCalled()
   {
     ModelIngestion ingestion = await _testUser.Ingestion.Create(
       new(_testModel.id, _testProject.id, "", new(".NET test", "0.0.0", null, null))
     );
     TaskCompletionSource<ProjectModelIngestionUpdatedMessage> tcs = new();
-
-    using var sub = Sut.CreateProjectModelIngestionCancellationRequestedSubscription(ingestion.id, _testProject.id);
+    using var sub = Sut.CreateProjectModelIngestionCancellationRequestedSubscription(_testProject.id, ingestion.id);
     sub.Listeners += (_, message) => tcs.SetResult(message);
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
@@ -155,55 +153,6 @@ public class SubscriptionResourceTests : IAsyncLifetime
     var subscriptionMessage = await tcs.Task;
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.type.Should().Be(ProjectModelIngestionUpdatedMessageType.cancellationRequested);
     subscriptionMessage.modelIngestion.id.Should().Be(ingestion.id);
   }
-
-  [Fact(Timeout = TIMEOUT), Trait("Server", "Internal")]
-  public async Task ProjectModelIngestionUpdate_UpdateSubscriptionIs()
-  {
-    ModelIngestion ingestion = await _testUser.Ingestion.Create(
-      new(_testModel.id, _testProject.id, "", new(".NET test", "0.0.0", null, null))
-    );
-    TaskCompletionSource<ProjectModelIngestionUpdatedMessage> tcs = new();
-
-    using var sub = Sut.CreateProjectModelIngestionUpdatedSubscription(
-      new(
-        _testProject.id,
-        new ModelIngestionReference(ingestion.id, null),
-        ProjectModelIngestionUpdatedMessageType.updated
-      )
-    );
-    sub.Listeners += (_, message) => tcs.SetResult(message);
-
-    await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
-
-    await _testUser.Ingestion.UpdateProgress(new(ingestion.id, _testProject.id, "Here's an update", 0.314));
-
-    var subscriptionMessage = await tcs.Task;
-
-    subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage.type.Should().Be(ProjectModelIngestionUpdatedMessageType.updated);
-    subscriptionMessage.modelIngestion.id.Should().Be(ingestion.id);
-  }
-
-  [Fact(Timeout = TIMEOUT), Trait("Server", "Internal")]
-  public async Task ProjectModelIngestionUpdate_CancelSubscriptionIsNotCalled()
-  {
-    ModelIngestion ingestion = await _testUser.Ingestion.Create(
-      new(_testModel.id, _testProject.id, "", new(".NET test", "0.0.0", null, null))
-    );
-    TaskCompletionSource<ProjectModelIngestionUpdatedMessage> tcs = new();
-
-    using var sub = Sut.CreateProjectModelIngestionCancellationRequestedSubscription(ingestion.id, _testProject.id);
-    sub.Listeners += (_, message) => tcs.SetResult(message);
-
-    await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
-
-    await _testUser.Ingestion.UpdateProgress(new(ingestion.id, _testProject.id, "this shouldn't cancel", null));
-
-    await Task.Delay(WAIT_PERIOD); // Give time to subscription to maybe fire
-
-    tcs.Task.IsCompleted.Should().BeFalse();
-  }
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.TestGetProjects.verified.json

@@ -0,0 +1,8 @@
+{
+  "Type": "AggregateException",
+  "InnerException": {
+    "Data": {},
+    "Message": "FORBIDDEN: Your auth token does not have the required scope: workspace:read.",
+    "Type": "SpeckleGraphQLForbiddenException"
+  }
+}

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.TestGetWorkspace.verified.json

@@ -0,0 +1,8 @@
+{
+  "Type": "AggregateException",
+  "InnerException": {
+    "Data": {},
+    "Message": "FORBIDDEN: Your auth token does not have the required scope: workspace:read.",
+    "Type": "SpeckleGraphQLForbiddenException"
+  }
+}

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/WorkspaceResourceTests.cs

@@ -25,15 +25,13 @@ public class WorkspaceResourceTests
   public async Task TestGetWorkspace()
   {
     var ex = await Assert.ThrowsAsync<AggregateException>(async () => _ = await Sut.Get("non-existent-id"));
-    Assert.Single(ex.InnerExceptions);
-    Assert.All(ex.InnerExceptions, item => Assert.IsType<SpeckleGraphQLForbiddenException>(item));
+    await Verify(ex);
   }
 
   [Fact]
   public async Task TestGetProjects()
   {
     var ex = await Assert.ThrowsAsync<AggregateException>(async () => _ = await Sut.GetProjects("non-existent-id"));
-    Assert.Single(ex.InnerExceptions);
-    Assert.All(ex.InnerExceptions, item => Assert.IsType<SpeckleGraphQLForbiddenException>(item));
+    await Verify(ex);
   }
 }

tests/Speckle.Sdk.Tests.Integration/Fixtures.cs

@@ -17,16 +17,11 @@ using Version = Speckle.Sdk.Api.GraphQL.Models.Version;
 
 [assembly: AssemblyTrait("Category", "Integration")]
 
-#if DEBUG
-[assembly: CollectionBehavior(MaxParallelThreads = 8)]
-
-#endif
-
 namespace Speckle.Sdk.Tests.Integration;
 
 public static class Fixtures
 {
-  public static readonly ServerInfo Server = new() { url = "http://localhost:3000", name = "Docker Server" };
+  public static readonly ServerInfo Server = new() { url = "http://localhost", name = "Docker Server" };
 
   public static IServiceProvider ServiceProvider { get; set; }
 

tests/Speckle.Sdk.Tests.Integration/MemoryTransportTests.cs

@@ -1,6 +1,8 @@
-using FluentAssertions;
+using System.Reflection;
+using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Sdk.Api;
+using Speckle.Sdk.Host;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Transports;
 
@@ -14,7 +16,8 @@ public class MemoryTransportTests : IDisposable
   public MemoryTransportTests()
   {
     CleanData();
-
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
   }

tests/Speckle.Sdk.Tests.Integration/Pipelines/Progress/IngestionProgressManagerTests.cs

@@ -1,76 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Models;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Pipelines.Progress;
-
-namespace Speckle.Sdk.Tests.Integration.Pipelines.Progress;
-
-[Trait("Server", "Internal")]
-public class IngestionProgressManagerTests : IAsyncLifetime
-{
-  private IIngestionProgressManagerFactory _factory;
-  private IClient _client;
-  private Project _project;
-  private Model _model;
-  private ModelIngestion _ingestion;
-
-  public async Task InitializeAsync()
-  {
-    var serviceProvider = TestServiceSetup.GetServiceProvider();
-    _factory = serviceProvider.GetRequiredService<IIngestionProgressManagerFactory>();
-
-    _client = await Fixtures.SeedUserWithClient();
-    _project = await _client.Project.Create(new("test", null, default));
-    _model = await _client.Model.Create(new("test", null, _project.id));
-    _ingestion = await _client.Ingestion.Create(
-      new(_model.id, _project.id, "Testing ingestion", new("integrationTests", "0.0.0", null, null))
-    );
-  }
-
-  [Fact]
-  public async Task TestProgress_NoThrottle()
-  {
-    var sut = _factory.CreateInstance(_client, _ingestion, TimeSpan.Zero, CancellationToken.None);
-    const string FIRST_MESSAGE = "This is a test 123";
-    const string SECOND_MESSAGE = "This is another test 321";
-
-    // first message (should go through)
-    sut.Report(new CardProgress(FIRST_MESSAGE, 0.123123123d));
-    await sut.LastUpdate.NotNull();
-    var res = await _client.Ingestion.Get(_ingestion.id, _project.id, CancellationToken.None);
-
-    Assert.Equal(FIRST_MESSAGE, res.statusData.progressMessage);
-
-    // second message (should also go through)
-    sut.Report(new CardProgress(SECOND_MESSAGE, 0.321321321d));
-    await sut.LastUpdate.NotNull();
-    res = await _client.Ingestion.Get(_ingestion.id, _project.id, CancellationToken.None);
-
-    Assert.Equal(SECOND_MESSAGE, res.statusData.progressMessage);
-  }
-
-  [Fact]
-  public async Task TestProgress_WithThrottle()
-  {
-    var sut = _factory.CreateInstance(_client, _ingestion, TimeSpan.FromMilliseconds(500), CancellationToken.None);
-    const string EXPECTED_MESSAGE = "First message should go through 123";
-
-    await Task.Delay(TimeSpan.FromMilliseconds(600));
-
-    // first message (should go through)
-    sut.Report(new CardProgress(EXPECTED_MESSAGE, 0.123123123d));
-    // second message (should be dropped)
-    sut.Report(new CardProgress("Second message, should be dropped", 0.321321321d));
-    await sut.LastUpdate.NotNull();
-    var res = await _client.Ingestion.Get(_ingestion.id, _project.id, CancellationToken.None);
-
-    Assert.Equal(EXPECTED_MESSAGE, res.statusData.progressMessage);
-  }
-
-  public Task DisposeAsync()
-  {
-    _client.Dispose();
-    return Task.CompletedTask;
-  }
-}

tests/Speckle.Sdk.Tests.Integration/SendReceiveTests.cs

@@ -1,8 +1,11 @@
-using System.Text;
+using System.Reflection;
+using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Sdk.Api;
 using Speckle.Sdk.Api.GraphQL.Enums;
 using Speckle.Sdk.Api.GraphQL.Models;
+using Speckle.Sdk.Host;
+using Speckle.Sdk.Models;
 
 namespace Speckle.Sdk.Tests.Integration;
 
@@ -16,6 +19,8 @@ public sealed class SendReceiveTests : IAsyncLifetime
 
   public async Task InitializeAsync()
   {
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
     ClearCache();

tests/Speckle.Sdk.Tests.Integration/Speckle.Sdk.Tests.Integration.csproj

@@ -16,7 +16,4 @@
     <ProjectReference Include="..\..\src\Speckle.Sdk\Speckle.Sdk.csproj" />
     <ProjectReference Include="..\Speckle.Sdk.Testing\Speckle.Sdk.Testing.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Pipelines\Send\" />
-  </ItemGroup>
 </Project>

tests/Speckle.Sdk.Tests.Performance/packages.lock.json

@@ -374,7 +374,7 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "CentralTransitive",
-        "requested": "[9.0.4, )",
+        "requested": "[5.0.0, )",
         "resolved": "1.1.0",
         "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg=="
       },

tests/Speckle.Sdk.Tests.Unit/Api/Operations/ClosureTests.cs

@@ -10,14 +10,14 @@ using Speckle.Sdk.Transports;
 
 namespace Speckle.Sdk.Tests.Unit.Api.Operations;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class Closures
 {
   private readonly IOperations _operations;
 
   public Closures()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(TableLegFixture).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(TableLegFixture).Assembly);
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
   }

tests/Speckle.Sdk.Tests.Unit/Api/Operations/OperationsReceiveTests.cs

@@ -7,7 +7,6 @@ using Speckle.Sdk.Transports;
 
 namespace Speckle.Sdk.Tests.Unit.Api.Operations;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public sealed partial class OperationsReceiveTests : IDisposable
 {
   private static readonly Base[] s_testObjects;
@@ -45,7 +44,8 @@ public sealed partial class OperationsReceiveTests : IDisposable
 
   private static void Reset()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
   }
 
   public static IEnumerable<object[]> TestCases()

tests/Speckle.Sdk.Tests.Unit/Api/Operations/SendObjectReferences.cs

@@ -7,14 +7,14 @@ using Speckle.Sdk.Transports;
 
 namespace Speckle.Sdk.Tests.Unit.Api.Operations;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class SendObjectReferences
 {
   private readonly IOperations _operations;
 
   public SendObjectReferences()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(DataChunk).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(DataChunk).Assembly);
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
   }

tests/Speckle.Sdk.Tests.Unit/Api/Operations/SendReceiveLocal.cs

@@ -9,14 +9,14 @@ using Speckle.Sdk.Transports;
 
 namespace Speckle.Sdk.Tests.Unit.Api.Operations;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public sealed class SendReceiveLocal : IDisposable
 {
   private readonly IOperations _operations;
 
   public SendReceiveLocal()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(Point).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(Point).Assembly);
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
   }

tests/Speckle.Sdk.Tests.Unit/Api/Operations/SerializationTests.cs

@@ -9,14 +9,14 @@ using Point = Speckle.Sdk.Tests.Unit.Host.Point;
 
 namespace Speckle.Sdk.Tests.Unit.Api.Operations;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class ObjectSerialization
 {
   private readonly IOperations _operations;
 
   public ObjectSerialization()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(DataChunk).Assembly, typeof(ColorMock).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(DataChunk).Assembly, typeof(ColorMock).Assembly);
     var serviceProvider = TestServiceSetup.GetServiceProvider();
     _operations = serviceProvider.GetRequiredService<IOperations>();
   }

tests/Speckle.Sdk.Tests.Unit/Assembly.cs

@@ -1 +1 @@
-[assembly: CollectionBehavior()]
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

tests/Speckle.Sdk.Tests.Unit/Collections.cs

@@ -1,7 +0,0 @@
-namespace Speckle.Sdk.Tests.Unit;
-
-[CollectionDefinition(nameof(RequiresTypeLoaderCollection), DisableParallelization = true)]
-public class RequiresTypeLoaderCollection;
-
-[CollectionDefinition(nameof(RequiresSqLiteAccountDb), DisableParallelization = true)]
-public class RequiresSqLiteAccountDb;

tests/Speckle.Sdk.Tests.Unit/Credentials/AccountManagerTests.cs

@@ -9,7 +9,6 @@ using Speckle.Sdk.Testing;
 
 namespace Speckle.Sdk.Tests.Unit.Credentials;
 
-[Collection(nameof(RequiresSqLiteAccountDb))]
 public sealed class AccountManagerTests : MoqTest
 {
   private class TestAccountFactory : IAccountFactory

tests/Speckle.Sdk.Tests.Unit/Credentials/AccountServerMigrationTests.cs

@@ -5,7 +5,6 @@ using Speckle.Sdk.Credentials;
 
 namespace Speckle.Sdk.Tests.Unit.Credentials;
 
-[Collection(nameof(RequiresSqLiteAccountDb))]
 public class AccountServerMigrationTests : IDisposable
 {
   private readonly List<Account> _accountsToCleanUp = [];

tests/Speckle.Sdk.Tests.Unit/Credentials/Accounts.cs

@@ -5,7 +5,6 @@ using Speckle.Sdk.Credentials;
 
 namespace Speckle.Sdk.Tests.Unit.Credentials;
 
-[Collection(nameof(RequiresSqLiteAccountDb))]
 public class CredentialInfrastructure : IDisposable
 {
   private readonly IAccountManager _accountManager;

tests/Speckle.Sdk.Tests.Unit/Models/BaseTests.cs

@@ -5,12 +5,12 @@ using Speckle.Sdk.Models;
 
 namespace Speckle.Sdk.Tests.Unit.Models;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class BaseTests
 {
   public BaseTests()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(BaseTests).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(BaseTests).Assembly);
   }
 
   [Fact]

tests/Speckle.Sdk.Tests.Unit/Models/DynamicBaseTests.cs

@@ -5,12 +5,12 @@ using Speckle.Sdk.Models;
 
 namespace Speckle.Sdk.Tests.Unit.Models;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class DynamicBaseTests
 {
   public DynamicBaseTests()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(BaseTests).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(BaseTests).Assembly);
   }
 
   [Fact]

tests/Speckle.Sdk.Tests.Unit/Models/Extensions/BaseExtensionsTests.cs

@@ -6,12 +6,12 @@ using Speckle.Sdk.Models.Extensions;
 
 namespace Speckle.Sdk.Tests.Unit.Models.Extensions;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class BaseExtensionsTests
 {
   public BaseExtensionsTests()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(TestBase).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(TestBase).Assembly);
   }
 
   [Theory]

tests/Speckle.Sdk.Tests.Unit/Models/Extensions/DisplayValueTests.cs

@@ -5,7 +5,6 @@ using Speckle.Sdk.Models.Extensions;
 
 namespace Speckle.Sdk.Tests.Unit.Models.Extensions;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class DisplayValueTests
 {
   private const string PAYLOAD = "This is my payload";
@@ -18,7 +17,8 @@ public class DisplayValueTests
 
   private static void Reset()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly);
   }
 
   [Fact]

tests/Speckle.Sdk.Tests.Unit/Models/GraphTraversal/GraphTraversalTests.cs

@@ -6,12 +6,12 @@ using Speckle.Sdk.Models.GraphTraversal;
 
 namespace Speckle.Sdk.Tests.Unit.Models.GraphTraversal;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
 public class GraphTraversalTests
 {
   public GraphTraversalTests()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(TraversalMock).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(TraversalMock).Assembly);
   }
 
   private static IEnumerable<TraversalContext> Traverse(Base testCase, params ITraversalRule[] rules)

tests/Speckle.Sdk.Tests.Unit/Models/Hashing.cs

@@ -6,12 +6,13 @@ using Speckle.Sdk.Tests.Unit.Host;
 
 namespace Speckle.Sdk.Tests.Unit.Models;
 
-[Collection(nameof(RequiresTypeLoaderCollection))]
+// Removed [TestFixture] and [TestOf] annotations as they are NUnit specific
 public class Hashing
 {
   public Hashing()
   {
-    TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(DiningTable).Assembly);
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, typeof(DiningTable).Assembly);
   }
 
   [Fact(DisplayName = "Checks that hashing (as represented by object IDs) actually works.")]

tests/Speckle.Sdk.Tests.Unit/Models/SpeckleType.cs

@@ -5,13 +5,13 @@ using Speckle.Sdk.Tests.Unit.Models.TestModels;
 
 namespace Speckle.Sdk.Tests.Unit.Models
 {
-  [Collection(nameof(RequiresTypeLoaderCollection))]
   public class SpeckleTypeTests
   {
     public SpeckleTypeTests()
     {
       // Setup logic during test class initialization
-      TypeLoader.ReInitialize(typeof(Base).Assembly, typeof(Foo).Assembly);
+      TypeLoader.Reset();
+      TypeLoader.Initialize(typeof(Base).Assembly, typeof(Foo).Assembly);
     }
 
     [Theory]

tests/Speckle.Sdk.Tests.Unit/Pipelines/Progress/AggregateProgressTests.cs

@@ -1,21 +0,0 @@
-using Moq;
-using Speckle.Sdk.Pipelines.Progress;
-
-namespace Speckle.Sdk.Tests.Unit.Pipelines.Progress;
-
-public class AggregateProgressTests
-{
-  [Fact]
-  public void Report_InvokesReportOnAllInnerProgresses()
-  {
-    var mock1 = new Mock<IProgress<int>>();
-    var mock2 = new Mock<IProgress<int>>();
-    const int TEST_VALUE = 42;
-    var target = new AggregateProgress<int>(mock1.Object, mock2.Object);
-
-    target.Report(TEST_VALUE);
-
-    mock1.Verify(x => x.Report(TEST_VALUE), Times.Once);
-    mock2.Verify(x => x.Report(TEST_VALUE), Times.Once);
-  }
-}

tests/Speckle.Sdk.Tests.Unit/Pipelines/Progress/ProgressStreamTests.cs

@@ -1,72 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Moq;
-using Speckle.Sdk.Pipelines.Progress;
-
-namespace Speckle.Sdk.Tests.Unit.Pipelines.Progress;
-
-[SuppressMessage(
-  "Performance",
-  "CA1835:Prefer the \'Memory\'-based overloads for \'ReadAsync\' and \'WriteAsync\'",
-  Justification = "Need to test it"
-)]
-public class ProgressStreamTests : IDisposable
-{
-  private readonly Mock<Stream> _innerStreamMock;
-  private readonly Mock<IProgress<StreamProgressArgs>> _progressMock;
-  private readonly ProgressStream _sut;
-
-  public ProgressStreamTests()
-  {
-    // Setup the mocks
-    _innerStreamMock = new Mock<Stream>();
-    _innerStreamMock.Setup(s => s.Length).Returns(1024L);
-
-    _progressMock = new Mock<IProgress<StreamProgressArgs>>();
-
-    // Inject mocks into the System Under Test
-    _sut = new ProgressStream(_innerStreamMock.Object, _progressMock.Object);
-  }
-
-  [Fact]
-  public async Task ReadAsync_Should_CallInnerStreamAndReportProgress()
-  {
-    // Arrange
-    var buffer = new byte[10];
-    _innerStreamMock
-      .Setup(s => s.ReadAsync(buffer, 0, buffer.Length, CancellationToken.None))
-      .Returns(Task.FromResult(5));
-
-    // Act
-    await _sut.ReadAsync(buffer, 0, buffer.Length);
-
-    // Assert - Inner Stream Read was called
-    _innerStreamMock.Verify(s => s.ReadAsync(buffer, 0, buffer.Length, CancellationToken.None), Times.Once);
-
-    // Assert - Progress Report was called with the correct byte count
-    _progressMock.Verify(p => p.Report(It.IsAny<StreamProgressArgs>()), Times.Once);
-  }
-
-  [Fact]
-  public async Task WriteAsync_Should_CallInnerStreamAndReportProgress()
-  {
-    // Arrange
-    var buffer = new byte[10];
-    _innerStreamMock
-      .Setup(s => s.WriteAsync(buffer, 0, buffer.Length, CancellationToken.None))
-      .Returns(Task.FromResult(5));
-
-    // Act
-    await _sut.WriteAsync(buffer, 0, buffer.Length);
-
-    // Assert - Inner Stream Write was called
-    _innerStreamMock.Verify(s => s.WriteAsync(buffer, 0, buffer.Length, CancellationToken.None), Times.Once);
-
-    // Assert - Progress Report was called with the correct byte count
-    _progressMock.Verify(p => p.Report(It.IsAny<StreamProgressArgs>()), Times.Once);
-  }
-
-  public void Dispose()
-  {
-    _sut.Dispose();
-  }
-}

tests/Speckle.Sdk.Tests.Unit/Pipelines/Progress/RenderedStreamProgressTests.cs

@@ -1,46 +0,0 @@
-using Speckle.Sdk.Pipelines.Progress;
-
-namespace Speckle.Sdk.Tests.Unit.Pipelines.Progress;
-
-public class RenderedStreamProgressTests
-{
-  [Theory]
-  [InlineData(1, "B", 1.0)]
-  [InlineData(1024, "B", 1.0)]
-  [InlineData(1024 + 1, "KB", 1.0 / 1024)]
-  [InlineData(1024 * 1024, "KB", 1.0 / 1024)]
-  [InlineData(1024 * 1024 + 1, "MB", 1.0 / (1024 * 1024))]
-  [InlineData(1024 * 1024 * 1024, "MB", 1.0 / (1024 * 1024))]
-  [InlineData(1024 * 1024 * 1024 + 1, "GB", 1.0 / (1024 * 1024 * 1024))]
-  [InlineData(1024L * 1024L * 1024L * 1024L, "GB", 1.0 / (1024L * 1024L * 1024L))]
-  public void GetFileSizeRendering_WithPositiveValue_ReturnsCorrectSuffix(
-    long value,
-    string expectedSuffix,
-    double expectedScaleFactor
-  )
-  {
-    var result = RenderedStreamProgress.GetFileSizeRendering(value);
-
-    Assert.Equal(expectedSuffix, result.suffix);
-    Assert.Equal(expectedScaleFactor, result.scaleFactor);
-  }
-
-  [Theory]
-  [InlineData(0)]
-  [InlineData(-1)]
-  [InlineData(-1000)]
-  public void GetFileSizeRendering_WithNonPositiveValue_ReturnsBytesSuffix(long value)
-  {
-    var result = RenderedStreamProgress.GetFileSizeRendering(value);
-
-    Assert.Equal("B", result.suffix);
-    Assert.Equal(1d, result.scaleFactor);
-  }
-
-  [Theory]
-  [InlineData(long.MaxValue)]
-  public void GetFileSizeRendering_WithVeryLargeValue_ThrowsArgumentOutOfRangeException(long value)
-  {
-    Assert.Throws<ArgumentOutOfRangeException>(() => RenderedStreamProgress.GetFileSizeRendering(value));
-  }
-}