From e5e02bdab193ffba0559caeee5725b78ceeedf09 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Mon, 3 Feb 2025 12:11:09 +0000 Subject: [PATCH] Cancellationmanager revamp (#527) * rhino and arc fix usage * fix registration * fix the rest * use interface * don't use rhino layer if there is no name * formatting * add tests * formatting * add to local and move * Update OTEL to remove grpc dependency * Fix deprecated method * really fixed with no incremental builds for tests * Fix references and lock * Update nuggets --- Build/Program.cs | 4 +- .../Bindings/ArcGISReceiveBinding.cs | 10 +- .../Bindings/ArcGISSendBinding.cs | 10 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../Bindings/AutocadReceiveBinding.cs | 10 +- .../Bindings/AutocadSendBaseBinding.cs | 10 +- .../Bindings/AutocadSendBinding.cs | 2 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../Bindings/Civil3dSendBinding.cs | 2 +- .../Bindings/CsiSharedSendBinding.cs | 10 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../Bindings/NavisworksSendBinding.cs | 8 +- .../NavisworksConnectorServiceRegistration.cs | 2 - .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../Bindings/RevitReceiveBinding.cs | 10 +- .../Bindings/RevitSendBinding.cs | 10 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../Bindings/RhinoReceiveBinding.cs | 10 +- .../Bindings/RhinoSendBinding.cs | 14 +- .../Registration/ServiceRegistration.cs | 4 - .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../Bindings/TeklaSendBinding.cs | 10 +- .../ServiceRegistration.cs | 2 - .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 34 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 24 +- .../packages.lock.json | 32 +- .../packages.lock.json | 64 +-- .../Speckle.Connectors.DUI/packages.lock.json | 28 +- Directory.Packages.props | 105 +++-- .../Speckle.Importers.Ifc.Tester/Program.cs | 2 +- .../packages.lock.json | 26 +- .../Speckle.Importers.Ifc/packages.lock.json | 22 +- Local.sln | 10 +- .../CancellationManagerTests.cs | 96 +++++ .../Speckle.Connectors.Common.Tests.csproj | 23 + .../packages.lock.json | 396 ++++++++++++++++++ .../Cancellation/CancellationManager.cs | 51 ++- .../Cancellation/ICancelable.cs | 9 - .../ContainerRegistration.cs | 16 +- .../packages.lock.json | 44 +- .../LoggingActivity.cs | 3 +- .../packages.lock.json | 373 +++++++---------- .../packages.lock.json | 28 +- .../packages.lock.json | 24 +- .../packages.lock.json | 44 +- Speckle.Connectors.sln | 9 + 92 files changed, 1814 insertions(+), 1355 deletions(-) create mode 100644 Sdk/Speckle.Connectors.Common.Tests/CancellationManagerTests.cs create mode 100644 Sdk/Speckle.Connectors.Common.Tests/Speckle.Connectors.Common.Tests.csproj create mode 100644 Sdk/Speckle.Connectors.Common.Tests/packages.lock.json delete mode 100644 Sdk/Speckle.Connectors.Common/Cancellation/ICancelable.cs diff --git a/Build/Program.cs b/Build/Program.cs index cb6e5fc36..86dfb77a4 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -176,10 +176,10 @@ void RemoveDirectory(string d) Glob.Files(".", "**/*.Tests.csproj"), file => { - Run("dotnet", $"restore {file} --locked-mode"); + Run("dotnet", $"build {file} -c Release --no-incremental"); Run( "dotnet", - $"test {file} -c Release --no-restore --verbosity=minimal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning" + $"test {file} -c Release --no-build --verbosity=minimal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning" ); } ); diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs index e78caa1ea..0924287ad 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs @@ -19,7 +19,7 @@ namespace Speckle.Connectors.ArcGIS.Bindings; public sealed class ArcGISReceiveBinding : IReceiveBinding { public string Name { get; } = "receiveBinding"; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly IOperationProgressManager _operationProgressManager; @@ -32,7 +32,7 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding public ArcGISReceiveBinding( DocumentModelStore store, IBrowserBridge parent, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IServiceProvider serviceProvider, IOperationProgressManager operationProgressManager, ILogger logger, @@ -60,7 +60,7 @@ public async Task Receive(string modelCardId) throw new InvalidOperationException("No download model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); using var scope = _serviceProvider.CreateScope(); scope .ServiceProvider.GetRequiredService>() @@ -76,8 +76,8 @@ public async Task Receive(string modelCardId) .ServiceProvider.GetRequiredService() .Execute( modelCard.GetReceiveInfo("ArcGIS"), // POC: get host app name from settings? same for GetSendInfo - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); modelCard.BakedObjectIds = receiveOperationResults.BakedObjectIds.ToList(); diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs index 22fadd614..c12020497 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs @@ -39,7 +39,7 @@ public sealed class ArcGISSendBinding : ISendBinding private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly List _sendFilters; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly ISendConversionCache _sendConversionCache; private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; @@ -64,7 +64,7 @@ public ArcGISSendBinding( IBrowserBridge parent, IEnumerable sendFilters, IServiceProvider serviceProvider, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, ISendConversionCache sendConversionCache, IOperationProgressManager operationProgressManager, ILogger logger, @@ -372,7 +372,7 @@ public async Task Send(string modelCardId) throw new InvalidOperationException("No publish model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); using var scope = _serviceProvider.CreateScope(); scope @@ -415,8 +415,8 @@ public async Task Send(string modelCardId) .Execute( mapMembers, modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json index 46fa2ef5a..e0a6fdf08 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json @@ -226,9 +226,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -236,8 +236,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -261,7 +261,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -299,18 +299,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -320,14 +320,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, "net6.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json index 8b8055345..e6bd24b61 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -294,7 +294,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -338,18 +338,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -359,14 +359,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json index 478a7b76b..1492b88e6 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -294,7 +294,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -338,18 +338,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -359,14 +359,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json index 156c39ad6..31fff56f8 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -295,7 +295,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -339,18 +339,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json index d8938faee..dcd4b5321 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json @@ -215,9 +215,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -225,8 +225,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -251,7 +251,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -315,14 +315,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs index cb5b3b0a6..d929c69bf 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs @@ -19,7 +19,7 @@ public sealed class AutocadReceiveBinding : IReceiveBinding public IBrowserBridge Parent { get; } private readonly DocumentModelStore _store; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly IServiceProvider _serviceProvider; private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; @@ -31,7 +31,7 @@ public sealed class AutocadReceiveBinding : IReceiveBinding public AutocadReceiveBinding( DocumentModelStore store, IBrowserBridge parent, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IServiceProvider serviceProvider, IOperationProgressManager operationProgressManager, ILogger logger, @@ -67,7 +67,7 @@ public async Task Receive(string modelCardId) throw new InvalidOperationException("No download model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); // Disable document activation (document creation and document switch) // Not disabling results in DUI model card being out of sync with the active document @@ -79,8 +79,8 @@ public async Task Receive(string modelCardId) .ServiceProvider.GetRequiredService() .Execute( modelCard.GetReceiveInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelReceiveResult( diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs index 5d44affc5..c1fdd8cea 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs @@ -35,7 +35,7 @@ public abstract class AutocadSendBaseBinding : ISendBinding private readonly DocumentModelStore _store; private readonly List _sendFilters; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly IServiceProvider _serviceProvider; private readonly ISendConversionCache _sendConversionCache; private readonly IOperationProgressManager _operationProgressManager; @@ -56,7 +56,7 @@ protected AutocadSendBaseBinding( DocumentModelStore store, IBrowserBridge parent, IEnumerable sendFilters, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IServiceProvider serviceProvider, ISendConversionCache sendConversionCache, IOperationProgressManager operationProgressManager, @@ -192,7 +192,7 @@ private async Task SendInternal(string modelCardId) using var scope = _serviceProvider.CreateScope(); InitializeSettings(scope.ServiceProvider); - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); // Disable document activation (document creation and document switch) // Not disabling results in DUI model card being out of sync with the active document @@ -215,8 +215,8 @@ private async Task SendInternal(string modelCardId) .Execute( autocadObjects, modelCard.GetSendInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs index 2745539ca..3311a88c0 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs @@ -22,7 +22,7 @@ public AutocadSendBinding( DocumentModelStore store, IBrowserBridge parent, IEnumerable sendFilters, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IServiceProvider serviceProvider, ISendConversionCache sendConversionCache, IOperationProgressManager operationProgressManager, diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json index 835e57ba6..372f45f73 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -304,7 +304,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -369,14 +369,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json index 372b388ac..3412811d5 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -304,7 +304,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -369,14 +369,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index e30f8280c..12dfa5953 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -304,7 +304,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -369,14 +369,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json index 13ba996a1..310032eb4 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json @@ -224,9 +224,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -234,8 +234,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -261,7 +261,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -305,18 +305,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -325,14 +325,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs index 880b6b5af..348c34ef4 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs +++ b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs @@ -25,7 +25,7 @@ public Civil3dSendBinding( DocumentModelStore store, IBrowserBridge parent, IEnumerable sendFilters, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IServiceProvider serviceProvider, ISendConversionCache sendConversionCache, IOperationProgressManager operationProgressManager, diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs index a07d566c9..901c9fe24 100644 --- a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs +++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs @@ -29,7 +29,7 @@ public sealed class CsiSharedSendBinding : ISendBinding private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly List _sendFilters; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; private readonly ICsiApplicationService _csiApplicationService; @@ -42,7 +42,7 @@ public CsiSharedSendBinding( IBrowserBridge parent, IEnumerable sendFilters, IServiceProvider serviceProvider, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IOperationProgressManager operationProgressManager, ILogger logger, ICsiConversionSettingsFactory csiConversionSettingsFactory, @@ -84,7 +84,7 @@ public async Task Send(string modelCardId) .ServiceProvider.GetRequiredService>() .Initialize(_csiConversionSettingsFactory.Create(_csiApplicationService.SapModel)); - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); List wrappers = modelCard .SendFilter.NotNull() @@ -102,8 +102,8 @@ public async Task Send(string modelCardId) .Execute( wrappers, modelCard.GetSendInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); diff --git a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json index bd723179d..25b720563 100644 --- a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json +++ b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.etabs21": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json index e0d61f403..6eae5c631 100644 --- a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json +++ b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json @@ -215,9 +215,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -225,8 +225,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -243,7 +243,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.etabs22": { @@ -293,18 +293,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -313,14 +313,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json index 17b6d6484..b0ac21806 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.navisworks2020": { @@ -348,9 +348,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json index d30f9c64c..934dffd67 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.navisworks2021": { @@ -348,9 +348,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json index 6f3fa4114..81bf383d5 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.navisworks2022": { @@ -348,9 +348,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json index fffd92db0..ce22425b8 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.navisworks2023": { @@ -348,9 +348,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json index dd28eb3f3..6afacad48 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.navisworks2024": { @@ -348,9 +348,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json index c98f6b675..2da1dc8bf 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json @@ -47,11 +47,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -274,9 +274,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -284,8 +284,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.navisworks2025": { @@ -348,9 +348,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSendBinding.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSendBinding.cs index 47675b88a..428d31b6d 100644 --- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSendBinding.cs +++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSendBinding.cs @@ -30,7 +30,7 @@ public class NavisworksSendBinding : ISendBinding private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly List _sendFilters; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; private readonly ISpeckleApplication _speckleApplication; @@ -44,7 +44,7 @@ public NavisworksSendBinding( IBrowserBridge parent, IEnumerable sendFilters, IServiceProvider serviceProvider, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IOperationProgressManager operationProgressManager, ILogger logger, ISpeckleApplication speckleApplication, @@ -93,11 +93,11 @@ public async Task Send(string modelCardId) InitializeConverterSettings(scope, modelCard); - CancellationToken token = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); var navisworksModelItems = GetNavisworksModelItems(modelCard); - var sendResult = await ExecuteSendOperation(scope, modelCard, navisworksModelItems, token); + var sendResult = await ExecuteSendOperation(scope, modelCard, navisworksModelItems, cancellationItem.Token); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); } diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs index cd8028276..1037d248c 100644 --- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs +++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs @@ -7,7 +7,6 @@ using Speckle.Connector.Navisworks.Services; using Speckle.Connectors.Common; using Speckle.Connectors.Common.Builders; -using Speckle.Connectors.Common.Cancellation; using Speckle.Connectors.Common.Operations; using Speckle.Connectors.Common.Threading; using Speckle.Connectors.DUI; @@ -59,7 +58,6 @@ public static void AddNavisworks(this IServiceCollection serviceCollection) serviceCollection.AddSingleton(); // Register Intercom/interop - serviceCollection.AddTransient(); serviceCollection.AddSingleton(); serviceCollection.AddSingleton(sp => sp.GetRequiredService()); serviceCollection.AddSingleton(); diff --git a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json index be1879d7c..986d88dcf 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json @@ -287,9 +287,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -297,8 +297,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -308,7 +308,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.revit2022": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -380,14 +380,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json index 8dbf49d37..fc67b21f2 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json @@ -287,9 +287,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -297,8 +297,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -308,7 +308,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.revit2023": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -380,14 +380,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json index 947e93812..d0c3125d4 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json @@ -287,9 +287,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -297,8 +297,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -308,7 +308,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.revit2024": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -380,14 +380,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json index 38bd8e118..12cd4db2d 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json @@ -237,9 +237,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -247,8 +247,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.revit2025": { @@ -303,11 +303,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Revit.API": { @@ -318,9 +318,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -329,14 +329,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs index 1f52cd26d..d4c8f2390 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs @@ -21,7 +21,7 @@ internal sealed class RevitReceiveBinding : IReceiveBinding private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly IRevitConversionSettingsFactory _revitConversionSettingsFactory; @@ -30,7 +30,7 @@ internal sealed class RevitReceiveBinding : IReceiveBinding public RevitReceiveBinding( DocumentModelStore store, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IBrowserBridge parent, IServiceProvider serviceProvider, IOperationProgressManager operationProgressManager, @@ -64,7 +64,7 @@ public async Task Receive(string modelCardId) throw new InvalidOperationException("No download model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); using var scope = _serviceProvider.CreateScope(); scope @@ -81,8 +81,8 @@ public async Task Receive(string modelCardId) .ServiceProvider.GetRequiredService() .Execute( modelCard.GetReceiveInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); modelCard.BakedObjectIds = conversionResults.BakedObjectIds.ToList(); diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs index e16ae8d28..360582808 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs @@ -31,7 +31,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding { private readonly IRevitContext _revitContext; private readonly DocumentModelStore _store; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly IServiceProvider _serviceProvider; private readonly ISendConversionCache _sendConversionCache; private readonly IOperationProgressManager _operationProgressManager; @@ -53,7 +53,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding public RevitSendBinding( IRevitContext revitContext, DocumentModelStore store, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IBrowserBridge bridge, IServiceProvider serviceProvider, ISendConversionCache sendConversionCache, @@ -119,7 +119,7 @@ public async Task Send(string modelCardId) throw new InvalidOperationException("No publish model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); using var scope = _serviceProvider.CreateScope(); scope @@ -146,8 +146,8 @@ public async Task Send(string modelCardId) .Execute( elementIds, modelCard.GetSendInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index 9864217c0..06716615d 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.rhino7": { @@ -347,18 +347,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -368,14 +368,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json index d41ae9c94..b735b96ec 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.converters.rhino8": { @@ -347,18 +347,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -368,14 +368,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoReceiveBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoReceiveBinding.cs index 0f255cafd..bbb1d5145 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoReceiveBinding.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoReceiveBinding.cs @@ -20,7 +20,7 @@ public class RhinoReceiveBinding : IReceiveBinding public string Name => "receiveBinding"; public IBrowserBridge Parent { get; } - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly IOperationProgressManager _operationProgressManager; @@ -31,7 +31,7 @@ public class RhinoReceiveBinding : IReceiveBinding public RhinoReceiveBinding( DocumentModelStore store, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, IBrowserBridge parent, IOperationProgressManager operationProgressManager, ILogger logger, @@ -70,7 +70,7 @@ public async Task Receive(string modelCardId) throw new InvalidOperationException("No download model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); undoRecord = RhinoDoc.ActiveDoc.BeginUndoRecord($"Receive Speckle model {modelCard.ModelName}"); // Receive host objects @@ -78,8 +78,8 @@ public async Task Receive(string modelCardId) .ServiceProvider.GetRequiredService() .Execute( modelCard.GetReceiveInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); modelCard.BakedObjectIds = conversionResults.BakedObjectIds.ToList(); diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs index 12df94128..024401302 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs @@ -35,7 +35,7 @@ public sealed class RhinoSendBinding : ISendBinding private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly List _sendFilters; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly ISendConversionCache _sendConversionCache; private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; @@ -67,7 +67,7 @@ public RhinoSendBinding( IBrowserBridge parent, IEnumerable sendFilters, IServiceProvider serviceProvider, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, ISendConversionCache sendConversionCache, IOperationProgressManager operationProgressManager, ILogger logger, @@ -220,6 +220,10 @@ private void OnLayerTableEvent(LayerTableEventArgs args) } var layer = RhinoDoc.ActiveDoc.Layers[args.LayerIndex]; + if (layer.Name is null) + { + return; + } // add all objects from the changed layers and sublayers to the non-destructively changed object list. var allLayers = args.Document.Layers.Where(l => /* NOTE: layer path may actually be null in some cases (rhino's fault, not ours) */ @@ -301,7 +305,7 @@ public async Task Send(string modelCardId) throw new InvalidOperationException("No publish model card was found."); } - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); List rhinoObjects = modelCard .SendFilter.NotNull() @@ -321,8 +325,8 @@ public async Task Send(string modelCardId) .Execute( rhinoObjects, modelCard.GetSendInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs index 82bf48c49..d0fb8a0eb 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs @@ -5,7 +5,6 @@ using Speckle.Connectors.Common; using Speckle.Connectors.Common.Builders; using Speckle.Connectors.Common.Caching; -using Speckle.Connectors.Common.Cancellation; using Speckle.Connectors.Common.Instances; using Speckle.Connectors.Common.Operations; using Speckle.Connectors.Common.Threading; @@ -47,9 +46,6 @@ public static void AddRhino(this IServiceCollection serviceCollection) serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); - // binding dependencies - serviceCollection.AddTransient(); - // register send filters serviceCollection.AddScoped(); serviceCollection.AddScoped(); diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json index 1299ba28d..ea7ad0799 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json @@ -35,11 +35,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Tekla.Structures.Dialog": { @@ -334,9 +334,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -344,8 +344,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -371,7 +371,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -415,9 +415,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -427,14 +427,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "Speckle.Triangle": { "type": "CentralTransitive", diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json index 244335d09..8c8962735 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json @@ -35,11 +35,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Tekla.Structures.Dialog": { @@ -415,9 +415,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -425,8 +425,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -452,7 +452,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -496,9 +496,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -508,14 +508,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "Speckle.Triangle": { "type": "CentralTransitive", diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs index f8d0d4990..fe4cedfcb 100644 --- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs @@ -34,7 +34,7 @@ public sealed class TeklaSendBinding : ISendBinding private readonly DocumentModelStore _store; private readonly IServiceProvider _serviceProvider; private readonly List _sendFilters; - private readonly CancellationManager _cancellationManager; + private readonly ICancellationManager _cancellationManager; private readonly ISendConversionCache _sendConversionCache; private readonly IOperationProgressManager _operationProgressManager; private readonly ILogger _logger; @@ -51,7 +51,7 @@ public TeklaSendBinding( IBrowserBridge parent, IEnumerable sendFilters, IServiceProvider serviceProvider, - CancellationManager cancellationManager, + ICancellationManager cancellationManager, ISendConversionCache sendConversionCache, IOperationProgressManager operationProgressManager, ILogger logger, @@ -120,7 +120,7 @@ public async Task Send(string modelCardId) _teklaConversionSettingsFactory.Create(_model, _toSpeckleSettingsManager.GetSendRebarsAsSolid(modelCard)) ); - CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); + using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId); List teklaObjects = modelCard .SendFilter.NotNull() @@ -139,8 +139,8 @@ public async Task Send(string modelCardId) .Execute( teklaObjects, modelCard.GetSendInfo(_speckleApplication.Slug), - _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), - cancellationToken + _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token), + cancellationItem.Token ); await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults); diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs index f058061e8..7a7571a5b 100644 --- a/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs @@ -2,7 +2,6 @@ using Speckle.Connectors.Common; using Speckle.Connectors.Common.Builders; using Speckle.Connectors.Common.Caching; -using Speckle.Connectors.Common.Cancellation; using Speckle.Connectors.Common.Operations; using Speckle.Connectors.Common.Threading; using Speckle.Connectors.DUI; @@ -57,7 +56,6 @@ public static IServiceCollection AddTekla(this IServiceCollection services) services.AddSingleton(); - services.AddTransient(); services.AddSingleton(); services.AddScoped(); diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json index 35bb6a83e..b817cfe40 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json @@ -219,7 +219,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -248,18 +248,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -269,14 +269,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index 8a25c8424..4b1107e7b 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index 33be69c89..036e0c32f 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index 74598178c..b10d615c4 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -331,18 +331,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -352,14 +352,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json index 996e7d915..61aadfbfd 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json @@ -215,9 +215,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -225,8 +225,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -243,7 +243,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json index 870cef532..2a0c2f4dd 100644 --- a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json +++ b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json index cac6de1b0..c21e5c103 100644 --- a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json +++ b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json @@ -214,7 +214,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -243,18 +243,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -263,14 +263,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json index 6025cd895..f10e077a8 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json index 76b6b1b9d..fbe4d080e 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index 92e8f5a29..88cf77588 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json index a33d838da..5e3766b15 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json @@ -224,9 +224,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -234,8 +234,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui.webview": { @@ -252,7 +252,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -316,14 +316,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json index e3d455167..088cde210 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -318,18 +318,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -339,14 +339,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json index e19dc736b..3e50479b3 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -318,18 +318,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -339,14 +339,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json index b8337ec2e..178b78ae6 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -318,18 +318,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -339,14 +339,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json index 844d792f5..c1842ab0b 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -318,18 +318,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -339,14 +339,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json index 5310f2f39..3c3e0a6d2 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -318,18 +318,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -339,14 +339,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json index 9949130bc..d563c0336 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -318,18 +318,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -339,14 +339,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json index f4b667e1f..67aae9178 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.testing": { @@ -376,18 +376,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -396,14 +396,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index 23895a7c5..45206ff01 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json index 6f3dcd606..628355ea2 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.testing": { @@ -376,18 +376,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -396,14 +396,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index a82da87cb..a126e5b65 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json index ada3fe588..574db78d7 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.testing": { @@ -376,18 +376,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -396,14 +396,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index df0008c0d..1643ca0e5 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 2e91d1230..f7c8bde81 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json @@ -214,7 +214,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -243,18 +243,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -263,14 +263,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json index 7f4f0718b..605726e81 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.testing": { @@ -376,18 +376,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -396,14 +396,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index da9753754..f53a561bf 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index 4b4dac9c8..9a8be2702 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json index 46a594fe6..8e2a706e2 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -331,18 +331,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -352,14 +352,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "Speckle.Triangle": { "type": "CentralTransitive", diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json index 8ac0b0c3b..5cd60bd37 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json @@ -343,7 +343,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "Microsoft.Extensions.Logging": { @@ -372,18 +372,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -393,14 +393,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "Speckle.Triangle": { "type": "CentralTransitive", diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json index b5b64866f..e8313d9c4 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -319,9 +319,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -329,8 +329,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -378,18 +378,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -398,14 +398,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json index 39f891aa3..946da5bd8 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -311,18 +311,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -332,14 +332,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, "net6.0-windows7.0": { @@ -561,9 +561,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.dui": { @@ -571,8 +571,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -613,18 +613,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -634,14 +634,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index 008d88d6e..8c6207e1c 100644 --- a/DUI3/Speckle.Connectors.DUI/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json @@ -50,9 +50,9 @@ }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -62,14 +62,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "GraphQL.Client": { "type": "Transitive", @@ -309,9 +309,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -346,11 +346,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index c55d6efa0..bfe0beda9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,58 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs index 104befd98..fc4b97841 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs @@ -47,7 +47,7 @@ sqlite, new DummyServerObjectManager(), new BaseChildFinder(new BasePropertyGatherer()), - new ObjectSerializerFactory(new BasePropertyGatherer()), + new BaseSerializer(sqlite, new ObjectSerializerFactory(new BasePropertyGatherer())), new NullLoggerFactory(), default, new SerializeProcessOptions(SkipServer: true) diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json index 7b6240f54..6118e4895 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json @@ -211,8 +211,8 @@ "Ara3D.Logging": "[1.4.5, )", "Ara3D.Utils": "[1.4.5, )", "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )" } }, "Ara3D.Buffers": { @@ -274,18 +274,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -294,14 +294,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json index 8f9c368e6..860fde061 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json @@ -68,18 +68,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -88,7 +88,7 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -288,9 +288,9 @@ }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Local.sln b/Local.sln index 0fdbf7b94..bca476ba4 100644 --- a/Local.sln +++ b/Local.sln @@ -8,7 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{85A13E .editorconfig = .editorconfig codecov.yml = codecov.yml Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props global.json = global.json README.md = README.md @@ -270,6 +269,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc", "Im EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester", "Importers\Ifc\Speckle.Importers.Ifc.Tester\Speckle.Importers.Ifc.Tester.csproj", "{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Connectors.Common.Tests", "Sdk\Speckle.Connectors.Common.Tests\Speckle.Connectors.Common.Tests.csproj", "{C19C3EDF-D95D-4D22-9949-D99F91447AE7}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Common.MeshTriangulation", "Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj", "{20BB9687-2C92-44E9-9E2F-9D2F45641354}" EndProject Global @@ -693,6 +694,12 @@ Global {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Local|Any CPU.Build.0 = Debug|Any CPU {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Release|Any CPU.Build.0 = Release|Any CPU + {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Local|Any CPU.ActiveCfg = Local|Any CPU + {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Local|Any CPU.Build.0 = Local|Any CPU + {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Release|Any CPU.Build.0 = Release|Any CPU {20BB9687-2C92-44E9-9E2F-9D2F45641354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20BB9687-2C92-44E9-9E2F-9D2F45641354}.Debug|Any CPU.Build.0 = Debug|Any CPU {20BB9687-2C92-44E9-9E2F-9D2F45641354}.Local|Any CPU.ActiveCfg = Debug|Any CPU @@ -822,6 +829,7 @@ Global {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} = {24750B06-C90D-43B1-B2E4-088D531D6748} {9FD99F9B-8D50-4C7A-B3A6-22E28AB5F26B} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} + {C19C3EDF-D95D-4D22-9949-D99F91447AE7} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {20BB9687-2C92-44E9-9E2F-9D2F45641354} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/Sdk/Speckle.Connectors.Common.Tests/CancellationManagerTests.cs b/Sdk/Speckle.Connectors.Common.Tests/CancellationManagerTests.cs new file mode 100644 index 000000000..cd9de3a95 --- /dev/null +++ b/Sdk/Speckle.Connectors.Common.Tests/CancellationManagerTests.cs @@ -0,0 +1,96 @@ +using FluentAssertions; +using NUnit.Framework; +using Speckle.Connectors.Common.Cancellation; + +namespace Speckle.Connectors.Common.Tests; + +public class CancellationManagerTests +{ + [Test] + public void CancelOne() + { + var manager = new CancellationManager(); + manager.NumberOfOperations.Should().Be(0); + + var id = Guid.NewGuid().ToString(); + var item = manager.GetCancellationItem(id); + + manager.NumberOfOperations.Should().Be(1); + manager.IsExist(id).Should().BeTrue(); + manager.CancelOperation(id); + item.Token.IsCancellationRequested.Should().BeTrue(); + manager.IsCancellationRequested(id).Should().BeTrue(); + manager.IsExist(id).Should().BeTrue(); + item.Dispose(); + + manager.IsExist(id).Should().BeFalse(); + Assert.Throws(() => item.Token.IsCancellationRequested.Should().BeTrue()); + + Assert.Throws(() => manager.IsCancellationRequested(id).Should().BeTrue()); + } + + [Test] + public void CancelTwo() + { + var manager = new CancellationManager(); + manager.NumberOfOperations.Should().Be(0); + + var id1 = Guid.NewGuid().ToString(); + var id2 = Guid.NewGuid().ToString(); + var item1 = manager.GetCancellationItem(id1); + var item2 = manager.GetCancellationItem(id2); + + manager.NumberOfOperations.Should().Be(2); + manager.IsExist(id1).Should().BeTrue(); + manager.CancelOperation(id1); + item1.Token.IsCancellationRequested.Should().BeTrue(); + manager.IsCancellationRequested(id1).Should().BeTrue(); + manager.IsExist(id1).Should().BeTrue(); + item1.Dispose(); + + manager.IsExist(id1).Should().BeFalse(); + Assert.Throws(() => item1.Token.IsCancellationRequested.Should().BeTrue()); + + Assert.Throws(() => manager.IsCancellationRequested(id1).Should().BeTrue()); + + manager.NumberOfOperations.Should().Be(1); + manager.IsExist(id2).Should().BeTrue(); + manager.CancelOperation(id2); + item2.Token.IsCancellationRequested.Should().BeTrue(); + manager.IsCancellationRequested(id2).Should().BeTrue(); + manager.IsExist(id2).Should().BeTrue(); + item2.Dispose(); + + manager.IsExist(id2).Should().BeFalse(); + Assert.Throws(() => item2.Token.IsCancellationRequested.Should().BeTrue()); + + Assert.Throws(() => manager.IsCancellationRequested(id2).Should().BeTrue()); + } + + [Test] + public void CancelAll() + { + var manager = new CancellationManager(); + manager.NumberOfOperations.Should().Be(0); + + var id1 = Guid.NewGuid().ToString(); + var id2 = Guid.NewGuid().ToString(); + var item1 = manager.GetCancellationItem(id1); + var item2 = manager.GetCancellationItem(id2); + + manager.NumberOfOperations.Should().Be(2); + manager.IsExist(id1).Should().BeTrue(); + manager.CancelAllOperations(); + item1.Token.IsCancellationRequested.Should().BeTrue(); + item2.Token.IsCancellationRequested.Should().BeTrue(); + manager.IsCancellationRequested(id1).Should().BeTrue(); + manager.IsCancellationRequested(id2).Should().BeTrue(); + manager.IsExist(id1).Should().BeTrue(); + manager.IsExist(id2).Should().BeTrue(); + item1.Dispose(); + item2.Dispose(); + + manager.IsExist(id1).Should().BeFalse(); + manager.IsExist(id2).Should().BeFalse(); + } +} diff --git a/Sdk/Speckle.Connectors.Common.Tests/Speckle.Connectors.Common.Tests.csproj b/Sdk/Speckle.Connectors.Common.Tests/Speckle.Connectors.Common.Tests.csproj new file mode 100644 index 000000000..9454563b8 --- /dev/null +++ b/Sdk/Speckle.Connectors.Common.Tests/Speckle.Connectors.Common.Tests.csproj @@ -0,0 +1,23 @@ + + + + net8.0 + false + true + Debug;Release;Local + + + + + + + + + + + + + + + + diff --git a/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json new file mode 100644 index 000000000..1da862a29 --- /dev/null +++ b/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json @@ -0,0 +1,396 @@ +{ + "version": 2, + "dependencies": { + "net8.0": { + "altcover": { + "type": "Direct", + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" + }, + "FluentAssertions": { + "type": "Direct", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", + "dependencies": { + "System.Configuration.ConfigurationManager": "4.4.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Direct", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + } + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", + "dependencies": { + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "Moq": { + "type": "Direct", + "requested": "[4.20.70, )", + "resolved": "4.20.70", + "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==", + "dependencies": { + "Castle.Core": "5.1.1" + } + }, + "NUnit": { + "type": "Direct", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "MT/DpAhjtiytzhTgTqIhBuWx4y26PKfDepYUHUM+5uv4TsryHC2jwFo5e6NhWkApCm/G6kZ80dRjdJFuAxq3rg==" + }, + "NUnit.Analyzers": { + "type": "Direct", + "requested": "[4.2.0, )", + "resolved": "4.2.0", + "contentHash": "4fJojPkzdoa4nB2+p6U+fITvPnVvwWSnsmiJ/Dl30xqiL3oxNbYvfeSLVd91hOmEjoUqSwN3Z7j1aFedjqWbUA==" + }, + "NUnit3TestAdapter": { + "type": "Direct", + "requested": "[4.6.0, )", + "resolved": "4.6.0", + "contentHash": "R7e1+a4vuV/YS+ItfL7f//rG+JBvVeVLX4mHzFEZo4W1qEKl8Zz27AqvQSAqo+BtIzUCo4aAJMYa56VXS4hudw==" + }, + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.6, )", + "resolved": "0.9.6", + "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w==" + }, + "Castle.Core": { + "type": "Transitive", + "resolved": "5.1.1", + "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", + "dependencies": { + "System.Diagnostics.EventLog": "6.0.0" + } + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0", + "GraphQL.Client.Abstractions.Websocket": "6.0.0", + "System.Reactive": "5.0.0" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "2.2.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Primitives": "2.2.0", + "System.ComponentModel.Annotations": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==", + "dependencies": { + "System.Memory": "4.5.1", + "System.Runtime.CompilerServices.Unsafe": "4.5.1" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", + "dependencies": { + "System.Reflection.Metadata": "1.6.0" + } + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "17.11.1", + "Newtonsoft.Json": "13.0.1" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==", + "dependencies": { + "System.Security.Cryptography.ProtectedData": "4.4.0" + } + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==" + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" + }, + "speckle.connectors.common": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", + "Speckle.Connectors.Logging": "[1.0.0, )", + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" + } + }, + "speckle.connectors.logging": { + "type": "Project" + }, + "Microsoft.Extensions.Logging": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==" + }, + "Speckle.DoubleNumerics": { + "type": "CentralTransitive", + "requested": "[4.1.0, )", + "resolved": "4.0.1", + "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + }, + "Speckle.Objects": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", + "dependencies": { + "Speckle.Sdk": "3.1.0-dev.251" + } + }, + "Speckle.Sdk": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", + "dependencies": { + "GraphQL.Client": "6.0.0", + "Microsoft.CSharp": "4.7.0", + "Microsoft.Data.Sqlite": "[7.0.5]", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", + "Microsoft.Extensions.Logging": "[2.2.0]", + "Speckle.DoubleNumerics": "4.0.1", + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" + } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" + } + } + } +} \ No newline at end of file diff --git a/Sdk/Speckle.Connectors.Common/Cancellation/CancellationManager.cs b/Sdk/Speckle.Connectors.Common/Cancellation/CancellationManager.cs index 155f5a15d..e46ede195 100644 --- a/Sdk/Speckle.Connectors.Common/Cancellation/CancellationManager.cs +++ b/Sdk/Speckle.Connectors.Common/Cancellation/CancellationManager.cs @@ -1,10 +1,25 @@ +using Speckle.InterfaceGenerator; + namespace Speckle.Connectors.Common.Cancellation; +public interface ICancellationItem : IDisposable +{ + CancellationToken Token { get; } +} + /// /// Util class to manage cancellations. /// -public class CancellationManager +[GenerateAutoInterface] +public class CancellationManager : ICancellationManager { + private sealed class CancellationItem(CancellationManager manager, string id) : ICancellationItem + { + public void Dispose() => manager.DisposeOperation(id); + + public CancellationToken Token => manager.GetToken(id); + } + /// /// Dictionary to relate with registered id. /// @@ -17,29 +32,21 @@ public class CancellationManager /// /// Id of the operation. /// CancellationToken that belongs to operation. - public CancellationToken GetToken(string id) - { - return _operationsInProgress[id].Token; - } + public CancellationToken GetToken(string id) => _operationsInProgress[id].Token; /// /// Whether given id registered or not. /// /// Id to check registration. /// Whether given id registered or not. - public bool IsExist(string id) - { - return _operationsInProgress.ContainsKey(id); - } + public bool IsExist(string id) => _operationsInProgress.ContainsKey(id); public void CancelAllOperations() { foreach (var operation in _operationsInProgress) { operation.Value.Cancel(); - operation.Value.Dispose(); } - _operationsInProgress.Clear(); } /// @@ -48,16 +55,13 @@ public void CancelAllOperations() /// /// Id to register token. /// Initialized cancellation token source. - public CancellationToken InitCancellationTokenSource(string id) + public ICancellationItem GetCancellationItem(string id) { - if (IsExist(id)) - { - CancelOperation(id); - } + DisposeOperation(id); var cts = new CancellationTokenSource(); _operationsInProgress[id] = cts; - return cts.Token; + return new CancellationItem(this, id); } /// @@ -65,6 +69,14 @@ public CancellationToken InitCancellationTokenSource(string id) /// /// Id to cancel operation. public void CancelOperation(string id) + { + if (_operationsInProgress.TryGetValue(id, out CancellationTokenSource? cts)) + { + cts.Cancel(); + } + } + + private void DisposeOperation(string id) { if (_operationsInProgress.TryGetValue(id, out CancellationTokenSource? cts)) { @@ -79,8 +91,5 @@ public void CancelOperation(string id) /// /// Id to check cancellation requested already or not. /// - public bool IsCancellationRequested(string id) - { - return _operationsInProgress[id].IsCancellationRequested; - } + public bool IsCancellationRequested(string id) => _operationsInProgress[id].IsCancellationRequested; } diff --git a/Sdk/Speckle.Connectors.Common/Cancellation/ICancelable.cs b/Sdk/Speckle.Connectors.Common/Cancellation/ICancelable.cs deleted file mode 100644 index c0db8880e..000000000 --- a/Sdk/Speckle.Connectors.Common/Cancellation/ICancelable.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Speckle.Connectors.Common.Cancellation; - -/// -/// Provides a mechanism for cancelling operations. -/// -public interface ICancelable -{ - public CancellationManager CancellationManager { get; } -} diff --git a/Sdk/Speckle.Connectors.Common/ContainerRegistration.cs b/Sdk/Speckle.Connectors.Common/ContainerRegistration.cs index 84ee2251d..62c03a0c3 100644 --- a/Sdk/Speckle.Connectors.Common/ContainerRegistration.cs +++ b/Sdk/Speckle.Connectors.Common/ContainerRegistration.cs @@ -9,23 +9,11 @@ namespace Speckle.Connectors.Common; public static class ContainerRegistration -{ /* - public static void AddConnectorUtils(this SpeckleContainerBuilder builder) - { - // send operation and dependencies - builder.AddSingleton(); - builder.AddScoped(); - builder.AddScoped(); - builder.AddSingleton(); - builder.ScanAssembly(Assembly.GetExecutingAssembly()); - - builder.ContainerBuilder.RegisterGeneric(typeof(Logger<>)).As(typeof(ILogger<>)).SingleInstance(); - } -*/ +{ public static void AddConnectorUtils(this IServiceCollection serviceCollection) { // send operation and dependencies - serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddSingleton(); diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json index d86c18ae6..d7ab8baac 100644 --- a/Sdk/Speckle.Connectors.Common/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common/packages.lock.json @@ -53,18 +53,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -74,14 +74,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "GraphQL.Client": { "type": "Transitive", @@ -387,18 +387,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -407,14 +407,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" }, "GraphQL.Client": { "type": "Transitive", diff --git a/Sdk/Speckle.Connectors.Logging/LoggingActivity.cs b/Sdk/Speckle.Connectors.Logging/LoggingActivity.cs index d8e6073bf..b3dacc691 100644 --- a/Sdk/Speckle.Connectors.Logging/LoggingActivity.cs +++ b/Sdk/Speckle.Connectors.Logging/LoggingActivity.cs @@ -1,5 +1,4 @@ using System.Diagnostics; -using OpenTelemetry.Trace; namespace Speckle.Connectors.Logging; @@ -16,7 +15,7 @@ internal LoggingActivity(Activity activity) public void SetTag(string key, object? value) => _activity.SetTag(key, value); - public void RecordException(Exception e) => _activity.RecordException(e); + public void RecordException(Exception e) => _activity.AddException(e); public string TraceId => _activity.TraceId.ToString(); diff --git a/Sdk/Speckle.Connectors.Logging/packages.lock.json b/Sdk/Speckle.Connectors.Logging/packages.lock.json index ca3f5b648..e56cd1682 100644 --- a/Sdk/Speckle.Connectors.Logging/packages.lock.json +++ b/Sdk/Speckle.Connectors.Logging/packages.lock.json @@ -41,25 +41,23 @@ }, "OpenTelemetry.Exporter.OpenTelemetryProtocol": { "type": "Direct", - "requested": "[1.9.0, )", - "resolved": "1.9.0", - "contentHash": "qzFOP3V2eYIVbug3U4BJzzidHe9JhAJ42WZ/H8pUp/45Ry3MQQg/+e/ZieClJcxKnpbkXi7dUq1rpvuNp+yBYA==", + "requested": "[1.11.1, )", + "resolved": "1.11.1", + "contentHash": "UiZBa+2b396Oxx9RX7h4ch+yZvX8nezxVkihPLU6zdEUfJbbVY2mNypJKEoW2Vh4xCaCp0fB6na3Kti+KfTVaw==", "dependencies": { - "Google.Protobuf": "[3.22.5, 4.0.0)", - "Grpc": "[2.44.0, 3.0.0)", - "Microsoft.Extensions.Configuration.Binder": "8.0.1", - "OpenTelemetry": "1.9.0" + "Grpc.Core": "[2.44.0, 3.0.0)", + "OpenTelemetry": "1.11.1" } }, "OpenTelemetry.Instrumentation.Http": { "type": "Direct", - "requested": "[1.9.0, )", - "resolved": "1.9.0", - "contentHash": "+ZXppf8Qxz3OdC803T8fB6i8iSscc8PsxMnM/JizSOYmkz+8vGiScEiaBBBFNZtMh2KpA0q+qxwnSwQUkbvzog==", + "requested": "[1.11.0, )", + "resolved": "1.11.0", + "contentHash": "1ncYPNmMaYNPX664uo3FlmSVGETBKQbBvarbGgB5ZynERTFmCsZ7UqefvVe3vnPYOIAGOjbMAbprYF2BfMielg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.9.0, 2.0.0)" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.11.1, 2.0.0)" } }, "PolySharp": { @@ -122,23 +120,6 @@ "resolved": "0.9.6", "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w==" }, - "Google.Protobuf": { - "type": "Transitive", - "resolved": "3.22.5", - "contentHash": "tTMtDZPbLxJew8pk7NBdqhLqC4OipfkZdwPuCEUNr2AoDo1siUGcxFqJK0wDewTL8ge5Cjrb16CToMPxBUHMGA==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } - }, - "Grpc": { - "type": "Transitive", - "resolved": "2.44.0", - "contentHash": "9a6FybBPcVMAxSXMTbwYxBmAe7dG+hMMSTrar4lccIXZxUNQM9zMEMzMqih1QTypdLv6udf1+oVOTf11T4c/sQ==", - "dependencies": { - "Grpc.Core": "2.44.0" - } - }, "Grpc.Core": { "type": "Transitive", "resolved": "2.44.0", @@ -163,8 +144,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } @@ -176,91 +157,91 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "resolved": "9.0.0", + "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==", + "resolved": "9.0.0", + "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "Microsoft.Bcl.AsyncInterfaces": "9.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Extensions.Diagnostics.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "resolved": "9.0.0", + "contentHash": "1K8P7XzuzX8W8pmXcZjcrqS6x5eSSdvhQohmcpgiQNY/HlDAlnrhR9dvlURfFz428A+RTCJpUyB+aKTA6AgVcQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", "System.Buffers": "4.5.1", - "System.Diagnostics.DiagnosticSource": "8.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0", "System.Memory": "4.5.5" } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", + "resolved": "9.0.0", + "contentHash": "H05HiqaNmg6GjH34ocYE9Wm1twm3Oz2aXZko8GTwGBzM7op2brpAA8pJ5yyD1OpS1mXUtModBYOlcZ/wXeWsSg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "9.0.0", + "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0", "System.ComponentModel.Annotations": "5.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", + "resolved": "9.0.0", + "contentHash": "Ob3FXsXkcSMQmGZi7qP07EQ39kZpSBlTcAZLbJLdI4FIf0Jug8biv2HTavWmnTirchctPlq9bl/26CXtQRguzA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -283,29 +264,29 @@ }, "OpenTelemetry": { "type": "Transitive", - "resolved": "1.9.0", - "contentHash": "7scS6BUhwYeSXEDGhCxMSezmvyCoDU5kFQbmfyW9iVvVTcWhec+1KIN33/LOCdBXRkzt2y7+g03mkdAB0XZ9Fw==", + "resolved": "1.11.1", + "contentHash": "F+HBI2bE7RKmb8Bj0kBtZIVzCfpTe1ZyY6kYP/jny1+9oq7IdBnNsVXZlPev9OqQzRp3iXpJ1UsnN1YOEwdtkQ==", "dependencies": { - "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Configuration": "8.0.0", - "OpenTelemetry.Api.ProviderBuilderExtensions": "1.9.0" + "Microsoft.Extensions.Diagnostics.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging.Configuration": "9.0.0", + "OpenTelemetry.Api.ProviderBuilderExtensions": "1.11.1" } }, "OpenTelemetry.Api": { "type": "Transitive", - "resolved": "1.9.0", - "contentHash": "Xz8ZvM1Lm0m7BbtGBnw2JlPo++YKyMp08zMK5p0mf+cIi5jeMt2+QsYu9X6YEAbjCxBQYwEak5Z8sY6Ig2WcwQ==", + "resolved": "1.11.1", + "contentHash": "KaBjGMqrqQv41mIkvPUvmAG7yxDlI6qchKhjXlOF3ZwsdcRRLrdrkiDLIJ90iZgUoKVdP8fE1fCri9nc+ug0Cg==", "dependencies": { - "System.Diagnostics.DiagnosticSource": "8.0.0" + "System.Diagnostics.DiagnosticSource": "9.0.0" } }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", - "resolved": "1.9.0", - "contentHash": "L0D4LBR5JFmwLun5MCWVGapsJLV0ANZ+XXu9NEI3JE/HRKkRuUO+J2MuHD5DBwiU//QMYYM4B22oev1hVLoHDQ==", + "resolved": "1.11.1", + "contentHash": "vMdNMQeW55jXIa/Kybec/br6jC+rWybniTi6DCW5lz1kGghKso+J+FC3uBgiq0/pTqusfeDbO5PEHGM/r5z8Ow==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "OpenTelemetry.Api": "1.9.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "OpenTelemetry.Api": "1.11.1" } }, "System.Buffers": { @@ -320,8 +301,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", + "resolved": "9.0.0", + "contentHash": "ddppcFpnbohLWdYKr/ZeLZHmmI+DXFgZ3Snq+/E7SwcdW4UnvxmaugkwGywvGVWkHPGCSZjCP+MLzu23AL5SDw==", "dependencies": { "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" @@ -371,35 +352,36 @@ "Microsoft.Extensions.DependencyInjection": { "type": "CentralTransitive", "requested": "[2.2.0, )", - "resolved": "8.0.0", - "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "resolved": "9.0.0", + "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Bcl.AsyncInterfaces": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Extensions.Logging": { "type": "CentralTransitive", "requested": "[2.2.0, )", - "resolved": "8.0.0", - "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", + "resolved": "9.0.0", + "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0" + "Microsoft.Bcl.AsyncInterfaces": "9.0.0", + "Microsoft.Extensions.DependencyInjection": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "CentralTransitive", "requested": "[2.2.0, )", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "9.0.0", + "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", "System.Buffers": "4.5.1", + "System.Diagnostics.DiagnosticSource": "9.0.0", "System.Memory": "4.5.5" } } @@ -435,25 +417,22 @@ }, "OpenTelemetry.Exporter.OpenTelemetryProtocol": { "type": "Direct", - "requested": "[1.9.0, )", - "resolved": "1.9.0", - "contentHash": "qzFOP3V2eYIVbug3U4BJzzidHe9JhAJ42WZ/H8pUp/45Ry3MQQg/+e/ZieClJcxKnpbkXi7dUq1rpvuNp+yBYA==", + "requested": "[1.11.1, )", + "resolved": "1.11.1", + "contentHash": "UiZBa+2b396Oxx9RX7h4ch+yZvX8nezxVkihPLU6zdEUfJbbVY2mNypJKEoW2Vh4xCaCp0fB6na3Kti+KfTVaw==", "dependencies": { - "Google.Protobuf": "[3.22.5, 4.0.0)", - "Grpc.Net.Client": "[2.52.0, 3.0.0)", - "Microsoft.Extensions.Configuration.Binder": "8.0.1", - "OpenTelemetry": "1.9.0" + "OpenTelemetry": "1.11.1" } }, "OpenTelemetry.Instrumentation.Http": { "type": "Direct", - "requested": "[1.9.0, )", - "resolved": "1.9.0", - "contentHash": "+ZXppf8Qxz3OdC803T8fB6i8iSscc8PsxMnM/JizSOYmkz+8vGiScEiaBBBFNZtMh2KpA0q+qxwnSwQUkbvzog==", + "requested": "[1.11.0, )", + "resolved": "1.11.0", + "contentHash": "1ncYPNmMaYNPX664uo3FlmSVGETBKQbBvarbGgB5ZynERTFmCsZ7UqefvVe3vnPYOIAGOjbMAbprYF2BfMielg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.9.0, 2.0.0)" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.11.1, 2.0.0)" } }, "PolySharp": { @@ -512,36 +491,6 @@ "resolved": "0.9.6", "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w==" }, - "Google.Protobuf": { - "type": "Transitive", - "resolved": "3.22.5", - "contentHash": "tTMtDZPbLxJew8pk7NBdqhLqC4OipfkZdwPuCEUNr2AoDo1siUGcxFqJK0wDewTL8ge5Cjrb16CToMPxBUHMGA==" - }, - "Grpc.Core.Api": { - "type": "Transitive", - "resolved": "2.52.0", - "contentHash": "SQiPyBczG4vKPmI6Fd+O58GcxxDSFr6nfRAJuBDUNj+PgdokhjWJvZE/La1c09AkL2FVm/jrDloG89nkzmVF7A==", - "dependencies": { - "System.Memory": "4.5.3" - } - }, - "Grpc.Net.Client": { - "type": "Transitive", - "resolved": "2.52.0", - "contentHash": "hWVH9g/Nnjz40ni//2S8UIOyEmhueQREoZIkD0zKHEPqLxXcNlbp4eebXIOicZtkwDSx0TFz9NpkbecEDn6rBw==", - "dependencies": { - "Grpc.Net.Common": "2.52.0", - "Microsoft.Extensions.Logging.Abstractions": "3.0.3" - } - }, - "Grpc.Net.Common": { - "type": "Transitive", - "resolved": "2.52.0", - "contentHash": "di9qzpdx525IxumZdYmu6sG2y/gXJyYeZ1ruFUzB9BJ1nj4kU1/dTAioNCMt1VLRvNVDqh8S8B1oBdKhHJ4xRg==", - "dependencies": { - "Grpc.Core.Api": "2.52.0" - } - }, "ILRepack": { "type": "Transitive", "resolved": "2.0.33", @@ -554,84 +503,84 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "resolved": "9.0.0", + "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "9.0.0", + "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg==" }, "Microsoft.Extensions.Diagnostics.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "resolved": "9.0.0", + "contentHash": "1K8P7XzuzX8W8pmXcZjcrqS6x5eSSdvhQohmcpgiQNY/HlDAlnrhR9dvlURfFz428A+RTCJpUyB+aKTA6AgVcQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "System.Diagnostics.DiagnosticSource": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0" } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", + "resolved": "9.0.0", + "contentHash": "H05HiqaNmg6GjH34ocYE9Wm1twm3Oz2aXZko8GTwGBzM7op2brpAA8pJ5yyD1OpS1mXUtModBYOlcZ/wXeWsSg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "9.0.0" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "9.0.0", + "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", + "resolved": "9.0.0", + "contentHash": "Ob3FXsXkcSMQmGZi7qP07EQ39kZpSBlTcAZLbJLdI4FIf0Jug8biv2HTavWmnTirchctPlq9bl/26CXtQRguzA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.Binder": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.Binder": "9.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.NETFramework.ReferenceAssemblies.net461": { "type": "Transitive", @@ -645,40 +594,35 @@ }, "OpenTelemetry": { "type": "Transitive", - "resolved": "1.9.0", - "contentHash": "7scS6BUhwYeSXEDGhCxMSezmvyCoDU5kFQbmfyW9iVvVTcWhec+1KIN33/LOCdBXRkzt2y7+g03mkdAB0XZ9Fw==", + "resolved": "1.11.1", + "contentHash": "F+HBI2bE7RKmb8Bj0kBtZIVzCfpTe1ZyY6kYP/jny1+9oq7IdBnNsVXZlPev9OqQzRp3iXpJ1UsnN1YOEwdtkQ==", "dependencies": { - "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Configuration": "8.0.0", - "OpenTelemetry.Api.ProviderBuilderExtensions": "1.9.0" + "Microsoft.Extensions.Diagnostics.Abstractions": "9.0.0", + "Microsoft.Extensions.Logging.Configuration": "9.0.0", + "OpenTelemetry.Api.ProviderBuilderExtensions": "1.11.1" } }, "OpenTelemetry.Api": { "type": "Transitive", - "resolved": "1.9.0", - "contentHash": "Xz8ZvM1Lm0m7BbtGBnw2JlPo++YKyMp08zMK5p0mf+cIi5jeMt2+QsYu9X6YEAbjCxBQYwEak5Z8sY6Ig2WcwQ==", + "resolved": "1.11.1", + "contentHash": "KaBjGMqrqQv41mIkvPUvmAG7yxDlI6qchKhjXlOF3ZwsdcRRLrdrkiDLIJ90iZgUoKVdP8fE1fCri9nc+ug0Cg==", "dependencies": { - "System.Diagnostics.DiagnosticSource": "8.0.0" + "System.Diagnostics.DiagnosticSource": "9.0.0" } }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", - "resolved": "1.9.0", - "contentHash": "L0D4LBR5JFmwLun5MCWVGapsJLV0ANZ+XXu9NEI3JE/HRKkRuUO+J2MuHD5DBwiU//QMYYM4B22oev1hVLoHDQ==", + "resolved": "1.11.1", + "contentHash": "vMdNMQeW55jXIa/Kybec/br6jC+rWybniTi6DCW5lz1kGghKso+J+FC3uBgiq0/pTqusfeDbO5PEHGM/r5z8Ow==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "OpenTelemetry.Api": "1.9.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "OpenTelemetry.Api": "1.11.1" } }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==" + "resolved": "9.0.0", + "contentHash": "ddppcFpnbohLWdYKr/ZeLZHmmI+DXFgZ3Snq+/E7SwcdW4UnvxmaugkwGywvGVWkHPGCSZjCP+MLzu23AL5SDw==" }, "System.Reflection.TypeExtensions": { "type": "Transitive", @@ -688,30 +632,31 @@ "Microsoft.Extensions.DependencyInjection": { "type": "CentralTransitive", "requested": "[2.2.0, )", - "resolved": "8.0.0", - "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "resolved": "9.0.0", + "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Logging": { "type": "CentralTransitive", "requested": "[2.2.0, )", - "resolved": "8.0.0", - "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", + "resolved": "9.0.0", + "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "CentralTransitive", "requested": "[2.2.0, )", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "9.0.0", + "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "System.Diagnostics.DiagnosticSource": "9.0.0" } } } diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json index 49a55e861..ad49a8d1d 100644 --- a/Sdk/Speckle.Connectors.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json @@ -319,9 +319,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )", - "Speckle.Sdk": "[3.1.0-dev.249, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )", + "Speckle.Sdk": "[3.1.0-dev.251, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )" } }, "speckle.connectors.logging": { @@ -369,18 +369,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -389,14 +389,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json index e76f61625..578917eec 100644 --- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json @@ -327,7 +327,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.249, )" + "Speckle.Objects": "[3.1.0-dev.251, )" } }, "speckle.testing": { @@ -363,18 +363,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -383,14 +383,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index 57e906290..7ac9bedc6 100644 --- a/Sdk/Speckle.Converters.Common/packages.lock.json +++ b/Sdk/Speckle.Converters.Common/packages.lock.json @@ -50,11 +50,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -310,9 +310,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", @@ -322,14 +322,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } }, "net8.0": { @@ -372,11 +372,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.249" + "Speckle.Sdk": "3.1.0-dev.251" } }, "GraphQL.Client": { @@ -570,9 +570,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==", + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -581,14 +581,14 @@ "Microsoft.Extensions.Logging": "[2.2.0]", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.249" + "Speckle.Sdk.Dependencies": "3.1.0-dev.251" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.249, )", - "resolved": "3.1.0-dev.249", - "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw==" + "requested": "[3.1.0-dev.251, )", + "resolved": "3.1.0-dev.251", + "contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g==" } } } diff --git a/Speckle.Connectors.sln b/Speckle.Connectors.sln index 75e326535..cc65052a7 100644 --- a/Speckle.Connectors.sln +++ b/Speckle.Connectors.sln @@ -277,6 +277,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Importers", "Importers", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester", "Importers\Ifc\Speckle.Importers.Ifc.Tester\Speckle.Importers.Ifc.Tester.csproj", "{FCD6CB79-6B41-4448-99E1-787408AD24B0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Connectors.Common.Tests", "Sdk\Speckle.Connectors.Common.Tests\Speckle.Connectors.Common.Tests.csproj", "{F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Common.MeshTriangulation", "Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj", "{B740A025-1035-4A75-865B-7825857D610C}" EndProject Global @@ -682,6 +684,12 @@ Global {FCD6CB79-6B41-4448-99E1-787408AD24B0}.Local|Any CPU.Build.0 = Debug|Any CPU {FCD6CB79-6B41-4448-99E1-787408AD24B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCD6CB79-6B41-4448-99E1-787408AD24B0}.Release|Any CPU.Build.0 = Release|Any CPU + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Local|Any CPU.ActiveCfg = Debug|Any CPU + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Local|Any CPU.Build.0 = Debug|Any CPU + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Release|Any CPU.Build.0 = Release|Any CPU {B740A025-1035-4A75-865B-7825857D610C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B740A025-1035-4A75-865B-7825857D610C}.Debug|Any CPU.Build.0 = Debug|Any CPU {B740A025-1035-4A75-865B-7825857D610C}.Local|Any CPU.ActiveCfg = Debug|Any CPU @@ -811,6 +819,7 @@ Global {E6B7A640-F85C-41C9-8226-B5310A98822D} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF} {F93052A6-6937-443F-8F1F-4A967A8A2BEF} = {336F0341-5C39-40F7-9377-122FED4E4549} {FCD6CB79-6B41-4448-99E1-787408AD24B0} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF} + {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {B740A025-1035-4A75-865B-7825857D610C} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution