Merge pull request #422 from specklesystems/dogukan/solidx-class

feat (objects): introducing SolidX class

.github/workflows/integration-test.yml

@@ -0,0 +1,53 @@
+name: Integration Test
+
+on:
+  workflow_call:
+    inputs:
+      docker-compose-file:
+        required: true
+        type: string
+      use-github-container-registry:
+        default: false
+        type: boolean
+
+jobs:
+  integration-test:
+    env:
+      Solution: "Speckle.Sdk.sln"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 8.x.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
+
+      - name: 🔐 Login to Github Container Registry
+        if: ${{ inputs.use-github-container-registry }}
+        uses: docker/login-action@v3
+        with:
+          registry: "ghcr.io"
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: ⚙️ Spin up Server
+        run: docker compose -f ${{ inputs.docker-compose-file }} up --wait
+
+      - name: 📦 Restore
+        run: dotnet restore ${{ env.Solution }} --locked-mode
+
+      - name: 🏗️ Build
+        run: dotnet build ${{ env.Solution }} --configuration Release --no-restore -warnaserror
+
+      - 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
+        with:
+          files: tests/**/coverage.xml
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pr.yml

@@ -1,46 +1,55 @@
-name: .NET CI Build
+name: PR Test
 
 on:
   pull_request:
 
 jobs:
   build:
+    env:
+      Solution: "Speckle.Sdk.sln"
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v5
+      - name: Checkout
+        uses: actions/checkout@v6
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.x.x
-        
-    - uses: actions/cache@v4
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-        
-    - id: set-version
-      name: Set version to output
-      run: |
-        SEMVER="3.0.99.${{ github.run_number }}"
-        FILE_VERSION=$(echo "$SEMVER" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
-        FILE_VERSION="$FILE_VERSION.${{ github.run_number }}"
-        
-        echo "semver=$SEMVER" >> "$GITHUB_OUTPUT"
-        echo "fileVersion=$FILE_VERSION" >> "$GITHUB_OUTPUT"
-        
-        echo $SEMVER
-        echo $FILE_VERSION
-        
-    - name: 🔫 Build All
-      run: ./build.sh
-      env:
-        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: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 8.x.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
+
+      - name: 📦 Tool Restore
+        run: dotnet tool restore
+
+      - name: 📄 Format
+        run: dotnet csharpier check .
+
+      - name: 📦 Restore
+        run: dotnet restore ${{ env.Solution }} --locked-mode
+
+      - name: 🏗️ Build
+        run: dotnet build ${{ env.Solution }} --configuration Release --no-restore -warnaserror
+
+      - name: 🔨 Unit Tests
+        run: dotnet test ${{ env.Solution }} --configuration Release --filter "Category!=Integration" --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage
+ 
+      - name: 🎁 Pack
+        run: dotnet pack ${{ env.Solution }} --configuration Release --no-build 
+
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/codecov-action@v5
+        with:
+          files: tests/**/coverage.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  integration-test-internal:
+    uses: "./.github/workflows/integration-test.yml"
+    with:
+      docker-compose-file: "docker-compose-internal.yml"
+      use-github-container-registry: true
+
+  integration-test-public:
+    uses: "./.github/workflows/integration-test.yml"
+    with:
+      docker-compose-file: "docker-compose.yml"

.github/workflows/release.yml

@@ -2,25 +2,27 @@ name: .NET Build and Publish
 
 on:
   push:
-    tags: ["3.*"]
+    tags: ["3.*.*"]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment:
+      name: "nuget.org"
+    permissions:
+      id-token: write # enable GitHub OIDC token issuance for this job
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
-        
+        uses: actions/checkout@v6
+
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 8.x.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
 
-      - uses: actions/cache@v4
-        with:
-          path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-          
       - id: set-version
         name: Set version to output
         run: |
@@ -37,18 +39,24 @@ jobs:
 
           echo $SEMVER
           echo $FILE_VERSION
-              
+
       - name: 🔫 Build and Pack
         run: ./build.sh pack
         env:
           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
+        id: login
+        with:
+          user: ${{ secrets.NUGET_USER }}
+
       - name: Push to nuget.org
-        run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{secrets.CONNECTORS_NUGET_TOKEN }} --skip-duplicate
+        run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{steps.login.outputs.NUGET_API_KEY}}

Directory.Build.targets

@@ -1,8 +1,8 @@
 <Project>
-  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(TestProjectAnalyserRules)' == 'true' ">
     <NoWarn>
       <!-- Things we need to test -->
-      CS0618;CA1034;CA2201;CA1051;CA1040;CA1724;
+      CS0618;CA1034;CA2201;CA1051;CA1040;CA1724;CA1065;
       IDE0044;IDE0130;CA1508;
       <!-- Analysers that provide no tangeable value to a test project -->
       CA5394;CA2007;CA1852;CA1819;CA1711;CA1063;CA1816;CA2234;CS8618;CA1054;CA1810;CA2208;CA1019;CA1831;

README.md

