diff --git a/Directory.Packages.props b/Directory.Packages.props index 8753acac..b249451f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,8 +6,6 @@ - - @@ -28,6 +26,8 @@ + + diff --git a/build/Program.cs b/build/Program.cs index bb199808..8f64963b 100644 --- a/build/Program.cs +++ b/build/Program.cs @@ -12,6 +12,21 @@ const string TEST = "test"; const string INTEGRATION = "integration"; const string PACK = "pack"; const string PACK_LOCAL = "pack-local"; +const string CLEAN_LOCKS = "clean-locks"; + +Target( + CLEAN_LOCKS, + () => + { + foreach (var f in Glob.Files(".", "**/*.lock.json")) + { + Console.WriteLine("Found and will delete: " + f); + File.Delete(f); + } + Console.WriteLine("Running restore now."); + Run("dotnet", "restore .\\Speckle.Sdk.sln"); + } +); Target( CLEAN, diff --git a/src/Speckle.Core/Api/Exceptions.cs b/src/Speckle.Core/Api/Exceptions.cs index f100fd22..da5c15f9 100644 --- a/src/Speckle.Core/Api/Exceptions.cs +++ b/src/Speckle.Core/Api/Exceptions.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using GraphQL; using Speckle.Core.Logging; diff --git a/src/Speckle.Core/Api/GraphQL/Client.cs b/src/Speckle.Core/Api/GraphQL/Client.cs index 34ebf29a..7d1050fa 100644 --- a/src/Speckle.Core/Api/GraphQL/Client.cs +++ b/src/Speckle.Core/Api/GraphQL/Client.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; using System.Dynamic; -using System.Linq; -using System.Net.Http; using System.Net.WebSockets; using System.Reflection; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using GraphQL.Client.Http; using Polly; @@ -92,15 +86,6 @@ public sealed partial class Client : ISpeckleGraphQLClient, IDisposable internal async Task ExecuteWithResiliencePolicies(Func> func) { - // TODO: handle these in the HttpClient factory with a custom RequestHandler class - // 408 Request Timeout - // 425 Too Early - // 429 Too Many Requests - // 500 Internal Server Error - // 502 Bad Gateway - // 503 Service Unavailable - // 504 Gateway Timeout - var delay = Backoff.DecorrelatedJitterBackoffV2(TimeSpan.FromSeconds(1), 5); var graphqlRetry = Policy .Handle() diff --git a/src/Speckle.Core/Api/GraphQL/GraphQLHttpClientExtensions.cs b/src/Speckle.Core/Api/GraphQL/GraphQLHttpClientExtensions.cs index 252fa7f9..6cf30414 100644 --- a/src/Speckle.Core/Api/GraphQL/GraphQLHttpClientExtensions.cs +++ b/src/Speckle.Core/Api/GraphQL/GraphQLHttpClientExtensions.cs @@ -1,9 +1,5 @@ -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using GraphQL.Client.Http; -using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; namespace Speckle.Core.Api.GraphQL; diff --git a/src/Speckle.Core/Api/GraphQL/ISpeckleGraphQLClient.cs b/src/Speckle.Core/Api/GraphQL/ISpeckleGraphQLClient.cs index 5b6a3720..29998fbd 100644 --- a/src/Speckle.Core/Api/GraphQL/ISpeckleGraphQLClient.cs +++ b/src/Speckle.Core/Api/GraphQL/ISpeckleGraphQLClient.cs @@ -1,7 +1,4 @@ -using System; -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; namespace Speckle.Core.Api.GraphQL; diff --git a/src/Speckle.Core/Api/GraphQL/Inputs/CommentInputs.cs b/src/Speckle.Core/Api/GraphQL/Inputs/CommentInputs.cs index df810ade..2c59ea30 100644 --- a/src/Speckle.Core/Api/GraphQL/Inputs/CommentInputs.cs +++ b/src/Speckle.Core/Api/GraphQL/Inputs/CommentInputs.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Speckle.Core.Api.GraphQL.Inputs; +namespace Speckle.Core.Api.GraphQL.Inputs; public sealed record CreateCommentInput( CommentContentInput content, diff --git a/src/Speckle.Core/Api/GraphQL/Inputs/ModelInputs.cs b/src/Speckle.Core/Api/GraphQL/Inputs/ModelInputs.cs index 817df64c..f1dd3e4f 100644 --- a/src/Speckle.Core/Api/GraphQL/Inputs/ModelInputs.cs +++ b/src/Speckle.Core/Api/GraphQL/Inputs/ModelInputs.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Speckle.Core.Api.GraphQL.Inputs; +namespace Speckle.Core.Api.GraphQL.Inputs; public sealed record CreateModelInput(string name, string? description, string projectId); diff --git a/src/Speckle.Core/Api/GraphQL/Inputs/ProjectInputs.cs b/src/Speckle.Core/Api/GraphQL/Inputs/ProjectInputs.cs index 568d0093..4c5911bb 100644 --- a/src/Speckle.Core/Api/GraphQL/Inputs/ProjectInputs.cs +++ b/src/Speckle.Core/Api/GraphQL/Inputs/ProjectInputs.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using Speckle.Core.Api.GraphQL.Enums; +using Speckle.Core.Api.GraphQL.Enums; namespace Speckle.Core.Api.GraphQL.Inputs; diff --git a/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs b/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs index c0c50893..4ce9dac4 100644 --- a/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs +++ b/src/Speckle.Core/Api/GraphQL/Inputs/VersionInputs.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Speckle.Core.Api.GraphQL.Inputs; +namespace Speckle.Core.Api.GraphQL.Inputs; public sealed record UpdateVersionInput(string versionId, string? message); diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ActivityOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ActivityOperations.cs index df430294..899ed851 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ActivityOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ActivityOperations.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using GraphQL; namespace Speckle.Core.Api; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.BranchOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.BranchOperations.cs index 456098e0..088149d1 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.BranchOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.BranchOperations.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using Speckle.Core.Api.GraphQL.Resources; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommentOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommentOperations.cs index aebce10a..0de4451a 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommentOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommentOperations.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using Speckle.Core.Api.GraphQL.Resources; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommitOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommitOperations.cs index d267b762..55ebf759 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommitOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.CommitOperations.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using Speckle.Core.Api.GraphQL.Resources; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs index 79e9f8b9..83bef6af 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ObjectOperations.cs @@ -1,5 +1,3 @@ -using System.Threading; -using System.Threading.Tasks; using GraphQL; namespace Speckle.Core.Api; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ServerOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ServerOperations.cs index 1ceb07fa..d2bb1c2d 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ServerOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.ServerOperations.cs @@ -1,7 +1,4 @@ -using System; using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using Speckle.Core.Api.GraphQL.Models.Responses; using Speckle.Core.Logging; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.StreamOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.StreamOperations.cs index dd7be354..c73b8bd6 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.StreamOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.StreamOperations.cs @@ -1,8 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.UserOperations.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.UserOperations.cs index 0ec16712..24554fae 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.UserOperations.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.GraphqlCleintOperations/Client.UserOperations.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Resources; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Branch.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Branch.cs index a27910a0..1daaca7d 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Branch.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Branch.cs @@ -1,5 +1,4 @@ #nullable disable -using System; using GraphQL; using Speckle.Core.Api.SubscriptionModels; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Commit.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Commit.cs index a3614ae6..436184d4 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Commit.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Commit.cs @@ -1,5 +1,4 @@ #nullable disable -using System; using GraphQL; using Speckle.Core.Api.SubscriptionModels; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Stream.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Stream.cs index a62e757f..1a176ae0 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Stream.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Client.Subscriptions/Client.Subscriptions.Stream.cs @@ -1,5 +1,4 @@ #nullable disable -using System; using GraphQL; using Speckle.Core.Api.SubscriptionModels; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs b/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs index 180c7285..7c3a31ac 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/LegacyGraphQLModels.cs @@ -1,6 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; using Speckle.Core.Api.GraphQL.Enums; using Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/Manager.cs b/src/Speckle.Core/Api/GraphQL/Legacy/Manager.cs index 94c1585e..d46c018d 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/Manager.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/Manager.cs @@ -1,6 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; using System.Text.Json.Serialization; namespace Speckle.Core.Api.GraphQL; diff --git a/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs b/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs index 1594b44f..335c52bf 100644 --- a/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs +++ b/src/Speckle.Core/Api/GraphQL/Legacy/SubscriptionModels.cs @@ -1,7 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; - namespace Speckle.Core.Api.SubscriptionModels; #region streams diff --git a/src/Speckle.Core/Api/GraphQL/Models/Collections.cs b/src/Speckle.Core/Api/GraphQL/Models/Collections.cs index 3e4738aa..efdb36ba 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/Collections.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/Collections.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Speckle.Core.Api.GraphQL.Models; +namespace Speckle.Core.Api.GraphQL.Models; public class ResourceCollection { diff --git a/src/Speckle.Core/Api/GraphQL/Models/Comment.cs b/src/Speckle.Core/Api/GraphQL/Models/Comment.cs index 75da443d..a9d10c1e 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/Comment.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/Comment.cs @@ -1,8 +1,5 @@ #nullable disable -using System; -using System.Collections.Generic; - namespace Speckle.Core.Api.GraphQL.Models; public sealed class Comment diff --git a/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs b/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs index eb27a765..d259195e 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/FileUpload.cs @@ -1,6 +1,5 @@ #nullable disable -using System; using Speckle.Core.Api.GraphQL.Enums; namespace Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Api/GraphQL/Models/Model.cs b/src/Speckle.Core/Api/GraphQL/Models/Model.cs index 1b4f001e..f48ee18f 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/Model.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/Model.cs @@ -1,7 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; - namespace Speckle.Core.Api.GraphQL.Models; public sealed class Model diff --git a/src/Speckle.Core/Api/GraphQL/Models/ModelsTreeItem.cs b/src/Speckle.Core/Api/GraphQL/Models/ModelsTreeItem.cs index f0d6e499..8269e790 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/ModelsTreeItem.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/ModelsTreeItem.cs @@ -1,8 +1,5 @@ #nullable disable -using System; -using System.Collections.Generic; - namespace Speckle.Core.Api.GraphQL.Models; public sealed class ModelsTreeItem diff --git a/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs b/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs index 2fee6705..275552fc 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/PendingStreamCollaborator.cs @@ -1,6 +1,4 @@ #nullable disable -using System; - namespace Speckle.Core.Api.GraphQL.Models; public sealed class PendingStreamCollaborator diff --git a/src/Speckle.Core/Api/GraphQL/Models/Project.cs b/src/Speckle.Core/Api/GraphQL/Models/Project.cs index 537ceb4d..1261c948 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/Project.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/Project.cs @@ -1,6 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; using Speckle.Core.Api.GraphQL.Enums; namespace Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Api/GraphQL/Models/ServerInfo.cs b/src/Speckle.Core/Api/GraphQL/Models/ServerInfo.cs index c0c36a5a..a63a5349 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/ServerInfo.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/ServerInfo.cs @@ -1,5 +1,4 @@ #nullable disable -using System; using System.Runtime.InteropServices; namespace Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Api/GraphQL/Models/SubscriptionMessages.cs b/src/Speckle.Core/Api/GraphQL/Models/SubscriptionMessages.cs index 0ce6dc56..e435ce3f 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/SubscriptionMessages.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/SubscriptionMessages.cs @@ -1,5 +1,4 @@ -using System; -using Speckle.Core.Api.GraphQL.Enums; +using Speckle.Core.Api.GraphQL.Enums; using Speckle.Newtonsoft.Json; namespace Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Api/GraphQL/Models/User.cs b/src/Speckle.Core/Api/GraphQL/Models/User.cs index 1588b433..3c8f1086 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/User.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/User.cs @@ -1,7 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; - namespace Speckle.Core.Api.GraphQL.Models; public abstract class UserBase diff --git a/src/Speckle.Core/Api/GraphQL/Models/Version.cs b/src/Speckle.Core/Api/GraphQL/Models/Version.cs index 1aa46b0d..7f1b1af8 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/Version.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/Version.cs @@ -1,7 +1,5 @@ #nullable disable -using System; - namespace Speckle.Core.Api.GraphQL.Models; public sealed class Version diff --git a/src/Speckle.Core/Api/GraphQL/Models/ViewerResourceGroup.cs b/src/Speckle.Core/Api/GraphQL/Models/ViewerResourceGroup.cs index 3ef11ed6..f242c534 100644 --- a/src/Speckle.Core/Api/GraphQL/Models/ViewerResourceGroup.cs +++ b/src/Speckle.Core/Api/GraphQL/Models/ViewerResourceGroup.cs @@ -1,7 +1,5 @@ #nullable disable -using System.Collections.Generic; - namespace Speckle.Core.Api.GraphQL.Models; public class ViewerResourceGroup diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs index 9946555d..6efacca5 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/ActiveUserResource.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/CommentResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/CommentResource.cs index bcdb4430..7b1350cb 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/CommentResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/CommentResource.cs @@ -1,6 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs index e0898a49..9d5005ee 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/ModelResource.cs @@ -1,6 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/OtherUserResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/OtherUserResource.cs index c2695615..a2ca73f9 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/OtherUserResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/OtherUserResource.cs @@ -1,6 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs index 44a120a5..6e22a76f 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/ProjectInviteResource.cs @@ -1,6 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs index 641dbd18..e2cfcb46 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/ProjectResource.cs @@ -1,6 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs index ff8884ce..a35fcbd7 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/SubscriptionResource.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs b/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs index a48fdcb8..4e808b2d 100644 --- a/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs +++ b/src/Speckle.Core/Api/GraphQL/Resources/VersionResource.cs @@ -1,6 +1,4 @@ -using System.Threading; -using System.Threading.Tasks; -using GraphQL; +using GraphQL; using Speckle.Core.Api.GraphQL.Inputs; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Api.GraphQL.Models.Responses; diff --git a/src/Speckle.Core/Api/GraphQL/Serializer/ConstantCaseEnumConverter.cs b/src/Speckle.Core/Api/GraphQL/Serializer/ConstantCaseEnumConverter.cs index 7088d10b..e0f438c3 100644 --- a/src/Speckle.Core/Api/GraphQL/Serializer/ConstantCaseEnumConverter.cs +++ b/src/Speckle.Core/Api/GraphQL/Serializer/ConstantCaseEnumConverter.cs @@ -1,7 +1,5 @@ #nullable disable -using System; -using System.Linq; using System.Reflection; using GraphQL.Client.Abstractions.Utilities; using Speckle.Newtonsoft.Json; diff --git a/src/Speckle.Core/Api/GraphQL/Serializer/MapConverter.cs b/src/Speckle.Core/Api/GraphQL/Serializer/MapConverter.cs index 07843438..2e7eb363 100644 --- a/src/Speckle.Core/Api/GraphQL/Serializer/MapConverter.cs +++ b/src/Speckle.Core/Api/GraphQL/Serializer/MapConverter.cs @@ -1,8 +1,5 @@ #nullable disable -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; using GraphQL; using Speckle.Newtonsoft.Json; using Speckle.Newtonsoft.Json.Linq; diff --git a/src/Speckle.Core/Api/GraphQL/Serializer/NewtonsoftJsonSerializer.cs b/src/Speckle.Core/Api/GraphQL/Serializer/NewtonsoftJsonSerializer.cs index 3509559b..236fccf6 100644 --- a/src/Speckle.Core/Api/GraphQL/Serializer/NewtonsoftJsonSerializer.cs +++ b/src/Speckle.Core/Api/GraphQL/Serializer/NewtonsoftJsonSerializer.cs @@ -1,9 +1,5 @@ #nullable disable -using System; -using System.IO; using System.Text; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using GraphQL.Client.Abstractions; using GraphQL.Client.Abstractions.Websocket; diff --git a/src/Speckle.Core/Api/Operations/Operations.Receive.Obsolete.cs b/src/Speckle.Core/Api/Operations/Operations.Receive.Obsolete.cs index 5c486aa2..e6b22e54 100644 --- a/src/Speckle.Core/Api/Operations/Operations.Receive.Obsolete.cs +++ b/src/Speckle.Core/Api/Operations/Operations.Receive.Obsolete.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; +using System.Collections.Concurrent; using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Serilog.Context; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Api/Operations/Operations.Receive.cs b/src/Speckle.Core/Api/Operations/Operations.Receive.cs index 2502b6d0..8a2a7792 100644 --- a/src/Speckle.Core/Api/Operations/Operations.Receive.cs +++ b/src/Speckle.Core/Api/Operations/Operations.Receive.cs @@ -1,10 +1,5 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Serilog.Context; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Api/Operations/Operations.Send.Obsolete.cs b/src/Speckle.Core/Api/Operations/Operations.Send.Obsolete.cs index 24cfd315..8a2ffb91 100644 --- a/src/Speckle.Core/Api/Operations/Operations.Send.Obsolete.cs +++ b/src/Speckle.Core/Api/Operations/Operations.Send.Obsolete.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; +using System.Collections.Concurrent; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Serilog.Context; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Api/Operations/Operations.Send.cs b/src/Speckle.Core/Api/Operations/Operations.Send.cs index 6a35fc6d..14f49261 100644 --- a/src/Speckle.Core/Api/Operations/Operations.Send.cs +++ b/src/Speckle.Core/Api/Operations/Operations.Send.cs @@ -1,10 +1,5 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Serilog.Context; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Api/Operations/Operations.Serialize.cs b/src/Speckle.Core/Api/Operations/Operations.Serialize.cs index bd3bea97..e8fa64e2 100644 --- a/src/Speckle.Core/Api/Operations/Operations.Serialize.cs +++ b/src/Speckle.Core/Api/Operations/Operations.Serialize.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Threading; using Speckle.Core.Logging; using Speckle.Core.Models; using Speckle.Core.Serialisation; diff --git a/src/Speckle.Core/Api/Operations/Operations.cs b/src/Speckle.Core/Api/Operations/Operations.cs index 83e153b6..3d4982f8 100644 --- a/src/Speckle.Core/Api/Operations/Operations.cs +++ b/src/Speckle.Core/Api/Operations/Operations.cs @@ -1,6 +1,4 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; using Speckle.Core.Serialisation; using Speckle.Newtonsoft.Json; using Speckle.Newtonsoft.Json.Serialization; diff --git a/src/Speckle.Core/Common/NotNullExtensions.cs b/src/Speckle.Core/Common/NotNullExtensions.cs index 9c53ad2c..73081bc9 100644 --- a/src/Speckle.Core/Common/NotNullExtensions.cs +++ b/src/Speckle.Core/Common/NotNullExtensions.cs @@ -52,4 +52,13 @@ public static class NotNullExtensions } return obj.Value; } + + public static IEnumerable Empty(this IEnumerable? obj) + { + if (obj is null) + { + return Enumerable.Empty(); + } + return obj; + } } diff --git a/src/Speckle.Core/Credentials/Account.cs b/src/Speckle.Core/Credentials/Account.cs index 2003b44c..42d608a3 100644 --- a/src/Speckle.Core/Credentials/Account.cs +++ b/src/Speckle.Core/Credentials/Account.cs @@ -1,7 +1,5 @@ #nullable disable -using System; using System.Runtime.InteropServices; -using System.Threading.Tasks; using Speckle.Core.Api.GraphQL.Models; using Speckle.Core.Common; using Speckle.Core.Helpers; diff --git a/src/Speckle.Core/Credentials/AccountManager.cs b/src/Speckle.Core/Credentials/AccountManager.cs index 19ce07e8..6a47a4d2 100644 --- a/src/Speckle.Core/Credentials/AccountManager.cs +++ b/src/Speckle.Core/Credentials/AccountManager.cs @@ -1,16 +1,9 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; using System.Net; -using System.Net.Http; using System.Net.Http.Headers; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; using GraphQL; using GraphQL.Client.Http; using Speckle.Core.Api; diff --git a/src/Speckle.Core/Credentials/Exceptions.cs b/src/Speckle.Core/Credentials/Exceptions.cs index 32aba319..c9766109 100644 --- a/src/Speckle.Core/Credentials/Exceptions.cs +++ b/src/Speckle.Core/Credentials/Exceptions.cs @@ -1,4 +1,3 @@ -using System; using Speckle.Core.Logging; namespace Speckle.Core.Credentials; diff --git a/src/Speckle.Core/Credentials/Responses.cs b/src/Speckle.Core/Credentials/Responses.cs index 7f701935..a92a4cba 100644 --- a/src/Speckle.Core/Credentials/Responses.cs +++ b/src/Speckle.Core/Credentials/Responses.cs @@ -1,4 +1,3 @@ -using System; using System.Runtime.InteropServices; using Speckle.Core.Api; using Speckle.Core.Api.GraphQL.Models; diff --git a/src/Speckle.Core/Credentials/StreamWrapper.cs b/src/Speckle.Core/Credentials/StreamWrapper.cs index cc22db55..9f8edcfe 100644 --- a/src/Speckle.Core/Credentials/StreamWrapper.cs +++ b/src/Speckle.Core/Credentials/StreamWrapper.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; using System.Text.RegularExpressions; -using System.Threading.Tasks; using System.Web; using Speckle.Core.Api; using Speckle.Core.Common; diff --git a/src/Speckle.Core/Helpers/Constants.cs b/src/Speckle.Core/Helpers/Constants.cs index 07ccf51b..0d9c0afe 100644 --- a/src/Speckle.Core/Helpers/Constants.cs +++ b/src/Speckle.Core/Helpers/Constants.cs @@ -1,4 +1,3 @@ -using System; using System.Diagnostics.CodeAnalysis; using System.Text.RegularExpressions; diff --git a/src/Speckle.Core/Helpers/Crypt.cs b/src/Speckle.Core/Helpers/Crypt.cs index 307980fe..83f89a2e 100644 --- a/src/Speckle.Core/Helpers/Crypt.cs +++ b/src/Speckle.Core/Helpers/Crypt.cs @@ -1,4 +1,3 @@ -using System; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Security.Cryptography; diff --git a/src/Speckle.Core/Helpers/Http.cs b/src/Speckle.Core/Helpers/Http.cs index f1b94b2e..0095bc92 100644 --- a/src/Speckle.Core/Helpers/Http.cs +++ b/src/Speckle.Core/Helpers/Http.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; using System.Net; -using System.Net.Http; using System.Net.NetworkInformation; using System.Net.Sockets; -using System.Threading; -using System.Threading.Tasks; using Polly; using Polly.Contrib.WaitAndRetry; using Polly.Extensions.Http; @@ -31,16 +26,10 @@ public static class Http .HandleTransientHttpError() .WaitAndRetryAsync( delay ?? DefaultDelay(), - (ex, timeSpan, retryAttempt, context) => { - //context.Remove("retryCount"); - //context.Add("retryCount", retryAttempt); - //Log.Information( - // ex.Exception, - // "The http request failed with {exceptionType} exception retrying after {cooldown} milliseconds. This is retry attempt {retryAttempt}", - // ex.GetType().Name, - // timeSpan.TotalSeconds * 1000, - // retryAttempt - //); + (ex, timeSpan, retryAttempt, context) => + { + context.Remove("retryCount"); + context.Add("retryCount", retryAttempt); } ); } @@ -207,14 +196,16 @@ public sealed class SpeckleHttpClientHandler : HttpClientHandler using (LogContext.PushProperty("httpMethod", request.Method)) { SpeckleLog.Logger.Debug("Starting execution of http request to {targetUrl}", request.RequestUri); - var timer = new Stopwatch(); - timer.Start(); + var timer = Stopwatch.StartNew(); + context.Add("retryCount", 0); + + request.Headers.Add("x-request-id", context.CorrelationId.ToString()); + var policyResult = await Http.HttpAsyncPolicy(_delay) .ExecuteAndCaptureAsync( ctx => { - request.Headers.Add("x-request-id", ctx.CorrelationId.ToString()); return base.SendAsync(request, cancellationToken); }, context @@ -226,14 +217,15 @@ public sealed class SpeckleHttpClientHandler : HttpClientHandler SpeckleLog .Logger.ForContext("ExceptionType", policyResult.FinalException?.GetType()) .Information( - "Execution of http request to {httpScheme}://{hostUrl}/{relativeUrl} {resultStatus} with {httpStatusCode} after {elapsed} seconds and {retryCount} retries", + "Execution of http request to {httpScheme}://{hostUrl}{relativeUrl} {resultStatus} with {httpStatusCode} after {elapsed} seconds and {retryCount} retries. Request correlation ID: {correlationId}", request.RequestUri.Scheme, request.RequestUri.Host, request.RequestUri.PathAndQuery, status, policyResult.Result?.StatusCode, timer.Elapsed.TotalSeconds, - retryCount ?? 0 + retryCount ?? 0, + context.CorrelationId.ToString() ); if (policyResult.Outcome == OutcomeType.Successful) { diff --git a/src/Speckle.Core/Helpers/Path.cs b/src/Speckle.Core/Helpers/Path.cs index 999639c8..b0bf788f 100644 --- a/src/Speckle.Core/Helpers/Path.cs +++ b/src/Speckle.Core/Helpers/Path.cs @@ -1,5 +1,3 @@ -using System; -using System.IO; using System.Reflection; using Speckle.Core.Logging; diff --git a/src/Speckle.Core/Helpers/State.cs b/src/Speckle.Core/Helpers/State.cs index 6dbebec5..5719b1c4 100644 --- a/src/Speckle.Core/Helpers/State.cs +++ b/src/Speckle.Core/Helpers/State.cs @@ -1,6 +1,4 @@ #nullable disable -using System; - namespace Speckle.Core.Helpers; public class State : IDisposable diff --git a/src/Speckle.Core/Kits/Attributes.cs b/src/Speckle.Core/Kits/Attributes.cs index f706859a..b46a6e1e 100644 --- a/src/Speckle.Core/Kits/Attributes.cs +++ b/src/Speckle.Core/Kits/Attributes.cs @@ -1,6 +1,4 @@ #nullable disable -using System; - namespace Speckle.Core.Kits; [AttributeUsage(AttributeTargets.Constructor)] diff --git a/src/Speckle.Core/Kits/Exceptions.cs b/src/Speckle.Core/Kits/Exceptions.cs index 6e3c4d4d..92fe130d 100644 --- a/src/Speckle.Core/Kits/Exceptions.cs +++ b/src/Speckle.Core/Kits/Exceptions.cs @@ -1,4 +1,3 @@ -using System; using Speckle.Core.Logging; namespace Speckle.Core.Kits; diff --git a/src/Speckle.Core/Kits/ISpeckleConverter.cs b/src/Speckle.Core/Kits/ISpeckleConverter.cs index c7ba36c5..a3abbbe1 100644 --- a/src/Speckle.Core/Kits/ISpeckleConverter.cs +++ b/src/Speckle.Core/Kits/ISpeckleConverter.cs @@ -1,5 +1,4 @@ #nullable disable -using System.Collections.Generic; using Speckle.Core.Models; namespace Speckle.Core.Kits; diff --git a/src/Speckle.Core/Kits/ISpeckleKit.cs b/src/Speckle.Core/Kits/ISpeckleKit.cs index c784ab00..90f52067 100644 --- a/src/Speckle.Core/Kits/ISpeckleKit.cs +++ b/src/Speckle.Core/Kits/ISpeckleKit.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace Speckle.Core.Kits; /// diff --git a/src/Speckle.Core/Kits/KitDeclaration.cs b/src/Speckle.Core/Kits/KitDeclaration.cs index abf8bc3e..38999464 100644 --- a/src/Speckle.Core/Kits/KitDeclaration.cs +++ b/src/Speckle.Core/Kits/KitDeclaration.cs @@ -1,7 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Linq; using Speckle.Core.Models; namespace Speckle.Core.Kits; diff --git a/src/Speckle.Core/Kits/KitManager.cs b/src/Speckle.Core/Kits/KitManager.cs index 05174459..29c604db 100644 --- a/src/Speckle.Core/Kits/KitManager.cs +++ b/src/Speckle.Core/Kits/KitManager.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Reflection; using Speckle.Core.Helpers; using Speckle.Core.Logging; diff --git a/src/Speckle.Core/Kits/Units.cs b/src/Speckle.Core/Kits/Units.cs index e3fec56e..b939b53f 100644 --- a/src/Speckle.Core/Kits/Units.cs +++ b/src/Speckle.Core/Kits/Units.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.Contracts; using Speckle.Core.Common; diff --git a/src/Speckle.Core/Logging/Analytics.cs b/src/Speckle.Core/Logging/Analytics.cs index 06234511..190d9345 100644 --- a/src/Speckle.Core/Logging/Analytics.cs +++ b/src/Speckle.Core/Logging/Analytics.cs @@ -1,16 +1,10 @@ #nullable disable -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net.Http; using System.Net.Http.Headers; using System.Net.NetworkInformation; using System.Reflection; using System.Runtime.InteropServices; using System.Text; -using System.Threading.Tasks; using System.Web; using Speckle.Core.Credentials; using Speckle.Core.Helpers; diff --git a/src/Speckle.Core/Logging/CumulativeTimer.cs b/src/Speckle.Core/Logging/CumulativeTimer.cs index a5286635..7da25919 100644 --- a/src/Speckle.Core/Logging/CumulativeTimer.cs +++ b/src/Speckle.Core/Logging/CumulativeTimer.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; namespace Speckle.Core.Logging; diff --git a/src/Speckle.Core/Logging/ExceptionHelpers.cs b/src/Speckle.Core/Logging/ExceptionHelpers.cs index 9af1c0d9..0d9d8e14 100644 --- a/src/Speckle.Core/Logging/ExceptionHelpers.cs +++ b/src/Speckle.Core/Logging/ExceptionHelpers.cs @@ -1,6 +1,4 @@ -using System; using System.Diagnostics.Contracts; -using System.Threading; namespace Speckle.Core.Logging; diff --git a/src/Speckle.Core/Logging/LoggingHelpers.cs b/src/Speckle.Core/Logging/LoggingHelpers.cs index 52596e6b..2d729f3f 100644 --- a/src/Speckle.Core/Logging/LoggingHelpers.cs +++ b/src/Speckle.Core/Logging/LoggingHelpers.cs @@ -1,4 +1,3 @@ -using System; using System.Diagnostics; namespace Speckle.Core.Logging; diff --git a/src/Speckle.Core/Logging/Setup.cs b/src/Speckle.Core/Logging/Setup.cs index 9a3a3e8b..ef8b3ffc 100644 --- a/src/Speckle.Core/Logging/Setup.cs +++ b/src/Speckle.Core/Logging/Setup.cs @@ -1,8 +1,6 @@ #nullable disable -using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Threading; using Speckle.Core.Credentials; using Speckle.Core.Kits; diff --git a/src/Speckle.Core/Logging/SpeckleException.cs b/src/Speckle.Core/Logging/SpeckleException.cs index 1256ff17..c2f2a154 100644 --- a/src/Speckle.Core/Logging/SpeckleException.cs +++ b/src/Speckle.Core/Logging/SpeckleException.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using GraphQL; -using Sentry; - namespace Speckle.Core.Logging; public class SpeckleException : Exception diff --git a/src/Speckle.Core/Logging/SpeckleLog.cs b/src/Speckle.Core/Logging/SpeckleLog.cs index 927bf75e..a5e15ce2 100644 --- a/src/Speckle.Core/Logging/SpeckleLog.cs +++ b/src/Speckle.Core/Logging/SpeckleLog.cs @@ -1,9 +1,6 @@ -using System; using System.Diagnostics; -using System.IO; using System.Reflection; using System.Runtime.InteropServices; -using Sentry; using Serilog; using Serilog.Core; using Serilog.Events; @@ -37,11 +34,6 @@ public sealed class SpeckleLogConfiguration /// public bool LogToFile { get; } - /// - /// Flag to enable Sentry sink - /// - public bool LogToSentry { get; } - /// /// Flag to enable Seq sink /// @@ -66,14 +58,12 @@ public sealed class SpeckleLogConfiguration /// Log events bellow this level are silently dropped /// Flag to enable console log sink /// Flag to enable Seq log sink - /// Flag to enable Sentry log sink /// Flag to enable File log sink /// Flag to enable enhanced context on every log event public SpeckleLogConfiguration( LogEventLevel minimumLevel = LogEventLevel.Debug, bool logToConsole = true, bool logToSeq = true, - bool logToSentry = true, bool logToFile = true, bool enhancedLogContext = true, string sentryDns = DEFAULT_SENTRY_DNS @@ -82,7 +72,6 @@ public sealed class SpeckleLogConfiguration MinimumLevel = minimumLevel; LogToConsole = logToConsole; LogToSeq = logToSeq; - LogToSentry = logToSentry; LogToFile = logToFile; EnhancedLogContext = enhancedLogContext; SentryDns = sentryDns; @@ -139,17 +128,6 @@ public static class SpeckleLog var id = GetUserIdFromDefaultAccount(); s_logger = s_logger.ForContext("id", id).ForContext("isMachineId", s_isMachineIdUsed); - // Configure scope after logger created. - SentrySdk.ConfigureScope(scope => - { - scope.User = new User { Id = id }; - }); - - SentrySdk.ConfigureScope(scope => - { - scope.SetTag("hostApplication", hostApplicationName); - }); - Logger .ForContext("userApplicationDataPath", SpecklePathProvider.UserApplicationDataPath()) .ForContext("installApplicationDataPath", SpecklePathProvider.InstallApplicationDataPath) @@ -223,35 +201,6 @@ public static class SpeckleLog ); } - if (logConfiguration.LogToSentry) - { - const string ENV = -#if DEBUG - "dev"; -#else - "production"; -#endif - - serilogLogConfiguration = serilogLogConfiguration.WriteTo.Sentry(o => - { - o.Dsn = logConfiguration.SentryDns; - o.Debug = false; - o.Environment = ENV; - o.Release = "SpeckleCore@" + Assembly.GetExecutingAssembly().GetName().Version; - o.AttachStacktrace = true; - o.StackTraceMode = StackTraceMode.Enhanced; - // Set traces_sample_rate to 1.0 to capture 100% of transactions for performance monitoring. - // We recommend adjusting this value in production. - o.TracesSampleRate = 1.0; - // Enable Global Mode if running in a client app - o.IsGlobalModeEnabled = true; - // Debug and higher are stored as breadcrumbs (default is Information) - o.MinimumBreadcrumbLevel = LogEventLevel.Debug; - // Warning and higher is sent as event (default is Error) - o.MinimumEventLevel = LogEventLevel.Error; - }); - } - var logger = serilogLogConfiguration.CreateLogger(); if (logConfiguration.LogToFile && !canLogToFile) diff --git a/src/Speckle.Core/Logging/SpeckleNonUserFacingException.cs b/src/Speckle.Core/Logging/SpeckleNonUserFacingException.cs index 0c2849a6..4b19d41f 100644 --- a/src/Speckle.Core/Logging/SpeckleNonUserFacingException.cs +++ b/src/Speckle.Core/Logging/SpeckleNonUserFacingException.cs @@ -1,5 +1,3 @@ -using System; - namespace Speckle.Core.Logging; /// diff --git a/src/Speckle.Core/Models/ApplicationObject.cs b/src/Speckle.Core/Models/ApplicationObject.cs index e58550b8..c373d82b 100644 --- a/src/Speckle.Core/Models/ApplicationObject.cs +++ b/src/Speckle.Core/Models/ApplicationObject.cs @@ -1,6 +1,4 @@ #nullable disable -using System.Collections.Generic; -using System.Linq; using Speckle.Newtonsoft.Json; namespace Speckle.Core.Models; diff --git a/src/Speckle.Core/Models/Attributes.cs b/src/Speckle.Core/Models/Attributes.cs index b7721b6b..7090791f 100644 --- a/src/Speckle.Core/Models/Attributes.cs +++ b/src/Speckle.Core/Models/Attributes.cs @@ -1,5 +1,3 @@ -using System; - namespace Speckle.Core.Models; /// diff --git a/src/Speckle.Core/Models/Base.cs b/src/Speckle.Core/Models/Base.cs index b5da1ed6..5d416a0d 100644 --- a/src/Speckle.Core/Models/Base.cs +++ b/src/Speckle.Core/Models/Base.cs @@ -1,9 +1,6 @@ #nullable disable -using System; using System.Collections; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.Reflection; using System.Text.RegularExpressions; using Speckle.Core.Api; diff --git a/src/Speckle.Core/Models/Blob.cs b/src/Speckle.Core/Models/Blob.cs index 0310824d..c5ec7ab1 100644 --- a/src/Speckle.Core/Models/Blob.cs +++ b/src/Speckle.Core/Models/Blob.cs @@ -1,7 +1,5 @@ #nullable disable -using System; using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Runtime.Serialization; using Speckle.Newtonsoft.Json; diff --git a/src/Speckle.Core/Models/Collections/Collection.cs b/src/Speckle.Core/Models/Collections/Collection.cs index 16e90596..d702dcd8 100644 --- a/src/Speckle.Core/Models/Collections/Collection.cs +++ b/src/Speckle.Core/Models/Collections/Collection.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace Speckle.Core.Models.Collections; /// diff --git a/src/Speckle.Core/Models/CommitObjectBuilder.cs b/src/Speckle.Core/Models/CommitObjectBuilder.cs index 5567f95c..34bcb98d 100644 --- a/src/Speckle.Core/Models/CommitObjectBuilder.cs +++ b/src/Speckle.Core/Models/CommitObjectBuilder.cs @@ -1,6 +1,4 @@ -using System; using System.Collections; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Speckle.Core.Logging; using Speckle.Core.Models.Collections; diff --git a/src/Speckle.Core/Models/DynamicBase.cs b/src/Speckle.Core/Models/DynamicBase.cs index a8acaa0f..fc6d3996 100644 --- a/src/Speckle.Core/Models/DynamicBase.cs +++ b/src/Speckle.Core/Models/DynamicBase.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Dynamic; -using System.Linq; using System.Reflection; using Speckle.Core.Kits; using Speckle.Core.Logging; diff --git a/src/Speckle.Core/Models/DynamicBaseMemberType.cs b/src/Speckle.Core/Models/DynamicBaseMemberType.cs index 9e9262dc..091fc266 100644 --- a/src/Speckle.Core/Models/DynamicBaseMemberType.cs +++ b/src/Speckle.Core/Models/DynamicBaseMemberType.cs @@ -1,5 +1,3 @@ -using System; - namespace Speckle.Core.Models; /// diff --git a/src/Speckle.Core/Models/Extensions/BaseExtensions.cs b/src/Speckle.Core/Models/Extensions/BaseExtensions.cs index 4f1eef63..744e7a69 100644 --- a/src/Speckle.Core/Models/Extensions/BaseExtensions.cs +++ b/src/Speckle.Core/Models/Extensions/BaseExtensions.cs @@ -1,7 +1,4 @@ -using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; using Speckle.Core.Models.Collections; namespace Speckle.Core.Models.Extensions; diff --git a/src/Speckle.Core/Models/Extras.cs b/src/Speckle.Core/Models/Extras.cs index 371d97b6..56cc24e6 100644 --- a/src/Speckle.Core/Models/Extras.cs +++ b/src/Speckle.Core/Models/Extras.cs @@ -1,7 +1,4 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Linq; using Speckle.Core.Models.Extensions; namespace Speckle.Core.Models; diff --git a/src/Speckle.Core/Models/GraphTraversal/DefaultTraversal.cs b/src/Speckle.Core/Models/GraphTraversal/DefaultTraversal.cs index 885b031d..5e965298 100644 --- a/src/Speckle.Core/Models/GraphTraversal/DefaultTraversal.cs +++ b/src/Speckle.Core/Models/GraphTraversal/DefaultTraversal.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; -using System.Linq; using Speckle.Core.Kits; namespace Speckle.Core.Models.GraphTraversal; diff --git a/src/Speckle.Core/Models/GraphTraversal/GraphTraversal.cs b/src/Speckle.Core/Models/GraphTraversal/GraphTraversal.cs index c397d292..1fb52980 100644 --- a/src/Speckle.Core/Models/GraphTraversal/GraphTraversal.cs +++ b/src/Speckle.Core/Models/GraphTraversal/GraphTraversal.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; namespace Speckle.Core.Models.GraphTraversal; diff --git a/src/Speckle.Core/Models/GraphTraversal/ITraversalRule.cs b/src/Speckle.Core/Models/GraphTraversal/ITraversalRule.cs index 25072717..5951c265 100644 --- a/src/Speckle.Core/Models/GraphTraversal/ITraversalRule.cs +++ b/src/Speckle.Core/Models/GraphTraversal/ITraversalRule.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Linq; - namespace Speckle.Core.Models.GraphTraversal; /// diff --git a/src/Speckle.Core/Models/GraphTraversal/RuleBuilder.cs b/src/Speckle.Core/Models/GraphTraversal/RuleBuilder.cs index 2012f805..ce37bc34 100644 --- a/src/Speckle.Core/Models/GraphTraversal/RuleBuilder.cs +++ b/src/Speckle.Core/Models/GraphTraversal/RuleBuilder.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; -using System.Linq; using Speckle.Core.Common; namespace Speckle.Core.Models.GraphTraversal; diff --git a/src/Speckle.Core/Models/GraphTraversal/TraversalContextExtensions.cs b/src/Speckle.Core/Models/GraphTraversal/TraversalContextExtensions.cs index dab65ed4..552b3e1b 100644 --- a/src/Speckle.Core/Models/GraphTraversal/TraversalContextExtensions.cs +++ b/src/Speckle.Core/Models/GraphTraversal/TraversalContextExtensions.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using System.Diagnostics.Contracts; -using System.Linq; +using System.Diagnostics.Contracts; namespace Speckle.Core.Models.GraphTraversal; diff --git a/src/Speckle.Core/Models/GraphTraversal/TraversalContexts.cs b/src/Speckle.Core/Models/GraphTraversal/TraversalContexts.cs index 3f3baf39..ddc9627b 100644 --- a/src/Speckle.Core/Models/GraphTraversal/TraversalContexts.cs +++ b/src/Speckle.Core/Models/GraphTraversal/TraversalContexts.cs @@ -1,5 +1,4 @@ -using System; -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; namespace Speckle.Core.Models.GraphTraversal; diff --git a/src/Speckle.Core/Models/Instances/GroupProxy.cs b/src/Speckle.Core/Models/Instances/GroupProxy.cs index c0221be6..0a94436c 100644 --- a/src/Speckle.Core/Models/Instances/GroupProxy.cs +++ b/src/Speckle.Core/Models/Instances/GroupProxy.cs @@ -1,4 +1,4 @@ -namespace Speckle.Core.Models.Instances; +namespace Speckle.Core.Models.Instances; /// /// Grouped objects with a meaningful way for host application so use this proxy if you want to group object references for any purpose. @@ -8,5 +8,8 @@ public class GroupProxy : Base, IProxyCollection { public List objects { get; set; } + /// + /// Name of the group proxy collection which is unique for rhino, autocad and sketchup + /// public string name { get; set; } } diff --git a/src/Speckle.Core/Models/Instances/IProxyCollection.cs b/src/Speckle.Core/Models/Instances/IProxyCollection.cs index 571e2d33..c6a918d6 100644 --- a/src/Speckle.Core/Models/Instances/IProxyCollection.cs +++ b/src/Speckle.Core/Models/Instances/IProxyCollection.cs @@ -1,4 +1,4 @@ -namespace Speckle.Core.Models.Instances; +namespace Speckle.Core.Models.Instances; /// /// Collection to proxy objects that lies in definitions, groups or whatever logic in the host app. @@ -10,9 +10,4 @@ public interface IProxyCollection /// On receive, they will be mapped to corresponding newly created definition ids. /// public List objects { get; set; } - - /// - /// Name of the proxy collection which is unique for rhino, autocad and sketchup - /// - public string name { get; set; } } diff --git a/src/Speckle.Core/Models/Instances/InstanceDefinitionProxy.cs b/src/Speckle.Core/Models/Instances/InstanceDefinitionProxy.cs index 47c9430a..54227648 100644 --- a/src/Speckle.Core/Models/Instances/InstanceDefinitionProxy.cs +++ b/src/Speckle.Core/Models/Instances/InstanceDefinitionProxy.cs @@ -12,5 +12,8 @@ public class InstanceDefinitionProxy : Base, IInstanceComponent, IProxyCollectio public int maxDepth { get; set; } + /// + /// Name of the instance definition proxy collection which is unique for rhino, autocad and sketchup + /// public string name { get; set; } } diff --git a/src/Speckle.Core/Models/InvalidPropNameException.cs b/src/Speckle.Core/Models/InvalidPropNameException.cs index 8a629afa..2c3d3cee 100644 --- a/src/Speckle.Core/Models/InvalidPropNameException.cs +++ b/src/Speckle.Core/Models/InvalidPropNameException.cs @@ -1,4 +1,3 @@ -using System; using Speckle.Core.Logging; namespace Speckle.Core.Models; diff --git a/src/Speckle.Core/Models/Utilities.cs b/src/Speckle.Core/Models/Utilities.cs index e2092805..bc8963a2 100644 --- a/src/Speckle.Core/Models/Utilities.cs +++ b/src/Speckle.Core/Models/Utilities.cs @@ -1,10 +1,6 @@ -using System; using System.Collections; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; -using System.IO; -using System.Linq; using System.Reflection; using System.Security.Cryptography; using Speckle.Core.Common; diff --git a/src/Speckle.Core/Serialisation/BaseObjectDeserializerV2.cs b/src/Speckle.Core/Serialisation/BaseObjectDeserializerV2.cs index 5213c3f8..53e4f146 100644 --- a/src/Speckle.Core/Serialisation/BaseObjectDeserializerV2.cs +++ b/src/Speckle.Core/Serialisation/BaseObjectDeserializerV2.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Reflection; -using System.Threading; -using System.Threading.Tasks; using Speckle.Core.Common; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Serialisation/BaseObjectSerializer.cs b/src/Speckle.Core/Serialisation/BaseObjectSerializer.cs index 418df0b7..ed7fac07 100644 --- a/src/Speckle.Core/Serialisation/BaseObjectSerializer.cs +++ b/src/Speckle.Core/Serialisation/BaseObjectSerializer.cs @@ -1,9 +1,6 @@ #nullable disable -using System; using System.Collections; -using System.Collections.Generic; using System.Runtime.Serialization; -using System.Threading; using Speckle.Core.Helpers; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Serialisation/BaseObjectSerializerV2.cs b/src/Speckle.Core/Serialisation/BaseObjectSerializerV2.cs index fb4efe46..dc0567a2 100644 --- a/src/Speckle.Core/Serialisation/BaseObjectSerializerV2.cs +++ b/src/Speckle.Core/Serialisation/BaseObjectSerializerV2.cs @@ -1,13 +1,8 @@ -using System; using System.Collections; -using System.Collections.Generic; using System.Diagnostics; using System.Drawing; using System.Globalization; -using System.Linq; using System.Reflection; -using System.Threading; -using Sentry; using Speckle.Core.Common; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Serialisation/SerializationUtilities/BaseObjectSerializationUtilities.cs b/src/Speckle.Core/Serialisation/SerializationUtilities/BaseObjectSerializationUtilities.cs index e8f00cad..9b26d7ad 100644 --- a/src/Speckle.Core/Serialisation/SerializationUtilities/BaseObjectSerializationUtilities.cs +++ b/src/Speckle.Core/Serialisation/SerializationUtilities/BaseObjectSerializationUtilities.cs @@ -1,10 +1,6 @@ -using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Runtime.Serialization; -using System.Threading; using Speckle.Core.Kits; using Speckle.Core.Logging; using Speckle.Core.Models; diff --git a/src/Speckle.Core/Serialisation/SerializationUtilities/CallsiteCache.cs b/src/Speckle.Core/Serialisation/SerializationUtilities/CallsiteCache.cs index 6d74cf37..f8abf7a7 100644 --- a/src/Speckle.Core/Serialisation/SerializationUtilities/CallsiteCache.cs +++ b/src/Speckle.Core/Serialisation/SerializationUtilities/CallsiteCache.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using Microsoft.CSharp.RuntimeBinder; namespace Speckle.Core.Serialisation.SerializationUtilities; diff --git a/src/Speckle.Core/Serialisation/SerializationUtilities/DeserializationWorkerThreads.cs b/src/Speckle.Core/Serialisation/SerializationUtilities/DeserializationWorkerThreads.cs index 459350b5..917687ed 100644 --- a/src/Speckle.Core/Serialisation/SerializationUtilities/DeserializationWorkerThreads.cs +++ b/src/Speckle.Core/Serialisation/SerializationUtilities/DeserializationWorkerThreads.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using Speckle.Core.Logging; namespace Speckle.Core.Serialisation.SerializationUtilities; diff --git a/src/Speckle.Core/Serialisation/SerializationUtilities/OperationTask.cs b/src/Speckle.Core/Serialisation/SerializationUtilities/OperationTask.cs index d5589fdc..25eb85d9 100644 --- a/src/Speckle.Core/Serialisation/SerializationUtilities/OperationTask.cs +++ b/src/Speckle.Core/Serialisation/SerializationUtilities/OperationTask.cs @@ -1,8 +1,4 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; namespace Speckle.Core.Serialisation.SerializationUtilities; diff --git a/src/Speckle.Core/Serialisation/SerializationUtilities/ValueConverter.cs b/src/Speckle.Core/Serialisation/SerializationUtilities/ValueConverter.cs index 58fa5ecb..27ae7b71 100644 --- a/src/Speckle.Core/Serialisation/SerializationUtilities/ValueConverter.cs +++ b/src/Speckle.Core/Serialisation/SerializationUtilities/ValueConverter.cs @@ -1,6 +1,4 @@ -using System; using System.Collections; -using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Drawing; using System.Globalization; diff --git a/src/Speckle.Core/Serialisation/SpeckleSerializerException.cs b/src/Speckle.Core/Serialisation/SpeckleSerializerException.cs index de74b572..f84e0f81 100644 --- a/src/Speckle.Core/Serialisation/SpeckleSerializerException.cs +++ b/src/Speckle.Core/Serialisation/SpeckleSerializerException.cs @@ -1,5 +1,4 @@ -using System; -using Speckle.Core.Logging; +using Speckle.Core.Logging; namespace Speckle.Core.Serialisation; diff --git a/src/Speckle.Core/Speckle.Core.csproj b/src/Speckle.Core/Speckle.Core.csproj index 10aeffc4..865c0335 100644 --- a/src/Speckle.Core/Speckle.Core.csproj +++ b/src/Speckle.Core/Speckle.Core.csproj @@ -11,6 +11,7 @@ true System.Runtime.CompilerServices.RequiresLocationAttribute Debug;Release;Local + AnyCPU;x64 @@ -25,8 +26,6 @@ - - @@ -36,6 +35,7 @@ + diff --git a/src/Speckle.Core/Transports/Exceptions.cs b/src/Speckle.Core/Transports/Exceptions.cs index d19c760d..35a4a95f 100644 --- a/src/Speckle.Core/Transports/Exceptions.cs +++ b/src/Speckle.Core/Transports/Exceptions.cs @@ -1,4 +1,3 @@ -using System; using Speckle.Core.Logging; namespace Speckle.Core.Transports; diff --git a/src/Speckle.Core/Transports/IServerTransport.cs b/src/Speckle.Core/Transports/IServerTransport.cs index 4e59f03a..0c9fcd51 100644 --- a/src/Speckle.Core/Transports/IServerTransport.cs +++ b/src/Speckle.Core/Transports/IServerTransport.cs @@ -4,7 +4,7 @@ public interface IServerTransport : IDisposable, ITransport, IBlobCapableTranspo { int TotalSentBytes { get; } Credentials.Account Account { get; } - string BaseUri { get; } + Uri BaseUri { get; } string StreamId { get; } int TimeoutSeconds { get; set; } } diff --git a/src/Speckle.Core/Transports/ITransport.cs b/src/Speckle.Core/Transports/ITransport.cs index 92e5d25c..79b021fe 100644 --- a/src/Speckle.Core/Transports/ITransport.cs +++ b/src/Speckle.Core/Transports/ITransport.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using Speckle.Core.Models; namespace Speckle.Core.Transports; diff --git a/src/Speckle.Core/Transports/Memory.cs b/src/Speckle.Core/Transports/Memory.cs index 011fdb7d..0b183351 100644 --- a/src/Speckle.Core/Transports/Memory.cs +++ b/src/Speckle.Core/Transports/Memory.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Threading; -using System.Threading.Tasks; using Speckle.Core.Logging; namespace Speckle.Core.Transports; diff --git a/src/Speckle.Core/Transports/SQLite.cs b/src/Speckle.Core/Transports/SQLite.cs index 06e21b3e..cf891dd1 100644 --- a/src/Speckle.Core/Transports/SQLite.cs +++ b/src/Speckle.Core/Transports/SQLite.cs @@ -1,12 +1,7 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Text; -using System.Threading; -using System.Threading.Tasks; using System.Timers; using Microsoft.Data.Sqlite; using Speckle.Core.Helpers; diff --git a/src/Speckle.Core/Transports/ServerUtils/GzipContent.cs b/src/Speckle.Core/Transports/ServerUtils/GzipContent.cs index 6fca6e89..76416424 100644 --- a/src/Speckle.Core/Transports/ServerUtils/GzipContent.cs +++ b/src/Speckle.Core/Transports/ServerUtils/GzipContent.cs @@ -1,9 +1,5 @@ -using System.Collections.Generic; -using System.IO; using System.IO.Compression; using System.Net; -using System.Net.Http; -using System.Threading.Tasks; namespace Speckle.Core.Transports.ServerUtils; diff --git a/src/Speckle.Core/Transports/ServerUtils/IServerApi.cs b/src/Speckle.Core/Transports/ServerUtils/IServerApi.cs index 17833590..75603c41 100644 --- a/src/Speckle.Core/Transports/ServerUtils/IServerApi.cs +++ b/src/Speckle.Core/Transports/ServerUtils/IServerApi.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - namespace Speckle.Core.Transports.ServerUtils; public delegate void CbObjectDownloaded(string id, string json); diff --git a/src/Speckle.Core/Transports/ServerUtils/ParallelServerAPI.cs b/src/Speckle.Core/Transports/ServerUtils/ParallelServerAPI.cs index b8308859..fe13f3c5 100644 --- a/src/Speckle.Core/Transports/ServerUtils/ParallelServerAPI.cs +++ b/src/Speckle.Core/Transports/ServerUtils/ParallelServerAPI.cs @@ -1,10 +1,5 @@ -using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Speckle.Core.Common; using Speckle.Core.Logging; using Speckle.Core.Serialisation.SerializationUtilities; @@ -27,14 +22,14 @@ internal class ParallelServerApi : ParallelOperationExecutor { private readonly string _authToken; - private readonly string _baseUri; + private readonly Uri _baseUri; private readonly object _callbackLock = new(); private readonly int _timeoutSeconds; public ParallelServerApi( - string baseUri, + Uri baseUri, string authorizationToken, string blobStorageFolder, int timeoutSeconds, diff --git a/src/Speckle.Core/Transports/ServerUtils/ServerAPI.cs b/src/Speckle.Core/Transports/ServerUtils/ServerAPI.cs index d6a32a54..450ef264 100644 --- a/src/Speckle.Core/Transports/ServerUtils/ServerAPI.cs +++ b/src/Speckle.Core/Transports/ServerUtils/ServerAPI.cs @@ -1,13 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Net; -using System.Net.Http; using System.Net.Http.Headers; using System.Text; -using System.Threading; -using System.Threading.Tasks; using Speckle.Core.Helpers; using Speckle.Core.Logging; using Speckle.Core.Models; @@ -27,14 +20,12 @@ public sealed class ServerApi : IDisposable, IServerApi private const int MAX_REQUEST_SIZE = 100_000_000; - private const int RETRY_COUNT = 3; - private static readonly HashSet s_retryCodes = new() { 408, 502, 503, 504 }; private static readonly char[] s_separator = { '\t' }; private static readonly string[] s_filenameSeparator = { "filename=" }; private readonly HttpClient _client; - public ServerApi(string baseUri, string? authorizationToken, string blobStorageFolder, int timeoutSeconds = 60) + public ServerApi(Uri baseUri, string? authorizationToken, string blobStorageFolder, int timeoutSeconds = 60) { CancellationToken = CancellationToken.None; @@ -44,7 +35,7 @@ public sealed class ServerApi : IDisposable, IServerApi new SpeckleHttpClientHandler { AutomaticDecompression = DecompressionMethods.GZip } ); - _client.BaseAddress = new Uri(baseUri); + _client.BaseAddress = baseUri; _client.Timeout = TimeSpan.FromSeconds(timeoutSeconds); Http.AddAuthHeader(_client, authorizationToken); @@ -77,13 +68,9 @@ public sealed class ServerApi : IDisposable, IServerApi Method = HttpMethod.Get }; - HttpResponseMessage rootHttpResponse; - do - { - rootHttpResponse = await _client - .SendAsync(rootHttpMessage, HttpCompletionOption.ResponseContentRead, CancellationToken) - .ConfigureAwait(false); - } while (ShouldRetry(rootHttpResponse)); + HttpResponseMessage rootHttpResponse = await _client + .SendAsync(rootHttpMessage, HttpCompletionOption.ResponseContentRead, CancellationToken) + .ConfigureAwait(false); rootHttpResponse.EnsureSuccessStatusCode(); @@ -256,11 +243,7 @@ public sealed class ServerApi : IDisposable, IServerApi try { - HttpResponseMessage response; - do - { - response = await _client.SendAsync(message, CancellationToken).ConfigureAwait(false); - } while (ShouldRetry(response)); //TODO: can we get rid of this now we have polly? + HttpResponseMessage response = await _client.SendAsync(message, CancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); @@ -335,13 +318,9 @@ public sealed class ServerApi : IDisposable, IServerApi childrenHttpMessage.Content = new StringContent(serializedPayload, Encoding.UTF8, "application/json"); childrenHttpMessage.Headers.Add("Accept", "text/plain"); - HttpResponseMessage childrenHttpResponse; - do - { - childrenHttpResponse = await _client - .SendAsync(childrenHttpMessage, HttpCompletionOption.ResponseHeadersRead, CancellationToken) - .ConfigureAwait(false); - } while (ShouldRetry(childrenHttpResponse)); + HttpResponseMessage childrenHttpResponse = await _client + .SendAsync(childrenHttpMessage, HttpCompletionOption.ResponseHeadersRead, CancellationToken) + .ConfigureAwait(false); childrenHttpResponse.EnsureSuccessStatusCode(); @@ -370,12 +349,8 @@ public sealed class ServerApi : IDisposable, IServerApi string serializedPayload = JsonConvert.SerializeObject(payload); var uri = new Uri($"/api/diff/{streamId}", UriKind.Relative); - HttpResponseMessage response; using StringContent stringContent = new(serializedPayload, Encoding.UTF8, "application/json"); - do - { - response = await _client.PostAsync(uri, stringContent, CancellationToken).ConfigureAwait(false); - } while (ShouldRetry(response)); + HttpResponseMessage response = await _client.PostAsync(uri, stringContent, CancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); @@ -434,11 +409,7 @@ public sealed class ServerApi : IDisposable, IServerApi } } message.Content = multipart; - HttpResponseMessage response; - do - { - response = await _client.SendAsync(message, CancellationToken).ConfigureAwait(false); - } while (ShouldRetry(response)); + HttpResponseMessage response = await _client.SendAsync(message, CancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); @@ -454,12 +425,7 @@ public sealed class ServerApi : IDisposable, IServerApi using StringContent stringContent = new(payload, Encoding.UTF8, "application/json"); - //TODO: can we get rid of this now we have polly? - HttpResponseMessage response; - do - { - response = await _client.PostAsync(uri, stringContent, CancellationToken).ConfigureAwait(false); - } while (ShouldRetry(response)); + HttpResponseMessage response = await _client.PostAsync(uri, stringContent, CancellationToken).ConfigureAwait(false); response.EnsureSuccessStatusCode(); @@ -473,28 +439,6 @@ public sealed class ServerApi : IDisposable, IServerApi return parsed; } - //TODO: can we get rid of this now we have polly? - private bool ShouldRetry(HttpResponseMessage? serverResponse) - { - if (serverResponse == null) - { - return true; - } - - if (!s_retryCodes.Contains((int)serverResponse.StatusCode)) - { - return false; - } - - if (RetriedCount >= RETRY_COUNT) - { - return false; - } - - RetriedCount += 1; - return true; - } - private sealed class BlobUploadResult { public List uploadResults { get; set; } diff --git a/src/Speckle.Core/Transports/ServerV2.cs b/src/Speckle.Core/Transports/ServerV2.cs index 26aded46..fbc35933 100644 --- a/src/Speckle.Core/Transports/ServerV2.cs +++ b/src/Speckle.Core/Transports/ServerV2.cs @@ -36,7 +36,7 @@ public sealed class ServerTransport : IServerTransport } Account = account; - BaseUri = account.serverInfo.url; + BaseUri = new(account.serverInfo.url); StreamId = streamId; AuthorizationToken = account.token; TimeoutSeconds = timeoutSeconds; @@ -49,7 +49,7 @@ public sealed class ServerTransport : IServerTransport public int TotalSentBytes { get; private set; } public Account Account { get; } - public string BaseUri { get; } + public Uri BaseUri { get; } public string StreamId { get; internal set; } public int TimeoutSeconds { get; set; } diff --git a/src/Speckle.Core/Transports/TransportHelpers.cs b/src/Speckle.Core/Transports/TransportHelpers.cs index c0977dcb..a3621370 100644 --- a/src/Speckle.Core/Transports/TransportHelpers.cs +++ b/src/Speckle.Core/Transports/TransportHelpers.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Threading; +using System.Diagnostics.CodeAnalysis; using Speckle.Core.Serialisation; using Speckle.Newtonsoft.Json; diff --git a/src/Speckle.Core/Transports/Utilities.cs b/src/Speckle.Core/Transports/Utilities.cs index c685c10e..92e788e1 100644 --- a/src/Speckle.Core/Transports/Utilities.cs +++ b/src/Speckle.Core/Transports/Utilities.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using Speckle.Core.Logging; namespace Speckle.Core.Transports; diff --git a/src/Speckle.Core/packages.lock.json b/src/Speckle.Core/packages.lock.json index 64527d43..1ec0473d 100644 --- a/src/Speckle.Core/packages.lock.json +++ b/src/Speckle.Core/packages.lock.json @@ -81,26 +81,6 @@ "resolved": "1.14.1", "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" }, - "Sentry": { - "type": "Direct", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", - "dependencies": { - "System.Reflection.Metadata": "5.0.0", - "System.Text.Json": "5.0.2" - } - }, - "Sentry.Serilog": { - "type": "Direct", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.7.1" - } - }, "Serilog": { "type": "Direct", "requested": "[2.12.0, )", @@ -175,6 +155,21 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, + "System.Text.Json": { + "type": "Direct", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "GraphQL.Client.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -366,14 +361,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", - "dependencies": { - "System.Memory": "4.5.4" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", @@ -398,14 +385,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", - "dependencies": { - "System.Collections.Immutable": "5.0.0" - } - }, "System.Reflection.TypeExtensions": { "type": "Transitive", "resolved": "4.7.0", @@ -442,20 +421,6 @@ "System.Memory": "4.5.4" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "5.0.2", - "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "5.0.0", - "System.Text.Encodings.Web": "5.0.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", diff --git a/src/Speckle.Objects/Other/RenderMaterial.cs b/src/Speckle.Objects/Other/RenderMaterial.cs index dfe7daa8..5ded81cf 100644 --- a/src/Speckle.Objects/Other/RenderMaterial.cs +++ b/src/Speckle.Objects/Other/RenderMaterial.cs @@ -1,6 +1,7 @@ using System.Drawing; using Speckle.Core.Kits; using Speckle.Core.Models; +using Speckle.Core.Models.Instances; using Speckle.Newtonsoft.Json; namespace Objects.Other; @@ -58,3 +59,27 @@ public class RenderMaterial : Base set => diffuse = value.ToArgb(); } } + +/// +/// Used to store render material to object relationships in root collections +/// +public class RenderMaterialProxy : Base, IProxyCollection +{ + public RenderMaterialProxy() { } + + public RenderMaterialProxy(RenderMaterial renderMaterial, List objects) + { + value = renderMaterial; + this.objects = objects; + } + + /// + /// The list of application ids of objects that use this render material + /// + public List objects { get; set; } + + /// + /// The render material used by + /// + public RenderMaterial value { get; set; } +} diff --git a/src/Speckle.Objects/Speckle.Objects.csproj b/src/Speckle.Objects/Speckle.Objects.csproj index 9f715ac3..984e6f86 100644 --- a/src/Speckle.Objects/Speckle.Objects.csproj +++ b/src/Speckle.Objects/Speckle.Objects.csproj @@ -9,6 +9,7 @@ $(PackageTags), objects System.Runtime.CompilerServices.RequiresLocationAttribute Debug;Release;Local + AnyCPU;x64 diff --git a/src/Speckle.Objects/packages.lock.json b/src/Speckle.Objects/packages.lock.json index 813c02c3..102d468f 100644 --- a/src/Speckle.Objects/packages.lock.json +++ b/src/Speckle.Objects/packages.lock.json @@ -230,14 +230,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", - "dependencies": { - "System.Memory": "4.5.4" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", @@ -262,14 +254,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", - "dependencies": { - "System.Collections.Immutable": "5.0.0" - } - }, "System.Reflection.TypeExtensions": { "type": "Transitive", "resolved": "4.7.0", @@ -306,20 +290,6 @@ "System.Memory": "4.5.4" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "5.0.2", - "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "5.0.0", - "System.Text.Encodings.Web": "5.0.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", @@ -337,8 +307,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -346,7 +314,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "GraphQL.Client": { @@ -397,26 +366,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", - "dependencies": { - "System.Reflection.Metadata": "5.0.0", - "System.Text.Json": "5.0.2" - } - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.7.1" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -484,6 +433,21 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } } } } diff --git a/src/Speckle.Transports.Disk/packages.lock.json b/src/Speckle.Transports.Disk/packages.lock.json index 813c02c3..102d468f 100644 --- a/src/Speckle.Transports.Disk/packages.lock.json +++ b/src/Speckle.Transports.Disk/packages.lock.json @@ -230,14 +230,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", - "dependencies": { - "System.Memory": "4.5.4" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", @@ -262,14 +254,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", - "dependencies": { - "System.Collections.Immutable": "5.0.0" - } - }, "System.Reflection.TypeExtensions": { "type": "Transitive", "resolved": "4.7.0", @@ -306,20 +290,6 @@ "System.Memory": "4.5.4" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "5.0.2", - "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "5.0.0", - "System.Text.Encodings.Web": "5.0.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", @@ -337,8 +307,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -346,7 +314,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "GraphQL.Client": { @@ -397,26 +366,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", - "dependencies": { - "System.Reflection.Metadata": "5.0.0", - "System.Text.Json": "5.0.2" - } - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.7.1" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -484,6 +433,21 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } } } } diff --git a/src/Speckle.Transports.MongoDB/packages.lock.json b/src/Speckle.Transports.MongoDB/packages.lock.json index 1b23bb1d..9c8b9b62 100644 --- a/src/Speckle.Transports.MongoDB/packages.lock.json +++ b/src/Speckle.Transports.MongoDB/packages.lock.json @@ -331,14 +331,6 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", - "dependencies": { - "System.Memory": "4.5.4" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", @@ -363,14 +355,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", - "dependencies": { - "System.Collections.Immutable": "5.0.0" - } - }, "System.Reflection.TypeExtensions": { "type": "Transitive", "resolved": "4.7.0", @@ -428,20 +412,6 @@ "System.Memory": "4.5.4" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "5.0.2", - "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "5.0.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "5.0.0", - "System.Text.Encodings.Web": "5.0.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.5.4", @@ -468,8 +438,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -477,7 +445,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "GraphQL.Client": { @@ -528,26 +497,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", - "dependencies": { - "System.Reflection.Metadata": "5.0.0", - "System.Text.Json": "5.0.2" - } - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.7.1" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -615,6 +564,21 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } } } } diff --git a/tests/Speckle.Core.Serialization.Tests/packages.lock.json b/tests/Speckle.Core.Serialization.Tests/packages.lock.json index 90a25a4a..29e4b9bb 100644 --- a/tests/Speckle.Core.Serialization.Tests/packages.lock.json +++ b/tests/Speckle.Core.Serialization.Tests/packages.lock.json @@ -340,8 +340,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -349,7 +347,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "speckle.objects": { @@ -406,22 +405,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==" - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.10.0" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -489,6 +472,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==" } } } diff --git a/tests/Speckle.Core.Tests.Integration/packages.lock.json b/tests/Speckle.Core.Tests.Integration/packages.lock.json index cda6b910..565a019d 100644 --- a/tests/Speckle.Core.Tests.Integration/packages.lock.json +++ b/tests/Speckle.Core.Tests.Integration/packages.lock.json @@ -340,8 +340,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -349,7 +347,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "speckle.core.tests.unit": { @@ -358,6 +357,7 @@ "Microsoft.NET.Test.Sdk": "[17.10.0, )", "NUnit": "[4.1.0, )", "NUnit3TestAdapter": "[4.5.0, )", + "Shouldly": "[4.2.1, )", "Speckle.Core": "[1.0.0, )", "Speckle.Transports.Disk": "[1.0.0, )", "altcover": "[8.8.74, )" @@ -417,22 +417,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==" - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.10.0" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -500,6 +484,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==" } } } diff --git a/tests/Speckle.Core.Tests.Unit/Common/NotNullTests.cs b/tests/Speckle.Core.Tests.Unit/Common/NotNullTests.cs new file mode 100644 index 00000000..925a4eac --- /dev/null +++ b/tests/Speckle.Core.Tests.Unit/Common/NotNullTests.cs @@ -0,0 +1,61 @@ +using NUnit.Framework; +using Shouldly; +using Speckle.Core.Common; + +namespace Speckle.Core.Tests.Unit.Common; + +public class NotNullTests +{ + [TestCase(null, 0)] + [TestCase(new string[0], 0)] + [TestCase(new[] { "yay" }, 1)] + public void Empty(string[]? test, int length) + { + var list = NotNullExtensions.Empty(test).ToList(); + list.Count.ShouldBe(length); + } + + [Test] + public void NotNullClass() + { + var t = NotNullExtensions.NotNull("test"); + t.ShouldNotBeNull().ShouldBe("test"); + } + + [Test] + public void NotNullStruct() + { + var t = NotNullExtensions.NotNull(2); + t.ShouldBe(2); + } + + [Test] + public async Task NotNullClass_Task() + { + var t = await NotNullExtensions.NotNull(Task.FromResult("test")); + t.ShouldNotBeNull().ShouldBe("test"); + } + + [Test] + public async Task NotNullStruct_Task() + { + var t = await NotNullExtensions.NotNull(Task.FromResult(2)); + t.ShouldBe(2); + } + + [Test] + public void NotNullClass_Exception() => + Assert.Throws(() => NotNullExtensions.NotNull((string?)null)); + + [Test] + public void NotNullStruct_Exception() => + Assert.Throws(() => NotNullExtensions.NotNull((int?)null)); + + [Test] + public void NotNullClass_Task_Exception() => + Assert.ThrowsAsync(() => NotNullExtensions.NotNull(Task.FromResult((string?)null))); + + [Test] + public void NotNullStruct_Task_Exception() => + Assert.ThrowsAsync(() => NotNullExtensions.NotNull(Task.FromResult((int?)null))); +} diff --git a/tests/Speckle.Core.Tests.Unit/Fixtures.cs b/tests/Speckle.Core.Tests.Unit/Fixtures.cs index 71457823..8695ce31 100644 --- a/tests/Speckle.Core.Tests.Unit/Fixtures.cs +++ b/tests/Speckle.Core.Tests.Unit/Fixtures.cs @@ -10,8 +10,7 @@ namespace Speckle.Core.Tests.Unit; [SetUpFixture] public class SetUp { - public static SpeckleLogConfiguration TestLogConfig { get; } = - new(logToFile: false, logToSeq: false, logToSentry: false); + public static SpeckleLogConfiguration TestLogConfig { get; } = new(logToFile: false, logToSeq: false); [OneTimeSetUp] public void BeforeAll() diff --git a/tests/Speckle.Core.Tests.Unit/Logging/SpeckleLogTests.cs b/tests/Speckle.Core.Tests.Unit/Logging/SpeckleLogTests.cs index 22b70330..b7bd071c 100644 --- a/tests/Speckle.Core.Tests.Unit/Logging/SpeckleLogTests.cs +++ b/tests/Speckle.Core.Tests.Unit/Logging/SpeckleLogTests.cs @@ -1,4 +1,4 @@ -using NUnit.Framework; +using NUnit.Framework; using Serilog.Context; using Serilog.Events; using Speckle.Core.Logging; @@ -106,8 +106,7 @@ public class SpeckleLogTests : IDisposable { const string TEST_MESSAGE = "This is my test message"; - SpeckleLogConfiguration config = - new(logToConsole: shouldWrite, logToSeq: false, logToSentry: false, logToFile: false); + SpeckleLogConfiguration config = new(logToConsole: shouldWrite, logToSeq: false, logToFile: false); using var logger = SpeckleLog.CreateConfiguredLogger("My Test Host App!!", null, config); logger.Fatal(TEST_MESSAGE); diff --git a/tests/Speckle.Core.Tests.Unit/Speckle.Core.Tests.Unit.csproj b/tests/Speckle.Core.Tests.Unit/Speckle.Core.Tests.Unit.csproj index 95a0f95b..20aa4cdc 100644 --- a/tests/Speckle.Core.Tests.Unit/Speckle.Core.Tests.Unit.csproj +++ b/tests/Speckle.Core.Tests.Unit/Speckle.Core.Tests.Unit.csproj @@ -11,6 +11,7 @@ + diff --git a/tests/Speckle.Core.Tests.Unit/packages.lock.json b/tests/Speckle.Core.Tests.Unit/packages.lock.json index da8845e3..8293ed45 100644 --- a/tests/Speckle.Core.Tests.Unit/packages.lock.json +++ b/tests/Speckle.Core.Tests.Unit/packages.lock.json @@ -52,12 +52,36 @@ "resolved": "1.14.1", "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" }, + "Shouldly": { + "type": "Direct", + "requested": "[4.2.1, )", + "resolved": "4.2.1", + "contentHash": "dKAKiSuhLKqD2TXwLKtqNg1nwzJcIKOOMncZjk9LYe4W+h+SCftpWdxwR79YZUIHMH+3Vu9s0s0UHNrgICLwRQ==", + "dependencies": { + "DiffEngine": "11.3.0", + "EmptyFiles": "4.4.0" + } + }, "Speckle.InterfaceGenerator": { "type": "Direct", "requested": "[0.9.5, )", "resolved": "0.9.5", "contentHash": "oU/L7pN1R7q8KkbrpQ3WJnHirPHqn+9DEA7asOcUiggV5dzVg1A/VYs7GOSusD24njxXh03tE3a2oTLOjt3cVg==" }, + "DiffEngine": { + "type": "Transitive", + "resolved": "11.3.0", + "contentHash": "k0ZgZqd09jLZQjR8FyQbSQE86Q7QZnjEzq1LPHtj1R2AoWO8sjV5x+jlSisL7NZAbUOI4y+7Bog8gkr9WIRBGw==", + "dependencies": { + "EmptyFiles": "4.4.0", + "System.Management": "6.0.1" + } + }, + "EmptyFiles": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "gwJEfIGS7FhykvtZoscwXj/XwW+mJY6UbAZk+qtLKFUGWC95kfKXnj8VkxsZQnWBxJemM/q664rGLN5nf+OHZw==" + }, "GraphQL.Client.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -259,11 +283,24 @@ "resolved": "4.5.0", "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" }, + "System.CodeDom": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA==" + }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "4.5.0", "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" }, + "System.Management": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "10J1D0h/lioojphfJ4Fuh5ZUThT/xOVHdV9roGBittKKNP2PMjrvibEdbVTGZcPra1399Ja3tqIJLyQrc5Wmhg==", + "dependencies": { + "System.CodeDom": "6.0.0" + } + }, "System.Memory": { "type": "Transitive", "resolved": "4.5.3", @@ -303,8 +340,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -312,7 +347,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "speckle.transports.disk": { @@ -369,22 +405,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==" - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.10.0" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -452,6 +472,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==" } } } diff --git a/tests/Speckle.Objects.Tests.Unit/packages.lock.json b/tests/Speckle.Objects.Tests.Unit/packages.lock.json index 5bb595db..6af23455 100644 --- a/tests/Speckle.Objects.Tests.Unit/packages.lock.json +++ b/tests/Speckle.Objects.Tests.Unit/packages.lock.json @@ -303,8 +303,6 @@ "Polly": "[7.2.3, )", "Polly.Contrib.WaitAndRetry": "[1.1.1, )", "Polly.Extensions.Http": "[3.0.0, )", - "Sentry": "[3.33.0, )", - "Sentry.Serilog": "[3.33.0, )", "Serilog": "[2.12.0, )", "Serilog.Enrichers.ClientInfo": "[1.3.0, )", "Serilog.Exceptions": "[8.4.0, )", @@ -312,7 +310,8 @@ "Serilog.Sinks.Seq": "[5.2.2, )", "SerilogTimings": "[3.0.1, )", "Speckle.DoubleNumerics": "[4.0.1, )", - "Speckle.Newtonsoft.Json": "[13.0.2, )" + "Speckle.Newtonsoft.Json": "[13.0.2, )", + "System.Text.Json": "[5.0.2, )" } }, "speckle.objects": { @@ -369,22 +368,6 @@ "Polly": "7.1.0" } }, - "Sentry": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==" - }, - "Sentry.Serilog": { - "type": "CentralTransitive", - "requested": "[3.33.0, )", - "resolved": "3.33.0", - "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", - "dependencies": { - "Sentry": "3.33.0", - "Serilog": "2.10.0" - } - }, "Serilog": { "type": "CentralTransitive", "requested": "[2.12.0, )", @@ -452,6 +435,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[5.0.2, )", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==" } } }