From f29926748c56cee9fc58709540153a295f6bce1f Mon Sep 17 00:00:00 2001 From: Dogukan Karatas <61163577+dogukankaratas@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:21:19 +0200 Subject: [PATCH 01/13] Dogukan/cnx 642 detect selections in Tekla (#312) * added tekla send binding and necessary updates about selection * TeklaSelectionFilter registered * resolved injections * build props added * formatted * deep clean --------- Co-authored-by: Claire Kuang --- .../Bindings/TeklaBasicConnectorBinding.cs | 8 +-- .../Bindings/TeklaSelectionBinding.cs | 72 +++++++++++++++++++ .../Bindings/TeklaSendBinding.cs | 10 +-- .../Filters/TeklaSelectionFilter.cs | 10 +++ .../HostApp/TeklaIdleManager.cs | 32 +++++++++ .../Plugin/TeklaPlugin.cs | 5 +- .../ServiceRegistration.cs | 11 ++- .../SpeckleTeklaPanelHost.cs | 2 +- 8 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSelectionBinding.cs create mode 100644 Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs create mode 100644 Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaIdleManager.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaBasicConnectorBinding.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaBasicConnectorBinding.cs index 0818a358..6e0864ea 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaBasicConnectorBinding.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaBasicConnectorBinding.cs @@ -1,4 +1,4 @@ -using Speckle.Connectors.DUI.Bindings; +using Speckle.Connectors.DUI.Bindings; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models; using Speckle.Connectors.DUI.Models.Card; @@ -34,11 +34,11 @@ DocumentModelStore store public DocumentModelStore GetDocumentState() => _store; - public void AddModel(ModelCard model) => throw new NotImplementedException(); + public void AddModel(ModelCard model) => _store.Models.Add(model); - public void UpdateModel(ModelCard model) => throw new NotImplementedException(); + public void UpdateModel(ModelCard model) => _store.UpdateModel(model); - public void RemoveModel(ModelCard model) => throw new NotImplementedException(); + public void RemoveModel(ModelCard model) => _store.RemoveModel(model); public Task HighlightModel(string modelCardId) => throw new NotImplementedException(); diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSelectionBinding.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSelectionBinding.cs new file mode 100644 index 00000000..cd1ca430 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSelectionBinding.cs @@ -0,0 +1,72 @@ +using Speckle.Connectors.DUI.Bindings; +using Speckle.Connectors.DUI.Bridge; +using Tekla.Structures.Model; + +namespace Speckle.Connector.Tekla2024.Bindings; + +public class TeklaSelectionBinding : ISelectionBinding +{ + private readonly IAppIdleManager _idleManager; + private const string SELECTION_EVENT = "setSelection"; + private readonly Tekla.Structures.Model.Events _events; + private readonly object _selectionEventHandlerLock = new object(); + private readonly Tekla.Structures.Model.UI.ModelObjectSelector _selector; + + public string Name => "selectionBinding"; + public IBrowserBridge Parent { get; } + + public TeklaSelectionBinding( + IAppIdleManager idleManager, + IBrowserBridge parent, + Events events, + Tekla.Structures.Model.UI.ModelObjectSelector selector + ) + { + _idleManager = idleManager; + Parent = parent; + _events = events; + _selector = selector; + + _events.SelectionChange += Events_SelectionChangeEvent; + _events.Register(); + + UpdateSelection(); + } + + private void Events_SelectionChangeEvent() + { + lock (_selectionEventHandlerLock) + { + _idleManager.SubscribeToIdle(nameof(TeklaSelectionBinding), UpdateSelection); + UpdateSelection(); + } + } + + private void UpdateSelection() + { + SelectionInfo selInfo = GetSelection(); + Parent.Send(SELECTION_EVENT, selInfo); + } + + public SelectionInfo GetSelection() + { + ModelObjectEnumerator selectedObjects = _selector.GetSelectedObjects(); + List objectIds = new List(); + List objectTypes = new List(); + + while (selectedObjects.MoveNext()) + { + ModelObject modelObject = selectedObjects.Current; + string globalId = modelObject.Identifier.GUID.ToString(); + objectIds.Add(globalId); + objectTypes.Add(modelObject.GetType().Name); + } + + string typesString = string.Join(", ", objectTypes.Distinct()); + + return new SelectionInfo( + objectIds, + objectIds.Count == 0 ? "No objects selected." : $"{objectIds.Count} objects ({typesString})" + ); + } +} diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs index 77c1f997..2a9d2116 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs @@ -1,4 +1,4 @@ -using Speckle.Connectors.DUI.Bindings; +using Speckle.Connectors.DUI.Bindings; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models.Card.SendFilter; using Speckle.Connectors.DUI.Settings; @@ -9,17 +9,19 @@ public class TeklaSendBinding : ISendBinding { public string Name => "sendBinding"; public IBrowserBridge Parent { get; } + private readonly List _sendFilters; - public TeklaSendBinding(IBrowserBridge parent) + public TeklaSendBinding(IBrowserBridge parent, IEnumerable sendFilters) { Parent = parent; + _sendFilters = sendFilters.ToList(); } - public List GetSendFilters() => []; + public List GetSendFilters() => _sendFilters; public List GetSendSettings() => []; - public Task Send(string modelCardId) => throw new NotImplementedException(); + public Task Send(string modelCardId) => Task.CompletedTask; public void CancelSend(string modelCardId) => throw new NotImplementedException(); diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs new file mode 100644 index 00000000..5980020c --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs @@ -0,0 +1,10 @@ +using Speckle.Connectors.DUI.Models.Card.SendFilter; + +namespace Speckle.Connector.Tekla2024.Filters; + +public class TeklaSelectionFilter : DirectSelectionSendFilter +{ + public override List GetObjectIds() => SelectedObjectIds; + + public override bool CheckExpiry(string[] changedObjectIds) => SelectedObjectIds.Intersect(changedObjectIds).Any(); +} diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaIdleManager.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaIdleManager.cs new file mode 100644 index 00000000..bef02dd5 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaIdleManager.cs @@ -0,0 +1,32 @@ +using Speckle.Connectors.DUI.Bridge; +using Tekla.Structures.Model; + +namespace Speckle.Connector.Tekla2024.HostApp; + +public sealed class TeklaIdleManager : AppIdleManager +{ + private readonly IIdleCallManager _idleCallManager; + private readonly Events _events; + + public TeklaIdleManager(IIdleCallManager idleCallManager, Events events) + : base(idleCallManager) + { + _idleCallManager = idleCallManager; + _events = events; + } + + protected override void AddEvent() + { + _events.ModelSave += TeklaEventsOnIdle; + _events.Register(); + } + + private void TeklaEventsOnIdle() + { + _idleCallManager.AppOnIdle(() => + { + _events.ModelSave -= TeklaEventsOnIdle; + _events.UnRegister(); + }); + } +} diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs index 493f407d..513daa06 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs @@ -1,4 +1,4 @@ -using Tekla.Structures.Plugins; +using Tekla.Structures.Plugins; namespace Speckle.Connector.Tekla2024.Plugin; @@ -8,6 +8,9 @@ namespace Speckle.Connector.Tekla2024.Plugin; public class TeklaPlugin : PluginBase { #pragma warning disable IDE1006 + + static TeklaPlugin() { } + public override bool Run(List Input) { return true; diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs index ebbe88e7..8489e85f 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs @@ -1,10 +1,13 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Speckle.Connector.Tekla2024.Bindings; +using Speckle.Connector.Tekla2024.Filters; using Speckle.Connector.Tekla2024.HostApp; using Speckle.Connectors.Common; using Speckle.Connectors.DUI; using Speckle.Connectors.DUI.Bindings; +using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models; +using Speckle.Connectors.DUI.Models.Card.SendFilter; using Speckle.Connectors.DUI.WebView; namespace Speckle.Connector.Tekla2024; @@ -29,5 +32,11 @@ public static void AddTekla(this IServiceCollection serviceCollection) serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); + + serviceCollection.AddScoped(); + serviceCollection.AddSingleton(new Tekla.Structures.Model.Events()); + serviceCollection.AddSingleton(new Tekla.Structures.Model.UI.ModelObjectSelector()); } } diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs index 220cc892..6eee33c5 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs @@ -1,4 +1,4 @@ -using System.Windows.Forms; +using System.Windows.Forms; using System.Windows.Forms.Integration; using Microsoft.Extensions.DependencyInjection; using Speckle.Connectors.Common; From 613d45da370f5066020caf99af2ee6faebe6910a Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 22 Oct 2024 09:35:12 +0100 Subject: [PATCH 02/13] chore(civil3d): constants fixes and additional conversion polishing (#317) * adds featurelines and additional subassembly info * some constants fixes --- .../HostApp/AutocadMaterialUnpacker.cs | 2 +- .../Speckle.Connectors.Civil3d2023.csproj | 2 +- .../Speckle.Connectors.Civil3d2024.csproj | 2 +- .../Speckle.Connectors.Civil3d2025.csproj | 2 +- .../Raw/DBBodyToSpeckleRawConverter.cs | 8 +-- .../Speckle.Converters.Civil3d2023.csproj | 2 +- .../Speckle.Converters.Civil3d2024.csproj | 2 +- .../Speckle.Converters.Civil3d2025.csproj | 2 +- .../Helpers/CorridorHandler.cs | 67 ++++++++++++++++++- .../Properties/ClassPropertiesExtractor.cs | 44 ++++++++++++ .../Point3dCollectionToSpeckleRawConverter.cs | 2 +- 11 files changed, 119 insertions(+), 16 deletions(-) diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs index db26b6de..1b08a173 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs @@ -70,7 +70,7 @@ List layers } } - // Stage 2: make sure we collect layer colors as well + // Stage 2: make sure we collect layer materials as well foreach (LayerTableRecord layer in layers) { try diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj index 3bcd6299..6591fc36 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj @@ -4,7 +4,7 @@ x64 true 2023 - $(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2023_OR_GREATER + $(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER Debug;Release;Local Program $(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj index 66dcd0fa..4f7d78ed 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj @@ -4,7 +4,7 @@ x64 true 2024 - $(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2024_OR_GREATER + $(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER Debug;Release;Local Program $(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.csproj b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.csproj index 2b4f6501..a8123bf9 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.csproj +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.csproj @@ -4,7 +4,7 @@ x64 true 2025 - $(DefineConstants);CIVIL3D2025;CIVIL3D + $(DefineConstants);CIVIL3D2025;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER Debug;Release;Local true win-x64 diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBBodyToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBBodyToSpeckleRawConverter.cs index 7c327884..39eb631e 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBBodyToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBBodyToSpeckleRawConverter.cs @@ -75,20 +75,16 @@ public SOG.Mesh Convert(ADB.Body target) { vertices = convertedVertices, faces = faces, + area = brep.GetSurfaceArea(), units = _settingsStore.Current.SpeckleUnits, bbox = bbox }; - try - { - mesh.area = brep.GetSurfaceArea(); - } - catch (Exception e) when (!e.IsFatal()) { } try { mesh.volume = brep.GetVolume(); } - catch (Exception e) when (!e.IsFatal()) { } + catch (Autodesk.AutoCAD.BoundaryRepresentation.Exception e) when (!e.IsFatal()) { } return mesh; } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj b/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj index a47a6d94..33a5975c 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj @@ -3,7 +3,7 @@ net48 x64 - $(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2023_OR_GREATER + $(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER Debug;Release;Local diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj b/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj index a56e01f9..f5f3a84f 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj @@ -3,7 +3,7 @@ net48 x64 - $(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2024_OR_GREATER + $(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER Debug;Release;Local diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/Speckle.Converters.Civil3d2025.csproj b/Converters/Civil3d/Speckle.Converters.Civil3d2025/Speckle.Converters.Civil3d2025.csproj index 11117c78..072f0cfc 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/Speckle.Converters.Civil3d2025.csproj +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/Speckle.Converters.Civil3d2025.csproj @@ -2,7 +2,7 @@ net8.0-windows x64 - $(DefineConstants);CIVIL3d2025;CIVIL3D + $(DefineConstants);CIVIL3d2025;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER Debug;Release;Local diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs index 4ced4dfe..6cc4ea65 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs @@ -27,16 +27,19 @@ public sealed class CorridorHandler private readonly ITypedConverter _solidConverter; private readonly ITypedConverter _bodyConverter; + private readonly ITypedConverter _pointCollectionConverter; private readonly IConverterSettingsStore _settingsStore; public CorridorHandler( ITypedConverter solidConverter, ITypedConverter bodyConverter, + ITypedConverter pointCollectionConverter, IConverterSettingsStore settingsStore ) { _solidConverter = solidConverter; _bodyConverter = bodyConverter; + _pointCollectionConverter = pointCollectionConverter; _settingsStore = settingsStore; } @@ -52,7 +55,7 @@ public List GetCorridorChildren(CDB.Corridor corridor) // track children hierarchy ids: string corridorHandle = corridor.Handle.ToString(); - // process baselines + // process baselines and any featurelines found List baselines = new(corridor.Baselines.Count); foreach (CDB.Baseline baseline in corridor.Baselines) { @@ -82,6 +85,42 @@ public List GetCorridorChildren(CDB.Corridor corridor) convertedBaseline["profileId"] = baseline.ProfileId.GetSpeckleApplicationId(); } + // get baseline featurelines + List mainFeatureLines = new(); + foreach ( + CDB.FeatureLineCollection mainFeaturelineCollection in baseline + .MainBaselineFeatureLines + .FeatureLineCollectionMap + ) + { + foreach (CDB.CorridorFeatureLine featureline in mainFeaturelineCollection) + { + mainFeatureLines.Add(FeatureLineToSpeckle(featureline)); + } + } + if (mainFeatureLines.Count > 0) + { + convertedBaseline["mainBaselineFeatureLines"] = mainFeatureLines; + } + + List offsetFeatureLines = new(); + foreach (CDB.BaselineFeatureLines offsetFeaturelineCollection in baseline.OffsetBaselineFeatureLinesCol) // offset featurelines + { + foreach ( + CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.FeatureLineCollectionMap + ) + { + foreach (CDB.CorridorFeatureLine featureline in featurelineCollection) + { + offsetFeatureLines.Add(FeatureLineToSpeckle(featureline)); + } + } + } + if (offsetFeatureLines.Count > 0) + { + convertedBaseline["offsetBaselineFeatureLines"] = mainFeatureLines; + } + // get the baseline regions List regions = new(); foreach (CDB.BaselineRegion region in baseline.BaselineRegions) @@ -228,6 +267,30 @@ CDB.AppliedSubassembly appliedSubassembly speckleAppliedSubassembly["calculatedShapes"] = calculatedShapes; } + private Base FeatureLineToSpeckle(CDB.CorridorFeatureLine featureline) + { + // get the display polylines + var polylines = new List(); + + var polylinePoints = new AG.Point3dCollection(); + for (int i = 0; i < featureline.FeatureLinePoints.Count; i++) + { + var point = featureline.FeatureLinePoints[i]; + if (!point.IsBreak) + { + polylinePoints.Add(point.XYZ); + } + if (polylinePoints.Count > 1 && (i == featureline.FeatureLinePoints.Count - 1 || point.IsBreak)) + { + polylines.Add(_pointCollectionConverter.Convert(polylinePoints)); + polylinePoints.Clear(); + } + } + + // create featureline + return new() { ["codeName"] = featureline.CodeName, ["displayValue"] = polylines }; + } + /// /// Extracts the solids from a corridor and stores in according to property sets on the solid. /// NOTE: The Export Solids method is only available for version 2024 or greater @@ -266,7 +329,7 @@ private void HandleCorridorSolids(CDB.Corridor corridor) if (solidKey is (string, string, string, string, string) validSolidKey) { - if (CorridorSolidsCache.TryGetValue(validSolidKey, out List display)) + if (CorridorSolidsCache.TryGetValue(validSolidKey, out List? display)) { display.Add(mesh); } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs index c72a9e48..333ac804 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs @@ -82,6 +82,49 @@ PipeNetworkHandler pipeNetworkHandler private Dictionary ExtractSubassemblyProperties(CDB.Subassembly subassembly) { Dictionary subassemblyProperties = new(); + + subassemblyProperties["origin"] = _pointConverter.Convert(subassembly.Origin); + + // get shapes > links > points info + Dictionary shapes = new(); + int shapeCount = 0; + foreach (CDB.Shape shape in subassembly.Shapes) + { + Dictionary links = new(); + int linkCount = 0; + foreach (CDB.Link link in shape.Links) + { + Dictionary points = new(); + int pointCount = 0; + foreach (CDB.Point point in link.Points) + { + points[pointCount.ToString()] = new Dictionary() + { + ["elevation"] = point.Elevation, + ["codes"] = point.Codes.ToList(), + ["offset"] = point.Offset, + }; + pointCount++; + } + + links[linkCount.ToString()] = new Dictionary() + { + ["codes"] = link.Codes.ToList(), + ["points"] = points + }; + + linkCount++; + } + + shapes[shapeCount.ToString()] = new Dictionary() + { + ["codes"] = shape.Codes.ToList(), + ["links"] = links + }; + } + + subassemblyProperties["shapes"] = shapes; + if (subassembly.HasSide) { subassemblyProperties["side"] = subassembly.Side; @@ -221,6 +264,7 @@ private void ExtractPartProperties(CDB.Part part, Dictionary di { // get the bounding curve of the catchment SOG.Polyline boundary = _point3dCollectionConverter.Convert(catchment.BoundaryPolyline3d); + boundary.closed = true; // use the catchment group handler to process the catchment's group _catchmentGroupHandler.HandleCatchmentGroup(catchment); diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/Point3dCollectionToSpeckleRawConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/Point3dCollectionToSpeckleRawConverter.cs index 8cb13973..b2c29160 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/Point3dCollectionToSpeckleRawConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/Point3dCollectionToSpeckleRawConverter.cs @@ -40,7 +40,7 @@ public SOG.Polyline Convert(AG.Point3dCollection target) { value = value, units = _settingsStore.Current.SpeckleUnits, - closed = true, + closed = false, length = length }; } From 29cf1327ff78ee2499b2f34ec46aa0c965057e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20Koral?= <45078678+oguzhankoral@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:58:31 +0300 Subject: [PATCH 03/13] Fix(revit): CNX-657 revit expiration checks seem to be not fully working for (#316) * Map element id to unique id * Evict sub elements too * Document IdMap --------- Co-authored-by: Claire Kuang --- .../Bindings/RevitSendBinding.cs | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs index 62cde743..a1de0b81 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs @@ -45,6 +45,11 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding /// private ConcurrentDictionary ChangedObjectIds { get; set; } = new(); + /// + /// We need it to get UniqueId whenever it is not available i.e. GetDeletedElementIds returns ElementId and cannot find its Element to get UniqueId. We store them both just before send to remember later. + /// + private ConcurrentDictionary IdMap { get; } = new(); + public RevitSendBinding( IRevitIdleManager idleManager, RevitContext revitContext, @@ -129,15 +134,22 @@ public async Task Send(string modelCardId) var activeUIDoc = RevitContext.UIApplication?.ActiveUIDocument ?? throw new SpeckleException("Unable to retrieve active UI document"); - List revitObjects = modelCard + + List elements = modelCard .SendFilter.NotNull() .GetObjectIds() .Select(uid => activeUIDoc.Document.GetElement(uid)) - .Where(el => el is not null) // NOTE: elements can get deleted from the host app. - .Select(el => el.Id) + .Where(el => el is not null) .ToList(); - if (revitObjects.Count == 0) + foreach (Element element in elements) + { + IdMap[element.Id.ToString()] = element.UniqueId; + } + + List elementIds = elements.Select(el => el.Id).ToList(); + + if (elementIds.Count == 0) { // Handle as CARD ERROR in this function throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!"); @@ -146,7 +158,7 @@ public async Task Send(string modelCardId) var sendResult = await scope .ServiceProvider.GetRequiredService>() .Execute( - revitObjects, + elementIds, modelCard.GetSendInfo(_speckleApplication.Slug), _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken), cancellationToken @@ -242,7 +254,7 @@ private bool HaveUnitsChanged(Document doc) private async Task RunExpirationChecks() { var senders = Store.GetSenders(); - string[] objectIdsList = ChangedObjectIds.Keys.ToArray(); + // string[] objectIdsList = ChangedObjectIds.Keys.ToArray(); var doc = RevitContext.UIApplication?.ActiveUIDocument.Document; if (doc == null) @@ -250,17 +262,17 @@ private async Task RunExpirationChecks() return; } - // Note: We're using unique ids as application ids in revit, so cache eviction must happen by those. - // NOTE: this is currently broken when deleting freestanding elements (e.g. unhosted elements) - // To reproduce, draw two unconnected walls, send, delete one wall -> no expiration notice - // I do not yet know the solution besides going back to element ids, but it would mean revisiting why we switched to unique ids (conflicting ids) - var objUniqueIds = objectIdsList - .Select(id => new ElementId(Convert.ToInt32(id))) - .Select(doc.GetElement) - .Where(el => el is not null) - .Select(el => el.UniqueId) - .ToList(); - _sendConversionCache.EvictObjects(objUniqueIds); + var objUniqueIds = new List(); + foreach (string changedElementId in ChangedObjectIds.Keys.ToArray()) + { + if (IdMap.TryGetValue(changedElementId, out var uniqueId)) + { + objUniqueIds.Add(uniqueId); + } + } + + var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objUniqueIds); + _sendConversionCache.EvictObjects(unpackedObjectIds); // Note: we're doing object selection and card expiry management by old school ids List expiredSenderIds = new(); @@ -282,6 +294,9 @@ private async Task RunExpirationChecks() // That's why don't bother for now how to get rid of from dup logic in other bindings. private async Task OnDocumentChanged() { + _sendConversionCache.ClearCache(); + IdMap.Clear(); + if (_cancellationManager.NumberOfOperations > 0) { _cancellationManager.CancelAllOperations(); From 797a2b70f31023c42c4d8b34b9a60873d7ee6cf2 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Wed, 23 Oct 2024 12:25:16 +0100 Subject: [PATCH 04/13] adds basecurves for parcel segments (#319) --- .../Helpers/BaseCurveExtractor.cs | 1 + .../BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs index 3fb287ef..74b697b6 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs @@ -54,6 +54,7 @@ IConverterSettingsStore converterSettings case CDB.FeatureLine: case CDB.Parcel: + case CDB.ParcelSegment: return new() { _curveConverter.Convert(entity.BaseCurve) }; // for any entities where basecurve prop doesn't make sense diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs index e655036d..882bab03 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs @@ -104,7 +104,6 @@ public Base Convert(CDB.Entity target) private List? GetSiteChildren(CDB.Site site) { List parcels = new(); - using (var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction()) { foreach (ADB.ObjectId parcelId in site.GetParcelIds()) @@ -115,6 +114,7 @@ public Base Convert(CDB.Entity target) tr.Commit(); } + return parcels.Count > 0 ? parcels : null; } From 6d375312ae21fc39ee98dd17ad7c8ce61df61e15 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Thu, 24 Oct 2024 11:33:31 +0100 Subject: [PATCH 05/13] fix(civil3d): alignment arc logic fixed (#320) * fixing alignment arc calculations * fixes alignment arc conversions * adds units --- .../Properties/ClassPropertiesExtractor.cs | 5 -- ...gnmentSubentityArcToSpeckleRawConverter.cs | 49 ++++++++----------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs index 333ac804..8fd6d705 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs @@ -252,11 +252,6 @@ private void ExtractPartProperties(CDB.Part part, Dictionary di catchmentProperties["featureLineIds"] = GetSpeckleApplicationIdsFromCollection(site.GetFeatureLineIds()); } - if (site.GetParcelIds().Count > 0) - { - catchmentProperties["parcelIds"] = GetSpeckleApplicationIdsFromCollection(site.GetParcelIds()); - } - return catchmentProperties; } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs index 5c6d9c56..f7c62dbe 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs @@ -1,6 +1,5 @@ using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; -using Speckle.Sdk; namespace Speckle.Converters.Civil3dShared.ToSpeckle.Raw; @@ -22,37 +21,30 @@ IConverterSettingsStore settingsStore public SOG.Arc Convert(CDB.AlignmentSubEntityArc target) { + // alignment arcs do not have the same properties as autocad arcs. + // we're assuming they are always 2d arcs on the xy plane to calculate the midpoint string units = _settingsStore.Current.SpeckleUnits; - // calculate midpoint of chord as between start and end point - AG.Point2d chordMid = - new((target.StartPoint.X + target.EndPoint.X) / 2, (target.StartPoint.Y + target.EndPoint.Y) / 2); - - // calculate sagitta as radius minus distance between arc center and chord midpoint - double sagitta = target.Radius - target.CenterPoint.GetDistanceTo(chordMid); - - // get unit vector from arc center to chord mid - AG.Vector2d midVector = target.CenterPoint.GetVectorTo(chordMid); - AG.Vector2d unitMidVector = midVector.DivideBy(midVector.Length); - - // get midpoint of arc by moving chord mid point the length of the sagitta along mid vector - // if greater than 180 >, move in other direction of distance radius + radius - sagitta - // in the case of an exactly perfect half circle arc...🤷‍♀️ - AG.Point2d midPoint = chordMid.Add(unitMidVector.MultiplyBy(sagitta)); - try + // calculate the mid vector (center to PI point (intersection of tangents) + // note: what is the PI point for a perfect half circle? + AG.Point2d piPoint = target.PIPoint; + double midVectorX = piPoint.X - target.CenterPoint.X; + double midVectorY = piPoint.Y - target.CenterPoint.Y; + double midVectorMag = Math.Sqrt(Math.Pow(midVectorX, 2.0) + Math.Pow(midVectorY, 2)); + double midScalingVectorX = target.Radius * midVectorX / midVectorMag; + double midScalingVectorY = target.Radius * midVectorY / midVectorMag; + if (target.Delta > Math.PI) { - if (target.GreaterThan180) // this can throw : The property gets an invalid value according to the entity's constraint type. - { - midPoint = chordMid.Add(unitMidVector.Negate().MultiplyBy(2 * target.Radius - sagitta)); - } + midScalingVectorX *= -1; + midScalingVectorY *= -1; } - catch (Exception e) when (!e.IsFatal()) { } // continue with original midpoint if GreaterThan180 doesn't apply to this arc + + double midPointX = target.CenterPoint.X + midScalingVectorX; + double midPointY = target.CenterPoint.Y + midScalingVectorY; // find arc plane (normal is in clockwise dir) var center3 = new AG.Point3d(target.CenterPoint.X, target.CenterPoint.Y, 0); - AG.Plane plane = target.Clockwise - ? new AG.Plane(center3, AG.Vector3d.ZAxis.MultiplyBy(-1)) - : new AG.Plane(center3, AG.Vector3d.ZAxis); + AG.Plane plane = new AG.Plane(center3, AG.Vector3d.ZAxis); // create arc SOG.Arc arc = @@ -74,21 +66,22 @@ public SOG.Arc Convert(CDB.AlignmentSubEntityArc target) }, midPoint = new() { - x = midPoint.X, - y = midPoint.Y, + x = midPointX, + y = midPointY, z = 0, units = units }, plane = _planeConverter.Convert(plane), radius = target.Radius, + angleRadians = target.Delta, length = target.Length, + units = units, // additional alignment subentity props ["startStation"] = target.StartStation, ["endStation"] = target.EndStation, ["startDirection"] = target.StartDirection, ["endDirection"] = target.EndDirection, - ["delta"] = target.Delta, ["deflectedAngle"] = target.DeflectedAngle, ["minumumRadius"] = target.MinimumRadius }; From 3088fae8a24489034c774d980858ceb3ad5659e0 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Thu, 24 Oct 2024 11:38:52 +0100 Subject: [PATCH 06/13] adds basecurves as display value when no display value exists (#321) --- .../Helpers/DisplayValueExtractor.cs | 4 ++-- .../BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs | 7 ++++--- .../ToSpeckle/Properties/GeneralPropertiesExtractor.cs | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs index 8bf7abea..d85d81c8 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs @@ -31,7 +31,7 @@ IConverterSettingsStore converterSettings _converterSettings = converterSettings; } - public List GetDisplayValue(CDB.Entity entity) + public List? GetDisplayValue(CDB.Entity entity) { switch (entity) { @@ -56,7 +56,7 @@ public List GetDisplayValue(CDB.Entity entity) return new() { gridSurfaceMesh }; default: - return new(); + return null; } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs index 882bab03..5f190690 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs @@ -59,9 +59,10 @@ public Base Convert(CDB.Entity target) civilObject["baseCurves"] = baseCurves; } - // extract display value - List display = _displayValueExtractor.GetDisplayValue(target); - if (display.Count > 0) + // extract display value. + // If object has no display but has basecurves, use basecurves for display instead (for viewer selection) + List? display = _displayValueExtractor.GetDisplayValue(target) ?? baseCurves?.Select(o => (Base)o).ToList(); + if (display is not null) { civilObject["displayValue"] = display; } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs index e5e6ec21..5f961e9c 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs @@ -292,7 +292,7 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F }; speedsCount++; } - designCriteriaDict["Design Speeds"] = designSpeedsDict; + if (designSpeedsDict.Count > 0) { designCriteriaDict["Design Speeds"] = designSpeedsDict; From 68f7cb8f418251ca6df9176ad839b5846f8378e9 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Thu, 24 Oct 2024 14:04:20 +0100 Subject: [PATCH 07/13] fix(civil3d): refactors corridors to only use extracted solids once (#318) * refactors corridors to only use extracted solids once changes applied assemblies and subassemblies to dicts * Update CorridorHandler.cs * refactors corridor display value extractor to its own class * changes scope --- .../Helpers/CorridorDisplayValueExtractor.cs | 184 +++++++++++ .../Helpers/CorridorHandler.cs | 285 +++++++----------- .../Helpers/DisplayValueExtractor.cs | 4 + .../ServiceRegistration.cs | 1 + ...Speckle.Converters.Civil3dShared.projitems | 1 + 5 files changed, 292 insertions(+), 183 deletions(-) create mode 100644 Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs new file mode 100644 index 00000000..8f49b101 --- /dev/null +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs @@ -0,0 +1,184 @@ +using Speckle.Converters.Common; +using Speckle.Converters.Common.Objects; +using Speckle.Sdk; + +namespace Speckle.Converters.Civil3dShared.Helpers; + +/// +/// Constructs a the Corridor Key for a subassembly with the Corridor Handle, Baseline Guid, Region Guid, Assembly Handle, and Subassembly Handle. +/// This order and type is determined by the structure of corridors and the available information on extracted corridor solid property sets. +/// +public readonly struct SubassemblyCorridorKey +{ + public string CorridorId { get; } + public string BaselineId { get; } + public string RegionId { get; } + public string AssemblyId { get; } + public string SubassemblyId { get; } + + public SubassemblyCorridorKey( + string corridorHandle, + string baselineGuid, + string regionGuid, + string assemblyHandle, + string subassemblyHandle + ) + { + CorridorId = corridorHandle.ToLower(); + BaselineId = CleanGuidString(baselineGuid.ToLower()); + RegionId = CleanGuidString(regionGuid.ToLower()); + AssemblyId = assemblyHandle.ToLower(); + SubassemblyId = subassemblyHandle.ToLower(); + } + + // Removes brackets from guid strings - property sets will return guids with brackets (unlike when retrieved from api) + private string CleanGuidString(string guid) + { + guid = guid.Replace("{", "").Replace("}", ""); + return guid; + } + + public override readonly string ToString() => $"{CorridorId}-{BaselineId}-{RegionId}-{AssemblyId}-{SubassemblyId}"; +} + +/// +/// Extracts and stores the display value meshes of a Corridor by the corridor's subassembly corridor keys. +/// +public sealed class CorridorDisplayValueExtractor +{ + /// + /// Keeps track of all corridor solids by their hierarchy of (corridor, baseline, region, applied assembly, applied subassembly) in the current send operation. + /// This should be added to the display value of the corridor applied subassemblies after they are processed + /// Handles should be used instead of Handle.Value (as is typically used for speckle app ids) since the exported solid property sets only stores the handle + /// + public Dictionary> CorridorSolidsCache { get; } = new(); + + // these ints are used to retrieve the correct values from the exported corridor solids property sets to cache them + // they were determined via trial and error +#pragma warning disable CA1805 // Initialized explicitly to 0 + private readonly int _corridorHandleIndex = 0; +#pragma warning restore CA1805 // Initialized explicitly to 0 + private readonly int _baselineGuidIndex = 6; + private readonly int _regionGuidIndex = 7; + private readonly int _assemblyHandleIndex = 3; + private readonly int _subassemblyHandleIndex = 4; + + private readonly ITypedConverter _solidConverter; + private readonly ITypedConverter _bodyConverter; + private readonly IConverterSettingsStore _settingsStore; + + public CorridorDisplayValueExtractor( + ITypedConverter solidConverter, + ITypedConverter bodyConverter, + IConverterSettingsStore settingsStore + ) + { + _solidConverter = solidConverter; + _bodyConverter = bodyConverter; + _settingsStore = settingsStore; + } + + /// + /// Extracts the solids from a corridor and stores them in by their subassembly corridor id. + /// Api method is only available for 2024 or greater. + /// + /// + /// This is pretty complicated because we need to match each extracted solid to a corridor subassembly by inspecting its property sets for identifying information + public void ProcessCorridorSolids(CDB.Corridor corridor) + { +#if CIVIL3D2024_OR_GREATER + + CDB.ExportCorridorSolidsParams param = new(); + + using (var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction()) + { + foreach (ADB.ObjectId solidId in corridor.ExportSolids(param, corridor.Database)) + { + SOG.Mesh? mesh = null; + var solid = tr.GetObject(solidId, ADB.OpenMode.ForRead); + if (solid is ADB.Solid3d solid3d) + { + // get the solid mesh + mesh = _solidConverter.Convert(solid3d); + } + else if (solid is ADB.Body body) + { + mesh = _bodyConverter.Convert(body); + } + + if (mesh is null) + { + continue; + } + + // get the subassembly corridor key from the solid property sets + if (GetSubassemblyKeyFromDBObject(solid, tr) is SubassemblyCorridorKey solidKey) + { + if (CorridorSolidsCache.TryGetValue(solidKey.ToString(), out List? display)) + { + display.Add(mesh); + } + else + { + CorridorSolidsCache[solidKey.ToString()] = new() { mesh }; + } + } + } + + tr.Commit(); + } +#endif + } + + private SubassemblyCorridorKey? GetSubassemblyKeyFromDBObject(ADB.DBObject obj, ADB.Transaction tr) + { + ADB.ObjectIdCollection? propertySetIds; + + try + { + propertySetIds = AAECPDB.PropertyDataServices.GetPropertySets(obj); + } + catch (Exception e) when (!e.IsFatal()) + { + return null; + } + + if (propertySetIds is null || propertySetIds.Count == 0) + { + return null; + } + + foreach (ADB.ObjectId id in propertySetIds) + { + AAECPDB.PropertySet propertySet = (AAECPDB.PropertySet)tr.GetObject(id, ADB.OpenMode.ForRead); + + if (propertySet.PropertySetDefinitionName == "Corridor Identity") + { + if (propertySet.PropertySetData[_corridorHandleIndex].GetData() is not string corridorHandle) + { + return null; + } + if (propertySet.PropertySetData[_baselineGuidIndex].GetData() is not string baselineGuid) + { + return null; + } + if (propertySet.PropertySetData[_regionGuidIndex].GetData() is not string regionGuid) + { + return null; + } + if (propertySet.PropertySetData[_assemblyHandleIndex].GetData() is not string assemblyHandle) + { + return null; + } + if (propertySet.PropertySetData[_subassemblyHandleIndex].GetData() is not string subassemblyHandle) + { + return null; + } + + return new SubassemblyCorridorKey(corridorHandle, baselineGuid, regionGuid, assemblyHandle, subassemblyHandle); + } + } + + return null; + } +} diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs index 6cc4ea65..0e35e13c 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorHandler.cs @@ -6,51 +6,37 @@ namespace Speckle.Converters.Civil3dShared.Helpers; +/// +/// Processes the children of a corridor. Expects to be a singleton service. +/// public sealed class CorridorHandler { - /// - /// Keeps track of all corridor solids by their hierarchy of (corridor, baseline, region, applied assembly, applied subassembly) in the current send operation. - /// This should be added to the display value of the corridor applied subassemblies after they are processed - /// Handles should be used instead of Handle.Value (as is typically used for speckle app ids) since the exported solid property sets only stores the handle - /// - public Dictionary<(string, string, string, string, string), List> CorridorSolidsCache { get; } = new(); - - // these ints are used to retrieve the correct values from the exported corridor solids property sets to cache them - // they were determined via trial and error -#pragma warning disable CA1805 // Initialized explicitly to 0 - private readonly int _corridorHandleIndex = 0; -#pragma warning restore CA1805 // Initialized explicitly to 0 - private readonly int _baselineGuidIndex = 6; - private readonly int _regionGuidIndex = 7; - private readonly int _assemblyHandleIndex = 3; - private readonly int _subassemblyHandleIndex = 4; - - private readonly ITypedConverter _solidConverter; - private readonly ITypedConverter _bodyConverter; + private readonly ITypedConverter _pointConverter; private readonly ITypedConverter _pointCollectionConverter; + private readonly CorridorDisplayValueExtractor _displayValueExtractor; private readonly IConverterSettingsStore _settingsStore; public CorridorHandler( - ITypedConverter solidConverter, - ITypedConverter bodyConverter, + ITypedConverter pointConverter, ITypedConverter pointCollectionConverter, + CorridorDisplayValueExtractor displayValueExtractor, IConverterSettingsStore settingsStore ) { - _solidConverter = solidConverter; - _bodyConverter = bodyConverter; + _pointConverter = pointConverter; _pointCollectionConverter = pointCollectionConverter; + _displayValueExtractor = displayValueExtractor; _settingsStore = settingsStore; } // Ok, this is going to be very complicated. - // We are building a nested `Base.elements` of corridor subelements in this hierarchy: corridor -> baselines -> baseline regions -> applied assemblies -> applied subassemblies - // This is because none of these entities inherit from CDB.Entity, and we need to match the corridor solids with the corresponding applied subassembly. + // We are building a nested `Base.elements` of corridor subelements in this hierarchy: corridor -> baselines -> baseline regions -> assembly -> subassemblies. + // Corridors will also have a dict of applied assemblies -> applied subassemblies attached to the region. + // This handler is in place because none of the corridor children inherit from CDB.Entity public List GetCorridorChildren(CDB.Corridor corridor) { - // first extract all corridor solids. - // this needs to be done before traversing children, so we can match the solid mesh to the appropriate subassembly - HandleCorridorSolids(corridor); + // extract corridor solids for display value first: this will be used later to attach display values to subassemblies. + _displayValueExtractor.ProcessCorridorSolids(corridor); // track children hierarchy ids: string corridorHandle = corridor.Handle.ToString(); @@ -138,32 +124,85 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F ["name"] = region.Name, ["startStation"] = region.StartStation, ["endStation"] = region.EndStation, - ["assemblyId"] = region.AssemblyId.GetSpeckleApplicationId(), ["units"] = _settingsStore.Current.SpeckleUnits, ["applicationId"] = regionGuid, }; - // get the region applied assemblies - List appliedAssemblies = new(); + // traverse region assembly for subassemblies and codes + // display values (corridor solids) will be dumped here, by their code + Dictionary subassemblyNameCache = new(); + using (var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction()) + { + var assembly = (CDB.Assembly)tr.GetObject(region.AssemblyId, ADB.OpenMode.ForRead); + string assemblyHandle = region.AssemblyId.Handle.ToString(); + + // traverse groups for subassemblies + List subassemblies = new(); + foreach (CDB.AssemblyGroup group in assembly.Groups) + { + foreach (ADB.ObjectId subassemblyId in group.GetSubassemblyIds()) + { + var subassembly = (CDB.Subassembly)tr.GetObject(subassemblyId, ADB.OpenMode.ForRead); + string subassemblyHandle = subassemblyId.Handle.ToString(); + + // store name in cache for later use by applied subassemblies + subassemblyNameCache[subassemblyId] = subassembly.Name; + + Base convertedSubassembly = + new() + { + ["name"] = subassembly.Name, + ["type"] = subassembly.GetType().ToString().Split('.').Last(), + applicationId = subassembly.GetSpeckleApplicationId() + }; + + // try to get the display value mesh from the corridor display value extractor by subassembly key + SubassemblyCorridorKey subassemblyKey = + new(corridorHandle, baselineGuid, regionGuid, assemblyHandle, subassemblyHandle); + + if ( + _displayValueExtractor.CorridorSolidsCache.TryGetValue( + subassemblyKey.ToString(), + out List? display + ) + ) + { + convertedSubassembly["displayValue"] = display; + } + + subassemblies.Add(convertedSubassembly); + } + } + + Base convertedAssembly = + new() + { + ["name"] = assembly.Name, + ["type"] = assembly.GetType().ToString().Split('.').Last(), + ["subassemblies"] = subassemblies, + applicationId = assembly.GetSpeckleApplicationId() + }; + + convertedRegion["assembly"] = convertedAssembly; + + tr.Commit(); + } + + // now get all region applied assemblies, applied subassemblies, and calculated shapes, links, and points as dicts + Dictionary appliedAssemblies = new(); double[] sortedStations = region.SortedStations(); for (int i = 0; i < sortedStations.Length; i++) { double station = sortedStations[i]; CDB.AppliedAssembly appliedAssembly = region.AppliedAssemblies[i]; - string assemblyHandle = appliedAssembly.AssemblyId.Handle.ToString(); - Base convertedAppliedAssembly = - new() - { - ["type"] = appliedAssembly.GetType().ToString().Split('.').Last(), - ["assemblyId"] = appliedAssembly.AssemblyId.GetSpeckleApplicationId(), - ["station"] = station, - ["units"] = _settingsStore.Current.SpeckleUnits - }; + + Dictionary appliedAssemblyDict = + new() { ["assemblyId"] = appliedAssembly.AssemblyId.GetSpeckleApplicationId(), ["station"] = station }; try { - convertedAppliedAssembly["adjustedElevation"] = appliedAssembly.AdjustedElevation; + appliedAssemblyDict["adjustedElevation"] = appliedAssembly.AdjustedElevation; } catch (ArgumentException e) when (!e.IsFatal()) { @@ -171,45 +210,29 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F } // get the applied assembly's applied subassemblies - List appliedSubassemblies = new(appliedAssembly.GetAppliedSubassemblies().Count); - + Dictionary appliedSubassemblies = new(); foreach (CDB.AppliedSubassembly appliedSubassembly in appliedAssembly.GetAppliedSubassemblies()) { - string subassemblyHandle = appliedSubassembly.SubassemblyId.Handle.ToString(); + string subassemblyId = appliedSubassembly.SubassemblyId.GetSpeckleApplicationId(); + string name = subassemblyNameCache.TryGetValue(appliedSubassembly.SubassemblyId, out string? cachedName) + ? cachedName + : subassemblyId; - Base convertedAppliedSubassembly = + Dictionary appliedSubassemblyDict = new() { - ["type"] = appliedSubassembly.GetType().ToString().Split('.').Last(), - ["subassemblyId"] = appliedSubassembly.SubassemblyId.GetSpeckleApplicationId(), - ["units"] = _settingsStore.Current.SpeckleUnits + ["subassemblyId"] = subassemblyId, + ["calculatedShapes"] = GetCalculatedShapes(appliedSubassembly) }; - // try to get the display value mesh - (string, string, string, string, string) corridorSolidsKey = ( - corridorHandle, - baselineGuid, - regionGuid, - assemblyHandle, - subassemblyHandle - ); - - if (CorridorSolidsCache.TryGetValue(corridorSolidsKey, out List? display)) - { - convertedAppliedSubassembly["displayValue"] = display; - } - - // get the applied subassembly's calculated stuff - AddSubassemblyCalculatedProperties(convertedAppliedSubassembly, appliedSubassembly); - - appliedSubassemblies.Add(convertedAppliedSubassembly); + appliedSubassemblies[name] = appliedSubassemblyDict; } + appliedAssemblyDict["appliedSubassemblies"] = appliedSubassemblies; - convertedAppliedAssembly["elements"] = appliedSubassemblies; - appliedAssemblies.Add(convertedAppliedAssembly); + appliedAssemblies[station.ToString()] = appliedAssemblyDict; } - convertedRegion["elements"] = appliedAssemblies; + convertedRegion["appliedAssemblies"] = appliedAssemblies; regions.Add(convertedRegion); } @@ -220,11 +243,8 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F return baselines; } - // Adds the calculated shapes > calculated links > calculated points as dicts to the applied subassembly - private void AddSubassemblyCalculatedProperties( - Base speckleAppliedSubassembly, - CDB.AppliedSubassembly appliedSubassembly - ) + // Gets the calculated shapes > calculated links > calculated points of an applied subassembly + private Dictionary GetCalculatedShapes(CDB.AppliedSubassembly appliedSubassembly) { Dictionary calculatedShapes = new(); int shapeCount = 0; @@ -240,7 +260,7 @@ CDB.AppliedSubassembly appliedSubassembly { calculatedPoints[pointCount.ToString()] = new Dictionary() { - ["xyz"] = point.XYZ.ToArray(), + ["xyz"] = _pointConverter.Convert(point.XYZ), ["corridorCodes"] = point.CorridorCodes.ToList(), ["stationOffsetElevationToBaseline"] = point.StationOffsetElevationToBaseline.ToArray(), }; @@ -263,8 +283,7 @@ CDB.AppliedSubassembly appliedSubassembly ["calculatedLinks"] = calculatedLinks }; } - - speckleAppliedSubassembly["calculatedShapes"] = calculatedShapes; + return calculatedShapes; } private Base FeatureLineToSpeckle(CDB.CorridorFeatureLine featureline) @@ -288,112 +307,12 @@ private Base FeatureLineToSpeckle(CDB.CorridorFeatureLine featureline) } // create featureline - return new() { ["codeName"] = featureline.CodeName, ["displayValue"] = polylines }; - } - - /// - /// Extracts the solids from a corridor and stores in according to property sets on the solid. - /// NOTE: The Export Solids method is only available for version 2024 or greater - /// - /// - /// - private void HandleCorridorSolids(CDB.Corridor corridor) - { -#if CIVIL3D2024_OR_GREATER - CDB.ExportCorridorSolidsParams param = new(); - - using (var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction()) - { - foreach (ADB.ObjectId solidId in corridor.ExportSolids(param, corridor.Database)) - { - SOG.Mesh? mesh = null; - var solid = tr.GetObject(solidId, ADB.OpenMode.ForRead); - if (solid is ADB.Solid3d solid3d) - { - // get the solid mesh - mesh = _solidConverter.Convert(solid3d); - } - else if (solid is ADB.Body body) - { - mesh = _bodyConverter.Convert(body); - } - - if (mesh is null) - { - continue; - } - - // get the (corridor handle, baseline guid, region guid, assembly handle, subassembly handle) of the solid property sets - (string corridor, string baseline, string region, string assembly, string subassembly)? solidKey = - GetCorridorSolidIdFromPropertySet(solid, tr); - - if (solidKey is (string, string, string, string, string) validSolidKey) - { - if (CorridorSolidsCache.TryGetValue(validSolidKey, out List? display)) - { - display.Add(mesh); - } - else - { - CorridorSolidsCache[validSolidKey] = new() { mesh }; - } - } - } - - tr.Commit(); - } -#endif - } - - private (string, string, string, string, string)? GetCorridorSolidIdFromPropertySet( - ADB.DBObject obj, - ADB.Transaction tr - ) - { - ADB.ObjectIdCollection? propertySetIds; - - try + return new() { - propertySetIds = AAECPDB.PropertyDataServices.GetPropertySets(obj); - } - catch (Exception e) when (!e.IsFatal()) - { - return null; - } - - if (propertySetIds is null || propertySetIds.Count == 0) - { - return null; - } - - foreach (ADB.ObjectId id in propertySetIds) - { - AAECPDB.PropertySet propertySet = (AAECPDB.PropertySet)tr.GetObject(id, ADB.OpenMode.ForRead); - - if (propertySet.PropertySetDefinitionName == "Corridor Identity") - { - AAECPDB.PropertySetData corridorData = propertySet.PropertySetData[_corridorHandleIndex]; - AAECPDB.PropertySetData baselineData = propertySet.PropertySetData[_baselineGuidIndex]; - AAECPDB.PropertySetData regionData = propertySet.PropertySetData[_regionGuidIndex]; - AAECPDB.PropertySetData assemblyData = propertySet.PropertySetData[_assemblyHandleIndex]; - AAECPDB.PropertySetData subassemblyData = propertySet.PropertySetData[_subassemblyHandleIndex]; - - return - corridorData.GetData() is not string corridorHandle - || baselineData.GetData() is not string baselineGuid // guid is uppercase and enclosed in {} which need to be removed - || regionData.GetData() is not string regionGuid // guid is uppercase and enclosed in {} which need to be removed - || assemblyData.GetData() is not string assemblyHandle - || subassemblyData.GetData() is not string subassemblyHandle - ? null - : ( - corridorHandle, - baselineGuid[1..^1].ToLower(), - regionGuid[1..^1].ToLower(), - assemblyHandle, - subassemblyHandle - ); - } - } - return null; + ["name"] = featureline.CodeName, + ["type"] = featureline.GetType().ToString().Split('.').Last(), + ["codeName"] = featureline.CodeName, + ["displayValue"] = polylines + }; } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs index d85d81c8..af1c6ae2 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs @@ -55,6 +55,10 @@ IConverterSettingsStore converterSettings SOG.Mesh gridSurfaceMesh = _gridSurfaceConverter.Convert(gridSurface); return new() { gridSurfaceMesh }; + // Corridors are complicated: their display values are extracted in the CorridorHandler when processing corridor children, since they are attached to the corridor subassemblies. + case CDB.Corridor: + return new(); + default: return null; } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs index 38f277c4..6b57c26a 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs @@ -45,5 +45,6 @@ public static void AddCivil3dConverters(this IServiceCollection serviceCollectio serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); + serviceCollection.AddScoped(); } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems index 62c0f54d..db39ca9d 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems @@ -15,6 +15,7 @@ + From 08bf19f74f52163c29f81db212ceacc0d3b6336f Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Thu, 24 Oct 2024 15:14:18 +0100 Subject: [PATCH 08/13] Use new Deserialization with Tasks (#308) * Fixes for new Deserialization usage * Use new serialization from nuget * format * better progress when checking cache and downloading * remove the speed as it's inaccurate * update sdk dependencies --- .../packages.lock.json | 60 ++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 60 ++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 60 ++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 60 ++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 61 +++++---- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 63 +++++----- .../packages.lock.json | 60 ++++----- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 60 ++++----- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 58 ++++----- .../packages.lock.json | 119 ++++++++---------- .../Speckle.Connectors.DUI.csproj | 2 + .../Speckle.Connectors.DUI/packages.lock.json | 58 ++++----- Directory.Packages.props | 7 +- .../Operations/PassthroughProgress.cs | 33 ++++- .../Operations/ProgressDisplayManager.cs | 20 +-- .../Operations/ReceiveOperation.cs | 36 +++--- .../Speckle.Connectors.Common.csproj | 2 + .../packages.lock.json | 53 ++++---- .../ProgressDisplayManagerTests.cs | 6 +- .../packages.lock.json | 55 ++++---- .../packages.lock.json | 52 ++++---- .../packages.lock.json | 53 ++++---- 49 files changed, 1207 insertions(+), 1386 deletions(-) diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json index f0866916..4da60d52 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json @@ -76,6 +76,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -161,24 +166,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -244,8 +231,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -253,7 +241,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -278,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -310,31 +299,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json index 19af999f..2429bc38 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -274,8 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -283,7 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -308,7 +300,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -346,31 +338,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json index 4ec63d83..c697539b 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -274,8 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -283,7 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -308,7 +300,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -346,31 +338,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json index 9d252671..23a83acf 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -274,8 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -283,7 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -309,7 +301,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -347,31 +339,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json index a9258454..7a08511f 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json @@ -70,6 +70,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -155,24 +160,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -238,8 +225,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -247,7 +235,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -273,7 +262,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -311,31 +300,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json index d4631de1..a749cfd2 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -283,8 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -292,7 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -318,7 +310,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -356,31 +348,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json index 244824e8..dd404713 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -283,8 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -292,7 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -318,7 +310,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -356,31 +348,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index b7fdad80..249a0e0b 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -283,8 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -292,7 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -318,7 +310,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -356,31 +348,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json index 808d2642..a15571a8 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json @@ -79,6 +79,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -164,24 +169,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -247,8 +234,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -256,7 +244,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -283,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -321,31 +310,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json index 73c41a8b..e816d975 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json @@ -99,6 +99,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -184,24 +192,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -302,8 +292,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -311,7 +302,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -322,7 +314,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.converters.revit2022": { @@ -361,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Revit.API": { @@ -376,22 +368,27 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json index e4114035..783febf8 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json @@ -99,6 +99,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -184,24 +192,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -302,8 +292,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -311,7 +302,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -322,7 +314,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.converters.revit2023": { @@ -361,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Revit.API": { @@ -376,22 +368,27 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json index 9c694a8c..21e40fe3 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json @@ -99,6 +99,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -184,24 +192,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -302,8 +292,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -311,7 +302,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -322,7 +314,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.converters.revit2024": { @@ -361,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Revit.API": { @@ -376,22 +368,27 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json index 716db46d..0663ee51 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json @@ -92,6 +92,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -177,24 +182,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -260,8 +247,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -269,7 +257,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -287,7 +276,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.converters.revit2025": { @@ -332,11 +321,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Revit.API": { @@ -347,22 +336,27 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index dd0abb15..349f28cb 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -283,8 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -292,7 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -310,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.converters.rhino7": { @@ -355,31 +347,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json index f60e36ff..4dd112a4 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -283,8 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -292,7 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -310,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.converters.rhino8": { @@ -355,31 +347,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json index 18e93fa1..c74dacad 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json @@ -109,6 +109,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -199,24 +207,6 @@ "resolved": "0.11.4", "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -399,8 +389,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -408,7 +399,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -457,31 +449,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json index 406af65b..c3f432f5 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json @@ -70,6 +70,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -155,24 +160,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -237,7 +224,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -260,30 +247,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index f3c7bc64..4b0cacc8 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index c6e104c0..fe5f047d 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index 45823bf9..308cf7a1 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -274,8 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -283,7 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -301,7 +293,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -339,31 +331,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json index e9db2066..11e8e5d0 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json @@ -70,6 +70,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -155,24 +160,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -238,8 +225,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -247,7 +235,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -265,7 +254,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -303,31 +292,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json index 4283d9f9..b5de6915 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -282,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -305,30 +295,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json index 368f65b1..7d217b55 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -282,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -305,30 +295,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index dd7293f6..45e3effb 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json @@ -80,6 +80,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -165,24 +173,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -282,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -305,30 +295,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json index c3d5274c..bc68fbe2 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json @@ -79,6 +79,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -164,24 +169,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -247,8 +234,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -256,7 +244,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -274,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -312,31 +301,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json index 322fadb8..0e21a6d4 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json @@ -133,6 +133,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -250,24 +255,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -363,7 +350,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.testing": { @@ -393,30 +380,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index ff498fea..9b28acb0 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json index 9d586b7e..29a2db34 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json @@ -133,6 +133,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -250,24 +255,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -363,7 +350,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.testing": { @@ -393,30 +380,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index 8ada0ee5..3b822f5b 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json index 8f6942e3..c8c2d120 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json @@ -133,6 +133,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -250,24 +255,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -363,7 +350,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.testing": { @@ -393,30 +380,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index f21e2627..381e3a48 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 5f01cf85..9a77e02c 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json @@ -70,6 +70,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -155,24 +160,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -237,7 +224,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -260,30 +247,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json index 03fef84b..8901d96d 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json @@ -133,6 +133,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -250,24 +255,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -363,7 +350,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.testing": { @@ -393,30 +380,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index ded5ea52..8cd36d5d 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index fc7b11b5..a798c5e9 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -273,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "Microsoft.Extensions.Logging": { @@ -296,30 +286,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json index 8908c313..d0815e3a 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -124,6 +124,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -236,24 +241,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -342,8 +329,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -351,7 +339,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -394,31 +383,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json index f83ebe60..894686ef 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json @@ -71,6 +71,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -156,24 +164,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -274,8 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -283,7 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -319,31 +311,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", @@ -420,6 +417,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -505,24 +507,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -588,8 +572,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.dui": { @@ -597,7 +582,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.164, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -633,31 +619,36 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", "requested": "[6.0.0, )", diff --git a/DUI3/Speckle.Connectors.DUI/Speckle.Connectors.DUI.csproj b/DUI3/Speckle.Connectors.DUI/Speckle.Connectors.DUI.csproj index ef192e83..8f3048e1 100644 --- a/DUI3/Speckle.Connectors.DUI/Speckle.Connectors.DUI.csproj +++ b/DUI3/Speckle.Connectors.DUI/Speckle.Connectors.DUI.csproj @@ -20,8 +20,10 @@ + + diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index 08f43f56..3efcda94 100644 --- a/DUI3/Speckle.Connectors.DUI/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json @@ -50,22 +50,27 @@ }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "Direct", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "System.Threading.Tasks.Dataflow": { "type": "Direct", "requested": "[6.0.0, )", @@ -103,6 +108,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -198,24 +211,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -325,8 +320,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.logging": { @@ -355,11 +351,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index 319af5ed..07bde9ee 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,8 +38,9 @@ - - + + + @@ -47,4 +48,4 @@ - \ No newline at end of file + diff --git a/Sdk/Speckle.Connectors.Common/Operations/PassthroughProgress.cs b/Sdk/Speckle.Connectors.Common/Operations/PassthroughProgress.cs index b21833e0..265c9554 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/PassthroughProgress.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/PassthroughProgress.cs @@ -2,7 +2,36 @@ namespace Speckle.Connectors.Common.Operations; -public class PassthroughProgress(Action progressCallback) : IProgress +public class PassthroughProgress : IProgress { - public void Report(ProgressArgs value) => progressCallback.Invoke(value); + private readonly Action _progressCallback; + private readonly Dictionary _totals = new(); + + public PassthroughProgress(Action progressCallback) + { + _progressCallback = progressCallback; + foreach (ProgressEvent value in Enum.GetValues(typeof(ProgressEvent))) + { + _totals[value] = 0; + } + } + + public void Report(ProgressArgs value) + { + if (value.ProgressEvent == ProgressEvent.DownloadBytes) + { + long totalBytes; + lock (_totals) + { + _totals[value.ProgressEvent] += value.Count; + totalBytes = _totals[value.ProgressEvent]; + } + + _progressCallback(value with { Count = totalBytes }); + } + else + { + _progressCallback(value); + } + } } diff --git a/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs b/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs index 9ec44399..639194f5 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs @@ -11,7 +11,12 @@ public class ProgressDisplayManager(IStopwatchManager stopwatch) : IProgressDisp public void Begin() => stopwatch.Start(); - public double LastCount { get; set; } + private long _lastCount; + public long LastCount + { + get => _lastCount; + set => _lastCount = value; + } public bool ShouldUpdate() { @@ -26,9 +31,9 @@ public bool ShouldUpdate() public double? CalculatePercentage(ProgressArgs args) { double? percentage = null; - if (args.Count is not null && args.Total is not null) + if (args.Total is not null) { - percentage = (double)args.Count.Value / args.Total.Value; + percentage = (double)args.Count / args.Total.Value; } return percentage; @@ -36,13 +41,12 @@ public bool ShouldUpdate() public string CalculateSpeed(ProgressArgs args) { - if (args.Count is null) + if (args.Count == 0) { return string.Empty; } - - var countPerSecond = (args.Count.Value - LastCount) / stopwatch.ElapsedSeconds; - LastCount = args.Count.Value; + var countPerSecond = (args.Count - _lastCount) / stopwatch.ElapsedSeconds; + Interlocked.Exchange(ref _lastCount, args.Count); switch (args.ProgressEvent) { @@ -51,6 +55,8 @@ public string CalculateSpeed(ProgressArgs args) return $"{ToFileSize(countPerSecond)} / sec"; case ProgressEvent.DeserializeObject: case ProgressEvent.SerializeObject: + case ProgressEvent.DownloadObject: + case ProgressEvent.UploadObject: return $"{ThreeNonZeroDigits(countPerSecond)} objects / sec"; default: return string.Empty; diff --git a/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs b/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs index a680d64f..7e622d29 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs @@ -57,13 +57,25 @@ CancellationToken cancellationToken using var transport = _serverTransportFactory.Create(account, receiveInfo.ProjectId); + double? previousPercentage = null; _progressDisplayManager.Begin(); Base? commitObject = await _operations - .Receive( + .Receive2( + new Uri(account.serverInfo.url), + receiveInfo.ProjectId, version.referencedObject, - transport, + account.token, onProgressAction: new PassthroughProgress(args => { + if (args.ProgressEvent == ProgressEvent.CacheCheck || args.ProgressEvent == ProgressEvent.DownloadBytes) + { + switch (args.ProgressEvent) + { + case ProgressEvent.CacheCheck: + previousPercentage = _progressDisplayManager.CalculatePercentage(args); + break; + } + } if (!_progressDisplayManager.ShouldUpdate()) { return; @@ -71,24 +83,12 @@ CancellationToken cancellationToken switch (args.ProgressEvent) { - case ProgressEvent.DownloadBytes: //TODO: OnOperationProgress is not awaited here. - onOperationProgressed.Report( - new( - $"Downloading ({_progressDisplayManager.CalculateSpeed(args)})", - _progressDisplayManager.CalculatePercentage(args) - ) - ); - break; - case ProgressEvent.DownloadObject: - onOperationProgressed.Report(new("Downloading Root Object...", null)); + case ProgressEvent.CacheCheck: + case ProgressEvent.DownloadBytes: + onOperationProgressed.Report(new("Checking and Downloading... ", previousPercentage)); break; case ProgressEvent.DeserializeObject: - onOperationProgressed.Report( - new( - $"Deserializing ({_progressDisplayManager.CalculateSpeed(args)})", - _progressDisplayManager.CalculatePercentage(args) - ) - ); + onOperationProgressed.Report(new("Deserializing ...", _progressDisplayManager.CalculatePercentage(args))); break; } }), diff --git a/Sdk/Speckle.Connectors.Common/Speckle.Connectors.Common.csproj b/Sdk/Speckle.Connectors.Common/Speckle.Connectors.Common.csproj index 3b90f2d2..e521cbc3 100644 --- a/Sdk/Speckle.Connectors.Common/Speckle.Connectors.Common.csproj +++ b/Sdk/Speckle.Connectors.Common/Speckle.Connectors.Common.csproj @@ -11,9 +11,11 @@ + + diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json index 0f941113..49b01fb4 100644 --- a/Sdk/Speckle.Connectors.Common/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common/packages.lock.json @@ -53,31 +53,36 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } }, + "Speckle.Sdk.Dependencies": { + "type": "Direct", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" + }, "GraphQL.Client": { "type": "Transitive", "resolved": "6.0.0", @@ -109,6 +114,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -204,24 +217,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", diff --git a/Sdk/Speckle.Connectors.Tests/ProgressDisplayManagerTests.cs b/Sdk/Speckle.Connectors.Tests/ProgressDisplayManagerTests.cs index a76fd326..b99c1380 100644 --- a/Sdk/Speckle.Connectors.Tests/ProgressDisplayManagerTests.cs +++ b/Sdk/Speckle.Connectors.Tests/ProgressDisplayManagerTests.cs @@ -10,11 +10,9 @@ public class ProgressDisplayManagerTests : MoqTest { [Test] [TestCase(5, 10, 0.5)] - [TestCase(null, 10, null)] [TestCase(1, null, null)] - [TestCase(null, null, null)] [TestCase(10, 10, 1)] - public void TestPercentage(long? count, long? total, double? percentage) + public void TestPercentage(long count, long? total, double? percentage) { var stopwatch = Create(); var manager = new ProgressDisplayManager(stopwatch.Object); @@ -26,7 +24,7 @@ public void TestPercentage(long? count, long? total, double? percentage) [TestCase(1, 1, 6, 10, "5.00 bytes / sec")] [TestCase(1, 0, 6, 10, "0 bytes / sec")] //infinity [TestCase(1 * 1024 * 1024, 1, 6 * 1024 * 1024, 10 * 1024 * 1024, "5.00 MB / sec")] - public void TestSpeed(long previousCount, long elapsed, long? count, long? total, string? percentage) + public void TestSpeed(long previousCount, long elapsed, long count, long? total, string? percentage) { var stopwatch = Create(); stopwatch.Setup(x => x.ElapsedSeconds).Returns(elapsed); diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json index 7faa56e3..6d957304 100644 --- a/Sdk/Speckle.Connectors.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json @@ -124,6 +124,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -236,24 +241,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -342,8 +329,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )", - "Speckle.Sdk": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )", + "Speckle.Sdk": "[3.1.0-dev.167, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.167, )" } }, "speckle.connectors.logging": { @@ -385,30 +373,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json index f63e7a5e..851d516e 100644 --- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json @@ -133,6 +133,11 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -245,24 +250,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -350,7 +337,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.164, )" + "Speckle.Objects": "[3.1.0-dev.167, )" } }, "speckle.testing": { @@ -380,30 +367,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index c51d87f0..56fb4033 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.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "VpMlOcApkQPLn90Xb5K+2nH64wN3NJ906u/YaM1oGAMw7v1SoYPbb5i03bFLuOw/Ho1KSGI0ccU82Jpi9p+n8A==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.164" + "Speckle.Sdk": "3.1.0-dev.167" } }, "GraphQL.Client": { @@ -88,6 +88,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -183,24 +191,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Polly": { - "type": "Transitive", - "resolved": "7.2.3", - "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" - }, - "Polly.Contrib.WaitAndRetry": { - "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" - }, - "Polly.Extensions.Http": { - "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", - "dependencies": { - "Polly": "7.1.0" - } - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -319,21 +309,26 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.164, )", - "resolved": "3.1.0-dev.164", - "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "KGbynDH2vFca7NqpVTp3KvNDE5zdX/ZuCtjdtqGG7rS8r5x2YMT6Ptk2RKJrpPNCaNL/YnuiZ425JLWua4lfqw==", "dependencies": { "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", "Microsoft.Data.Sqlite": "7.0.7", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", "Microsoft.Extensions.Logging": "2.2.0", - "Polly": "7.2.3", - "Polly.Contrib.WaitAndRetry": "1.1.1", - "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", - "Speckle.Newtonsoft.Json": "13.0.2" + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.167" } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.167, )", + "resolved": "3.1.0-dev.167", + "contentHash": "LOV43Wn6IYWfK+ifz/XfcYDaL5ZFF6wLVJQGgSkaNEpGOBitCg6bQc2AuNuy5QHk85dbB1QS9XXEXjeoMxugLg==" } } } From 900427ad307d519ae8f5f0ab3ef4140d7899857e Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Thu, 24 Oct 2024 17:22:54 +0100 Subject: [PATCH 09/13] fix(autocad): arc to host conversions fixed to remove dependency on incoming arc plane and angle props (#325) * removes dependencies on incoming arc plane and angle props * fixes incorrect root to speckle naming * Update Speckle.Converters.AutocadShared.projitems --- ...Converter.cs => AutocadRootToSpeckleConverter.cs} | 4 ++-- .../ServiceRegistration.cs | 4 ++-- .../Speckle.Converters.AutocadShared.projitems | 2 +- .../ToHost/Geometry/ArcToHostConverter.cs | 12 +++++++----- .../ToHost/Raw/ArcToHostRawConverter.cs | 10 ---------- 5 files changed, 12 insertions(+), 20 deletions(-) rename Converters/Autocad/Speckle.Converters.AutocadShared/{AutocadRootToHostConverter.cs => AutocadRootToSpeckleConverter.cs} (92%) diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/AutocadRootToHostConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/AutocadRootToSpeckleConverter.cs similarity index 92% rename from Converters/Autocad/Speckle.Converters.AutocadShared/AutocadRootToHostConverter.cs rename to Converters/Autocad/Speckle.Converters.AutocadShared/AutocadRootToSpeckleConverter.cs index a165142a..c6cdfe40 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/AutocadRootToHostConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/AutocadRootToSpeckleConverter.cs @@ -7,12 +7,12 @@ namespace Speckle.Converters.Autocad; -public class AutocadRootToHostConverter : IRootToSpeckleConverter +public class AutocadRootToSpeckleConverter : IRootToSpeckleConverter { private readonly IConverterManager _toSpeckle; private readonly IConverterSettingsStore _settingsStore; - public AutocadRootToHostConverter( + public AutocadRootToSpeckleConverter( IConverterManager toSpeckle, IConverterSettingsStore settingsStore ) diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs index e5ca83c1..3db647bd 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using Microsoft.Extensions.DependencyInjection; using Speckle.Converters.Common; using Speckle.Converters.Common.Registration; @@ -14,7 +14,7 @@ public static void AddAutocadConverters(this IServiceCollection serviceCollectio //register types by default serviceCollection.AddMatchingInterfacesAsTransient(converterAssembly); // add single root converter - serviceCollection.AddRootCommon(converterAssembly); + serviceCollection.AddRootCommon(converterAssembly); // add application converters and context stack serviceCollection.AddApplicationConverters(converterAssembly); diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems b/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems index d303d2d3..b4966066 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems @@ -11,7 +11,7 @@ - + diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/ArcToHostConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/ArcToHostConverter.cs index c86714f4..bc1b7fb1 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/ArcToHostConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/ArcToHostConverter.cs @@ -31,11 +31,13 @@ public ADB.Arc Convert(SOG.Arc target) AG.CircularArc3d circularArc = _arcConverter.Convert(target); // calculate adjusted start and end angles from circularArc reference - AG.Plane plane = _planeConverter.Convert(target.plane); - double angle = circularArc.ReferenceVector.AngleOnPlane(plane); - double startAngle = circularArc.StartAngle + angle; - double endAngle = circularArc.EndAngle + angle; + // for some reason, if just the circular arc start and end angle props are used, this moves the endpoints of the created arc + // so we need to calculate the adjusted start and end angles from the circularArc reference vector. + AG.Plane plane = new(circularArc.Center, circularArc.Normal); + double angleOnPlane = circularArc.ReferenceVector.AngleOnPlane(plane); + double adjustedStartAngle = circularArc.StartAngle + angleOnPlane; + double adjustEndAngle = circularArc.EndAngle + angleOnPlane; - return new(circularArc.Center, circularArc.Normal, circularArc.Radius, startAngle, endAngle); + return new(circularArc.Center, circularArc.Normal, circularArc.Radius, adjustedStartAngle, adjustEndAngle); } } diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/ArcToHostRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/ArcToHostRawConverter.cs index 7537a70e..6a68b43a 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/ArcToHostRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/ArcToHostRawConverter.cs @@ -27,16 +27,6 @@ public AG.CircularArc3d Convert(SOG.Arc target) AG.Point3d end = _pointConverter.Convert(target.endPoint); AG.Point3d mid = _pointConverter.Convert(target.midPoint); AG.CircularArc3d arc = new(start, mid, end); - - AG.Vector3d normal = _vectorConverter.Convert(target.plane.normal); - AG.Vector3d xdir = _vectorConverter.Convert(target.plane.xdir); - arc.SetAxes(normal, xdir); - - if (target.startAngle is double startAngle && target.endAngle is double endAngle) - { - arc.SetAngles(startAngle, endAngle); - } - return arc; } } From a14b0a6fd051e593cc43053a5a23a177e8d23fd3 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Fri, 25 Oct 2024 12:43:37 +0100 Subject: [PATCH 10/13] feat(rhino): adds names to all objects on bake (#327) * adds names to all objects on bake * Update RhinoHostObjectBuilder.cs * refactors to pass in attributes for bake from parent * adds name property to all rhino objects on send --- .../Receive/RhinoHostObjectBuilder.cs | 34 ++++++++++++++----- .../RhinoObjectToSpeckleTopLevelConverter.cs | 6 +++- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Receive/RhinoHostObjectBuilder.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Receive/RhinoHostObjectBuilder.cs index e1bf9336..80f44c35 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Receive/RhinoHostObjectBuilder.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Receive/RhinoHostObjectBuilder.cs @@ -129,9 +129,13 @@ CancellationToken cancellationToken onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count)); try { - // 1: get pre-created layer from cache in layer baker + // 0: get pre-created layer from cache in layer baker int layerIndex = _layerBaker.GetAndCreateLayerFromPath(path, baseLayerName); + // 1: create object attributes for baking + string name = obj["name"] as string ?? ""; + using ObjectAttributes atts = new() { LayerIndex = layerIndex, Name = name }; + // 2: convert var result = _converter.Convert(obj); @@ -139,7 +143,7 @@ CancellationToken cancellationToken var conversionIds = new List(); if (result is GeometryBase geometryBase) { - var guid = BakeObject(geometryBase, obj, layerIndex); + var guid = BakeObject(geometryBase, obj, atts); conversionIds.Add(guid.ToString()); } else if (result is List geometryBases) // one to many raw encoding case @@ -150,13 +154,13 @@ CancellationToken cancellationToken // EXTRA EXTRA NOTE: TY Ogu, i am no longer than unhappy about it. It's legit "mess". foreach (var gb in geometryBases) { - var guid = BakeObject(gb, obj, layerIndex); + var guid = BakeObject(gb, obj, atts); conversionIds.Add(guid.ToString()); } } else if (result is IEnumerable<(object, Base)> fallbackConversionResult) // one to many fallback conversion { - var guids = BakeObjectsAsGroup(fallbackConversionResult, obj, layerIndex, baseLayerName); + var guids = BakeObjectsAsFallbackGroup(fallbackConversionResult, obj, atts, baseLayerName); conversionIds.AddRange(guids.Select(id => id.ToString())); } @@ -253,9 +257,19 @@ private void PreReceiveDeepClean(string baseLayerName) _groupBaker.PurgeGroups(baseLayerName); } - private Guid BakeObject(GeometryBase obj, Base originalObject, int layerIndex) + /// + /// Bakes an object to the document. + /// + /// + /// + /// + /// + /// + /// Material and Color attributes are processed here due to those properties existing sometimes on fallback geometry (instead of parent). + /// and this method is called by + /// + private Guid BakeObject(GeometryBase obj, Base originalObject, ObjectAttributes atts) { - ObjectAttributes atts = new() { LayerIndex = layerIndex }; var objectId = originalObject.applicationId ?? originalObject.id; if (_materialBaker.ObjectIdAndMaterialIndexMap.TryGetValue(objectId, out int mIndex)) @@ -273,10 +287,10 @@ private Guid BakeObject(GeometryBase obj, Base originalObject, int layerIndex) return _converterSettings.Current.Document.Objects.Add(obj, atts); } - private List BakeObjectsAsGroup( + private List BakeObjectsAsFallbackGroup( IEnumerable<(object, Base)> fallbackConversionResult, Base originatingObject, - int layerIndex, + ObjectAttributes atts, string baseLayerName ) { @@ -289,7 +303,7 @@ string baseLayerName continue; } - var id = BakeObject(geometryBase, originalBaseObject, layerIndex); + var id = BakeObject(geometryBase, originalBaseObject, atts); objectIds.Add(id); } @@ -297,7 +311,9 @@ string baseLayerName $@"{originatingObject.speckle_type.Split('.').Last()} - {originatingObject.applicationId ?? originatingObject.id} ({baseLayerName})", objectIds ); + var group = _converterSettings.Current.Document.Groups.FindIndex(groupIndex); + objectIds.Insert(0, group.Id); return objectIds; } diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/TopLevel/RhinoObjectToSpeckleTopLevelConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/TopLevel/RhinoObjectToSpeckleTopLevelConverter.cs index 9638229c..7ec873b6 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/TopLevel/RhinoObjectToSpeckleTopLevelConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/TopLevel/RhinoObjectToSpeckleTopLevelConverter.cs @@ -1,4 +1,4 @@ -using Speckle.Converters.Common.Objects; +using Speckle.Converters.Common.Objects; using Speckle.Sdk.Models; using RhinoObject = Rhino.DocObjects.RhinoObject; @@ -28,6 +28,10 @@ public virtual Base Convert(object target) // POC: Any common operations for all RhinoObjects should be done here, not on the specific implementer // Things like user-dictionaries and other user-defined metadata. + if (!string.IsNullOrEmpty(typedTarget.Attributes.Name)) + { + result["name"] = typedTarget.Attributes.Name; + } return result; } From af7bc47cbf8d66f2f7c691fe776871a2c8e1d458 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Fri, 25 Oct 2024 15:07:45 +0100 Subject: [PATCH 11/13] fix(civil3d/rhino): adds correct curves to displayvalue and receiving arcs as fallback in rhino (#326) * processes basecurves to appropriate display values in autocad and adds arcs to supported fallback curves in rhino * turns on recursive conversion resolution by default --- .../Civil3dRootToSpeckleConverter.cs | 2 +- .../Helpers/DisplayValueExtractor.cs | 39 +++++++++++++++++++ .../CivilEntityToSpeckleTopLevelConverter.cs | 3 +- .../RevitRootToSpeckleConverter.cs | 2 +- .../FallbackToHostTopLevelConverter.cs | 6 ++- .../Registration/ConverterManager.cs | 2 +- .../Registration/IConverterManager.cs | 4 +- 7 files changed, 51 insertions(+), 7 deletions(-) diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs index e6b8c554..a0d0430a 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs @@ -55,7 +55,7 @@ public Base Convert(object target) properties = GetCivilEntityProperties(civilEntity); } - var objectConverter = _toSpeckle.ResolveConverter(type, true); + var objectConverter = _toSpeckle.ResolveConverter(type); try { diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs index af1c6ae2..2c3c2ebf 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; +using Speckle.Objects; using Speckle.Sdk.Models; namespace Speckle.Converters.Civil3dShared.Helpers; @@ -63,4 +64,42 @@ IConverterSettingsStore converterSettings return null; } } + + /// + /// Processes a list of ICurves for suitable display value curves. + /// + /// + /// + /// List of simple curves: lines, polylines, and arcs. + /// Null if no suitable display curves were found. + /// + public List? ProcessICurvesForDisplay(List? iCurves) + { + if (iCurves is null) + { + return null; + } + + List result = new(); + foreach (ICurve curve in iCurves) + { + switch (curve) + { + case SOG.Line: + case SOG.Polyline: + case SOG.Arc: + result.Add((Base)curve); + break; + case SOG.Polycurve polycurve: + List? processedSegments = ProcessICurvesForDisplay(polycurve.segments); + if (processedSegments is not null) + { + result.AddRange(processedSegments); + } + break; + } + } + + return result.Count > 0 ? result : null; + } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs index 5f190690..02df1472 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs @@ -61,7 +61,8 @@ public Base Convert(CDB.Entity target) // extract display value. // If object has no display but has basecurves, use basecurves for display instead (for viewer selection) - List? display = _displayValueExtractor.GetDisplayValue(target) ?? baseCurves?.Select(o => (Base)o).ToList(); + List? display = + _displayValueExtractor.GetDisplayValue(target) ?? _displayValueExtractor.ProcessICurvesForDisplay(baseCurves); if (display is not null) { civilObject["displayValue"] = display; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/RevitRootToSpeckleConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/RevitRootToSpeckleConverter.cs index a29910a2..cc112060 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/RevitRootToSpeckleConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/RevitRootToSpeckleConverter.cs @@ -43,7 +43,7 @@ public Base Convert(object target) throw new ValidationException($"Target object is not a db element, it's a {target.GetType()}"); } - var objectConverter = _toSpeckle.ResolveConverter(target.GetType(), true); + var objectConverter = _toSpeckle.ResolveConverter(target.GetType()); Base result = objectConverter.Convert(target); diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/FallbackToHostTopLevelConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/FallbackToHostTopLevelConverter.cs index 3fd7a910..24beb37a 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/FallbackToHostTopLevelConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/TopLevel/FallbackToHostTopLevelConverter.cs @@ -1,4 +1,4 @@ -using Speckle.Converters.Common; +using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; using Speckle.Sdk.Common; using Speckle.Sdk.Common.Exceptions; @@ -14,6 +14,7 @@ public class FallbackToHostTopLevelConverter private readonly ITypedConverter _pointConverter; private readonly ITypedConverter _lineConverter; private readonly ITypedConverter _polylineConverter; + private readonly ITypedConverter _arcConverter; private readonly ITypedConverter _meshConverter; private readonly IConverterSettingsStore _settingsStore; @@ -21,6 +22,7 @@ public FallbackToHostTopLevelConverter( ITypedConverter pointConverter, ITypedConverter lineConverter, ITypedConverter polylineConverter, + ITypedConverter arcConverter, ITypedConverter meshConverter, IConverterSettingsStore settingsStore ) @@ -28,6 +30,7 @@ IConverterSettingsStore settingsStore _pointConverter = pointConverter; _lineConverter = lineConverter; _polylineConverter = polylineConverter; + _arcConverter = arcConverter; _meshConverter = meshConverter; _settingsStore = settingsStore; } @@ -43,6 +46,7 @@ IConverterSettingsStore settingsStore { SOG.Line line => _lineConverter.Convert(line), SOG.Polyline polyline => _polylineConverter.Convert(polyline), + SOG.Arc arc => _arcConverter.Convert(arc), SOG.Mesh mesh => _meshConverter.Convert(mesh), SOG.Point point => _pointConverter.Convert(point), _ => throw new ConversionException($"Found unsupported fallback geometry: {item.GetType()}") diff --git a/Sdk/Speckle.Converters.Common/Registration/ConverterManager.cs b/Sdk/Speckle.Converters.Common/Registration/ConverterManager.cs index 9ef4d96c..49a1558f 100644 --- a/Sdk/Speckle.Converters.Common/Registration/ConverterManager.cs +++ b/Sdk/Speckle.Converters.Common/Registration/ConverterManager.cs @@ -9,7 +9,7 @@ public class ConverterManager(ConcurrentDictionary converterTyp { public string Name => typeof(T).Name; - public T ResolveConverter(Type type, bool recursive = false) + public T ResolveConverter(Type type, bool recursive = true) { var currentType = type; while (true) diff --git a/Sdk/Speckle.Converters.Common/Registration/IConverterManager.cs b/Sdk/Speckle.Converters.Common/Registration/IConverterManager.cs index dab7e628..6be88928 100644 --- a/Sdk/Speckle.Converters.Common/Registration/IConverterManager.cs +++ b/Sdk/Speckle.Converters.Common/Registration/IConverterManager.cs @@ -1,7 +1,7 @@ -namespace Speckle.Converters.Common.Registration; +namespace Speckle.Converters.Common.Registration; public interface IConverterManager { public string Name { get; } - public T ResolveConverter(Type type, bool recursive = false); + public T ResolveConverter(Type type, bool recursive = true); } From 76701627b66a71bdead69cdeb1809fcd536244f8 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 28 Oct 2024 09:48:41 +0000 Subject: [PATCH 12/13] adds missing surface properties and extension dictionaries (#324) --- .../Civil3dRootToSpeckleConverter.cs | 47 ++++++++------- .../ServiceRegistration.cs | 1 + ...Speckle.Converters.Civil3dShared.projitems | 1 + .../ExtensionDictionaryExtractor.cs | 57 +++++++++++++++++++ .../Properties/GeneralPropertiesExtractor.cs | 7 +++ 5 files changed, 92 insertions(+), 21 deletions(-) create mode 100644 Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs index a0d0430a..b09be19c 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs @@ -16,13 +16,15 @@ public class Civil3dRootToSpeckleConverter : IRootToSpeckleConverter private readonly PartDataExtractor _partDataExtractor; private readonly PropertySetExtractor _propertySetExtractor; private readonly GeneralPropertiesExtractor _generalPropertiesExtractor; + private readonly ExtensionDictionaryExtractor _extensionDictionaryExtractor; public Civil3dRootToSpeckleConverter( IConverterManager toSpeckle, IConverterSettingsStore settingsStore, PartDataExtractor partDataExtractor, PropertySetExtractor propertySetExtractor, - GeneralPropertiesExtractor generalPropertiesExtractor + GeneralPropertiesExtractor generalPropertiesExtractor, + ExtensionDictionaryExtractor extensionDictionaryExtractor ) { _toSpeckle = toSpeckle; @@ -30,6 +32,7 @@ GeneralPropertiesExtractor generalPropertiesExtractor _partDataExtractor = partDataExtractor; _propertySetExtractor = propertySetExtractor; _generalPropertiesExtractor = generalPropertiesExtractor; + _extensionDictionaryExtractor = extensionDictionaryExtractor; } public Base Convert(object target) @@ -86,29 +89,31 @@ public Base Convert(object target) { Dictionary properties = new(); - // get general properties - Dictionary? generalProperties = _generalPropertiesExtractor.GetGeneralProperties(entity); - if (generalProperties is not null && generalProperties.Count > 0) - { - properties.Add("Properties", generalProperties); - } + AddDictionaryToPropertyDictionary( + _generalPropertiesExtractor.GetGeneralProperties(entity), + "General Properties", + properties + ); + AddDictionaryToPropertyDictionary(_partDataExtractor.GetPartData(entity), "Part Data", properties); + AddDictionaryToPropertyDictionary(_propertySetExtractor.GetPropertySets(entity), "Property Sets", properties); + AddDictionaryToPropertyDictionary( + _extensionDictionaryExtractor.GetExtensionDictionary(entity), + "Extension Dictionary", + properties + ); - // get part data - Dictionary? partData = _partDataExtractor.GetPartData(entity); - if (partData is not null && partData.Count > 0) - { - properties.Add("Part Data", partData); - } + return properties; + } - // get property set data - Dictionary? propertySets = _propertySetExtractor.GetPropertySets(entity); - if (propertySets is not null && propertySets.Count > 0) + private void AddDictionaryToPropertyDictionary( + Dictionary? entryDictionary, + string entryName, + Dictionary propertyDictionary + ) + { + if (entryDictionary is not null && entryDictionary.Count > 0) { - properties.Add("Property Sets", propertySets); + propertyDictionary.Add(entryName, entryDictionary); } - - // TODO: add XDATA here - - return properties; } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs index 6b57c26a..dc990d7b 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs @@ -42,6 +42,7 @@ public static void AddCivil3dConverters(this IServiceCollection serviceCollectio serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); + serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems index db39ca9d..9a515053 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems @@ -25,6 +25,7 @@ + diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs new file mode 100644 index 00000000..024fba91 --- /dev/null +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs @@ -0,0 +1,57 @@ +using Speckle.Converters.Common; + +namespace Speckle.Converters.Civil3dShared.ToSpeckle; + +/// +/// Extracts extension dictionaries out from an element. Expects to be scoped per operation. +/// +public class ExtensionDictionaryExtractor +{ + private readonly IConverterSettingsStore _settingsStore; + + public ExtensionDictionaryExtractor(IConverterSettingsStore settingsStore) + { + _settingsStore = settingsStore; + } + + /// + /// Extracts extension dictionary out from an entity. Expects to be scoped per operation. + /// + /// + /// + public Dictionary? GetExtensionDictionary(CDB.Entity entity) + { + if (entity is null || entity.ExtensionDictionary == ADB.ObjectId.Null) + { + return null; + } + + Dictionary extensionDictionaryDict = new(); + + using (ADB.Transaction tr = _settingsStore.Current.Document.TransactionManager.StartTransaction()) + { + var extensionDictionary = (ADB.DBDictionary)tr.GetObject(entity.ExtensionDictionary, ADB.OpenMode.ForRead, false); + + foreach (ADB.DBDictionaryEntry entry in extensionDictionary) + { + if (tr.GetObject(entry.Value, ADB.OpenMode.ForRead) is ADB.Xrecord xRecord) // sometimes these can be RXClass objects, in property sets + { + Dictionary entryDict = new(); + foreach (ADB.TypedValue xEntry in xRecord.Data) + { + entryDict[xEntry.TypeCode.ToString()] = xEntry.Value; + } + + if (entryDict.Count > 0) + { + extensionDictionaryDict[$"{entry.Key}"] = entryDict; + } + } + } + + tr.Commit(); + } + + return extensionDictionaryDict.Count > 0 ? extensionDictionaryDict : null; + } +} diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs index 5f961e9c..3c2478d5 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs @@ -331,7 +331,11 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F switch (surface) { case CDB.TinSurface tinSurface: + statisticsDict["Terrain"] = ExtractPropertiesGeneric( + tinSurface.GetTerrainProperties() + ); statisticsDict["TIN"] = ExtractPropertiesGeneric(tinSurface.GetTinProperties()); + break; case CDB.TinVolumeSurface tinVolumeSurface: statisticsDict["TIN"] = ExtractPropertiesGeneric(tinVolumeSurface.GetTinProperties()); @@ -340,6 +344,9 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F ); break; case CDB.GridSurface gridSurface: + statisticsDict["Terrain"] = ExtractPropertiesGeneric( + gridSurface.GetTerrainProperties() + ); statisticsDict["Grid"] = ExtractPropertiesGeneric(gridSurface.GetGridProperties()); break; case CDB.GridVolumeSurface gridVolumeSurface: From e2866d2595d3fba965cbb2cc90aff50021853e7f Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 28 Oct 2024 09:55:29 +0000 Subject: [PATCH 13/13] chore(civil3d): refactor to yield return (#329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * processes basecurves to appropriate display values in autocad and adds arcs to supported fallback curves in rhino * turns on recursive conversion resolution by default * minor refactor --------- Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com> --- .../Helpers/DisplayValueExtractor.cs | 33 +++++----- .../CivilEntityToSpeckleTopLevelConverter.cs | 64 +++++++++++-------- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs index 2c3c2ebf..49591520 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs @@ -32,7 +32,7 @@ IConverterSettingsStore converterSettings _converterSettings = converterSettings; } - public List? GetDisplayValue(CDB.Entity entity) + public IEnumerable GetDisplayValue(CDB.Entity entity) { switch (entity) { @@ -40,28 +40,32 @@ IConverterSettingsStore converterSettings SOG.Polyline featurelinePolyline = _pointCollectionConverter.Convert( featureline.GetPoints(Autodesk.Civil.FeatureLinePointType.PIPoint) ); - return new() { featurelinePolyline }; + yield return featurelinePolyline; + break; // pipe networks: https://help.autodesk.com/view/CIV3D/2025/ENU/?guid=ade47b62-debf-f899-9b94-5645a620ab4f case CDB.Part part: SOG.Mesh partMesh = _solidConverter.Convert(part.Solid3dBody); - return new() { partMesh }; + yield return partMesh; + break; // surfaces: https://help.autodesk.com/view/CIV3D/2025/ENU/?guid=d741aa49-e7da-9513-6b0b-226ebe3fa43f // POC: volume surfaces not supported case CDB.TinSurface tinSurface: SOG.Mesh tinSurfaceMesh = _tinSurfaceConverter.Convert(tinSurface); - return new() { tinSurfaceMesh }; + yield return tinSurfaceMesh; + break; case CDB.GridSurface gridSurface: SOG.Mesh gridSurfaceMesh = _gridSurfaceConverter.Convert(gridSurface); - return new() { gridSurfaceMesh }; + yield return gridSurfaceMesh; + break; // Corridors are complicated: their display values are extracted in the CorridorHandler when processing corridor children, since they are attached to the corridor subassemblies. case CDB.Corridor: - return new(); + yield break; default: - return null; + yield break; } } @@ -73,14 +77,13 @@ IConverterSettingsStore converterSettings /// List of simple curves: lines, polylines, and arcs. /// Null if no suitable display curves were found. /// - public List? ProcessICurvesForDisplay(List? iCurves) + public IEnumerable ProcessICurvesForDisplay(List? iCurves) { if (iCurves is null) { - return null; + yield break; } - List result = new(); foreach (ICurve curve in iCurves) { switch (curve) @@ -88,18 +91,16 @@ IConverterSettingsStore converterSettings case SOG.Line: case SOG.Polyline: case SOG.Arc: - result.Add((Base)curve); + yield return (Base)curve; break; case SOG.Polycurve polycurve: - List? processedSegments = ProcessICurvesForDisplay(polycurve.segments); - if (processedSegments is not null) + IEnumerable processedSegments = ProcessICurvesForDisplay(polycurve.segments); + foreach (Base processedSegment in processedSegments) { - result.AddRange(processedSegments); + yield return processedSegment; } break; } } - - return result.Count > 0 ? result : null; } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs index 02df1472..1960ea1b 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/BuiltElements/CivilEntityToSpeckleTopLevelConverter.cs @@ -61,11 +61,14 @@ public Base Convert(CDB.Entity target) // extract display value. // If object has no display but has basecurves, use basecurves for display instead (for viewer selection) - List? display = - _displayValueExtractor.GetDisplayValue(target) ?? _displayValueExtractor.ProcessICurvesForDisplay(baseCurves); - if (display is not null) + List displayValue = _displayValueExtractor.GetDisplayValue(target).ToList(); + if (displayValue.Count == 0) { - civilObject["displayValue"] = display; + displayValue = _displayValueExtractor.ProcessICurvesForDisplay(baseCurves).ToList(); + } + if (displayValue.Count > 0) + { + civilObject["displayValue"] = displayValue; } // add any additional class properties @@ -80,60 +83,69 @@ public Base Convert(CDB.Entity target) // determine if this entity has any children elements that need to be converted. // this is a bespoke method by class type. - List? children = null; - switch (target) + var children = GetEntityChildren(target).ToList(); + if (children.Count > 0) + { + civilObject["elements"] = children; + } + + return civilObject; + } + + private IEnumerable GetEntityChildren(CDB.Entity entity) + { + switch (entity) { case CDB.Alignment alignment: - children = GetAlignmentChildren(alignment); + var alignmentChildren = GetAlignmentChildren(alignment); + foreach (var child in alignmentChildren) + { + yield return child; + } break; case CDB.Corridor corridor: - children = _corridorHandler.GetCorridorChildren(corridor); + var corridorChildren = _corridorHandler.GetCorridorChildren(corridor); + foreach (var child in corridorChildren) + { + yield return child; + } break; case CDB.Site site: - children = GetSiteChildren(site); + var siteChildren = GetSiteChildren(site).ToList(); + foreach (var child in siteChildren) + { + yield return child; + } break; } - - if (children is not null) - { - civilObject["elements"] = children; - } - - return civilObject; } - private List? GetSiteChildren(CDB.Site site) + private IEnumerable GetSiteChildren(CDB.Site site) { - List parcels = new(); using (var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction()) { foreach (ADB.ObjectId parcelId in site.GetParcelIds()) { var parcel = (CDB.Parcel)tr.GetObject(parcelId, ADB.OpenMode.ForRead); - parcels.Add(Convert(parcel)); + yield return Convert(parcel); } tr.Commit(); } - - return parcels.Count > 0 ? parcels : null; } - private List? GetAlignmentChildren(CDB.Alignment alignment) + private IEnumerable GetAlignmentChildren(CDB.Alignment alignment) { - List profiles = new(); using (var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction()) { foreach (ADB.ObjectId profileId in alignment.GetProfileIds()) { var profile = (CDB.Profile)tr.GetObject(profileId, ADB.OpenMode.ForRead); - profiles.Add(Convert(profile)); + yield return Convert(profile); } tr.Commit(); } - - return profiles.Count > 0 ? profiles : null; } }