@@ -65,10 +65,12 @@ Docs are a bit patchy [https://docs.speckle.systems/developers/looking-for-devel
 ### Tests
 
 There are several test projects. It is a requirement that all tests pass for PRs to be merged.
+
 The Integration test projects require a local server to be running.
+You must have docker installed. Then you can run `docker compose up` from the root of the repo to start the required containers.
 
-You must have docker installed. Then you can run `docker compose up --wait` from the root of the repo to start the required containers.
-
+In CI, they will be run against both the public and private versions of the server.
+It is important that we remain compatible with both server versions.
 ## Contributing
 
 Before embarking on submitting a patch, please make sure you read:

Speckle.Sdk.sln

@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{DA2AED
 		CodeMetricsConfig.txt = CodeMetricsConfig.txt
 		Directory.Build.Targets = Directory.Build.Targets
 		.config\dotnet-tools.json = .config\dotnet-tools.json
+		docker-compose-internal.yml = docker-compose-internal.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{58D37DA9-F948-48CA-9A73-F5BBBD533DBF}"
@@ -41,6 +42,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\pr.yml = .github\workflows\pr.yml
 		.github\workflows\release.yml = .github\workflows\release.yml
+		.github\workflows\integration-test.yml = .github\workflows\integration-test.yml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Tests.Performance", "tests\Speckle.Sdk.Tests.Performance\Speckle.Sdk.Tests.Performance.csproj", "{870E3396-E6F7-43AE-B120-E651FA4F46BD}"

docker-compose-internal.yml

@@ -0,0 +1,118 @@
+name: "speckle-server"
+
+services:
+  ####
+  # Speckle Server dependencies
+  #######
+  postgres:
+    image: "postgres:16.4-alpine3.20@sha256:d898b0b78a2627cb4ee63464a14efc9d296884f1b28c841b0ab7d7c42f1fffdf"
+    restart: always
+    environment:
+      POSTGRES_DB: speckle
+      POSTGRES_USER: speckle
+      POSTGRES_PASSWORD: speckle
+    volumes:
+      - ./.volumes/postgres-data:/var/lib/postgresql/data/
+    healthcheck:
+      # the -U user has to match the POSTGRES_USER value
+      test: ["CMD-SHELL", "pg_isready -U speckle"]
+      interval: 5s
+      timeout: 5s
+      retries: 30
+
+  redis:
+    image: "valkey/valkey:8.1-alpine@sha256:0d27f0bca0249f61d060029a6aaf2e16b2c417d68d02a508e1dfb763fa2948b4"
+    restart: always
+    volumes:
+      - ./.volumes/redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 30
+
+  minio:
+    image: "minio/minio:RELEASE.2023-10-25T06-33-25Z"
+    command: server /data --console-address ":9001"
+    restart: always
+    volumes:
+      - ./.volumes/minio-data:/data
+    ports:
+      - '127.0.0.1:9000:9000'
+      - '127.0.0.1:9001:9001'
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "curl -s -o /dev/null http://127.0.0.1:9000/minio/index.html",
+        ]
+      interval: 5s
+      timeout: 30s
+      retries: 30
+      start_period: 10s
+
+  speckle-server:
+    image: ghcr.io/specklesystems/speckle-server:latest
+    restart: always
+    healthcheck:
+      test:
+        - CMD
+        - /nodejs/bin/node
+        - -e
+        - "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/readiness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(Number(res.statusCode != 200 || body.toLowerCase().includes('error')));}); }).end(); } catch { process.exit(1); }"
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 90s
+    ports:
+      - "0.0.0.0:3000:3000"
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+    environment:
+      # TODO: Change this to the URL of the speckle server, as accessed from the network
+      CANONICAL_URL: "http://127.0.0.1:8080"
+      SPECKLE_AUTOMATE_URL: "http://127.0.0.1:3030"
+      FRONTEND_ORIGIN: "http://127.0.0.1:8081"
+
+      # TODO: Change thvolumes:
+      REDIS_URL: "redis://redis"
+
+      S3_ENDPOINT: "http://minio:9000"
+      S3_PUBLIC_ENDPOINT: "http://127.0.0.1:9000"
+      S3_ACCESS_KEY: "minioadmin"
+      S3_SECRET_KEY: "minioadmin"
+      S3_BUCKET: "speckle-server"
+      S3_CREATE_BUCKET: "true"
+
+      FILE_SIZE_LIMIT_MB: 100
+      MAX_PROJECT_MODELS_PER_PAGE: 500
+
+      # TODO: Change this to a unique secret for this server
+      SESSION_SECRET: "TODO:ReplaceWithLongString"
+
+      STRATEGY_LOCAL: "true"
+
+      POSTGRES_URL: "postgres"
+      POSTGRES_USER: "speckle"
+      POSTGRES_PASSWORD: "speckle"
+      POSTGRES_DB: "speckle"
+      ENABLE_MP: "false"
+
+      LOG_PRETTY: "true"
+
+      FF_NEXT_GEN_FILE_IMPORTER_ENABLED: "true"
+      FF_LARGE_FILE_IMPORTS_ENABLED: "true"
+
+networks:
+  default:
+    name: speckle-server
+
+volumes:
+  postgres-data:
+  redis-data:
+  minio-data:

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       POSTGRES_USER: speckle
       POSTGRES_PASSWORD: speckle
     volumes:
-      - postgres-data:/var/lib/postgresql/data/
+      - ./.volumes/postgres-data:/var/lib/postgresql/data/
     healthcheck:
       # the -U user has to match the POSTGRES_USER value
       test: ["CMD-SHELL", "pg_isready -U speckle"]
@@ -24,7 +24,7 @@ services:
     image: "valkey/valkey:8.1-alpine@sha256:0d27f0bca0249f61d060029a6aaf2e16b2c417d68d02a508e1dfb763fa2948b4"
     restart: always
     volumes:
-      - redis-data:/data
+      - ./.volumes/redis-data:/data
     healthcheck:
       test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
       interval: 5s
@@ -36,7 +36,7 @@ services:
     command: server /data --console-address ":9001"
     restart: always
     volumes:
-      - minio-data:/data
+      - ./.volumes/minio-data:/data
     ports:
       - '127.0.0.1:9000:9000'
       - '127.0.0.1:9001:9001'
@@ -55,7 +55,7 @@ services:
     image: speckle/speckle-server:latest
     restart: always
     healthcheck:
-      test: 
+      test:
         - CMD
         - /nodejs/bin/node
         - -e
@@ -81,9 +81,9 @@ services:
 
       # TODO: Change thvolumes:
       REDIS_URL: "redis://redis"
-      
+
       S3_ENDPOINT: "http://minio:9000"
-      S3_PUBLIC_ENDPOINT: 'http://127.0.0.1:9000'
+      S3_PUBLIC_ENDPOINT: "http://127.0.0.1:9000"
       S3_ACCESS_KEY: "minioadmin"
       S3_SECRET_KEY: "minioadmin"
       S3_BUCKET: "speckle-server"
@@ -96,19 +96,17 @@ services:
       SESSION_SECRET: "TODO:ReplaceWithLongString"
 
       STRATEGY_LOCAL: "true"
-      DEBUG: "speckle:*"
 
       POSTGRES_URL: "postgres"
       POSTGRES_USER: "speckle"
       POSTGRES_PASSWORD: "speckle"
       POSTGRES_DB: "speckle"
       ENABLE_MP: "false"
-      
+
       LOG_PRETTY: "true"
-      
+
       FF_NEXT_GEN_FILE_IMPORTER_ENABLED: "true"
       FF_LARGE_FILE_IMPORTS_ENABLED: "true"
-      
 
 networks:
   default:

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,6 +74,10 @@ 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.Objects/Geometry/SolidX.cs

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

src/Speckle.Objects/Interfaces.cs

@@ -2,6 +2,7 @@ using Speckle.Objects.Geometry;
 using Speckle.Objects.Other;
 using Speckle.Objects.Primitive;
 using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Data;
 
 namespace Speckle.Objects;
 
@@ -110,15 +111,7 @@ public interface IDisplayValue<out T> : ISpeckleObject
 
 #region Data objects
 
-/// <summary>
-/// Specifies properties on objects to be used for data-based workflows
-/// </summary>
-public interface IProperties : ISpeckleObject
-{
-  Dictionary<string, object?> properties { get; }
-}
-
-public interface IDataObject : IProperties, IDisplayValue<IReadOnlyList<Base>>
+public interface IDataObject : IProperties, IDisplayValue<IReadOnlyList<Base>>, ISpeckleObject
 {
   /// <summary>
   /// The name of the object, primarily used to decorate the object for consumption in frontend and other apps

src/Speckle.Objects/Other/Camera.cs

@@ -0,0 +1,32 @@
+using Speckle.Objects.Geometry;
+using Speckle.Sdk.Models;
+
+namespace Speckle.Objects.Other;
+
+/// <summary>
+/// Camera class to represent a perspective camera for a 3D view.
+/// </summary>
+/// <remarks>Assumes a Z-up, right-handed convention for orientation vectors</remarks>
+[SpeckleType("Objects.Other.Camera")]
+public class Camera : Base
+{
+  /// <summary>
+  /// The name of the view that is created by this camera
+  /// </summary>
+  public required string name { get; set; }
+
+  /// <summary>
+  /// The location of the camera
+  /// </summary>
+  public required Point position { get; set; }
+
+  /// <summary>
+  /// The unit up vector of the camera
+  /// </summary>
+  public required Vector up { get; set; }
+
+  /// <summary>
+  /// The unit forward vector of the camera
+  /// </summary>
+  public required Vector forward { get; set; }
+}

src/Speckle.Objects/Other/RawEncoding.cs

@@ -20,4 +20,6 @@ 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/Other/RenderMaterial.cs

@@ -35,6 +35,6 @@ public class RenderMaterial : Base
   public Color emissiveColor
   {
     get => Color.FromArgb(emissive);
-    set => diffuse = value.ToArgb();
+    set => emissive = value.ToArgb();
   }
 }

src/Speckle.Sdk/Api/Exceptions.cs

@@ -23,10 +23,15 @@ public class SpeckleGraphQLException : SpeckleException
 }
 
 /// <summary>
-/// Represents a "FORBIDDEN" or "UNAUTHORIZED" GraphQL error as an exception.
+/// Represents a "FORBIDDEN" or "UNAUTHENTICATED" or "UNAUTHORIZED" or "UNAUTHORIZED_ACCESS_ERROR" GraphQL error as an exception.
 /// https://www.apollographql.com/docs/apollo-server/v2/data/errors/#unauthenticated
 /// https://www.apollographql.com/docs/apollo-server/v2/data/errors/#forbidden
+/// https://github.com/specklesystems/speckle-server/blob/v2.23.18/packages/server/modules/shared/errors/index.ts#L34
 /// </summary>
+/// <remarks>
+/// Server is a bit inconsistent with these error codes, hence there's 4 different codes that mean "auth no work"
+/// Apollo no longer considers "FORBIDDEN" or "UNAUTHENTICATED" as built in error codes, so everything is custom anyway.
+/// </remarks>
 public sealed class SpeckleGraphQLForbiddenException : SpeckleGraphQLException
 {
   public SpeckleGraphQLForbiddenException() { }

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

@@ -28,7 +28,8 @@ internal static class GraphQLErrorHandler
       var ex = code switch
       {
         "GRAPHQL_PARSE_FAILED" or "GRAPHQL_VALIDATION_FAILED" => new SpeckleGraphQLInvalidQueryException(message),
-        "FORBIDDEN" or "UNAUTHENTICATED" => new SpeckleGraphQLForbiddenException(message),
+        "FORBIDDEN" or "UNAUTHENTICATED" or "UNAUTHORIZED" or "UNAUTHORIZED_ACCESS_ERROR" =>
+          new SpeckleGraphQLForbiddenException(message),
         "STREAM_NOT_FOUND" => new SpeckleGraphQLStreamNotFoundException(message),
         "BAD_USER_INPUT" => new SpeckleGraphQLBadInputException(message),
         "INTERNAL_SERVER_ERROR" => new SpeckleGraphQLInternalErrorException(message),

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

@@ -14,7 +14,7 @@ public sealed class Comment
   public string rawText { get; init; }
   public ResourceCollection<Comment> replies { get; init; }
   public CommentReplyAuthorCollection replyAuthors { get; init; }
-  public List<ResourceIdentifier> resources { get; init; }
+  public List<ResourceIdentifier> resources { get; init; } //todo: add resourceIds/baseResourceIds
   public string? screenshot { get; init; }
   public DateTime updatedAt { get; init; }
   public DateTime? viewedAt { get; init; }

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

@@ -19,6 +19,9 @@ public sealed class ServerInfo
   [Obsolete("Don't use")]
   public bool frontend2 { get; set; } = true;
 
+  /// <summary>
+  /// The URL that should be used to talk with the server
+  /// </summary>
   /// <remarks>
   /// This field is not returned from the GQL API,
   /// it should be populated after construction.

src/Speckle.Sdk/Api/Operations/Operations.Receive.cs

@@ -2,6 +2,7 @@ using Microsoft.Extensions.Logging;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Serialisation;
+using Speckle.Sdk.Serialisation.V2.Receive;
 using Speckle.Sdk.Transports;
 
 namespace Speckle.Sdk.Api;
@@ -15,6 +16,7 @@ public partial class Operations
   /// <exception cref="ArgumentException">No transports were specified</exception>
   /// <exception cref="ArgumentNullException">The <paramref name="objectId"/> was <see langword="null"/></exception>
   /// <exception cref="SpeckleException">Serialization or Send operation was unsuccessful</exception>
+  /// <exception cref="HttpRequestException">HTTP layer errors</exception>
   /// <exception cref="OperationCanceledException">The <paramref name="cancellationToken"/> requested cancellation</exception>
   public async Task<Base> Receive2(
     Uri url,
@@ -22,7 +24,8 @@ public partial class Operations
     string objectId,
     string? authorizationToken,
     IProgress<ProgressArgs>? onProgressAction,
-    CancellationToken cancellationToken
+    CancellationToken cancellationToken,
+    DeserializeProcessOptions? options = null
   )
   {
     using var receiveActivity = activityFactory.Start("Operations.Receive");
@@ -36,7 +39,8 @@ public partial class Operations
       streamId,
       authorizationToken,
       onProgressAction,
-      cancellationToken
+      cancellationToken,
+      options
     );
     try
     {
@@ -44,6 +48,11 @@ public partial class Operations
       receiveActivity?.SetStatus(SdkActivityStatusCode.Ok);
       return result;
     }
+    catch (OperationCanceledException)
+    {
+      //this is handled by the caller
+      throw;
+    }
     catch (Exception ex)
     {
       receiveActivity?.SetStatus(SdkActivityStatusCode.Error);

src/Speckle.Sdk/Api/Operations/Operations.Send.cs

@@ -25,7 +25,8 @@ public partial class Operations
     string? authorizationToken,
     Base value,
     IProgress<ProgressArgs>? onProgressAction,
-    CancellationToken cancellationToken
+    CancellationToken cancellationToken,
+    SerializeProcessOptions? options = null
   )
   {
     using var receiveActivity = activityFactory.Start("Operations.Send");
@@ -38,7 +39,8 @@ public partial class Operations
       streamId,
       authorizationToken,
       onProgressAction,
-      cancellationToken
+      cancellationToken,
+      options
     );
     try
     {

src/Speckle.Sdk/Credentials/Account.cs

@@ -59,15 +59,20 @@ public class Account : IEquatable<Account>
 
   #region public methods
 
+
+  /// <remarks>The logic is aligned with <c>distinct_id</c> mixpanel property</remarks>
+  /// <exception cref="ArgumentNullException">Thrown if <see name="userInfo.email"/> was <see langword="null"/></exception>
   public string GetHashedEmail()
   {
-    string email = userInfo?.email ?? "unknown";
+    string email = userInfo.email.NotNull();
     return "@" + Md5.GetString(email).ToUpperInvariant();
   }
 
+  /// <remarks>The logic is aligned with <c>server</c> mixpanel property</remarks>
+  /// <exception cref="ArgumentNullException">Thrown if <see name="serverInfo.url"/> was <see langword="null"/></exception>
   public string GetHashedServer()
   {
-    string url = serverInfo?.url ?? AccountManager.DEFAULT_SERVER_URL;
+    string url = serverInfo.url.NotNull();
     return Md5.GetString(CleanURL(url)).ToUpperInvariant();
   }
 
@@ -97,6 +102,8 @@ public class Account : IEquatable<Account>
 
   #endregion
 
+  internal const string LOCAL_IDENTIFIER_DEPRECATION_MESSAGE = "Local identifiers no longer nesseary";
+
   /// <summary>
   /// Retrieves the local identifier for the current user.
   /// </summary>
@@ -121,5 +128,6 @@ public class Account : IEquatable<Account>
   ///     https://speckle.xyz?id=123
   ///   </code>
   /// </example>
+  [Obsolete(LOCAL_IDENTIFIER_DEPRECATION_MESSAGE)]
   internal Uri GetLocalIdentifier() => new($"{serverInfo.url}?id={userInfo.id}");
 }

src/Speckle.Sdk/Credentials/AccountManager.cs

@@ -419,6 +419,7 @@ public sealed class AccountManager(
   /// <remarks>
   /// <inheritdoc cref="Account.GetLocalIdentifier"/>
   /// </remarks>
+  [Obsolete(Account.LOCAL_IDENTIFIER_DEPRECATION_MESSAGE)]
   public Uri? GetLocalIdentifierForAccount(Account account)
   {
     var identifier = account.GetLocalIdentifier();
@@ -440,6 +441,7 @@ public sealed class AccountManager(
   /// </summary>
   /// <param name="localIdentifier">The local identifier of the account.</param>
   /// <returns>The account that matches the local identifier, or null if no match is found.</returns>
+  [Obsolete(Account.LOCAL_IDENTIFIER_DEPRECATION_MESSAGE)]
   public Account? GetAccountForLocalIdentifier(Uri localIdentifier)
   {
     var searchResult = GetAccounts()

src/Speckle.Sdk/Logging/SpecklePathProvider.cs

@@ -9,12 +9,14 @@ public static class SpecklePathProvider
 {
   private const string APPLICATION_NAME = "Speckle";
 
+  private const string LOG_FOLDER_NAME = "Logs";
+
   private const string BLOB_FOLDER_NAME = "Blobs";
 
   private const string ACCOUNTS_FOLDER_NAME = "Accounts";
 
-  private static string UserDataPathEnvVar => "SPECKLE_USERDATA_PATH";
-  private static string? Path => Environment.GetEnvironmentVariable(UserDataPathEnvVar);
+  public const string USER_DATA_PATH_ENV_VAR = "SPECKLE_USERDATA_PATH";
+  private static string? Path => Environment.GetEnvironmentVariable(USER_DATA_PATH_ENV_VAR);
 
   /// <summary>
   /// Get the installation path.
@@ -43,7 +45,7 @@ public static class SpecklePathProvider
   /// <see cref="Environment.SpecialFolder.ApplicationData"/> path usually maps to
   /// <ul>
   ///   <li>win: <c>%appdata%/</c></li>
-  ///   <li>MacOS: <c>~/.config/</c></li>
+  ///   <li>MacOS: <c>~/Library/Application Support</c></li>
   ///   <li>Linux: <c>~/.config/</c></li>
   /// </ul>
   /// </remarks>
@@ -57,29 +59,18 @@ public static class SpecklePathProvider
       return pathOverride;
     }
 
-    // on desktop linux and macos we use the appdata.
-    // but we might not have write access to the disk
-    // so the catch falls back to the user profile
     try
     {
       return Environment.GetFolderPath(
         Environment.SpecialFolder.ApplicationData,
-        // if the folder doesn't exist, we get back an empty string on OSX,
-        // which in turn, breaks other stuff down the line.
-        // passing in the Create option ensures that this directory exists,
-        // which is not a given on all OS-es.
+        // It's not a given that the folder is already there on all OS-es, so we'll create it
         Environment.SpecialFolderOption.Create
       );
     }
-    catch (SystemException ex) when (ex is PlatformNotSupportedException or ArgumentException)
+    catch (PlatformNotSupportedException)
     {
-      //Adding this log just so we confidently know which Exception type to catch here.
-      // TODO: Must re-add log call when (and if) this get's made as a service
-      //SpeckleLog.Logger.Warning(ex, "Falling back to user profile path");
-
-      // on server linux, there might not be a user setup, things can run under root
-      // in that case, the appdata variable is most probably not set up
-      // we fall back to the value of the home folder
+      // We might not have write access to the disk to create the folder,
+      // so we'll fall back to the user profile
       return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
     }
   }
@@ -96,4 +87,7 @@ public static class SpecklePathProvider
     Directory.CreateDirectory(path);
     return path;
   }
+
+  public static string LogFolderPath(string applicationAndVersion) =>
+    EnsureFolderExists(UserSpeckleFolderPath, LOG_FOLDER_NAME, applicationAndVersion);
 }

src/Speckle.Sdk/Models/Collections/RootCollection.cs

@@ -0,0 +1,21 @@
+using Speckle.Sdk.Models.Data;
+
+namespace Speckle.Sdk.Models.Collections;
+
+/// <summary>
+/// Root collection that represents the top-level commit object.
+/// Extends Collection to include model-wide properties that apply to the entire model.
+/// </summary>
+[SpeckleType("Speckle.Core.Models.Collections.RootCollection")]
+public class RootCollection : Collection, IProperties
+{
+  public RootCollection() { }
+
+  public RootCollection(string name)
+    : base(name) { }
+
+  /// <summary>
+  /// Model-wide properties that apply to the entire model.
+  /// </summary>
+  public Dictionary<string, object?> properties { get; set; } = new();
+}

src/Speckle.Sdk/Models/Data/IProperties.cs

@@ -0,0 +1,10 @@
+namespace Speckle.Sdk.Models.Data;
+
+/// <summary>
+/// Specifies properties on objects to be used for data-based workflows.
+/// Can be applied to both objects and collections.
+/// </summary>
+public interface IProperties
+{
+  Dictionary<string, object?> properties { get; }
+}

src/Speckle.Sdk/Serialisation/V2/MemoryServerObjectManager.cs

@@ -9,6 +9,7 @@ public class MemoryServerObjectManager(ConcurrentDictionary<string, string> obje
 {
   public virtual async IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
+    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     [EnumeratorCancellation] CancellationToken cancellationToken
   )

src/Speckle.Sdk/Serialisation/V2/Receive/DeserializeProcess.cs

@@ -10,7 +10,7 @@ using Speckle.Sdk.Transports;
 namespace Speckle.Sdk.Serialisation.V2.Receive;
 
 public record DeserializeProcessOptions(
-  bool SkipCache = false,
+  bool SkipCache = false, //TODO: This appears to be bugged when set to `true`, `LoadId` depends on sqlite
   bool ThrowOnMissingReferences = true,
   bool SkipInvalidConverts = false,
   int? MaxParallelism = null,

src/Speckle.Sdk/Serialisation/V2/Receive/ObjectLoader.cs

@@ -19,9 +19,7 @@ public sealed class ObjectLoader(
   IProgress<ProgressArgs>? progress,
   ILogger<ObjectLoader> logger,
   CancellationToken cancellationToken
-#pragma warning disable CS9107 // Parameter is captured into the state of the enclosing type and its value is also passed to the base constructor. The value might be captured by the base class as well.
 ) : ChannelLoader<BaseItem>(cancellationToken), IObjectLoader
-#pragma warning restore CS9107 // Parameter is captured into the state of the enclosing type and its value is also passed to the base constructor. The value might be captured by the base class as well.
 {
   private int? _allChildrenCount;
   private long _checkCache;
@@ -29,6 +27,7 @@ public sealed class ObjectLoader(
   private long _downloaded;
   private long _totalToDownload;
   private DeserializeProcessOptions _options = new();
+  private readonly CancellationToken _cancellationToken = cancellationToken;
 
   [AutoInterfaceIgnore]
   public void Dispose() => sqLiteJsonCacheManager.Dispose();
@@ -46,7 +45,7 @@ public sealed class ObjectLoader(
         {
           //assume everything exists as the root is there.
           var allChildren = ClosureParser
-            .GetClosuresSorted(rootJson, cancellationToken)
+            .GetClosuresSorted(rootJson, _cancellationToken)
             .Select(x => new Id(x.Item1))
             .ToList();
           //this probably yields away from the Main thread to let host apps update progress
@@ -59,11 +58,11 @@ public sealed class ObjectLoader(
       if (!options.SkipServer)
       {
         rootJson = await serverObjectManager
-          .DownloadSingleObject(rootId, progress, cancellationToken)
+          .DownloadSingleObject(rootId, progress, _cancellationToken)
           .NotNull()
           .ConfigureAwait(false);
         IReadOnlyCollection<Id> allChildrenIds = ClosureParser
-          .GetClosures(rootJson, cancellationToken)
+          .GetClosures(rootJson, _cancellationToken)
           .OrderByDescending(x => x.Item2)
           .Select(x => new Id(x.Item1))
           .Where(x => !x.Value.StartsWith("blob", StringComparison.Ordinal))
@@ -111,12 +110,13 @@ public sealed class ObjectLoader(
     await foreach (
       var (id, json) in serverObjectManager.DownloadObjects(
         ids.Select(x => x.NotNull()).ToList(),
+        null, //TODO: Implement attribute masking in a safe way that will not poison SQLite DB.
         progress,
-        cancellationToken
+        _cancellationToken
       )
     )
     {
-      cancellationToken.ThrowIfCancellationRequested();
+      _cancellationToken.ThrowIfCancellationRequested();
       Interlocked.Increment(ref _downloaded);
       progress?.Report(new(ProgressEvent.DownloadObjects, _downloaded, _totalToDownload));
       toCache.Add(new(new(id), new(json), true, null));
@@ -138,7 +138,7 @@ public sealed class ObjectLoader(
     {
       if (!_options.SkipCache)
       {
-        cancellationToken.ThrowIfCancellationRequested();
+        _cancellationToken.ThrowIfCancellationRequested();
         sqLiteJsonCacheManager.SaveObjects(batch.Select(x => (x.Id.Value, x.Json.Value)));
         Interlocked.Exchange(ref _cached, _cached + batch.Count);
         progress?.Report(new(ProgressEvent.CachedToLocal, _cached, _allChildrenCount));
@@ -168,7 +168,7 @@ public sealed class ObjectLoader(
   private void ThrowIfFailed()
   {
     //always check for cancellation first
-    cancellationToken.ThrowIfCancellationRequested();
+    _cancellationToken.ThrowIfCancellationRequested();
     if (Exception is not null)
     {
       throw new SpeckleException($"Error while loading: {Exception.Message}", Exception);

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

@@ -21,12 +21,7 @@ public class BaseSerializer(
   public IReadOnlyDictionary<Id, ObjectReference> ObjectReferences => _objectReferences;
 
   //leave this sync
-  public IEnumerable<BaseItem> Serialise(
-    Base obj,
-    IReadOnlyDictionary<Id, NodeInfo> childInfo,
-    bool skipCacheRead,
-    CancellationToken cancellationToken
-  )
+  public IEnumerable<BaseItem> Serialise(Base obj, bool skipCacheRead, CancellationToken cancellationToken)
   {
     if (!skipCacheRead && obj.id != null)
     {
@@ -38,7 +33,7 @@ public class BaseSerializer(
       }
     }
 
-    using var serializer2 = objectSerializerFactory.Create(childInfo, cancellationToken);
+    using var serializer2 = objectSerializerFactory.Create(cancellationToken);
     var items = _pool.Get();
     try
     {

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

@@ -20,10 +20,10 @@ public sealed class ObjectSaver(
   ISqLiteJsonCacheManager sqLiteJsonCacheManager,
   IServerObjectManager serverObjectManager,
   ILogger<ObjectSaver> logger,
-  CancellationToken cancellationToken,
+  SerializeProcessOptions options,
+  CancellationToken cancellationToken
 #pragma warning disable CS9107
 #pragma warning disable CA2254
-  SerializeProcessOptions? options = null
 ) : ChannelSaver<BaseItem>, IObjectSaver
 #pragma warning restore CA2254
 #pragma warning restore CS9107

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

@@ -26,8 +26,6 @@ public sealed class ObjectSerializer : IObjectSerializer
 {
   private HashSet<object> _parentObjects = new();
 
-  private readonly IReadOnlyDictionary<Id, NodeInfo> _childCache;
-
   private readonly IBasePropertyGatherer _propertyGatherer;
   private readonly CancellationToken _cancellationToken;
 
@@ -52,7 +50,6 @@ public sealed class ObjectSerializer : IObjectSerializer
   /// <param name="cancellationToken"></param>
   public ObjectSerializer(
     IBasePropertyGatherer propertyGatherer,
-    IReadOnlyDictionary<Id, NodeInfo> childCache,
     Pool<List<(Id, Json, Closures)>> chunksPool,
     Pool<List<DataChunk>> chunks2Pool,
     Pool<List<object?>> chunks3Pool,
@@ -60,7 +57,6 @@ public sealed class ObjectSerializer : IObjectSerializer
   )
   {
     _propertyGatherer = propertyGatherer;
-    _childCache = childCache;
     _chunksPool = chunksPool;
     _chunks2Pool = chunks2Pool;
     _chunks3Pool = chunks3Pool;
@@ -299,28 +295,14 @@ public sealed class ObjectSerializer : IObjectSerializer
 
   private (Id, Json)? SerializeDetachedBase(Base baseObj, Closures closures)
   {
-    Closures childClosures;
-    Id id;
-    Json json;
-    //avoid multiple serialization to get closures
-    if (baseObj.id != null && _childCache.TryGetValue(new(baseObj.id), out var info))
-    {
-      id = new Id(baseObj.id);
-      childClosures = info.GetClosures(_cancellationToken);
-      json = info.Json;
-      closures.IncrementClosures(childClosures);
-    }
-    else
-    {
-      childClosures = [];
-      var sb = Pools.StringBuilders.Get();
-      using var writer = new StringWriter(sb);
-      using var jsonWriter = SpeckleObjectSerializerPool.Instance.GetJsonTextWriter(writer);
-      id = SerializeBaseWithClosures(baseObj, jsonWriter, childClosures, true);
-      closures.IncrementClosures(childClosures);
-      json = new Json(writer.ToString());
-      Pools.StringBuilders.Return(sb);
-    }
+    Closures childClosures = [];
+    var sb = Pools.StringBuilders.Get();
+    using var writer = new StringWriter(sb);
+    using var jsonWriter = SpeckleObjectSerializerPool.Instance.GetJsonTextWriter(writer);
+    var id = SerializeBaseWithClosures(baseObj, jsonWriter, childClosures, true);
+    var json = new Json(writer.ToString());
+    Pools.StringBuilders.Return(sb);
+    closures.IncrementClosures(childClosures);
     var json2 = ReferenceGenerator.CreateReference(id);
     closures.MergeClosure(id);
     // add to obj refs to return

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

@@ -12,6 +12,6 @@ public class ObjectSerializerFactory(IBasePropertyGatherer propertyGatherer) : I
   private readonly Pool<List<DataChunk>> _chunk2Pool = Pools.CreateListPool<DataChunk>();
   private readonly Pool<List<object?>> _chunk3Pool = Pools.CreateListPool<object?>();
 
-  public IObjectSerializer Create(IReadOnlyDictionary<Id, NodeInfo> baseCache, CancellationToken cancellationToken) =>
-    new ObjectSerializer(propertyGatherer, baseCache, _chunkPool, _chunk2Pool, _chunk3Pool, cancellationToken);
+  public IObjectSerializer Create(CancellationToken cancellationToken) =>
+    new ObjectSerializer(propertyGatherer, _chunkPool, _chunk2Pool, _chunk3Pool, cancellationToken);
 }

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

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Speckle.InterfaceGenerator;
@@ -37,8 +36,8 @@ public sealed class SerializeProcess(
   IBaseChildFinder baseChildFinder,
   IBaseSerializer baseSerializer,
   ILoggerFactory loggerFactory,
-  CancellationToken cancellationToken,
-  SerializeProcessOptions? options = null
+  SerializeProcessOptions options,
+  CancellationToken cancellationToken
 ) : ISerializeProcess
 {
   private static readonly Dictionary<Id, NodeInfo> EMPTY_CLOSURES = new();
@@ -64,13 +63,8 @@ public sealed class SerializeProcess(
     ThreadPriority.BelowNormal,
     Environment.ProcessorCount * 2
   );
-  private readonly SerializeProcessOptions _options = options ?? new();
 
   private readonly Pool<Dictionary<Id, NodeInfo>> _currentClosurePool = Pools.CreateDictionaryPool<Id, NodeInfo>();
-  private readonly Pool<ConcurrentDictionary<Id, NodeInfo>> _childClosurePool = Pools.CreateConcurrentDictionaryPool<
-    Id,
-    NodeInfo
-  >();
 
   private readonly Pool<List<Task<Dictionary<Id, NodeInfo>>>> _taskResultPool = Pools.CreateListPool<
     Task<Dictionary<Id, NodeInfo>>
@@ -113,13 +107,13 @@ public sealed class SerializeProcess(
     try
     {
       var channelTask = objectSaver.Start(
-        options?.MaxParallelism,
-        options?.MaxHttpSendBatchSize,
-        options?.MaxCacheBatchSize,
+        options.MaxParallelism,
+        options.MaxHttpSendBatchSize,
+        options.MaxCacheBatchSize,
         _processSource.Token
       );
       var findTotalObjectsTask = Task.CompletedTask;
-      if (!_options.SkipFindTotalObjects)
+      if (!options.SkipFindTotalObjects)
       {
         ThrowIfFailed();
         findTotalObjectsTask = Task.Factory.StartNew(
@@ -225,7 +219,6 @@ public sealed class SerializeProcess(
         return EMPTY_CLOSURES;
       }
 
-      var childClosures = _childClosurePool.Get();
       foreach (var childClosure in taskClosures)
       {
         if (IsCancelled())
@@ -234,7 +227,6 @@ public sealed class SerializeProcess(
         }
         foreach (var kvp in childClosure)
         {
-          childClosures[kvp.Key] = kvp.Value;
           if (IsCancelled())
           {
             return EMPTY_CLOSURES;
@@ -249,7 +241,7 @@ public sealed class SerializeProcess(
         return EMPTY_CLOSURES;
       }
 
-      var items = baseSerializer.Serialise(obj, childClosures, _options.SkipCacheRead, _processSource.Token);
+      var items = baseSerializer.Serialise(obj, options.SkipCacheRead, _processSource.Token);
 
       if (IsCancelled())
       {
@@ -257,32 +249,26 @@ public sealed class SerializeProcess(
       }
 
       var currentClosures = _currentClosurePool.Get();
-      try
+
+      Interlocked.Increment(ref _objectCount);
+      progress?.Report(new(ProgressEvent.FromCacheOrSerialized, _objectCount, Math.Max(_objectCount, _objectsFound)));
+      foreach (var item in items)
       {
-        Interlocked.Increment(ref _objectCount);
-        progress?.Report(new(ProgressEvent.FromCacheOrSerialized, _objectCount, Math.Max(_objectCount, _objectsFound)));
-        foreach (var item in items)
+        if (IsCancelled())
         {
-          if (IsCancelled())
-          {
-            return EMPTY_CLOSURES;
-          }
-
-          if (item.NeedsStorage)
-          {
-            Interlocked.Increment(ref _objectsSerialized);
-            await objectSaver.SaveAsync(item).ConfigureAwait(false);
-          }
-
-          if (!currentClosures.ContainsKey(item.Id))
-          {
-            currentClosures.Add(item.Id, new NodeInfo(item.Json, item.Closures));
-          }
+          return EMPTY_CLOSURES;
+        }
+
+        if (item.NeedsStorage)
+        {
+          Interlocked.Increment(ref _objectsSerialized);
+          await objectSaver.SaveAsync(item).ConfigureAwait(false);
+        }
+
+        if (!currentClosures.ContainsKey(item.Id))
+        {
+          currentClosures.Add(item.Id, new NodeInfo(item.Json, item.Closures));
         }
-      }
-      finally
-      {
-        _childClosurePool.Return(childClosures);
       }
 
       return currentClosures;

src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs

@@ -44,13 +44,14 @@ public class SerializeProcessFactory(
         sqLiteJsonCacheManager,
         serverObjectManager,
         loggerFactory.CreateLogger<ObjectSaver>(),
+        options ?? new SerializeProcessOptions(),
         cancellationToken
       ),
       baseChildFinder,
       new BaseSerializer(sqLiteJsonCacheManager, objectSerializerFactory),
       loggerFactory,
-      cancellationToken,
-      options
+      options ?? new SerializeProcessOptions(),
+      cancellationToken
     );
 
   public ISerializeProcess CreateSerializeProcess(

src/Speckle.Sdk/Serialisation/V2/ServerObjectManager.cs

@@ -51,6 +51,7 @@ public class ServerObjectManager : IServerObjectManager
 
   public async IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
+    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     [EnumeratorCancellation] CancellationToken cancellationToken
   )
@@ -59,10 +60,14 @@ public class ServerObjectManager : IServerObjectManager
     cancellationToken.ThrowIfCancellationRequested();
 
     using var childrenHttpMessage = new HttpRequestMessage();
-    childrenHttpMessage.RequestUri = new Uri($"/api/getobjects/{_streamId}", UriKind.Relative);
+    childrenHttpMessage.RequestUri = new Uri($"/api/v2/projects/{_streamId}/object-stream/", UriKind.Relative);
     childrenHttpMessage.Method = HttpMethod.Post;
 
-    Dictionary<string, string> postParameters = new() { { "objects", JsonConvert.SerializeObject(objectIds) } };
+    Dictionary<string, object> postParameters = new() { { "objectIds", objectIds } };
+    if (!string.IsNullOrWhiteSpace(attributeMask))
+    {
+      postParameters.Add("attributeMask", attributeMask.NotNull());
+    }
     string serializedPayload = JsonConvert.SerializeObject(postParameters);
     childrenHttpMessage.Content = new StringContent(serializedPayload, Encoding.UTF8, "application/json");
     childrenHttpMessage.Headers.Add("Accept", "text/plain");

tests/Speckle.Automate.Sdk.Integration/Speckle.Automate.Sdk.Integration.csproj

@@ -3,6 +3,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="altcover" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.assert" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Speckle.Sdk.Testing\Speckle.Sdk.Testing.csproj" />
     <ProjectReference Include="..\..\src\Speckle.Automate.Sdk\Speckle.Automate.Sdk.csproj" />

tests/Speckle.Automate.Sdk.Integration/SpeckleAutomate.cs

@@ -25,7 +25,9 @@ public sealed class AutomationContextTest : IAsyncLifetime
 
   public async Task InitializeAsync()
   {
-    var serviceProvider = TestServiceSetup.GetServiceProvider();
+    var serviceCollection = new ServiceCollection();
+    serviceCollection.AddAutomateSdk();
+    var serviceProvider = serviceCollection.BuildServiceProvider();
     _account = await Fixtures.SeedUser().ConfigureAwait(false);
     _client = serviceProvider.GetRequiredService<IClientFactory>().Create(_account);
     _runner = serviceProvider.GetRequiredService<IAutomationRunner>();
@@ -42,7 +44,7 @@ public sealed class AutomationContextTest : IAsyncLifetime
   private async Task<AutomationRunData> AutomationRunData(Base testObject)
   {
     Project project = await _client.Project.Create(new("Automate function e2e test", null, ProjectVisibility.Public));
-    const string BRANCH_NAME = "main";
+    const string BRANCH_NAME = "Trigger";
 
     var model = await _client.Model.Create(new(BRANCH_NAME, null, project.id));
     string modelId = model.id;

tests/Speckle.Automate.Sdk.Integration/packages.lock.json

@@ -2,6 +2,28 @@
   "version": 2,
   "dependencies": {
     "net8.0": {
+      "altcover": {
+        "type": "Direct",
+        "requested": "[9.0.1, )",
+        "resolved": "9.0.1",
+        "contentHash": "aadciFNDT5bnylaYUkKal+s5hF7yU/lmZxImQWAlk1438iPqK1Uf79H5ylELpyLIU49HL5ql+tnWBihp3WVLCA=="
+      },
+      "AwesomeAssertions": {
+        "type": "Direct",
+        "requested": "[8.1.0, )",
+        "resolved": "8.1.0",
+        "contentHash": "IfNC4cpXPi9tclWvuNO9lfkuIxJsUTLTS1NXto55jDrAUQJYl0zLI9ByISrfkbBE2Xtg+IWaAXQ6jnUx3anDuw=="
+      },
+      "Microsoft.NET.Test.Sdk": {
+        "type": "Direct",
+        "requested": "[17.13.0, )",
+        "resolved": "17.13.0",
+        "contentHash": "W19wCPizaIC9Zh47w8wWI/yxuqR7/dtABwOrc8r2jX/8mUNxM2vw4fXDh+DJTeogxV+KzKwg5jNNGQVwf3LXyA==",
+        "dependencies": {
+          "Microsoft.CodeCoverage": "17.13.0",
+          "Microsoft.TestPlatform.TestHost": "17.13.0"
+        }
+      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -24,6 +46,18 @@
         "resolved": "0.9.6",
         "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
       },
+      "xunit.assert": {
+        "type": "Direct",
+        "requested": "[2.9.3, )",
+        "resolved": "2.9.3",
+        "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA=="
+      },
+      "xunit.runner.visualstudio": {
+        "type": "Direct",
+        "requested": "[3.0.2, )",
+        "resolved": "3.0.2",
+        "contentHash": "oXbusR6iPq0xlqoikjdLvzh+wQDkMv9If58myz9MEzldS4nIcp442Btgs2sWbYWV+caEluMe2pQCZ0hUZgPiow=="
+      },
       "Argon": {
         "type": "Transitive",
         "resolved": "0.28.0",
@@ -364,18 +398,6 @@
           "xunit.runner.visualstudio": "[3.0.2, )"
         }
       },
-      "altcover": {
-        "type": "CentralTransitive",
-        "requested": "[9.0.1, )",
-        "resolved": "9.0.1",
-        "contentHash": "aadciFNDT5bnylaYUkKal+s5hF7yU/lmZxImQWAlk1438iPqK1Uf79H5ylELpyLIU49HL5ql+tnWBihp3WVLCA=="
-      },
-      "AwesomeAssertions": {
-        "type": "CentralTransitive",
-        "requested": "[8.1.0, )",
-        "resolved": "8.1.0",
-        "contentHash": "IfNC4cpXPi9tclWvuNO9lfkuIxJsUTLTS1NXto55jDrAUQJYl0zLI9ByISrfkbBE2Xtg+IWaAXQ6jnUx3anDuw=="
-      },
       "GraphQL.Client": {
         "type": "CentralTransitive",
         "requested": "[6.0.0, )",
@@ -424,16 +446,6 @@
           "Microsoft.Extensions.Options": "2.2.0"
         }
       },
-      "Microsoft.NET.Test.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[17.13.0, )",
-        "resolved": "17.13.0",
-        "contentHash": "W19wCPizaIC9Zh47w8wWI/yxuqR7/dtABwOrc8r2jX/8mUNxM2vw4fXDh+DJTeogxV+KzKwg5jNNGQVwf3LXyA==",
-        "dependencies": {
-          "Microsoft.CodeCoverage": "17.13.0",
-          "Microsoft.TestPlatform.TestHost": "17.13.0"
-        }
-      },
       "Moq": {
         "type": "CentralTransitive",
         "requested": "[4.20.72, )",
@@ -515,18 +527,6 @@
           "xunit.assert": "2.9.3",
           "xunit.core": "[2.9.3]"
         }
-      },
-      "xunit.assert": {
-        "type": "CentralTransitive",
-        "requested": "[2.9.3, )",
-        "resolved": "2.9.3",
-        "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA=="
-      },
-      "xunit.runner.visualstudio": {
-        "type": "CentralTransitive",
-        "requested": "[3.0.2, )",
-        "resolved": "3.0.2",
-        "contentHash": "oXbusR6iPq0xlqoikjdLvzh+wQDkMv9If58myz9MEzldS4nIcp442Btgs2sWbYWV+caEluMe2pQCZ0hUZgPiow=="
       }
     }
   }

tests/Speckle.Objects.Tests.Unit/Serialization/ObjectsSerializationTest.cs

@@ -18,10 +18,7 @@ public sealed class ObjectsSerializationTest
 
   private static IReadOnlyList<(Id, Json, Dictionary<Id, int>)> Serialize(Base data)
   {
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
-      new Dictionary<Id, NodeInfo>(),
-      default
-    );
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
     return serializer.Serialize(data).ToList();
   }
 

tests/Speckle.Sdk.Serialization.Testing/Speckle.Sdk.Serialization.Testing.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <TestProjectAnalyserRules>true</TestProjectAnalyserRules>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Speckle.Sdk\Speckle.Sdk.csproj" />

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

@@ -41,7 +41,7 @@ public class DataObjectTests
       new DummyServerObjectManager(),
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true)
+      new SerializeProcessOptions(false, false, true, true)
     );
     await serializeProcess.Serialize(x);
     await VerifyJson(json.Single().Value.Value).UseParameters(type);

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

@@ -41,7 +41,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
     await serializeProcess.Serialize(@base);
 
@@ -123,7 +123,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -150,7 +150,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -172,7 +172,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -239,7 +239,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
 
     var results = await serializeProcess.Serialize(@base);
@@ -272,7 +272,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
     var results = await serializeProcess.Serialize(@base);
     await VerifyJsonDictionary(objects);
@@ -338,6 +338,7 @@ public class DummyServerObjectManager : IServerObjectManager
 {
   public IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
+    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     CancellationToken cancellationToken
   ) => throw new NotImplementedException();

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

@@ -113,14 +113,14 @@ public class ExceptionTests
       new ExceptionServerObjectManager(),
       null,
       new NullLogger<ObjectLoader>(),
-      default
+      CancellationToken.None
     );
     await using var process = new DeserializeProcess(
       o,
       null,
       new BaseDeserializer(new ObjectDeserializerFactory()),
       new NullLoggerFactory(),
-      default,
+      CancellationToken.None,
       new(SkipCache: true, MaxParallelism: 1, SkipServer: true)
     );
 
@@ -144,7 +144,7 @@ public class ExceptionTests
       null,
       new BaseDeserializer(new ObjectDeserializerFactory()),
       new NullLoggerFactory(),
-      default,
+      CancellationToken.None,
       new(true, MaxParallelism: 1)
     );
 
@@ -169,7 +169,7 @@ public class ExceptionTests
       null,
       new BaseDeserializer(new ObjectDeserializerFactory()),
       new NullLoggerFactory(),
-      default,
+      CancellationToken.None,
       new(MaxParallelism: 1)
     );
 
@@ -194,16 +194,14 @@ public class ExceptionTests
   [SpeckleType("Objects.Geometry.BadBase")]
   public class BadBase : Base
   {
-#pragma warning disable CA1065
     public string BadProp => throw new NotImplementedException();
-#pragma warning restore CA1065
   }
 
   [Fact]
   public void Test_SpeckleSerializerException()
   {
     var factory = new ObjectSerializerFactory(new BasePropertyGatherer());
-    var serializer = factory.Create(new Dictionary<Id, NodeInfo>(), default);
+    var serializer = factory.Create(default);
     Assert.Throws<SpeckleSerializeException>(() =>
     {
       var _ = serializer.Serialize(new BadBase()).ToList();

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

@@ -3,7 +3,6 @@ using Speckle.Objects.Primitive;
 using Speckle.Sdk.Host;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Extensions;
-using Speckle.Sdk.Serialisation;
 using Speckle.Sdk.Serialisation.V2.Send;
 
 namespace Speckle.Sdk.Serialization.Tests;
@@ -20,10 +19,7 @@ public class ExternalIdTests
   public async Task ExternalIdTest_Detached()
   {
     var p = new Polyline() { units = "cm", value = [1, 2] };
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
-      new Dictionary<Id, NodeInfo>(),
-      default
-    );
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
     var objects = serializer.Serialize(p).ToDictionary(x => x.Item1, x => x.Item2);
 
     await VerifyJsonDictionary(objects);
@@ -45,10 +41,7 @@ public class ExternalIdTests
       knots = [],
       weights = [],
     };
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
-      new Dictionary<Id, NodeInfo>(),
-      default
-    );
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
     var objects = serializer.Serialize(curve).ToDictionary(x => x.Item1, x => x.Item2);
 
     await VerifyJsonDictionary(objects);
@@ -71,10 +64,7 @@ public class ExternalIdTests
       weights = [],
     };
     var polycurve = new Polycurve() { segments = [curve], units = "cm" };
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
-      new Dictionary<Id, NodeInfo>(),
-      default
-    );
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
     var objects = serializer.Serialize(polycurve).ToDictionary(x => x.Item1, x => x.Item2);
 
     await VerifyJsonDictionary(objects);
@@ -99,10 +89,7 @@ public class ExternalIdTests
     var polycurve = new Polycurve() { segments = [curve], units = "cm" };
     var @base = new Base();
     @base.SetDetachedProp("profile", polycurve);
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
-      new Dictionary<Id, NodeInfo>(),
-      default
-    );
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
     var objects = serializer.Serialize(@base).ToDictionary(x => x.Item1, x => x.Item2);
     await VerifyJsonDictionary(objects);
   }

tests/Speckle.Sdk.Serialization.Tests/Framework/ExceptionServerObjectManager.cs

@@ -8,6 +8,7 @@ public class ExceptionServerObjectManager : IServerObjectManager
 {
   public IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
+    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     CancellationToken cancellationToken
   ) => throw new NotImplementedException();

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

@@ -150,7 +150,7 @@ public class SerializationTests
     id.Should().Be(newId.Value);
   }
 
-  [Theory]
+  [Theory(Skip = "Takes too long")]
   [InlineData("RevitObject.json.gz", "3416d3fe01c9196115514c4a2f41617b", 7818)]
   public async Task Roundtrip_Test_Old(string fileName, string _, int count)
   {
@@ -186,8 +186,6 @@ public class SerializationTests
 
   [Theory]
   [InlineData(1)]
-  [InlineData(2)]
-  [InlineData(3)]
   [InlineData(4)]
   public async Task Roundtrip_Test_New(int concurrency)
   {
@@ -205,7 +203,7 @@ public class SerializationTests
         new DummyReceiveServerObjectManager(closures),
         null,
         new NullLogger<ObjectLoader>(),
-        default
+        CancellationToken.None
       )
     )
     {

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

@@ -31,14 +31,17 @@ public class ServerObjectManagerTests : MoqTest
     var jObject = new JObject { { "id", id }, { "value", true } };
     var jObject2 = new JObject { { "id", id2 }, { "value", true } };
     var mockHttp = new MockHttpMessageHandler();
-    Dictionary<string, string> postParameters = new()
+    Dictionary<string, object> postParameters = new()
     {
-      { "objects", JsonConvert.SerializeObject(new List<string> { id, id2 }) },
+      {
+        "objectIds",
+        new List<string> { id, id2 }
+      },
     };
 
     string serializedPayload = JsonConvert.SerializeObject(postParameters);
     mockHttp
-      .When(HttpMethod.Post, $"http://localhost/api/getobjects/{streamId}")
+      .When(HttpMethod.Post, $"http://localhost/api/v2/projects/{streamId}/object-stream/")
       .WithContent(serializedPayload)
       .Respond(
         "application/json",
@@ -59,7 +62,7 @@ public class ServerObjectManagerTests : MoqTest
       token,
       new(timeout: TimeSpan.FromSeconds(timeout))
     );
-    var results = serverObjectManager.DownloadObjects(new List<string> { id, id2 }, null, ct);
+    var results = serverObjectManager.DownloadObjects(new List<string> { id, id2 }, null, null, ct);
     var objects = new JObject();
     await foreach (var (x, json) in results)
     {

tests/Speckle.Sdk.Testing/Framework/DummyReceiveServerObjectManager.cs

@@ -10,6 +10,7 @@ public class DummyReceiveServerObjectManager(IReadOnlyDictionary<string, string>
 {
   public async IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
+    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     [EnumeratorCancellation] CancellationToken cancellationToken
   )

tests/Speckle.Sdk.Testing/Framework/DummySendServerObjectManager.cs

@@ -9,6 +9,7 @@ public class DummySendServerObjectManager(ConcurrentDictionary<string, string> s
 {
   public IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
+    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     CancellationToken cancellationToken
   ) => throw new NotImplementedException();

tests/Speckle.Sdk.Testing/MoqTest.cs

@@ -8,7 +8,19 @@ public abstract class MoqTest : IDisposable
 {
   protected MoqTest() => Repository = new(MockBehavior.Strict);
 
-  public void Dispose() => Repository.VerifyAll();
+  protected virtual void Dispose(bool isDisposing)
+  {
+    if (isDisposing)
+    {
+      Repository.VerifyAll();
+    }
+  }
+
+  public void Dispose()
+  {
+    Dispose(true);
+    GC.SuppressFinalize(this);
+  }
 
   protected MockRepository Repository { get; private set; } = new(MockBehavior.Strict);
 

tests/Speckle.Sdk.Testing/Speckle.Sdk.Testing.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <IsTestProject>true</IsTestProject>
+    <TestProjectAnalyserRules>true</TestProjectAnalyserRules>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Moq" />

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

@@ -93,7 +93,7 @@ public class ProjectResourceExceptionalTests : IAsyncLifetime
         new(_testProject.id, "My new name", ProjectVisibility.Public, "NonExistentWorkspace")
       )
     );
-    ex.InnerExceptions.Single().Should().BeOfType<SpeckleGraphQLException>();
+    ex.InnerExceptions.Single().Should().BeOfType<SpeckleGraphQLForbiddenException>();
   }
 
   [Theory]

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

@@ -10,7 +10,12 @@ namespace Speckle.Sdk.Tests.Integration.API.GraphQL.Resources;
 
 public class SubscriptionResourceTests : IAsyncLifetime
 {
-  private const int WAIT_PERIOD = 300;
+#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 = 400; // For CI runs, a much smaller wait time is acceptable
+#endif
+  private const int TIMEOUT = WAIT_PERIOD + WAIT_PERIOD + 400;
   private IClient _testUser;
   private Project _testProject;
   private Model _testModel;
@@ -32,105 +37,101 @@ public class SubscriptionResourceTests : IAsyncLifetime
     _testVersion = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
   }
 
-  [Fact]
+  [Fact(Timeout = TIMEOUT)]
   public async Task UserProjectsUpdated_SubscriptionIsCalled()
   {
-    UserProjectsUpdatedMessage? subscriptionMessage = null;
-
+    TaskCompletionSource<UserProjectsUpdatedMessage> tcs = new();
     using var sub = Sut.CreateUserProjectsUpdatedSubscription();
-    sub.Listeners += (_, message) => subscriptionMessage = message;
+    sub.Listeners += (_, message) => tcs.SetResult(message);
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var created = await _testUser.Project.Create(new(null, null, null));
 
-    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
+    var subscriptionMessage = await tcs.Task;
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage!.id.Should().Be(created.id);
+    subscriptionMessage.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(UserProjectsUpdatedMessageType.ADDED);
     subscriptionMessage.project.Should().NotBeNull();
   }
 
-  [Fact]
+  [Fact(Timeout = TIMEOUT)]
   public async Task ProjectModelsUpdated_SubscriptionIsCalled()
   {
-    ProjectModelsUpdatedMessage? subscriptionMessage = null;
-
+    TaskCompletionSource<ProjectModelsUpdatedMessage> tcs = new();
     using var sub = Sut.CreateProjectModelsUpdatedSubscription(_testProject.id);
-    sub.Listeners += (_, message) => subscriptionMessage = message;
+    sub.Listeners += (_, message) => tcs.SetResult(message);
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     CreateModelInput input = new("my model", "myDescription", _testProject.id);
     var created = await _testUser.Model.Create(input);
 
-    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
+    var subscriptionMessage = await tcs.Task;
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage!.id.Should().Be(created.id);
+    subscriptionMessage.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectModelsUpdatedMessageType.CREATED);
     subscriptionMessage.model.Should().NotBeNull();
   }
 
-  [Fact]
+  [Fact(Timeout = TIMEOUT)]
   public async Task ProjectUpdated_SubscriptionIsCalled()
   {
-    ProjectUpdatedMessage? subscriptionMessage = null;
-
+    TaskCompletionSource<ProjectUpdatedMessage> tcs = new();
     using var sub = Sut.CreateProjectUpdatedSubscription(_testProject.id);
-    sub.Listeners += (_, message) => subscriptionMessage = message;
+    sub.Listeners += (_, message) => tcs.SetResult(message);
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var input = new ProjectUpdateInput(_testProject.id, "This is my new name");
     var created = await _testUser.Project.Update(input);
 
-    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
+    var subscriptionMessage = await tcs.Task;
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage!.id.Should().Be(created.id);
+    subscriptionMessage.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectUpdatedMessageType.UPDATED);
     subscriptionMessage.project.Should().NotBeNull();
   }
 
-  [Fact]
+  [Fact(Timeout = TIMEOUT)]
   public async Task ProjectVersionsUpdated_SubscriptionIsCalled()
   {
-    ProjectVersionsUpdatedMessage? subscriptionMessage = null;
-
+    TaskCompletionSource<ProjectVersionsUpdatedMessage> tcs = new();
     using var sub = Sut.CreateProjectVersionsUpdatedSubscription(_testProject.id);
-    sub.Listeners += (_, message) => subscriptionMessage = message;
+    sub.Listeners += (_, message) => tcs.SetResult(message);
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var created = await Fixtures.CreateVersion(_testUser, _testProject.id, _testModel.id);
 
-    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
+    var subscriptionMessage = await tcs.Task;
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage!.id.Should().Be(created.id);
+    subscriptionMessage.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectVersionsUpdatedMessageType.CREATED);
     subscriptionMessage.version.Should().NotBeNull();
   }
 
-  [Fact(Skip = CommentResourceTests.SERVER_SKIP_MESSAGE)]
+  [Fact(Skip = CommentResourceTests.SERVER_SKIP_MESSAGE, Timeout = TIMEOUT)]
   public async Task ProjectCommentsUpdated_SubscriptionIsCalled()
   {
     string resourceIdString = $"{_testProject.id},{_testModel.id},{_testVersion}";
-    ProjectCommentsUpdatedMessage? subscriptionMessage = null;
 
+    TaskCompletionSource<ProjectCommentsUpdatedMessage> tcs = new();
     using var sub = Sut.CreateProjectCommentsUpdatedSubscription(new(_testProject.id, resourceIdString));
-    sub.Listeners += (_, message) => subscriptionMessage = message;
+    sub.Listeners += (_, message) => tcs.SetResult(message);
 
     await Task.Delay(WAIT_PERIOD); // Give time to subscription to be setup
 
     var created = await Fixtures.CreateComment(_testUser, _testProject.id, _testModel.id, _testVersion.id);
 
-    await Task.Delay(WAIT_PERIOD); // Give time for subscription to be triggered
+    var subscriptionMessage = await tcs.Task;
 
     subscriptionMessage.Should().NotBeNull();
-    subscriptionMessage!.id.Should().Be(created.id);
+    subscriptionMessage.id.Should().Be(created.id);
     subscriptionMessage.type.Should().Be(ProjectCommentsUpdatedMessageType.CREATED);
     subscriptionMessage.comment.Should().NotBeNull();
   }

tests/Speckle.Sdk.Tests.Integration/Credentials/UserServerInfoTests.cs

@@ -1,85 +0,0 @@
-using FluentAssertions;
-using GraphQL.Client.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Sdk.Api.GraphQL.Models;
-using Speckle.Sdk.Credentials;
-
-namespace Speckle.Sdk.Tests.Integration.Credentials;
-
-public class UserServerInfoTests : IAsyncLifetime
-{
-  private Account _acc;
-
-  public Task DisposeAsync() => Task.CompletedTask;
-
-  public async Task InitializeAsync()
-  {
-    _acc = await Fixtures.SeedUser();
-  }
-
-  [Fact]
-  public async Task IsFrontEnd2True()
-  {
-    ServerInfo result = await Fixtures
-      .ServiceProvider.GetRequiredService<IAccountManager>()
-      .GetServerInfo(new("https://app.speckle.systems/"));
-
-    result.Should().NotBeNull();
-    result.frontend2.Should().BeTrue();
-  }
-
-  [Fact]
-  public async Task GetServerInfo_ExpectFail_NoServer()
-  {
-    Uri serverUrl = new("http://invalidserver.local");
-
-    await FluentActions
-      .Invoking(async () =>
-        await Fixtures.ServiceProvider.GetRequiredService<IAccountManager>().GetServerInfo(serverUrl)
-      )
-      .Should()
-      .ThrowAsync<HttpRequestException>();
-  }
-
-  [Fact]
-  public async Task GetUserInfo()
-  {
-    Uri serverUrl = new(_acc.serverInfo.url);
-    UserInfo result = await Fixtures
-      .ServiceProvider.GetRequiredService<IAccountManager>()
-      .GetUserInfo(_acc.token, serverUrl);
-
-    result.id.Should().Be(_acc.userInfo.id);
-    result.name.Should().Be(_acc.userInfo.name);
-    result.email.Should().Be(_acc.userInfo.email);
-    result.company.Should().Be(_acc.userInfo.company);
-    result.avatar.Should().Be(_acc.userInfo.avatar);
-  }
-
-  [Fact]
-  public async Task GetUserInfo_ExpectFail_NoServer()
-  {
-    Uri serverUrl = new("http://invalidserver.local");
-
-    await FluentActions
-      .Invoking(async () =>
-        await Fixtures.ServiceProvider.GetRequiredService<IAccountManager>().GetUserInfo("", serverUrl)
-      )
-      .Should()
-      .ThrowAsync<HttpRequestException>();
-  }
-
-  [Fact]
-  public async Task GetUserInfo_ExpectFail_NoUser()
-  {
-    Uri serverUrl = new(_acc.serverInfo.url);
-    await FluentActions
-      .Invoking(async () =>
-        await Fixtures
-          .ServiceProvider.GetRequiredService<IAccountManager>()
-          .GetUserInfo("Bearer 08913c3c1e7ac65d779d1e1f11b942a44ad9672ca9", serverUrl)
-      )
-      .Should()
-      .ThrowAsync<GraphQLHttpRequestException>();
-  }
-}

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

@@ -15,6 +15,8 @@ using Speckle.Sdk.Tests.Integration.API.GraphQL.Resources;
 using Speckle.Sdk.Transports;
 using Version = Speckle.Sdk.Api.GraphQL.Models.Version;
 
+[assembly: AssemblyTrait("Category", "Integration")]
+
 namespace Speckle.Sdk.Tests.Integration;
 
 public static class Fixtures

tests/Speckle.Sdk.Tests.Integration/SendReceiveTests.ReceiveNonExistentObjectThrows.verified.json

@@ -0,0 +1,6 @@
+{
+  "Data": {},
+  "Message": "Response status code does not indicate success: 404 (Not Found).",
+  "StatusCode": "NotFound",
+  "Type": "HttpRequestException"
+}

tests/Speckle.Sdk.Tests.Integration/SendReceiveTests.ReceiveNonExistentProjectThrows.verified.json

@@ -0,0 +1,6 @@
+{
+  "Data": {},
+  "Message": "Response status code does not indicate success: 404 (Not Found).",
+  "StatusCode": "NotFound",
+  "Type": "HttpRequestException"
+}

tests/Speckle.Sdk.Tests.Integration/SendReceiveTests.SendAndReceive.verified.json

@@ -0,0 +1,4 @@
+{
+  "ConvertedReferences": {},
+  "RootId": "5313a8f61e1fa7abe9bf716ddfc767bd"
+}

tests/Speckle.Sdk.Tests.Integration/SendReceiveTests.SendInvalidData.verified.json

@@ -0,0 +1,18 @@
+{
+  "Data": {},
+  "InnerException": {
+    "$type": "SpeckleSerializeException",
+    "Data": {},
+    "InnerException": {
+      "$type": "ArgumentException",
+      "Data": {},
+      "Message": "Unsupported value in serialization: System.Text.StringBuilder",
+      "ParamName": "obj",
+      "Type": "ArgumentException"
+    },
+    "Message": "Failed to extract (pre-serialize) properties from the Speckle.Sdk.Models.Base",
+    "Type": "SpeckleSerializeException"
+  },
+  "Message": "Error while sending: Failed to extract (pre-serialize) properties from the Speckle.Sdk.Models.Base",
+  "Type": "SpeckleException"
+}

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

@@ -0,0 +1,190 @@
+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;
+
+public sealed class SendReceiveTests : IAsyncLifetime
+{
+  private Project _project;
+  private IClient _client;
+  private IOperations _operations;
+  private const string NON_EXISTENT_OBJECT_ID = "0a480dfb7aa774f19a82bee9d6320abd";
+  private const string NON_EXISTENT_PROJECT_ID = "8cdc651d13";
+
+  public async Task InitializeAsync()
+  {
+    TypeLoader.Reset();
+    TypeLoader.Initialize(typeof(Base).Assembly, Assembly.GetExecutingAssembly());
+    var serviceProvider = TestServiceSetup.GetServiceProvider();
+    _operations = serviceProvider.GetRequiredService<IOperations>();
+    ClearCache();
+
+    _client = await Fixtures.SeedUserWithClient();
+    _project = await _client.Project.Create(new("Blobber", "Flobber", ProjectVisibility.Private));
+  }
+
+  [Fact]
+  public async Task SendAndReceive()
+  {
+    var myObject = Fixtures.GenerateNestedObject();
+    string expectedId = myObject.GetId(true);
+
+    //SEND
+    var fistSend = await _operations.Send2(
+      _client.ServerUrl,
+      _project.id,
+      _client.Account.token,
+      myObject,
+      null,
+      CancellationToken.None
+    );
+
+    Assert.Equal(expectedId, fistSend.RootId);
+    await Verify(fistSend);
+
+    //RECEIVE
+    var received = await _operations.Receive2(
+      _client.ServerUrl,
+      _project.id,
+      fistSend.RootId,
+      _client.Account.token,
+      null,
+      CancellationToken.None
+    );
+
+    Assert.Equal(expectedId, received.id);
+
+    //SEND AGAIN!
+    var secondSend = await _operations.Send2(
+      _client.ServerUrl,
+      _project.id,
+      _client.Account.token,
+      received,
+      null,
+      CancellationToken.None
+    );
+
+    Assert.Equal(expectedId, secondSend.RootId);
+
+    //RECEIVE AGAIN, but using cache
+    ClearCache();
+    var secondReceive = await _operations.Receive2(
+      _client.ServerUrl,
+      _project.id,
+      fistSend.RootId,
+      _client.Account.token,
+      null,
+      CancellationToken.None
+    );
+
+    Assert.Equal(expectedId, secondReceive.id);
+  }
+
+  private void ClearCache() { }
+
+  [Fact]
+  public async Task ReceiveNonExistentObjectThrows()
+  {
+    var ex = await Assert.ThrowsAsync<HttpRequestException>(async () =>
+    {
+      _ = await _operations.Receive2(
+        _client.ServerUrl,
+        _project.id,
+        NON_EXISTENT_OBJECT_ID,
+        _client.Account.token,
+        null,
+        CancellationToken.None,
+        new(true)
+      );
+    });
+    await Verify(ex);
+  }
+
+  [Fact]
+  public async Task ReceiveNonExistentProjectThrows()
+  {
+    var ex = await Assert.ThrowsAsync<HttpRequestException>(async () =>
+    {
+      _ = await _operations.Receive2(
+        _client.ServerUrl,
+        NON_EXISTENT_PROJECT_ID,
+        NON_EXISTENT_OBJECT_ID,
+        _client.Account.token,
+        null,
+        CancellationToken.None,
+        new(true)
+      );
+    });
+    await Verify(ex);
+  }
+
+  [Fact]
+  public async Task SendInvalidData()
+  {
+    var myObject = Fixtures.GenerateNestedObject();
+    myObject["invalidProp"] = new StringBuilder(); //Serializer does not support serializing this type
+
+    var ex = await Assert.ThrowsAsync<SpeckleException>(async () =>
+    {
+      _ = await _operations.Send2(
+        _client.ServerUrl,
+        _project.id,
+        _client.Account.token,
+        myObject,
+        null,
+        CancellationToken.None,
+        new(SkipCacheRead: true, SkipCacheWrite: true)
+      );
+    });
+    await Verify(ex);
+  }
+
+  [Fact]
+  public async Task ReceiveNonAuthThrows()
+  {
+    using IClient unauthed = Fixtures.Unauthed;
+    await Assert.ThrowsAsync<HttpRequestException>(async () =>
+    {
+      _ = await _operations.Receive2(
+        unauthed.ServerUrl,
+        _project.id,
+        NON_EXISTENT_OBJECT_ID,
+        unauthed.Account.token,
+        null,
+        CancellationToken.None,
+        new(true)
+      );
+    });
+  }
+
+  [Fact]
+  public async Task ReceiveCancellation()
+  {
+    using CancellationTokenSource ct = new();
+    await ct.CancelAsync();
+    await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
+    {
+      _ = await _operations.Receive2(
+        _client.ServerUrl,
+        _project.id,
+        NON_EXISTENT_OBJECT_ID,
+        _client.Account.token,
+        null,
+        ct.Token,
+        new(true)
+      );
+    });
+  }
+
+  public Task DisposeAsync()
+  {
+    _client?.Dispose();
+    return Task.CompletedTask;
+  }
+}

tests/Speckle.Sdk.Tests.Performance/Speckle.Sdk.Tests.Performance.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
-    <IsTestProject>true</IsTestProject>
+    <TestProjectAnalyserRules>true</TestProjectAnalyserRules>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />

tests/Speckle.Sdk.Tests.Unit/Api/GraphQLErrorHandler.cs

@@ -11,6 +11,7 @@ public class GraphQLErrorHandlerTests
   {
     yield return [typeof(SpeckleGraphQLForbiddenException), new Map { { "code", "FORBIDDEN" } }];
     yield return [typeof(SpeckleGraphQLForbiddenException), new Map { { "code", "UNAUTHENTICATED" } }];
+    yield return [typeof(SpeckleGraphQLForbiddenException), new Map { { "code", "UNAUTHORIZED_ACCESS_ERROR" } }];
     yield return [typeof(SpeckleGraphQLInternalErrorException), new Map { { "code", "INTERNAL_SERVER_ERROR" } }];
     yield return [typeof(SpeckleGraphQLStreamNotFoundException), new Map { { "code", "STREAM_NOT_FOUND" } }];
     yield return [typeof(SpeckleGraphQLBadInputException), new Map { { "code", "BAD_USER_INPUT" } }];

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

@@ -9,7 +9,7 @@ using Speckle.Sdk.Testing;
 
 namespace Speckle.Sdk.Tests.Unit.Credentials;
 
-public class AccountManagerTests : MoqTest
+public sealed class AccountManagerTests : MoqTest
 {
   private class TestAccountFactory : IAccountFactory
   {
@@ -36,7 +36,9 @@ public class AccountManagerTests : MoqTest
   private readonly Mock<ISqLiteJsonCacheManager> _mockAccountStorage;
   private readonly Mock<ISqLiteJsonCacheManager> _mockAccountAddLockStorage;
 
+#pragma warning disable CA2213
   private readonly AccountManager _accountManager;
+#pragma warning restore CA2213
 
   public AccountManagerTests()
   {

tests/Speckle.Sdk.Tests.Unit/Serialisation/SerializeProcessRecordExceptionTests.cs

@@ -31,6 +31,7 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
+      new(),
       cts.Token
     );
     var ex = new Exception("Test error");
@@ -67,6 +68,7 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
+      new(),
       cts.Token
     );
     var ex = new OperationCanceledException();
@@ -98,6 +100,7 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
+      new(),
       cts.Token
     );
     var ex = new AggregateException(new OperationCanceledException());