Jrm/ci fix (#3670)

* Ensure CI runs on net8 * remove net 7 * bump csharpier for net8 support * ensure net8 sdk is available on connector builds * relax rollforward rules instead
specklesystems · Jan 7, 2025 · 17b2486 · 17b2486
1 parent 62009cb
commit 17b2486
Show file tree

Hide file tree

Showing 299 changed files with 2,727 additions and 2,395 deletions.
diff --git a/.circleci/scripts/config-template.yml b/.circleci/scripts/config-template.yml
@@ -76,9 +76,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Install dotnet
           command: |
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel sts
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 7.0.410
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.206
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.404
             $HOME/.dotnet/dotnet --version
       - run:
           name: Enforce formatting
@@ -125,8 +123,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Install dotnet
           command: |
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel sts
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.206
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.404
             $HOME/.dotnet/dotnet --version
       - run:
           name: Startup the Speckle Server
@@ -257,7 +254,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
 
   deploy-connector-new:
     docker:
-      - image: mcr.microsoft.com/dotnet/sdk:6.0
+      - image: mcr.microsoft.com/dotnet/sdk:8.0
     parameters:
       slug:
         type: string
@@ -324,8 +321,7 @@ jobs: # Each project will have individual jobs for each specific task it has to
       - run:
           name: Install dotnet
           command: |
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel sts
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.206
+            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 8.0.404
 
             $HOME/.dotnet/dotnet --version
             $HOME/.dotnet/dotnet --list-runtimes

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "csharpier": {
-      "version": "0.23.0",
+      "version": "0.28.2",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/Automate/Speckle.Automate.Sdk/AutomationContext.cs b/Automate/Speckle.Automate.Sdk/AutomationContext.cs
@@ -284,8 +284,8 @@ public async Task StoreFileResult(string filePath)
     FileStream fileStream = new(filePath, FileMode.Open, FileAccess.Read);
     using StreamContent streamContent = new(fileStream);
     formData.Add(streamContent, "files", Path.GetFileName(filePath));
-    HttpResponseMessage? request = await SpeckleClient.GQLClient.HttpClient
-      .PostAsync(
+    HttpResponseMessage? request = await SpeckleClient
+      .GQLClient.HttpClient.PostAsync(
         new Uri($"{AutomationRunData.SpeckleServerUrl}api/stream/{AutomationRunData.ProjectId}/blob"),
         formData
       )

diff --git a/Automate/Speckle.Automate.Sdk/Test/TestAutomateEnvironment.cs b/Automate/Speckle.Automate.Sdk/Test/TestAutomateEnvironment.cs
@@ -1,5 +1,5 @@
-using Speckle.Core.Logging;
 using System.Text.Json;
+using Speckle.Core.Logging;
 
 namespace Speckle.Automate.Sdk.Test;
 

diff --git a/Automate/Speckle.Automate.Sdk/Test/TestAutomateUtils.cs b/Automate/Speckle.Automate.Sdk/Test/TestAutomateUtils.cs
@@ -12,24 +12,24 @@ public static async Task<AutomationRunData> CreateTestRun(Client speckleClient)
     GraphQLRequest query =
       new(
         query: """
-                    mutation Mutation($projectId: ID!, $automationId: ID!) {
-                        projectMutations {
-                            automationMutations(projectId: $projectId) {
-                                createTestAutomationRun(automationId: $automationId) {
-                                    automationRunId
-                                    functionRunId
-                                    triggers {
-                                        payload {
-                                            modelId
-                                            versionId
-                                        }
-                                        triggerType
-                                    }
+            mutation Mutation($projectId: ID!, $automationId: ID!) {
+                projectMutations {
+                    automationMutations(projectId: $projectId) {
+                        createTestAutomationRun(automationId: $automationId) {
+                            automationRunId
+                            functionRunId
+                            triggers {
+                                payload {
+                                    modelId
+                                    versionId
                                 }
+                                triggerType
                             }
                         }
                     }
-                """,
+                }
+            }
+        """,
         variables: new
         {
           automationId = TestAutomateEnvironment.GetSpeckleAutomationId(),

diff --git a/Automate/Tests/Speckle.Automate.Sdk.Tests.Integration/SpeckleAutomate.cs b/Automate/Tests/Speckle.Automate.Sdk.Tests.Integration/SpeckleAutomate.cs
@@ -155,8 +155,8 @@ public async Task TestCreateVersionInProject()
 
     await automationContext.CreateNewVersionInProject(Utils.TestObject(), BRANCH_NAME, COMMIT_MSG);
 
-    Branch branch = await automationContext.SpeckleClient
-      .BranchGet(automationRunData.ProjectId, BRANCH_NAME, 1)
+    Branch branch = await automationContext
+      .SpeckleClient.BranchGet(automationRunData.ProjectId, BRANCH_NAME, 1)
       .ConfigureAwait(false);
 
     Assert.NotNull(branch);

diff --git a/Automate/Tests/Speckle.Automate.Sdk.Tests.Integration/TestAutomateUtils.cs b/Automate/Tests/Speckle.Automate.Sdk.Tests.Integration/TestAutomateUtils.cs
@@ -34,26 +34,26 @@ string automationRevisionId
     GraphQLRequest query =
       new(
         query: """
-               mutation CreateAutomation(
-                   $projectId: String!
-                   $modelId: String!
-                   $automationName: String!
-                   $automationId: String!
-                   $automationRevisionId: String!
-               ) {
-                       automationMutations {
-                           create(
-                               input: {
-                                   projectId: $projectId
-                                   modelId: $modelId
-                                   automationName: $automationName
-                                   automationId: $automationId
-                                   automationRevisionId: $automationRevisionId
-                               }
-                           )
-                       }
-                   }
-               """,
+        mutation CreateAutomation(
+            $projectId: String!
+            $modelId: String!
+            $automationName: String!
+            $automationId: String!
+            $automationRevisionId: String!
+        ) {
+                automationMutations {
+                    create(
+                        input: {
+                            projectId: $projectId
+                            modelId: $modelId
+                            automationName: $automationName
+                            automationId: $automationId
+                            automationRevisionId: $automationRevisionId
+                        }
+                    )
+                }
+            }
+        """,
         variables: new
         {
           projectId,

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateBeam.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateBeam.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateBeam : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateBeam : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateColumn.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateColumn.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateColumn : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateColumn : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDirectShape.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDirectShape.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateDirectShape : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateDirectShape : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDoor.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateDoor.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateDoor : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateDoor : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateFloor.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateFloor.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateFloor : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateFloor : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateGridElement.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateGridElement.cs
@@ -5,7 +5,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateGridElement : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateGridElement : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateObject.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateObject.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Archicad.Model;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Archicad.Model;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateObject : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateObject : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateOpening.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateOpening.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateOpening : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateOpening : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoof.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoof.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Objects.BuiltElements.Archicad;
-using Speckle.Newtonsoft.Json;
 using Speckle.Core.Models;
+using Speckle.Newtonsoft.Json;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateRoof : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateRoof : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoom.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateRoom.cs
@@ -5,7 +5,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateRoom : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateRoom : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateShell.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateShell.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Objects.BuiltElements.Archicad;
-using Speckle.Newtonsoft.Json;
 using Speckle.Core.Models;
+using Speckle.Newtonsoft.Json;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateShell : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateShell : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateSkylight.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateSkylight.cs
@@ -6,7 +6,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateSkylight : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateSkylight : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWall.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWall.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateWall : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateWall : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWindow.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_CreateWindow.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Objects.BuiltElements.Archicad;
 using Speckle.Core.Models;
 using Speckle.Newtonsoft.Json;
-using Objects.BuiltElements.Archicad;
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class CreateWindow : ICommand<IEnumerable<ApplicationObject>>
+internal sealed class CreateWindow : ICommand<IEnumerable<ApplicationObject>>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters

diff --git a/...ctorArchicad/ConnectorArchicad/Communication/Commands/Command_FinishReceiveTransaction.cs b/...ctorArchicad/ConnectorArchicad/Communication/Commands/Command_FinishReceiveTransaction.cs
@@ -3,7 +3,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class FinishReceiveTransaction : ICommand<object>
+internal sealed class FinishReceiveTransaction : ICommand<object>
 {
   [JsonObject(MemberSerialization.OptIn)]
   public sealed class Parameters { }

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetBeamData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetBeamData.cs
@@ -4,7 +4,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class GetBeamData : GetDataBase, ICommand<Speckle.Newtonsoft.Json.Linq.JArray>
+internal sealed class GetBeamData : GetDataBase, ICommand<Speckle.Newtonsoft.Json.Linq.JArray>
 {
   public GetBeamData(IEnumerable<string> applicationIds, bool sendProperties, bool sendListingParameters)
     : base(applicationIds, sendProperties, sendListingParameters) { }

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetColumnData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetColumnData.cs
@@ -4,7 +4,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class GetColumnData : GetDataBase, ICommand<Speckle.Newtonsoft.Json.Linq.JArray>
+internal sealed class GetColumnData : GetDataBase, ICommand<Speckle.Newtonsoft.Json.Linq.JArray>
 {
   public GetColumnData(IEnumerable<string> applicationIds, bool sendProperties, bool sendListingParameters)
     : base(applicationIds, sendProperties, sendListingParameters) { }

diff --git a/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetDoorData.cs b/ConnectorArchicad/ConnectorArchicad/Communication/Commands/Command_GetDoorData.cs
@@ -4,7 +4,7 @@
 
 namespace Archicad.Communication.Commands;
 
-sealed internal class GetDoorData : GetDataBase, ICommand<Speckle.Newtonsoft.Json.Linq.JArray>
+internal sealed class GetDoorData : GetDataBase, ICommand<Speckle.Newtonsoft.Json.Linq.JArray>
 {
   public GetDoorData(IEnumerable<string> applicationIds, bool sendProperties, bool sendListingParameters)
     : base(applicationIds, sendProperties, sendListingParameters) { }