From aee97d2c77aa35126a154234e9f8e5316cacfc4f Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 28 Oct 2024 18:32:29 +0000 Subject: [PATCH 1/9] updates constructors and deprecates any unused code & functionality --- .../HostApp/AutocadMaterialUnpacker.cs | 12 +- .../HostApp/RhinoMaterialUnpacker.cs | 9 +- .../ToHost/Raw/GisFeatureToHostConverter.cs | 32 --- .../Utils/ArcGISFieldUtils.cs | 47 +--- .../Utils/CRSoffsetRotation.cs | 31 --- .../Utils/CRSorigin.cs | 35 --- .../Helpers/ParameterValueSetter.cs | 204 ------------------ .../Helpers/RevitToSpeckleCacheSingleton.cs | 8 +- .../ServiceRegistration.cs | 3 +- .../Speckle.Converters.RevitShared.projitems | 3 - ...erialAsRevitMaterialConversionToSpeckle.cs | 55 ----- .../Raw/MaterialQuantitiesToSpeckle.cs | 66 ------ .../Raw/ParameterConversionToSpeckle.cs | 40 ---- .../CeilingTopLevelConverterToSpeckle.cs | 2 +- .../DirectShapeTopLevelConverterToSpeckle.cs | 7 +- .../FloorTopLevelConverterToSpeckle.cs | 3 +- ...FootPrintRoofToSpeckleTopLevelConverter.cs | 6 +- .../RoomTopLevelConverterToSpeckle.cs | 21 +- 18 files changed, 45 insertions(+), 539 deletions(-) delete mode 100644 Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/GisFeatureToHostConverter.cs delete mode 100644 Converters/Revit/Speckle.Converters.RevitShared/Helpers/ParameterValueSetter.cs delete mode 100644 Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialAsRevitMaterialConversionToSpeckle.cs delete mode 100644 Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ParameterConversionToSpeckle.cs diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs index 1b08a1735..9b1f843b3 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs @@ -110,10 +110,14 @@ private RenderMaterialProxy ConvertMaterialToRenderMaterialProxy(Material materi diffuseColor.Blue ); - string name = material.Name; - double opacity = material.Opacity.Percentage; - - RenderMaterial renderMaterial = new(opacity: opacity, diffuse: diffuse) { name = name, applicationId = id }; + RenderMaterial renderMaterial = + new() + { + name = material.Name, + opacity = material.Opacity.Percentage, + diffuse = diffuse.ToArgb(), + applicationId = id + }; // Add additional properties renderMaterial["ior"] = material.Refraction.Index; diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoMaterialUnpacker.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoMaterialUnpacker.cs index 24a31a5fc..d4b16bb5f 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoMaterialUnpacker.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoMaterialUnpacker.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Rhino; using Rhino.DocObjects; using Rhino.Render; @@ -180,9 +180,14 @@ private SpeckleRenderMaterial ConvertRenderMaterialToSpeckle(RenderMaterial rend : pbRenderMaterial.Emission.AsSystemColor(); // pbRenderMaterial.emission gives wrong color for emission materials, and material.emissioncolor gives the wrong value for most others *shrug* SpeckleRenderMaterial speckleRenderMaterial = - new(opacity, pbRenderMaterial.Metallic, pbRenderMaterial.Roughness, diffuse, emissive) + new() { name = renderMaterialName, + opacity = opacity, + metalness = pbRenderMaterial.Metallic, + roughness = pbRenderMaterial.Roughness, + diffuse = diffuse.ToArgb(), + emissive = emissive.ToArgb(), applicationId = renderMaterial.Id.ToString() }; diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/GisFeatureToHostConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/GisFeatureToHostConverter.cs deleted file mode 100644 index 5fe697442..000000000 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/GisFeatureToHostConverter.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Speckle.Converters.Common.Objects; -using Speckle.Objects.GIS; -using Speckle.Sdk.Models; - -namespace Speckle.Converters.ArcGIS3.ToHost.Raw; - -/// -/// Converter for (which is sent by QGIS V2) with geometry. -/// -/// Thrown when GisFeature has null or empty geometry -public class GisFeatureToHostConverter : ITypedConverter -{ - private readonly ITypedConverter, ACG.Geometry> _geometryConverter; - - public GisFeatureToHostConverter(ITypedConverter, ACG.Geometry> geometryConverter) - { - _geometryConverter = geometryConverter; - } - - public (Base, ACG.Geometry) Convert(GisFeature target) - { - if (target.geometry is List geometry) - { - ACG.Geometry nativeShape = _geometryConverter.Convert(geometry); - return (target, nativeShape); - } - else - { - throw new ArgumentException("GisFeature had null or empty geometry"); - } - } -} diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/ArcGISFieldUtils.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/ArcGISFieldUtils.cs index e577297a6..5e48fb6de 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/ArcGISFieldUtils.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/ArcGISFieldUtils.cs @@ -186,49 +186,10 @@ List fieldAdded { if (field.Value is Base attributeBase) { - // only traverse Base if it's Rhino userStrings, or Revit parameter, or Base containing Revit parameters - if (field.Key == "parameters") - { - foreach (KeyValuePair attributField in attributeBase.GetMembers(DynamicBaseMemberType.Dynamic)) - { - // only iterate through elements if they are actually Revit Parameters or parameter IDs - if ( - attributField.Value is Objects.BuiltElements.Revit.Parameter - || attributField.Key == "applicationId" - || attributField.Key == "id" - ) - { - KeyValuePair newAttributField = - new($"{field.Key}.{attributField.Key}", attributField.Value); - Func functionAdded = x => (function(x) as Base)?[attributField.Key]; - TraverseAttributes(newAttributField, functionAdded, fieldsAndFunctions, fieldAdded); - } - } - } - else if (field.Key == "userStrings") - { - foreach (KeyValuePair attributField in attributeBase.GetMembers(DynamicBaseMemberType.Dynamic)) - { - KeyValuePair newAttributField = new($"{field.Key}.{attributField.Key}", attributField.Value); - Func functionAdded = x => (function(x) as Base)?[attributField.Key]; - TraverseAttributes(newAttributField, functionAdded, fieldsAndFunctions, fieldAdded); - } - } - else if (field.Value is Objects.BuiltElements.Revit.Parameter) - { - foreach ( - KeyValuePair attributField in attributeBase.GetMembers(DynamicBaseMemberType.Instance) - ) - { - KeyValuePair newAttributField = new($"{field.Key}.{attributField.Key}", attributField.Value); - Func functionAdded = x => (function(x) as Base)?[attributField.Key]; - TraverseAttributes(newAttributField, functionAdded, fieldsAndFunctions, fieldAdded); - } - } - else - { - // for now, ignore all other properties of Base type - } + // Revit parameters are sent under the `properties` field as a `Dictionary`. + // This is the same for attributes from other applications. No Speckle objects should have attributes of type `Base`. + // Currently we are not sending any rhino user strings. + // TODO: add support for attributes of type `Dictionary` } else if (field.Value is IList attributeList) { diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSoffsetRotation.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSoffsetRotation.cs index bebb9097b..e22c7e9ce 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSoffsetRotation.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSoffsetRotation.cs @@ -1,8 +1,6 @@ using System.Xml.Linq; using ArcGIS.Desktop.Mapping; -using Speckle.Objects.BuiltElements.Revit; using Speckle.Sdk.Common; -using Speckle.Sdk.Models; namespace Speckle.Converters.ArcGIS3.Utils; @@ -70,35 +68,6 @@ private void NormalizeAngle() } } - public static double? RotationFromRevitData(Base rootObject) - { - // rewrite function to take into account Local reference point in Revit, and Transformation matrix - foreach (KeyValuePair prop in rootObject.GetMembers(DynamicBaseMemberType.Dynamic)) - { - if (prop.Key == "info") - { - ProjectInfo? revitProjInfo = (ProjectInfo?)rootObject[prop.Key]; - if (revitProjInfo != null) - { - try - { - if (revitProjInfo["locations"] is List locationList && locationList.Count > 0) - { - Base location = locationList[0]; - return Convert.ToDouble(location["trueNorth"]); - } - } - catch (Exception ex) when (ex is FormatException || ex is InvalidCastException || ex is OverflowException) - { - // origin not found, do nothing - } - break; - } - } - } - return null; - } - /// /// Initializes a new instance of . /// diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSorigin.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSorigin.cs index 07bfebe2c..eeb12cd01 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSorigin.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Utils/CRSorigin.cs @@ -1,6 +1,4 @@ using ArcGIS.Core.Geometry; -using Speckle.Objects.BuiltElements.Revit; -using Speckle.Sdk.Models; namespace Speckle.Converters.ArcGIS3.Utils; @@ -23,39 +21,6 @@ public CRSorigin(double latDegrees, double lonDegrees) LonDegrees = lonDegrees; } - public static CRSorigin? FromRevitData(Base rootObject) - { - // rewrite function to take into account Local reference point in Revit, and Transformation matrix - foreach (KeyValuePair prop in rootObject.GetMembers(DynamicBaseMemberType.Dynamic)) - { - if (prop.Key == "info") - { - ProjectInfo? revitProjInfo = (ProjectInfo?)rootObject[prop.Key]; - if (revitProjInfo != null) - { - try - { - double lat = Convert.ToDouble(revitProjInfo["latitude"]); - double lon = Convert.ToDouble(revitProjInfo["longitude"]); - double trueNorth; - if (revitProjInfo["locations"] is List locationList && locationList.Count > 0) - { - Base location = locationList[0]; - trueNorth = Convert.ToDouble(location["trueNorth"]); - } - return new CRSorigin(lat * 180 / Math.PI, lon * 180 / Math.PI); - } - catch (Exception ex) when (ex is FormatException || ex is InvalidCastException || ex is OverflowException) - { - // origin not found, do nothing - } - break; - } - } - } - return null; - } - public SpatialReference CreateCustomCRS() { string wktString = diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/ParameterValueSetter.cs b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/ParameterValueSetter.cs deleted file mode 100644 index 0e6c2399c..000000000 --- a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/ParameterValueSetter.cs +++ /dev/null @@ -1,204 +0,0 @@ -using System.Text.RegularExpressions; -using Speckle.Converters.RevitShared.Services; -using Speckle.Sdk; -using Speckle.Sdk.Common; -using Speckle.Sdk.Common.Exceptions; -using Speckle.Sdk.Models; - -namespace Speckle.Converters.RevitShared.Helpers; - -public class ParameterValueSetter(ScalingServiceToHost scalingService) -{ - public void SetInstanceParameters(DB.Element revitElement, Base speckleElement, List? exclusions = null) - { - if (speckleElement["parameters"] is not Base speckleParameters || !speckleParameters.GetDynamicMemberNames().Any()) - { - return; - } - - if ( - speckleElement["phaseCreated"] is string phaseCreated - && !string.IsNullOrEmpty(phaseCreated) - && GetRevitPhase(revitElement.Document, phaseCreated) is DB.Phase revitPhaseCreated - ) - { - TrySetParam(revitElement, DB.BuiltInParameter.PHASE_CREATED, revitPhaseCreated); - } - - if ( - speckleElement["phaseDemolished"] is string phaseDemolished - && !string.IsNullOrEmpty(phaseDemolished) - && GetRevitPhase(revitElement.Document, phaseDemolished) is DB.Phase revitPhaseDemolished - ) - { - TrySetParam(revitElement, DB.BuiltInParameter.PHASE_DEMOLISHED, revitPhaseDemolished); - } - - // NOTE: we are using the ParametersMap here and not Parameters, as it's a much smaller list of stuff and - // Parameters most likely contains extra (garbage) stuff that we don't need to set anyways - // so it's a much faster conversion. If we find that's not the case, we might need to change it in the future - IList? revitParameters; - if (exclusions == null) - { - revitParameters = revitElement - .ParametersMap.Cast() - .Where(x => x != null && !x.IsReadOnly) - .ToArray(); - } - else - { - revitParameters = revitElement - .ParametersMap.Cast() - .Where(x => x != null && !x.IsReadOnly && !exclusions.Contains(GetParamInternalName(x))) - .ToArray(); - } - - // Here we are creating two dictionaries for faster lookup - // one uses the BuiltInName / GUID the other the name as Key - // we need both to support parameter set by Schema Builder, that might be generated with one or the other - // Also, custom parameters that are not Shared, will have an INVALID BuiltInParameter name and no GUID, then we need to use their name - var revitParameterById = revitParameters.ToDictionary(x => GetParamInternalName(x), x => x); - var revitParameterByName = revitParameters.ToDictionary(x => x.Definition.Name, x => x); - - // speckleParameters is a Base - // its member names will have for Key either a BuiltInName, GUID or Name of the parameter (depending onwhere it comes from) - // and as value the full Parameter object, that might come from Revit or SchemaBuilder - // We only loop params we can set and that actually exist on the revit element - var filteredSpeckleParameters = speckleParameters - .GetMembers() - .Where(x => revitParameterById.ContainsKey(x.Key) || revitParameterByName.ContainsKey(x.Key)); - - foreach (var spk in filteredSpeckleParameters) - { - if (spk.Value is not SOBR.Parameter sp || sp.isReadOnly || sp.value == null) - { - continue; - } - - var rp = revitParameterById.TryGetValue(spk.Key, out DB.Parameter? value) ? value : revitParameterByName[spk.Key]; - - TrySetParam(rp, sp.value, sp.units, sp.applicationUnit); - } - } - - private void TrySetParam(DB.Parameter rp, object value, string units = "", string applicationUnit = "") - { - try - { - SetParam(rp, value, units, applicationUnit); - } - catch (Autodesk.Revit.Exceptions.ApplicationException) - { - // POC: setting parameters via the above method can throw several different exceptions. We don't want any of these failed parameters to stop conversion of the object because these parameters are typically unimportant. All important parameters have been moved to specific properties in the object model. We should log these to learn more about what specific failures are occuring - } - catch (SpeckleException) - { - // same as above - } - } - - private void SetParam(DB.Parameter rp, object value, string units = "", string applicationUnit = "") - { - switch (rp.StorageType) - { - case DB.StorageType.Double: - DB.ForgeTypeId unitTypeId; - // This is meant for parameters that come from Revit - // as they might use a lot more unit types that Speckle doesn't currently support - if (!string.IsNullOrEmpty(applicationUnit)) - { - unitTypeId = new(applicationUnit); - } - else - { - try - { - unitTypeId = scalingService.UnitsToNative(units); - } - catch (UnitNotSupportedException) - { - unitTypeId = rp.GetUnitTypeId(); - } - } - - rp.Set(scalingService.ScaleToNative(Convert.ToDouble(value), unitTypeId)); - break; - - case DB.StorageType.Integer: - if (value is string s) - { - if (s.Equals("no", StringComparison.CurrentCultureIgnoreCase)) - { - value = 0; - } - else if (s.Equals("yes", StringComparison.CurrentCultureIgnoreCase)) - { - value = 1; - } - } - rp.Set(Convert.ToInt32(value)); - break; - - case DB.StorageType.String: - string stringValue = - Convert.ToString(value) - ?? throw new ValidationException( - $"Expected parameter value storage type to be string, but instead it was {value.GetType()}" - ); - var temp = Regex.Replace(stringValue, "[^0-9a-zA-Z ]+", ""); - rp.Set(temp); - break; - default: - break; - } - } - - private void TrySetParam(DB.Element elem, DB.BuiltInParameter bip, DB.Element value) - { - var param = elem.get_Parameter(bip); - if (param != null && value != null && !param.IsReadOnly) - { - param.Set(value.Id); - } - } - - private void TrySetParam(DB.Element elem, DB.BuiltInParameter bip, bool value) - { - var param = elem.get_Parameter(bip); - if (param != null && !param.IsReadOnly) - { - param.Set(value ? 1 : 0); - } - } - - //Shared parameters use a GUID to be uniquely identified - //Other parameters use a BuiltInParameter enum - private static string GetParamInternalName(DB.Parameter rp) - { - if (rp.IsShared) - { - return rp.GUID.ToString(); - } - else - { - var def = rp.Definition as DB.InternalDefinition; - if (def.NotNull().BuiltInParameter == DB.BuiltInParameter.INVALID) - { - return def.Name; - } - - return def.BuiltInParameter.ToString(); - } - } - - private DB.Phase? GetRevitPhase(DB.Document document, string phaseName) - { - using var collector = new DB.FilteredElementCollector(document); - - Dictionary phases = collector - .OfCategory(DB.BuiltInCategory.OST_Phases) - .ToDictionary(el => el.Name, el => (DB.Phase)el); - - return phases.TryGetValue(phaseName, out var phase) ? phase : null; - } -} diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitToSpeckleCacheSingleton.cs b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitToSpeckleCacheSingleton.cs index 9cd5ce502..e1ff847df 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitToSpeckleCacheSingleton.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitToSpeckleCacheSingleton.cs @@ -1,5 +1,4 @@ -using Speckle.Objects.Other; -using Speckle.Objects.Other.Revit; +using Speckle.Objects.Other; namespace Speckle.Converters.RevitShared.Helpers; @@ -14,11 +13,6 @@ namespace Speckle.Converters.RevitShared.Helpers; /// public class RevitToSpeckleCacheSingleton { - /// - /// (DB.Material id, RevitMaterial). This can be generated from converting render materials or material quantities. - /// - public Dictionary RevitMaterialCache { get; } = new(); - /// /// (DB.Material id, RenderMaterial). This can be generated from converting render materials or material quantities. /// diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs b/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs index ed644f76c..4d5859adf 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/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; @@ -44,7 +44,6 @@ public static IServiceCollection AddRevitConverters(this IServiceCollection serv serviceCollection.AddScoped(); serviceCollection.AddScoped(); - serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems b/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems index 25c8e14a2..d0947de80 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems +++ b/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems @@ -11,7 +11,6 @@ - @@ -73,7 +72,6 @@ - @@ -81,7 +79,6 @@ - diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialAsRevitMaterialConversionToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialAsRevitMaterialConversionToSpeckle.cs deleted file mode 100644 index 3d125e652..000000000 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialAsRevitMaterialConversionToSpeckle.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Speckle.Converters.Common.Objects; -using Speckle.Converters.RevitShared.Helpers; -using Speckle.Objects.Other.Revit; - -namespace Speckle.Converters.RevitShared.ToSpeckle; - -public class MaterialAsRevitMaterialConversionToSpeckle : ITypedConverter -{ - private readonly RevitToSpeckleCacheSingleton _revitToSpeckleCacheSingleton; - - public MaterialAsRevitMaterialConversionToSpeckle(RevitToSpeckleCacheSingleton revitToSpeckleCacheSingleton) - { - _revitToSpeckleCacheSingleton = revitToSpeckleCacheSingleton; - } - - public RevitMaterial Convert(DB.Material target) - { - RevitMaterial material; - if ( - _revitToSpeckleCacheSingleton.RevitMaterialCache.TryGetValue(target.UniqueId, out RevitMaterial? cachedMaterial) - ) - { - material = cachedMaterial; - } - else - { - material = ConvertToRevitMaterial(target); - _revitToSpeckleCacheSingleton.RevitMaterialCache.Add(target.UniqueId, material); - } - - return material; - } - - private RevitMaterial ConvertToRevitMaterial(DB.Material target) - { - // POC: we need to validate these properties on the RevitMaterial class, ie are they used? - RevitMaterial material = - new( - target.Name, - target.MaterialCategory, - target.MaterialClass, - target.Shininess, - target.Smoothness, - target.Transparency - ) - { - applicationId = target.UniqueId - }; - - // POC: I'm removing material parameter assigning here as we're exploding a bit the whole space with too many parameters. - // We can bring this back if needed/requested by our end users. - // _parameterObjectAssigner.AssignParametersToBase(target, material); - return material; - } -} diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs index 6defa25b0..04cf03bb3 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs @@ -2,8 +2,6 @@ using Speckle.Converters.Common.Objects; using Speckle.Converters.RevitShared.Services; using Speckle.Converters.RevitShared.Settings; -using Speckle.Objects.Other; -using Speckle.Objects.Other.Revit; namespace Speckle.Converters.RevitShared.ToSpeckle; @@ -62,67 +60,3 @@ public Dictionary Convert(DB.Element target) return quantities; } } - -/// -/// NOTE: Phased out (for now) due to dependency on the MaterialQuantity class, which creates/promotes a bloated data extraction. -/// -[Obsolete("Creates a rather bloated data structure - 2.0 style. More in the comment above.")] -public class MaterialQuantitiesToSpeckle : ITypedConverter> -{ - private readonly ITypedConverter _revitMaterialConverter; - private readonly ScalingServiceToSpeckle _scalingService; - private readonly IConverterSettingsStore _converterSettings; - - public MaterialQuantitiesToSpeckle( - ScalingServiceToSpeckle scalingService, - IConverterSettingsStore converterSettings, - ITypedConverter revitMaterialConverter - ) - { - _scalingService = scalingService; - _converterSettings = converterSettings; - _revitMaterialConverter = revitMaterialConverter; - } - - /// - /// Material Quantities in Revit are stored in different ways and therefore need to be retrieved - /// using different methods. According to this forum post https://forums.autodesk.com/t5/revit-api-forum/method-getmaterialarea-appears-to-use-different-formulas-for/td-p/11988215 - /// "Hosts" will return the area of a single side of the object and non-host objects will return the combined area of every side of the element. - /// Certain MEP element materials are attached to the MEP system that the element belongs to. - /// POC: We are only sending API-retreivable quantities instead of doing calculations on solids ourselves. Skipping MEP elements for now. Need to validate with users if this fulfills their data extraction workflows. - /// - /// - /// - public List Convert(DB.Element target) - { - // TODO: inefficient layout - // Creates detached materials - // Let's create a new class for this with basic props and material name - // TODO: the above - List quantities = new(); - - if (target.Category.HasMaterialQuantities) - { - foreach (DB.ElementId matId in target.GetMaterialIds(false)) - { - if (matId is null) - { - continue; - } - - double factor = _scalingService.ScaleLength(1); - double area = factor * factor * target.GetMaterialArea(matId, false); - double volume = factor * factor * factor * target.GetMaterialVolume(matId); - - if (_converterSettings.Current.Document.GetElement(matId) is DB.Material material) - { - RevitMaterial convertedMaterial = _revitMaterialConverter.Convert(material); - // NOTE: the RevitMaterial class is semi useless, and it used to extract parameters out too for each material. Overkill. - quantities.Add(new(convertedMaterial, volume, area, _converterSettings.Current.SpeckleUnits)); - } - } - } - - return quantities; - } -} diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ParameterConversionToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ParameterConversionToSpeckle.cs deleted file mode 100644 index a0b1f01da..000000000 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ParameterConversionToSpeckle.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Autodesk.Revit.DB; -using Speckle.Converters.Common.Objects; -using Speckle.Converters.RevitShared.Extensions; -using Speckle.Converters.RevitShared.Helpers; - -namespace Speckle.Converters.RevitShared.ToSpeckle; - -public class ParameterConversionToSpeckle : ITypedConverter -{ - private readonly ParameterValueExtractor _valueExtractor; - - public ParameterConversionToSpeckle(ParameterValueExtractor valueExtractor) - { - _valueExtractor = valueExtractor; - } - - public SOBR.Parameter Convert(Parameter target) - { - string internalName = target.GetInternalName(); - ForgeTypeId? unitTypeId = null; - if (target.StorageType is StorageType.Double) - { - // according to the api documentation, this method will throw if the storage type is not a VALUE type - // however, I've found that it will still throw if StorageType == StorageType.Integer - unitTypeId = target.GetUnitTypeId(); - } - Definition definition = target.Definition; - - return new SOBR.Parameter() - { - applicationInternalName = internalName, - applicationUnit = unitTypeId?.ToUniqueString() ?? "None", - isShared = target.IsShared, - isReadOnly = target.IsReadOnly, - name = definition.Name, - units = unitTypeId?.GetSymbol() ?? "None", - value = _valueExtractor.GetValue(target) - }; - } -} diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/CeilingTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/CeilingTopLevelConverterToSpeckle.cs index d799caaa4..2cb8a5022 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/CeilingTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/CeilingTopLevelConverterToSpeckle.cs @@ -38,7 +38,7 @@ public override RevitCeiling Convert(Ceiling target) var elementType = (ElementType)target.Document.GetElement(target.GetTypeId()); // POC: our existing receive operation is checking the "slopeDirection" prop, // but it is never being set. We should be setting it - var level = _parameterValueExtractor.GetValueAsDocumentObject(target, DB.BuiltInParameter.LEVEL_PARAM); + var level = _parameterValueExtractor.GetValueAsDocumentObject(target, BuiltInParameter.LEVEL_PARAM); RevitLevel speckleLevel = _levelConverter.Convert(level); List displayValue = _displayValueExtractor.GetDisplayValue(target); diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/DirectShapeTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/DirectShapeTopLevelConverterToSpeckle.cs index d7c6e6799..417a174b9 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/DirectShapeTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/DirectShapeTopLevelConverterToSpeckle.cs @@ -1,4 +1,4 @@ -using Speckle.Converters.Common; +using Speckle.Converters.Common; using Speckle.Converters.RevitShared.Extensions; using Speckle.Converters.RevitShared.Helpers; using Speckle.Converters.RevitShared.Settings; @@ -31,8 +31,11 @@ public override SOBR.DirectShape Convert(DB.DirectShape target) var geometries = _displayValueExtractor.GetDisplayValue(target).Cast().ToList(); SOBR.DirectShape result = - new(target.Name, category, geometries) + new() { + name = target.Name, + category = category, + baseGeometries = geometries, displayValue = geometries, units = _converterSettings.Current.SpeckleUnits, elementId = target.Id.ToString().NotNull() diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs index 89cc0435a..0ee46dedf 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs @@ -4,7 +4,6 @@ using Speckle.Converters.RevitShared.ToSpeckle; using Speckle.Objects; using Speckle.Objects.BuiltElements.Revit; -using Speckle.Sdk.Models; namespace Speckle.Converters.Common; @@ -108,6 +107,7 @@ private void TryAssignSlopeFromSlopeArrow(DB.Floor target, SOBR.RevitFloor speck units = _converterSettings.Current.SpeckleUnits }; + /* The parameters refactor no longer uses the `Parameter` class and now we are only sending parameters as dictionaries in the `properties` field if ( speckleFloor["parameters"] is Base parameters && parameters["FLOOR_HEIGHTABOVELEVEL_PARAM"] is SOBR.Parameter offsetParam @@ -116,5 +116,6 @@ private void TryAssignSlopeFromSlopeArrow(DB.Floor target, SOBR.RevitFloor speck { offsetParam.value = offset + tailOffset; } + */ } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FootPrintRoofToSpeckleTopLevelConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FootPrintRoofToSpeckleTopLevelConverter.cs index 3234b6c7f..2ec612988 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FootPrintRoofToSpeckleTopLevelConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FootPrintRoofToSpeckleTopLevelConverter.cs @@ -13,7 +13,7 @@ namespace Speckle.Converters.RevitShared.ToSpeckle; -[NameAndRankValue(nameof(DB.FootPrintRoof), 0)] +[NameAndRankValue(nameof(FootPrintRoof), 0)] public class FootPrintRoofToSpeckleTopLevelConverter : BaseTopLevelConverterToSpeckle { @@ -45,13 +45,13 @@ public override RevitFootprintRoof Convert(FootPrintRoof target) { var baseLevel = _parameterValueExtractor.GetValueAsDocumentObject( target, - DB.BuiltInParameter.ROOF_BASE_LEVEL_PARAM + BuiltInParameter.ROOF_BASE_LEVEL_PARAM ); // We don't currently validate the success of this TryGet, it is assumed some Roofs don't have a top-level. _parameterValueExtractor.TryGetValueAsDocumentObject( target, - DB.BuiltInParameter.ROOF_UPTO_LEVEL_PARAM, + BuiltInParameter.ROOF_UPTO_LEVEL_PARAM, out var topLevel ); diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RoomTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RoomTopLevelConverterToSpeckle.cs index 9528b3ac8..42c0480ea 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RoomTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RoomTopLevelConverterToSpeckle.cs @@ -52,14 +52,19 @@ public override SOBE.Room Convert(DBA.Room target) var outline = profiles.First(); var voids = profiles.Skip(1).ToList(); - var speckleRoom = new SOBE.Room(name ?? "-", number, level, basePoint) - { - displayValue = displayValue, - area = area, - outline = outline, - voids = voids, - units = _converterSettings.Current.SpeckleUnits - }; + SOBE.Room speckleRoom = + new() + { + name = name ?? "-", + number = number, + level = level, + basePoint = basePoint, + displayValue = displayValue, + area = area, + outline = outline, + voids = voids, + units = _converterSettings.Current.SpeckleUnits + }; // POC: Removed dynamic property `phaseCreated` as it seems the info is included in the parameters already From 114356ca21ac9e05dd4b5757ef178289f6fde9c1 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 29 Oct 2024 16:25:57 +0000 Subject: [PATCH 2/9] updates arcs and polycurves --- .../PolycurveToHostPolylineRawConverter.cs | 9 ++++---- .../Geometry/Polyline3dToSpeckleConverter.cs | 3 +++ .../Geometry/PolylineToSpeckleConverter.cs | 1 + .../Raw/CircularArc2dToSpeckleRawConverter.cs | 12 +--------- .../Raw/CircularArc3dToSpeckleRawConverter.cs | 14 ++++-------- .../Raw/DBArcToSpeckleRawConverter.cs | 16 +++++--------- ...gnmentSubentityArcToSpeckleRawConverter.cs | 9 ++++---- .../ToHost/Raw/Geometry/ArcConverterToHost.cs | 22 +------------------ .../Raw/Geometry/ArcToSpeckleConverter.cs | 14 +----------- .../ToSpeckle/Raw/ArcToSpeckleConverter.cs | 17 +++++--------- 10 files changed, 29 insertions(+), 88 deletions(-) diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/PolycurveToHostPolylineRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/PolycurveToHostPolylineRawConverter.cs index d7ab9ea8b..bad5a843b 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/PolycurveToHostPolylineRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/PolycurveToHostPolylineRawConverter.cs @@ -46,14 +46,13 @@ public ADB.Polyline Convert(SOG.Polycurve target) break; case SOG.Arc arc: // POC: possibly endAngle and startAngle null? - double? angle = arc.endAngle - arc.startAngle; - angle = angle < 0 ? angle + 2 * Math.PI : angle; - if (angle is null) + double measure = arc.measure; + if (measure <= 0 || measure >= 2 * Math.PI) { - throw new ArgumentNullException(nameof(target), "Cannot convert arc without angle value."); + throw new ArgumentOutOfRangeException(nameof(target), "Cannot convert arc with measure <= 0 or >= 2 pi"); } - var bulge = Math.Tan((double)angle / 4) * BulgeDirection(arc.startPoint, arc.midPoint, arc.endPoint); + var bulge = Math.Tan(measure / 4) * BulgeDirection(arc.startPoint, arc.midPoint, arc.endPoint); polyline.AddVertexAt(count, _pointConverter.Convert(arc.startPoint).Convert2d(plane), bulge, 0, 0); if (!target.closed && count == target.segments.Count - 1) { diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/Polyline3dToSpeckleConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/Polyline3dToSpeckleConverter.cs index 42b8b4c13..f01ff31f9 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/Polyline3dToSpeckleConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/Polyline3dToSpeckleConverter.cs @@ -120,6 +120,9 @@ public SOG.Autocad.AutocadPolycurve Convert(ADB.Polyline3d target) new() { segments = segments, + bulges = null, + tangents = null, + normal = null, value = value, polyType = polyType, closed = target.Closed, diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolylineToSpeckleConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolylineToSpeckleConverter.cs index c8e8895de..d0a63cb02 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolylineToSpeckleConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolylineToSpeckleConverter.cs @@ -80,6 +80,7 @@ public SOG.Autocad.AutocadPolycurve Convert(ADB.Polyline target) value = value, bulges = bulges, normal = normal, + tangents = null, elevation = target.Elevation, polyType = SOG.Autocad.AutocadPolyType.Light, closed = target.Closed, diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc2dToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc2dToSpeckleRawConverter.cs index 7b9635e0c..40a8feab6 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc2dToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc2dToSpeckleRawConverter.cs @@ -21,17 +21,12 @@ public SOG.Arc Convert(AG.CircularArc2d target) { string units = _settingsStore.Current.SpeckleUnits; - // find arc plane (normal is in clockwise dir) + // find arc plane (normal is in counterclockwise dir) var center3 = new AG.Point3d(target.Center.X, target.Center.Y, 0); AG.Plane plane = target.IsClockWise ? new AG.Plane(center3, AG.Vector3d.ZAxis.MultiplyBy(-1)) : new AG.Plane(center3, AG.Vector3d.ZAxis); - // calculate total angle. TODO: This needs to be validated across all possible arc orientations - var totalAngle = target.IsClockWise - ? Math.Abs(target.EndAngle - target.StartAngle) - : Math.Abs(target.EndAngle - target.StartAngle); - double startParam = target.GetParameterOf(target.StartPoint); double endParam = target.GetParameterOf(target.EndPoint); AG.Point2d midPoint = target.EvaluatePoint(target.StartAngle + (target.EndAngle - target.StartAngle) / 2); @@ -40,7 +35,6 @@ public SOG.Arc Convert(AG.CircularArc2d target) var arc = new SOG.Arc() { plane = _planeConverter.Convert(plane), - radius = target.Radius, startPoint = new() { x = target.StartPoint.X, @@ -62,11 +56,7 @@ public SOG.Arc Convert(AG.CircularArc2d target) z = 0, units = units }, - startAngle = target.StartAngle, - endAngle = target.EndAngle, - angleRadians = totalAngle, domain = new SOP.Interval { start = startParam, end = endParam }, - length = target.GetLength(0, 1), units = units }; diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc3dToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc3dToSpeckleRawConverter.cs index 912868884..1ca841b1e 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc3dToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/CircularArc3dToSpeckleRawConverter.cs @@ -22,7 +22,7 @@ IConverterSettingsStore settingsStore public SOG.Arc Convert(AG.CircularArc3d target) { - SOG.Plane plane = _planeConverter.Convert(target.GetPlane()); + SOG.Plane plane = _planeConverter.Convert(new(target.Center, target.Normal)); SOG.Point start = _pointConverter.Convert(target.StartPoint); SOG.Point end = _pointConverter.Convert(target.EndPoint); double startParam = target.GetParameterOf(target.StartPoint); @@ -31,20 +31,14 @@ public SOG.Arc Convert(AG.CircularArc3d target) SOG.Point mid = _pointConverter.Convert(midPoint); SOG.Arc arc = - new( - plane, - target.Radius, - target.StartAngle, - target.EndAngle, - target.EndAngle - target.StartAngle, // POC: testing, unsure - _settingsStore.Current.SpeckleUnits - ) + new() { + plane = plane, startPoint = start, endPoint = end, midPoint = mid, domain = new SOP.Interval { start = startParam, end = endParam }, - length = target.GetLength(0, 1, 0.000) + units = _settingsStore.Current.SpeckleUnits, }; return arc; diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBArcToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBArcToSpeckleRawConverter.cs index 1e4d619be..11defe471 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBArcToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBArcToSpeckleRawConverter.cs @@ -28,7 +28,7 @@ IConverterSettingsStore settingsStore public SOG.Arc Convert(ADB.Arc target) { - SOG.Plane plane = _planeConverter.Convert(target.GetPlane()); + SOG.Plane plane = _planeConverter.Convert(new(target.Center, target.Normal)); SOG.Point start = _pointConverter.Convert(target.StartPoint); SOG.Point end = _pointConverter.Convert(target.EndPoint); SOG.Point mid = _pointConverter.Convert(target.GetPointAtDist(target.Length / 2.0)); @@ -36,21 +36,15 @@ public SOG.Arc Convert(ADB.Arc target) SOG.Box bbox = _boxConverter.Convert(target.GeometricExtents); SOG.Arc arc = - new( - plane, - target.Radius, - target.StartAngle, - target.EndAngle, - target.TotalAngle, - _settingsStore.Current.SpeckleUnits - ) + new() { + plane = plane, startPoint = start, endPoint = end, midPoint = mid, domain = domain, - length = target.Length, - bbox = bbox + bbox = bbox, + units = _settingsStore.Current.SpeckleUnits }; return arc; diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs index f7c62dbeb..47a42bb5a 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentityArcToSpeckleRawConverter.cs @@ -42,9 +42,11 @@ public SOG.Arc Convert(CDB.AlignmentSubEntityArc target) double midPointX = target.CenterPoint.X + midScalingVectorX; double midPointY = target.CenterPoint.Y + midScalingVectorY; - // find arc plane (normal is in clockwise dir) + // find arc plane (normal is in counterclockwise dir) var center3 = new AG.Point3d(target.CenterPoint.X, target.CenterPoint.Y, 0); - AG.Plane plane = new AG.Plane(center3, AG.Vector3d.ZAxis); + AG.Plane plane = target.Clockwise + ? new AG.Plane(center3, AG.Vector3d.ZAxis.MultiplyBy(-1)) + : new AG.Plane(center3, AG.Vector3d.ZAxis); // create arc SOG.Arc arc = @@ -72,9 +74,6 @@ public SOG.Arc Convert(CDB.AlignmentSubEntityArc target) units = units }, plane = _planeConverter.Convert(plane), - radius = target.Radius, - angleRadians = target.Delta, - length = target.Length, units = units, // additional alignment subentity props diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs index 514370bc6..dde45fe8b 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs @@ -1,6 +1,5 @@ using Speckle.Converters.Common.Objects; using Speckle.Converters.RevitShared.Services; -using Speckle.Sdk.Common; namespace Speckle.Converters.RevitShared.ToHost.Raw.Geometry; @@ -23,31 +22,12 @@ public ArcConverterToHost( public DB.Arc Convert(SOG.Arc target) { - double startAngle; - double endAngle; - - if (target.startAngle > target.endAngle) - { - startAngle = (double)target.endAngle; - endAngle = (double)target.startAngle; - } - else - { - startAngle = (double)target.startAngle.NotNull(); - endAngle = (double)target.endAngle.NotNull(); - } - var plane = _planeConverter.Convert(target.plane); if (SOG.Point.Distance(target.startPoint, target.endPoint) < 1E-6) { // Endpoints coincide, it's a circle. - return DB.Arc.Create( - plane, - _scalingService.ScaleToNative(target.radius ?? 0, target.units), - startAngle, - endAngle - ); + return DB.Arc.Create(plane, _scalingService.ScaleToNative(target.radius, target.units), 0, Math.PI * 2); } return DB.Arc.Create( diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/ArcToSpeckleConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/ArcToSpeckleConverter.cs index 829404935..7ea198160 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/ArcToSpeckleConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/ArcToSpeckleConverter.cs @@ -28,32 +28,20 @@ ScalingServiceToSpeckle scalingService public SOG.Arc Convert(DB.Arc target) { - // see https://forums.autodesk.com/t5/revit-api-forum/how-to-retrieve-startangle-and-endangle-of-arc-object/td-p/7637128 + // Revit arcs are always counterclockwise in the arc normal direction. This aligns with Speckle arc plane convention. var arcPlane = DB.Plane.CreateByOriginAndBasis(target.Center, target.XDirection, target.YDirection); - DB.XYZ center = target.Center; - - DB.XYZ dir0 = target.GetEndPoint(0).Subtract(center).Normalize(); - DB.XYZ dir1 = target.GetEndPoint(1).Subtract(center).Normalize(); DB.XYZ start = target.Evaluate(0, true); DB.XYZ end = target.Evaluate(1, true); DB.XYZ mid = target.Evaluate(0.5, true); - double startAngle = target.XDirection.AngleOnPlaneTo(dir0, target.Normal); - double endAngle = target.XDirection.AngleOnPlaneTo(dir1, target.Normal); - return new SOG.Arc() { plane = _planeConverter.Convert(arcPlane), - radius = _scalingService.ScaleLength(target.Radius), - startAngle = startAngle, - endAngle = endAngle, - angleRadians = endAngle - startAngle, units = _converterSettings.Current.SpeckleUnits, endPoint = _xyzToPointConverter.Convert(end), startPoint = _xyzToPointConverter.Convert(start), midPoint = _xyzToPointConverter.Convert(mid), - length = _scalingService.ScaleLength(target.Length), domain = new Interval { start = target.GetEndParameter(0), end = target.GetEndParameter(1) } }; } diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs index 707c67b88..abc78c7ee 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs @@ -1,4 +1,4 @@ -using Speckle.Converters.Common; +using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; namespace Speckle.Converters.Rhino.ToSpeckle.Raw; @@ -9,7 +9,6 @@ public class ArcToSpeckleConverter : ITypedConverter private readonly ITypedConverter _planeConverter; private readonly ITypedConverter _boxConverter; private readonly IConverterSettingsStore _settingsStore; - private readonly IBoxFactory _boxFactory; public ArcToSpeckleConverter( @@ -36,20 +35,14 @@ IBoxFactory boxFactory /// This method assumes the domain of the arc is (0,1) as Arc types in Rhino do not have domain. You may want to request a conversion from ArcCurve instead. /// public SOG.Arc Convert(RG.Arc target) => - new( - _planeConverter.Convert(target.Plane), - target.Radius, - target.StartAngle, - target.EndAngle, - target.Angle, - _settingsStore.Current.SpeckleUnits - ) + new() { + plane = _planeConverter.Convert(target.Plane), // POC: need to validate if this follows the Speckle arc plane handedness convention startPoint = _pointConverter.Convert(target.StartPoint), midPoint = _pointConverter.Convert(target.MidPoint), endPoint = _pointConverter.Convert(target.EndPoint), domain = SOP.Interval.UnitInterval, - length = target.Length, - bbox = _boxConverter.Convert(_boxFactory.Create(target.BoundingBox())) + bbox = _boxConverter.Convert(_boxFactory.Create(target.BoundingBox())), + units = _settingsStore.Current.SpeckleUnits, }; } From a400494403e0e293d8c8de82223094ebd003bfb9 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 29 Oct 2024 17:10:43 +0000 Subject: [PATCH 3/9] removes set only circle props --- .../ToSpeckle/Raw/DBCircleToSpeckleRawConverter.cs | 1 - .../ToSpeckle/Raw/Geometry/CircleToSpeckleConverter.cs | 3 +-- .../ToSpeckle/Raw/CircleToSpeckleConverter.cs | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBCircleToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBCircleToSpeckleRawConverter.cs index 2014997ff..7d63f6ee8 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBCircleToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBCircleToSpeckleRawConverter.cs @@ -33,7 +33,6 @@ public SOG.Circle Convert(ADB.Circle target) plane = plane, radius = target.Radius, units = _settingsStore.Current.SpeckleUnits, - length = target.Circumference, bbox = bbox }; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/CircleToSpeckleConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/CircleToSpeckleConverter.cs index e7d776cc8..ebc1ea835 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/CircleToSpeckleConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/CircleToSpeckleConverter.cs @@ -32,8 +32,7 @@ public SOG.Circle Convert(DB.Arc target) { plane = _planeConverter.Convert(arcPlane), radius = _scalingService.ScaleLength(target.Radius), - units = _converterSettings.Current.SpeckleUnits, - length = _scalingService.ScaleLength(target.Length) + units = _converterSettings.Current.SpeckleUnits }; return c; diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/CircleToSpeckleConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/CircleToSpeckleConverter.cs index 6d617adde..a475a05ea 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/CircleToSpeckleConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/CircleToSpeckleConverter.cs @@ -1,4 +1,4 @@ -using Speckle.Converters.Common; +using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; using Speckle.Sdk.Models; @@ -34,8 +34,6 @@ public SOG.Circle Convert(RG.Circle target) => plane = _planeConverter.Convert(target.Plane), radius = target.Radius, units = _settingsStore.Current.SpeckleUnits, - domain = SOP.Interval.UnitInterval, - length = 2 * Math.PI * target.Radius, - area = Math.PI * Math.Pow(target.Radius, 2), + domain = SOP.Interval.UnitInterval }; } From 47be7349d05c75f23d5afb674208e419718346d7 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Wed, 30 Oct 2024 13:52:40 +0000 Subject: [PATCH 4/9] updates box conversions --- .../ToSpeckle/Raw/EnvelopBoxToSpeckleConverter.cs | 2 +- .../ToSpeckle/Raw/BoxToSpeckleRawConverter.cs | 6 ++---- .../Raw/Geometry/BoundingBoxXYZToSpeckleConverter.cs | 2 +- .../ToSpeckle/Raw/BoxToSpeckleConverter.cs | 8 +++----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/EnvelopBoxToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/EnvelopBoxToSpeckleConverter.cs index 09ea3e94e..a871117ef 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/EnvelopBoxToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/EnvelopBoxToSpeckleConverter.cs @@ -50,7 +50,7 @@ public SOG.Box Convert(Envelope target) return new SOG.Box() { - basePlane = plane, + plane = plane, xSize = new Interval { start = minPtSpeckle.x, end = maxPtSpeckle.x }, ySize = new Interval { start = minPtSpeckle.y, end = maxPtSpeckle.y }, zSize = new Interval { start = minPtSpeckle.z, end = maxPtSpeckle.z }, diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/BoxToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/BoxToSpeckleRawConverter.cs index 60a675f23..94f768ebe 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/BoxToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/BoxToSpeckleRawConverter.cs @@ -26,7 +26,6 @@ public SOG.Box Convert(ADB.Extents3d target) SOP.Interval xSize = new() { start = target.MinPoint.X, end = target.MaxPoint.X }; SOP.Interval ySize = new() { start = target.MinPoint.Y, end = target.MaxPoint.Y }; SOP.Interval zSize = new() { start = target.MinPoint.Z, end = target.MaxPoint.Z }; - double volume = xSize.Length * ySize.Length * zSize.Length; // get the base plane of the bounding box from extents and current UCS var ucs = _settingsStore.Current.Document.Editor.CurrentUserCoordinateSystem.CoordinateSystem3d; @@ -36,12 +35,11 @@ public SOG.Box Convert(ADB.Extents3d target) SOG.Box box = new() { - basePlane = plane, + plane = plane, xSize = xSize, ySize = ySize, zSize = zSize, - units = _settingsStore.Current.SpeckleUnits, - volume = volume, + units = _settingsStore.Current.SpeckleUnits }; return box; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/BoundingBoxXYZToSpeckleConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/BoundingBoxXYZToSpeckleConverter.cs index f9baa10c7..795e3a277 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/BoundingBoxXYZToSpeckleConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/BoundingBoxXYZToSpeckleConverter.cs @@ -41,7 +41,7 @@ public SOG.Box Convert(DB.BoundingBoxXYZ target) xSize = new Interval { start = min.x, end = max.x }, ySize = new Interval { start = min.y, end = max.y }, zSize = new Interval { start = min.z, end = max.z }, - basePlane = _planeConverter.Convert(plane), + plane = _planeConverter.Convert(plane), units = _converterSettings.Current.SpeckleUnits }; diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/BoxToSpeckleConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/BoxToSpeckleConverter.cs index 7b0503bae..1887d1015 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/BoxToSpeckleConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/BoxToSpeckleConverter.cs @@ -1,4 +1,4 @@ -using Speckle.Converters.Common; +using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; namespace Speckle.Converters.Rhino.ToSpeckle.Raw; @@ -28,12 +28,10 @@ IConverterSettingsStore settingsStore public SOG.Box Convert(RG.Box target) => new() { - basePlane = _planeConverter.Convert(target.Plane), + plane = _planeConverter.Convert(target.Plane), xSize = _intervalConverter.Convert(target.X), ySize = _intervalConverter.Convert(target.Y), zSize = _intervalConverter.Convert(target.Z), - units = _settingsStore.Current.SpeckleUnits, - area = target.Area, - volume = target.Volume, + units = _settingsStore.Current.SpeckleUnits }; } From 6706def65e10fcbf39cd0864790d171b9321c1aa Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Thu, 31 Oct 2024 23:27:16 +0000 Subject: [PATCH 5/9] fixes model curves and transforms --- .../Receive/RevitHostObjectBuilder.cs | 2 +- .../ModelCurveToSpeckleTopLevelConverter.cs | 44 +++++++++---------- .../LocalToGlobalConverterUtils.cs | 5 ++- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs index d7a8afd75..ac740b667 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs @@ -191,7 +191,7 @@ localToGlobalMap.AtomicObject is ITransformable transformable and ICurve ITransformable? newTransformable = null; foreach (var mat in localToGlobalMap.Matrix) { - transformable.TransformTo(new Transform(mat, units), out newTransformable); + transformable.TransformTo(new Transform() { matrix = mat, units = units }, out newTransformable); } localToGlobalMap.AtomicObject = (newTransformable as Base)!; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs index d54cc81be..1c70676df 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs @@ -1,42 +1,40 @@ using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; -using Speckle.Converters.RevitShared.Settings; using Speckle.Objects; -using Speckle.Sdk.Common; +using Speckle.Sdk.Common.Exceptions; +using Speckle.Sdk.Models; namespace Speckle.Converters.RevitShared.ToSpeckle; -// POC: ModelCurve looks a bit bogus and we may wish to revise what that is and how it inherits -// see https://spockle.atlassian.net/browse/CNX-9381 [NameAndRankValue(nameof(DB.ModelCurve), 0)] -public class ModelCurveToSpeckleTopLevelConverter : BaseTopLevelConverterToSpeckle +public class ModelCurveToSpeckleTopLevelConverter : BaseTopLevelConverterToSpeckle { private readonly ITypedConverter _curveConverter; - private readonly IConverterSettingsStore _converterSettings; - public ModelCurveToSpeckleTopLevelConverter( - ITypedConverter curveConverter, - IConverterSettingsStore converterSettings - ) + public ModelCurveToSpeckleTopLevelConverter(ITypedConverter curveConverter) { _curveConverter = curveConverter; - _converterSettings = converterSettings; } - public override SOBR.Curve.ModelCurve Convert(DB.ModelCurve target) + public override Base Convert(DB.ModelCurve target) { - var modelCurve = new SOBR.Curve.ModelCurve() - { - baseCurve = _curveConverter.Convert(target.GeometryCurve), - lineStyle = target.LineStyle.Name, - elementId = target.Id.ToString().NotNull(), - units = _converterSettings.Current.SpeckleUnits - }; + ICurve? iCurve = _curveConverter.Convert(target.GeometryCurve); - // POC: check this is not going to set the display value to anything we cannot actually display - i.e. polycurve - // also we have a class for doing this, but probably this is fine for now. see https://spockle.atlassian.net/browse/CNX-9381 - modelCurve["@displayValue"] = modelCurve.baseCurve; + switch (iCurve) + { + case SOG.Line line: + return new SOG.Revit.RevitLine(line); + case SOG.Ellipse ellipse: + return new SOG.Revit.RevitEllipse(ellipse); + case SOG.Curve curve: + return new SOG.Revit.RevitCurve(curve); + case SOG.Arc arc: + return new SOG.Revit.RevitArc(arc); - return modelCurve; + default: + throw new ConversionException( + $"No Revit class available for ModelCurve of type {target.GeometryCurve.GetType()}" + ); + } } } diff --git a/Sdk/Speckle.Converters.Common/LocalToGlobalConverterUtils.cs b/Sdk/Speckle.Converters.Common/LocalToGlobalConverterUtils.cs index 1cf534be4..d3788fc68 100644 --- a/Sdk/Speckle.Converters.Common/LocalToGlobalConverterUtils.cs +++ b/Sdk/Speckle.Converters.Common/LocalToGlobalConverterUtils.cs @@ -1,5 +1,6 @@ -using Speckle.DoubleNumerics; +using Speckle.DoubleNumerics; using Speckle.Objects; +using Speckle.Sdk.Common; using Speckle.Sdk.Common.Exceptions; using Speckle.Sdk.Models; @@ -27,7 +28,7 @@ public Base TransformObjects(Base atomicObject, List matrix) } List transforms = matrix - .Select(x => new Speckle.Objects.Other.Transform(x, "none")) + .Select(x => new Speckle.Objects.Other.Transform() { matrix = x, units = Units.None }) .ToList(); if (atomicObject is ITransformable c) From 232d8596a5d96e134d90dd0efe660dfd2747c2eb Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Fri, 1 Nov 2024 00:06:02 +0000 Subject: [PATCH 6/9] Update ModelCurveToSpeckleTopLevelConverter.cs --- .../ModelCurveToSpeckleTopLevelConverter.cs | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs index 1c70676df..b3c8b107d 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs @@ -1,11 +1,11 @@ using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; using Speckle.Objects; -using Speckle.Sdk.Common.Exceptions; using Speckle.Sdk.Models; namespace Speckle.Converters.RevitShared.ToSpeckle; +// Converts model curves to regurlar speckle curves, since we aren't receiving them and the only property used in V2 was the linestyle (not element ids or parameters). Don't see a need to handle these differently from regular geometry. [NameAndRankValue(nameof(DB.ModelCurve), 0)] public class ModelCurveToSpeckleTopLevelConverter : BaseTopLevelConverterToSpeckle { @@ -16,25 +16,5 @@ public ModelCurveToSpeckleTopLevelConverter(ITypedConverter cu _curveConverter = curveConverter; } - public override Base Convert(DB.ModelCurve target) - { - ICurve? iCurve = _curveConverter.Convert(target.GeometryCurve); - - switch (iCurve) - { - case SOG.Line line: - return new SOG.Revit.RevitLine(line); - case SOG.Ellipse ellipse: - return new SOG.Revit.RevitEllipse(ellipse); - case SOG.Curve curve: - return new SOG.Revit.RevitCurve(curve); - case SOG.Arc arc: - return new SOG.Revit.RevitArc(arc); - - default: - throw new ConversionException( - $"No Revit class available for ModelCurve of type {target.GeometryCurve.GetType()}" - ); - } - } + public override Base Convert(DB.ModelCurve target) => (Base)_curveConverter.Convert(target.GeometryCurve); } From ad74743425be5ee7f158bb8a201d6ced4b58050e Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 5 Nov 2024 10:16:24 +0000 Subject: [PATCH 7/9] bumps nugets --- .../TopLevel/ModelCurveToSpeckleTopLevelConverter.cs | 2 +- Directory.Packages.props | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs index b3c8b107d..a37213406 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs @@ -5,7 +5,7 @@ namespace Speckle.Converters.RevitShared.ToSpeckle; -// Converts model curves to regurlar speckle curves, since we aren't receiving them and the only property used in V2 was the linestyle (not element ids or parameters). Don't see a need to handle these differently from regular geometry. +// Converts model curves to regular speckle curves, since we aren't receiving them and the only property used in V2 was the linestyle (not element ids or parameters). Don't see a need to handle these differently from regular geometry. [NameAndRankValue(nameof(DB.ModelCurve), 0)] public class ModelCurveToSpeckleTopLevelConverter : BaseTopLevelConverterToSpeckle { diff --git a/Directory.Packages.props b/Directory.Packages.props index 03e2481c4..b91a88842 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,9 +39,9 @@ - - - + + + From d65d53a784ce343d86d5f4f9a79758a063f217e1 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 5 Nov 2024 10:21:51 +0000 Subject: [PATCH 8/9] fixes package locks and arc --- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../HostApp/TeklaMaterialUnpacker.cs | 4 +- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 34 +++++----- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../ToHost/Raw/Geometry/ArcConverterToHost.cs | 5 +- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 32 +++++----- .../packages.lock.json | 64 +++++++++---------- .../Speckle.Connectors.DUI/packages.lock.json | 28 ++++---- .../packages.lock.json | 22 +++---- .../packages.lock.json | 28 ++++---- .../packages.lock.json | 24 +++---- .../packages.lock.json | 22 +++---- 45 files changed, 640 insertions(+), 643 deletions(-) diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json index 034b2e915..821cb0378 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json @@ -231,9 +231,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -241,8 +241,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -299,18 +299,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -320,14 +320,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json index 0ca074304..85bb02c89 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json @@ -264,9 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -274,8 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -300,7 +300,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -338,18 +338,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -359,14 +359,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json index 17d28c99a..40af6b713 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json @@ -264,9 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -274,8 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -300,7 +300,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -338,18 +338,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -359,14 +359,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json index 18b60810c..52a84f076 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json @@ -264,9 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -274,8 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -301,7 +301,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -339,18 +339,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -360,14 +360,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json index a797a3305..7c109df9c 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json @@ -220,9 +220,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -230,8 +230,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -257,7 +257,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -315,14 +315,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json index dd6d589af..2dca6f3eb 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json @@ -273,9 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -283,8 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -310,7 +310,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -369,14 +369,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json index 2c7264d4e..9546c0a39 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json @@ -273,9 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -283,8 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -310,7 +310,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -369,14 +369,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index 1c6285d0d..7c769403d 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -273,9 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -283,8 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -310,7 +310,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -369,14 +369,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json index a44fc361c..13d838f52 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json @@ -229,9 +229,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -239,8 +239,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -305,18 +305,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -325,14 +325,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json index 70c92ac2f..4ad8dd254 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json @@ -292,9 +292,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -302,8 +302,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -314,7 +314,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.converters.revit2022": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -380,14 +380,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json index 2c74b96ee..cd519ecff 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json @@ -292,9 +292,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -302,8 +302,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -314,7 +314,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.converters.revit2023": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -380,14 +380,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json index 4b72d3131..f7cec6bd5 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json @@ -292,9 +292,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -302,8 +302,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -314,7 +314,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.converters.revit2024": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -380,14 +380,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json index ee42f6c01..d4e3ec0ba 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json @@ -242,9 +242,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -252,8 +252,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -271,7 +271,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.converters.revit2025": { @@ -316,11 +316,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Revit.API": { @@ -331,9 +331,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -342,14 +342,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index 7d3d7494b..8039e2693 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json @@ -273,9 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -283,8 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.converters.rhino7": { @@ -347,18 +347,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -368,14 +368,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json index f4be9cad2..9aaedae10 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json @@ -273,9 +273,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -283,8 +283,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.converters.rhino8": { @@ -347,18 +347,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -368,14 +368,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs index 2e6952ac9..2f2a1a0c0 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs @@ -1,4 +1,4 @@ -using System.Drawing; +using System.Drawing; using Speckle.Connector.Tekla2024.Extensions; using Speckle.Objects.Other; @@ -38,7 +38,7 @@ public List UnpackRenderMaterial(List atom } else { - var renderMaterial = new RenderMaterial() { name = colorId, diffuseColor = systemColor }; + var renderMaterial = new RenderMaterial() { name = colorId, diffuse = systemColor.ToArgb() }; RenderMaterialProxy proxyRenderMaterial = new() { diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json index 2cf7746a1..bc2e07ca9 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json @@ -35,11 +35,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Tekla.Structures.Dialog": { @@ -413,9 +413,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -423,8 +423,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -450,7 +450,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -488,9 +488,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -500,14 +500,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json index 498650a05..7f355e74a 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json @@ -224,7 +224,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -247,18 +247,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -268,14 +268,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index 0b5b29311..3e25b8dfc 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index d712fa5bc..9af315ba7 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index 39ec0de86..03e3f3966 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -264,9 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -274,8 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -293,7 +293,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -331,18 +331,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -352,14 +352,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json index 70dc2ee2d..f6684e1c7 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json @@ -220,9 +220,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -230,8 +230,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -249,7 +249,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json index 1cc1c15c2..d82950ff6 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json @@ -272,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -316,14 +316,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json index 28966633f..d58fe235d 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json @@ -272,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -316,14 +316,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index b90a4cd62..0de2de741 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json @@ -272,7 +272,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -316,14 +316,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json index f2e13f78d..e238cdf69 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json @@ -229,9 +229,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -239,8 +239,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -316,14 +316,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json index b90bd905e..6019ad499 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -395,14 +395,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index abcd6fce8..31ca15702 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json index 532d6793f..e7d61e065 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -395,14 +395,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index eafa3875c..ad8638c4d 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json index ca33399e3..a4676bade 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -395,14 +395,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index 6a15624db..90463e862 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 38453ca9e..7db6acfed 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json @@ -219,7 +219,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -242,18 +242,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -262,14 +262,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs index e9c70627f..b906c3301 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs @@ -25,11 +25,8 @@ public DB.Arc Convert(SOG.Arc target) // Endpoints coincide, it's a circle. if (SOG.Point.Distance(target.startPoint, target.endPoint) < 1E-6) { - double radius = - target.radius ?? _scalingService.ScaleToNative(target.plane.origin.DistanceTo(target.startPoint), target.units); var plane = _planeConverter.Convert(target.plane); - return DB.Arc.Create(plane, _scalingService.ScaleToNative(radius, target.units), 0, Math.PI * 2); - + return DB.Arc.Create(plane, _scalingService.ScaleToNative(target.radius, target.units), 0, Math.PI * 2); } return DB.Arc.Create( diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json index 012f5f023..3ea5c770d 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -395,14 +395,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index 569ae28bb..6e0163d2d 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index cba92f9a8..055b33f9d 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json @@ -263,7 +263,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json index e66429f0b..827129b68 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json @@ -341,7 +341,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "Microsoft.Extensions.Logging": { @@ -364,18 +364,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -385,14 +385,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "Tekla.Structures.Plugins": { "type": "CentralTransitive", diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json index d46540974..404f519ef 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -324,9 +324,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -334,8 +334,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -378,18 +378,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -398,14 +398,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json index 4b77a2d3e..ccb054c3c 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json @@ -264,9 +264,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -274,8 +274,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -311,18 +311,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -332,14 +332,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", @@ -572,9 +572,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.dui": { @@ -582,8 +582,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -619,18 +619,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -640,14 +640,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index b9e6823ee..e599c86a9 100644 --- a/DUI3/Speckle.Connectors.DUI/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json @@ -50,9 +50,9 @@ }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -62,14 +62,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "System.Threading.Tasks.Dataflow": { "type": "Direct", @@ -320,9 +320,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.logging": { @@ -351,11 +351,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } } } diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json index 53f9dc338..36fcf0d79 100644 --- a/Sdk/Speckle.Connectors.Common/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common/packages.lock.json @@ -53,18 +53,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -74,14 +74,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" }, "GraphQL.Client": { "type": "Transitive", diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json index d32156b27..8d0c9ed3d 100644 --- a/Sdk/Speckle.Connectors.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json @@ -324,9 +324,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )", - "Speckle.Sdk": "[3.1.0-dev.170, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.174, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" } }, "speckle.connectors.logging": { @@ -368,18 +368,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -388,14 +388,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json index 91ea164ef..da52fe1b8 100644 --- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json @@ -332,7 +332,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.170, )" + "Speckle.Objects": "[3.1.0-dev.174, )" } }, "speckle.testing": { @@ -362,18 +362,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -382,14 +382,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index 63b539ee2..0814f6f7f 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.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "T5p8Ra9NuliEsdfkInjtX0y5tsLzCLeCuAI/HMkJwGalcUuB6tY1wIAsKmE5slDrhOfwaMJ+DcBgoeOap6sj1A==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.170" + "Speckle.Sdk": "3.1.0-dev.174" } }, "GraphQL.Client": { @@ -309,9 +309,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "y9trGxWi/np52nKTufe9YMCboj5zCTzlP1yA99RVm+fVJUXKpibvWMG0LYaL8wxYryB/iJ7YLSy7wNbLkuZkQQ==", + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -321,14 +321,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.170" + "Speckle.Sdk.Dependencies": "3.1.0-dev.174" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.170, )", - "resolved": "3.1.0-dev.170", - "contentHash": "HIRsT/tC20vGp+5YRRv8iQEd5ICRDl475H+cGdIa2/aOCwAv6OJ1KHEYRa+E1Kk9rn8nI/ltCsU14r6JkleQSw==" + "requested": "[3.1.0-dev.174, )", + "resolved": "3.1.0-dev.174", + "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" } } } From ae08faa0a954ddb5e53e4b7110e5f52e735a2517 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 5 Nov 2024 10:32:28 +0000 Subject: [PATCH 9/9] updates rhino arc test --- .../ArcToSpeckleConverterTests.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs index 57806f31c..5f73f5606 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using FluentAssertions; using Moq; using NUnit.Framework; using Speckle.Converters.Common; @@ -15,7 +15,6 @@ public class ArcToSpeckleConverterTests : MoqTest public void Convert_ShouldConvertArcCorrectly() { // Arrange - var radius = 1.1d; var mockPointConverter = Create>(); var mockPlaneConverter = Create>(); var mockBoxConverter = Create>(); @@ -33,11 +32,6 @@ public void Convert_ShouldConvertArcCorrectly() var boundbox = Create(); targetArc.Setup(x => x.Plane).Returns(targetPlane.Object); - targetArc.Setup(x => x.Radius).Returns(radius); - targetArc.Setup(x => x.StartAngle).Returns(radius); - targetArc.Setup(x => x.EndAngle).Returns(radius); - targetArc.Setup(x => x.Angle).Returns(radius); - targetArc.Setup(x => x.Length).Returns(radius); targetArc.Setup(x => x.StartPoint).Returns(point3d.Object); targetArc.Setup(x => x.MidPoint).Returns(point3d.Object); targetArc.Setup(x => x.EndPoint).Returns(point3d.Object);