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 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/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 SpeckleLogConfiguration( MinimumLevel = minimumLevel; LogToConsole = logToConsole; LogToSeq = logToSeq; - LogToSentry = logToSentry; LogToFile = logToFile; EnhancedLogContext = enhancedLogContext; SentryDns = sentryDns; @@ -139,17 +128,6 @@ public static void Initialize( 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 @@ SpeckleLogConfiguration logConfiguration ); } - 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/Models/DynamicBaseMemberType.cs b/src/Speckle.Core/Models/DynamicBaseMemberType.cs index 9e9262dc..cbaceb34 100644 --- a/src/Speckle.Core/Models/DynamicBaseMemberType.cs +++ b/src/Speckle.Core/Models/DynamicBaseMemberType.cs @@ -1,4 +1,4 @@ -using System; +using ObsoleteAttribute = System.ObsoleteAttribute; namespace 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/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/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/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 08175c10..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": { @@ -418,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, )", @@ -501,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/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 e587feb8..b7bd071c 100644 --- a/tests/Speckle.Core.Tests.Unit/Logging/SpeckleLogTests.cs +++ b/tests/Speckle.Core.Tests.Unit/Logging/SpeckleLogTests.cs @@ -106,8 +106,7 @@ public void CreateConfiguredLogger_WritesToConsole_ToConsole(bool shouldWrite) { 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/packages.lock.json b/tests/Speckle.Core.Tests.Unit/packages.lock.json index 2ada2fdc..8293ed45 100644 --- a/tests/Speckle.Core.Tests.Unit/packages.lock.json +++ b/tests/Speckle.Core.Tests.Unit/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.transports.disk": { @@ -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.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==" } } }