diff --git a/Build/Solutions.cs b/Build/Solutions.cs index dfdad4d08..d42a63134 100644 --- a/Build/Solutions.cs +++ b/Build/Solutions.cs @@ -45,6 +45,7 @@ void CheckAndRemoveKnown(string projectName) CheckAndRemoveKnown("Speckle.Objects"); CheckAndRemoveKnown("Speckle.Sdk"); + CheckAndRemoveKnown("Speckle.Sdk.Dependencies"); if (localProjects.Count != 0) { throw new InvalidOperationException( diff --git a/Build/packages.lock.json b/Build/packages.lock.json index df89bd19f..93a2fc8f2 100644 --- a/Build/packages.lock.json +++ b/Build/packages.lock.json @@ -16,18 +16,16 @@ }, "Microsoft.Build": { "type": "Direct", - "requested": "[17.10.4, )", - "resolved": "17.10.4", - "contentHash": "ZmGA8vhVXFzC4oo48ybQKlEybVKd0Ntfdr+Enqrn5ES1R6e/krIK9hLk0W33xuT0/G6QYd3YdhJZh+Xle717Ag==", + "requested": "[17.11.4, )", + "resolved": "17.11.4", + "contentHash": "UMC7DfeFEHY2GGHHaghybUuUlLaByFHEFudR2PehMgDBuRuLAUePp1iaa4eFtVzepRzMtIbeSCVJCzzX3NV2Gg==", "dependencies": { - "Microsoft.Build.Framework": "17.10.4", - "Microsoft.NET.StringTools": "17.10.4", + "Microsoft.Build.Framework": "17.11.4", + "Microsoft.NET.StringTools": "17.11.4", "System.Collections.Immutable": "8.0.0", "System.Configuration.ConfigurationManager": "8.0.0", "System.Reflection.Metadata": "8.0.0", - "System.Reflection.MetadataLoadContext": "8.0.0", - "System.Security.Principal.Windows": "5.0.0", - "System.Threading.Tasks.Dataflow": "8.0.0" + "System.Reflection.MetadataLoadContext": "8.0.0" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -69,8 +67,8 @@ }, "Microsoft.Build.Framework": { "type": "Transitive", - "resolved": "17.10.4", - "contentHash": "4qXCwNOXBR1dyCzuks9SwTwFJQO/xmf2wcMislotDWJu7MN/r3xDNoU8Ae5QmKIHPaLG1xmfDkYS7qBVzxmeKw==" + "resolved": "17.11.4", + "contentHash": "u28uDihlqxtt8h2dL1ZJOZ7TRkxBK+HGr+3FgQpILVo7Q7gErkw8mYW9R+RM5PtxvZTdYb/4MWDL66vdIsANBQ==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -79,8 +77,8 @@ }, "Microsoft.NET.StringTools": { "type": "Transitive", - "resolved": "17.10.4", - "contentHash": "wyABaqY+IHCMMSTQmcc3Ca6vbmg5BaEPgicnEgpll+4xyWZWlkQqUwafweUd9VAhBb4jqplMl6voUHQ6yfdUcg==" + "resolved": "17.11.4", + "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA==" }, "Microsoft.NETFramework.ReferenceAssemblies.net461": { "type": "Transitive", @@ -132,17 +130,6 @@ "type": "Transitive", "resolved": "8.0.0", "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Threading.Tasks.Dataflow": { - "type": "CentralTransitive", - "requested": "[6.0.0, )", - "resolved": "8.0.0", - "contentHash": "7V0I8tPa9V7UxMx/+7DIwkhls5ouaEMQx6l/GwGm1Y8kJQ61On9B/PxCXFLbgu5/C47g0BP2CUYs+nMv1+Oaqw==" } } } diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs index 17a41caf7..1b3dcb613 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs @@ -381,7 +381,7 @@ public async Task Send(string modelCardId) ); List mapMembers = modelCard .SendFilter.NotNull() - .GetObjectIds() + .RefreshObjectIds() .Select(id => (MapMember)MapView.Active.Map.FindLayer(id) ?? MapView.Active.Map.FindStandaloneTable(id)) .Where(obj => obj != null) .ToList(); @@ -454,7 +454,7 @@ private async Task RunExpirationChecks(bool idsDeleted) foreach (SenderModelCard sender in senders) { - var objIds = sender.SendFilter.NotNull().GetObjectIds(); + var objIds = sender.SendFilter.NotNull().RefreshObjectIds(); var intersection = objIds.Intersect(objectIdsList).ToList(); bool isExpired = intersection.Count != 0; if (isExpired) diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs index 82804397a..6b3e68ccf 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs @@ -76,7 +76,7 @@ public async Task HighlightModel(string modelCardId) if (model is SenderModelCard senderModelCard) { - objectIds = senderModelCard.SendFilter.NotNull().GetObjectIds().Select(x => new ObjectID(x)).ToList(); + objectIds = senderModelCard.SendFilter.NotNull().RefreshObjectIds().Select(x => new ObjectID(x)).ToList(); } if (model is ReceiverModelCard receiverModelCard) diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Filters/ArcGISSelectionFilter.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Filters/ArcGISSelectionFilter.cs index 6712e1c46..3d50f1876 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Filters/ArcGISSelectionFilter.cs +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Filters/ArcGISSelectionFilter.cs @@ -9,5 +9,5 @@ public ArcGISSelectionFilter() IsDefault = true; } - public override List GetObjectIds() => SelectedObjectIds; + public override List RefreshObjectIds() => SelectedObjectIds; } diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json index 821cb0378..90b86ef23 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -299,18 +299,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 85bb02c89..bf7ccb558 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -338,18 +338,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 40af6b713..4924a2b3f 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -338,18 +338,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 52a84f076..6ab451a8b 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -339,18 +339,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 7c109df9c..6d728cc45 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs index bf6a80b4c..dbc34f1b6 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs @@ -104,7 +104,7 @@ public async Task HighlightModel(string modelCardId) if (model is SenderModelCard senderModelCard) { - var dbObjects = doc.GetObjects(senderModelCard.SendFilter.NotNull().GetObjectIds()); + var dbObjects = doc.GetObjects(senderModelCard.SendFilter.NotNull().RefreshObjectIds()); objectIds = dbObjects.Select(tuple => tuple.Root.Id).ToArray(); } diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs index dda2cca8e..11f840f92 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs @@ -111,10 +111,13 @@ private void OnObjectChanged(DBObject dbObject) private void OnChangeChangedObjectIds(DBObject dBObject) { ChangedObjectIds[dBObject.GetSpeckleApplicationId()] = 1; - _idleManager.SubscribeToIdle(nameof(AutocadSendBinding), RunExpirationChecks); + _idleManager.SubscribeToIdle( + nameof(AutocadSendBinding), + async () => await RunExpirationChecks().ConfigureAwait(false) + ); } - private void RunExpirationChecks() + private async Task RunExpirationChecks() { var senders = _store.GetSenders(); string[] objectIdsList = ChangedObjectIds.Keys.ToArray(); @@ -124,7 +127,7 @@ private void RunExpirationChecks() foreach (SenderModelCard modelCard in senders) { - var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objectIdsList).ToList(); + var intersection = modelCard.SendFilter.NotNull().RefreshObjectIds().Intersect(objectIdsList).ToList(); bool isExpired = intersection.Count != 0; if (isExpired) { @@ -132,7 +135,7 @@ private void RunExpirationChecks() } } - Commands.SetModelsExpired(expiredSenderIds); + await Commands.SetModelsExpired(expiredSenderIds).ConfigureAwait(false); ChangedObjectIds = new(); } @@ -169,7 +172,7 @@ private async Task SendInternal(string modelCardId) // Get elements to convert List autocadObjects = Application.DocumentManager.CurrentDocument.GetObjects( - modelCard.SendFilter.NotNull().GetObjectIds() + modelCard.SendFilter.NotNull().RefreshObjectIds() ); if (autocadObjects.Count == 0) diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Filters/AutocadSelectionFilter.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Filters/AutocadSelectionFilter.cs index bc5243319..3c6348bb0 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Filters/AutocadSelectionFilter.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Filters/AutocadSelectionFilter.cs @@ -9,5 +9,5 @@ public AutocadSelectionFilter() IsDefault = true; } - public override List GetObjectIds() => SelectedObjectIds; + public override List RefreshObjectIds() => SelectedObjectIds; } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json index 2dca6f3eb..10fc540ab 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 9546c0a39..3b9f2dd7c 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 7c769403d..e8be4e08a 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -348,18 +348,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 13d838f52..6ec99ede6 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -305,18 +305,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 4ad8dd254..7bbaa0073 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.converters.revit2022": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 cd519ecff..49f4585f8 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.converters.revit2023": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 f7cec6bd5..823419024 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.converters.revit2024": { @@ -353,11 +353,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Revit.API": { @@ -368,9 +368,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 d4e3ec0ba..d93a1dc8f 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.converters.revit2025": { @@ -316,11 +316,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Revit.API": { @@ -331,9 +331,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs index 4d6ff3cef..db2faf01b 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs @@ -106,9 +106,13 @@ public async Task HighlightModel(string modelCardId) if (model is SenderModelCard senderModelCard) { + if (senderModelCard.SendFilter is IRevitSendFilter revitFilter) + { + revitFilter.SetContext(_revitContext, _apiContext); + } + if (senderModelCard.SendFilter is RevitViewsFilter revitViewsFilter) { - revitViewsFilter.SetContext(_revitContext, _apiContext); await _apiContext .Run(() => { @@ -122,9 +126,7 @@ await _apiContext return; } - var selectedObjects = await _apiContext - .Run(_ => senderModelCard.SendFilter.NotNull().GetObjectIds()) - .ConfigureAwait(false); + var selectedObjects = senderModelCard.SendFilter.NotNull().IdMap.NotNull().Values; elementIds = selectedObjects .Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid)) diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs index a7b1186f2..c2cf62291 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs @@ -47,11 +47,6 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding /// private ConcurrentDictionary ChangedObjectIds { get; set; } = new(); - /// - /// We need it to get UniqueId whenever it is not available i.e. GetDeletedElementIds returns ElementId and cannot find its Element to get UniqueId. We store them both just before send to remember later. - /// - private ConcurrentDictionary IdMap { get; } = new(); - public RevitSendBinding( IRevitIdleManager idleManager, RevitContext revitContext, @@ -96,7 +91,11 @@ ISpeckleApplication speckleApplication } public List GetSendFilters() => - [new RevitSelectionFilter() { IsDefault = true }, new RevitViewsFilter(RevitContext, _apiContext)]; + [ + new RevitSelectionFilter() { IsDefault = true }, + new RevitViewsFilter(RevitContext, _apiContext), + new RevitCategoriesFilter(RevitContext, _apiContext) + ]; public List GetSendSettings() => [ @@ -109,9 +108,7 @@ public List GetSendSettings() => public SendBindingUICommands Commands { get; } -#pragma warning disable CA1506 public async Task Send(string modelCardId) -#pragma warning restore CA1506 { // Note: removed top level handling thing as it was confusing me try @@ -129,33 +126,23 @@ public async Task Send(string modelCardId) .ServiceProvider.GetRequiredService>() .Initialize( _revitConversionSettingsFactory.Create( - await _toSpeckleSettingsManager.GetDetailLevelSetting(modelCard).ConfigureAwait(false), - await _toSpeckleSettingsManager.GetReferencePointSetting(modelCard).ConfigureAwait(false), - await _toSpeckleSettingsManager.GetSendParameterNullOrEmptyStringsSetting(modelCard).ConfigureAwait(false) + _toSpeckleSettingsManager.GetDetailLevelSetting(modelCard), + _toSpeckleSettingsManager.GetReferencePointSetting(modelCard), + _toSpeckleSettingsManager.GetSendParameterNullOrEmptyStringsSetting(modelCard) ) ); - var activeUIDoc = - RevitContext.UIApplication?.ActiveUIDocument - ?? throw new SpeckleException("Unable to retrieve active UI document"); - - if (modelCard.SendFilter is RevitViewsFilter viewFilter) - { - viewFilter.SetContext(RevitContext, _apiContext); - } - - var selectedObjects = await _apiContext - .Run(_ => modelCard.SendFilter.NotNull().GetObjectIds()) - .ConfigureAwait(false); + List elements = await RefreshElementsOnSender(modelCard.NotNull()).ConfigureAwait(false); - List elements = selectedObjects - .Select(uid => activeUIDoc.Document.GetElement(uid)) - .Where(el => el is not null) - .ToList(); - - foreach (Element element in elements) + if (modelCard is SenderModelCard senderModel) { - IdMap[element.Id.ToString()] = element.UniqueId; + foreach (Element element in elements) + { + senderModel.SendFilter.NotNull().IdMap.NotNull()[element.Id.ToString()] = element.UniqueId; + } + await Commands + .SetFilterObjectIds(modelCardId, senderModel.SendFilter.NotNull().IdMap.NotNull()) + .ConfigureAwait(false); } List elementIds = elements.Select(el => el.Id).ToList(); @@ -193,12 +180,48 @@ await Commands } } + private async Task> RefreshElementsOnSender(SenderModelCard modelCard) + { + var activeUIDoc = + RevitContext.UIApplication?.ActiveUIDocument + ?? throw new SpeckleException("Unable to retrieve active UI document"); + + if (modelCard.SendFilter is IRevitSendFilter viewFilter) + { + viewFilter.SetContext(RevitContext, _apiContext); + } + + var selectedObjects = await _apiContext + .Run(_ => modelCard.SendFilter.NotNull().RefreshObjectIds()) + .ConfigureAwait(false); + + List elements = selectedObjects + .Select(uid => activeUIDoc.Document.GetElement(uid)) + .Where(el => el is not null) + .ToList(); + + if (modelCard.SendFilter is not null && modelCard.SendFilter.IdMap is not null) + { + foreach (Element element in elements) + { + modelCard.SendFilter.IdMap[element.Id.ToString()] = element.UniqueId; + } + + // We update the state on the UI SenderModelCard to prevent potential inconsistencies between hostApp IdMap in sendfilters. + await Commands + .SetFilterObjectIds(modelCard.ModelCardId.NotNull(), modelCard.SendFilter.IdMap) + .ConfigureAwait(false); + } + + return elements; + } + /// /// Keeps track of the changed element ids as well as checks if any of them need to trigger /// a filter refresh (e.g., views being added). /// /// - private async Task DocChangeHandler(Autodesk.Revit.DB.Events.DocumentChangedEventArgs e) + private void DocChangeHandler(Autodesk.Revit.DB.Events.DocumentChangedEventArgs e) { ICollection addedElementIds = e.GetAddedElementIds(); ICollection deletedElementIds = e.GetDeletedElementIds(); @@ -219,18 +242,22 @@ private async Task DocChangeHandler(Autodesk.Revit.DB.Events.DocumentChangedEven ChangedObjectIds[elementId] = 1; } + if (addedElementIds.Count > 0) + { + _idleManager.SubscribeToIdle(nameof(PostSetObjectIds), PostSetObjectIds); + } + if (HaveUnitsChanged(e.GetDocument())) { var objectIds = new List(); - foreach (var sender in Store.GetSenders()) + foreach (var sender in Store.GetSenders().ToList()) { if (sender.SendFilter is null) { continue; } - var selectedObjects = await _apiContext - .Run(_ => sender.SendFilter.NotNull().GetObjectIds()) - .ConfigureAwait(false); + + var selectedObjects = sender.SendFilter.NotNull().SelectedObjectIds; objectIds.AddRange(selectedObjects); } var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objectIds.ToList()); @@ -275,6 +302,14 @@ private bool HaveUnitsChanged(Document doc) return false; } + private async Task PostSetObjectIds() + { + foreach (var sender in Store.GetSenders().ToList()) + { + await RefreshElementsOnSender(sender).ConfigureAwait(false); + } + } + /// /// Notifies ui if any filters need refreshing. Currently, this only applies for view filters. /// @@ -297,7 +332,7 @@ private async Task CheckFilterExpiration() private async Task RunExpirationChecks() { - var senders = Store.GetSenders(); + var senders = Store.GetSenders().ToList(); // string[] objectIdsList = ChangedObjectIds.Keys.ToArray(); var doc = RevitContext.UIApplication?.ActiveUIDocument.Document; @@ -307,20 +342,38 @@ private async Task RunExpirationChecks() } var objUniqueIds = new List(); - foreach (var changedElementId in ChangedObjectIds.Keys.ToArray()) + + foreach (var sender in senders) { - if (IdMap.TryGetValue(changedElementId.ToString(), out var uniqueId)) - { - objUniqueIds.Add(uniqueId); - } - else + // if (sender.SendFilter is null) // NOTE: RunExpirationChecks sometimes triggered unnecessarily before send and, we didn't set up yet IdMap, if so we do not need to deal with it + // { + // continue; + // } + + foreach (var changedElementId in ChangedObjectIds.Keys.ToArray()) { - var uniqId = doc.GetElement(changedElementId).UniqueId; - objUniqueIds.Add(uniqId); - IdMap[changedElementId.ToString()] = uniqId; + if (sender.SendFilter.NotNull().IdMap.NotNull().ContainsKey(changedElementId.ToString())) + { + objUniqueIds.Add(sender.SendFilter.NotNull().IdMap.NotNull()[changedElementId.ToString()]); + } } } + // foreach (var changedElementId in ChangedObjectIds.Keys.ToArray()) + // { + // foreach (var sender in senders) + // { + // if (sender.SendFilter.NotNull().IdMap is null) + // { + // continue; + // } + // if (sender.SendFilter.NotNull().IdMap.NotNull().ContainsKey(changedElementId.ToString())) + // { + // objUniqueIds.Add(sender.SendFilter.NotNull().IdMap.NotNull()[changedElementId.ToString()]); + // } + // } + // } + var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objUniqueIds); _sendConversionCache.EvictObjects(unpackedObjectIds); @@ -328,13 +381,12 @@ private async Task RunExpirationChecks() List expiredSenderIds = new(); foreach (SenderModelCard modelCard in senders) { - if (modelCard.SendFilter is RevitViewsFilter viewFilter) + if (modelCard.SendFilter is IRevitSendFilter viewFilter) { viewFilter.SetContext(RevitContext, _apiContext); } - var selectedObjects = await _apiContext - .Run(_ => modelCard.SendFilter.NotNull().GetObjectIds()) - .ConfigureAwait(false); + + var selectedObjects = modelCard.SendFilter.NotNull().IdMap.NotNull().Values; var intersection = selectedObjects.Intersect(objUniqueIds).ToList(); bool isExpired = intersection.Count != 0; if (isExpired) @@ -352,7 +404,6 @@ private async Task RunExpirationChecks() private async Task OnDocumentChanged() { _sendConversionCache.ClearCache(); - IdMap.Clear(); if (_cancellationManager.NumberOfOperations > 0) { diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/ElementIdHelper.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/ElementIdHelper.cs index f19938e0f..fdbe913a2 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/ElementIdHelper.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/ElementIdHelper.cs @@ -9,4 +9,16 @@ public static class ElementIdHelper Element element = doc.GetElement(uniqueId); return element?.Id; } + + public static ElementId? GetElementId(string elementId) + { + if (int.TryParse(elementId, out int elementIdInt)) + { + return new ElementId(elementIdInt); + } + else + { + return null; + } + } } diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs index ac740b667..6734d1219 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs @@ -180,10 +180,10 @@ CancellationToken cancellationToken { using var activity = _activityFactory.Start("BakeObject"); - // POC hack of the ages: try to pre transform curves before baking + // POC hack of the ages: try to pre transform curves, points and meshes before baking // we need to bypass the local to global converter as there we don't have access to what we want. that service will/should stop existing. if ( - localToGlobalMap.AtomicObject is ITransformable transformable and ICurve + localToGlobalMap.AtomicObject is ITransformable transformable // and ICurve && localToGlobalMap.Matrix.Count > 0 && localToGlobalMap.AtomicObject["units"] is string units ) diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs new file mode 100644 index 000000000..8895b357b --- /dev/null +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs @@ -0,0 +1,9 @@ +using Speckle.Connectors.Revit.HostApp; +using Speckle.Converters.RevitShared.Helpers; + +namespace Speckle.Connectors.RevitShared.Operations.Send.Filters; + +public interface IRevitSendFilter +{ + public void SetContext(RevitContext revitContext, APIContext apiContext); +} diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs new file mode 100644 index 000000000..b1cd74db7 --- /dev/null +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs @@ -0,0 +1,91 @@ +using Autodesk.Revit.DB; +using Speckle.Connectors.DUI.Exceptions; +using Speckle.Connectors.DUI.Models.Card.SendFilter; +using Speckle.Connectors.DUI.Utils; +using Speckle.Connectors.Revit.HostApp; +using Speckle.Converters.RevitShared.Helpers; + +namespace Speckle.Connectors.RevitShared.Operations.Send.Filters; + +public record CategoryData(string Name, string Id); + +public class RevitCategoriesFilter : DiscriminatedObject, ISendFilter, IRevitSendFilter +{ + private RevitContext _revitContext; + private APIContext _apiContext; + private Document? _doc; + public string Id { get; set; } = "revitCategories"; + public string Name { get; set; } = "Categories"; + public string? Summary { get; set; } + public bool IsDefault { get; set; } + public List SelectedObjectIds { get; set; } = new(); + public Dictionary? IdMap { get; set; } + public List? SelectedCategories { get; set; } + public List? AvailableCategories { get; set; } + + public RevitCategoriesFilter() { } + + public RevitCategoriesFilter(RevitContext revitContext, APIContext apiContext) + { + _revitContext = revitContext; + _apiContext = apiContext; + _doc = _revitContext.UIApplication?.ActiveUIDocument.Document; + + GetCategories(); + } + + /// + /// Always need to run on Revit UI thread (main) because of FilteredElementCollector. + /// Use it with APIContext.Run + /// + /// Whenever no view is found. + public List RefreshObjectIds() + { + var objectIds = new List(); + if (SelectedCategories is null) + { + return objectIds; + } + + var elementIds = SelectedCategories.Select(c => ElementIdHelper.GetElementId(c)).Where(e => e is not null).ToList(); + + using var categoryFilter = new ElementMulticategoryFilter(elementIds); + using var collector = new FilteredElementCollector(_doc); + var elements = collector + .WhereElementIsNotElementType() + .WhereElementIsViewIndependent() + .WherePasses(categoryFilter) + .ToList(); + objectIds = elements.Select(e => e.UniqueId).ToList(); + SelectedObjectIds = objectIds; + return objectIds; + } + + private void GetCategories() + { + if (_doc is null) + { + return; + } + + var categories = new List(); + + foreach (Category category in _doc.Settings.Categories) + { + categories.Add(new CategoryData(category.Name, category.Id.ToString())); + } + + AvailableCategories = categories; + } + + /// + /// NOTE: this is needed since we need doc on `GetObjectIds()` function after it deserialized. + /// DI doesn't help here to pass RevitContext from constructor. + /// + public void SetContext(RevitContext revitContext, APIContext apiContext) + { + _revitContext = revitContext; + _apiContext = apiContext; + _doc = _revitContext.UIApplication?.ActiveUIDocument.Document; + } +} diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitSelectionFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitSelectionFilter.cs index 0cf40cd92..b50505990 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitSelectionFilter.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitSelectionFilter.cs @@ -9,5 +9,5 @@ public RevitSelectionFilter() IsDefault = true; } - public override List GetObjectIds() => SelectedObjectIds; + public override List RefreshObjectIds() => SelectedObjectIds; } diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs index b5eaf8f29..d98f46b80 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs @@ -7,7 +7,7 @@ namespace Speckle.Connectors.RevitShared.Operations.Send.Filters; -public class RevitViewsFilter : DiscriminatedObject, ISendFilter +public class RevitViewsFilter : DiscriminatedObject, ISendFilter, IRevitSendFilter { private RevitContext _revitContext; private APIContext _apiContext; @@ -17,6 +17,8 @@ public class RevitViewsFilter : DiscriminatedObject, ISendFilter public string? Summary { get; set; } public bool IsDefault { get; set; } public string? SelectedView { get; set; } + public List SelectedObjectIds { get; set; } + public Dictionary? IdMap { get; set; } = new(); public List? AvailableViews { get; set; } public RevitViewsFilter() { } @@ -52,7 +54,7 @@ public RevitViewsFilter(RevitContext revitContext, APIContext apiContext) /// Use it with APIContext.Run /// /// Whenever no view is found. - public List GetObjectIds() + public List RefreshObjectIds() { var objectIds = new List(); if (SelectedView is null) @@ -78,6 +80,7 @@ public List GetObjectIds() using var viewCollector = new FilteredElementCollector(_doc, view.Id); List elementsInView = viewCollector.ToElements().ToList(); objectIds = elementsInView.Select(e => e.UniqueId).ToList(); + SelectedObjectIds = objectIds; return objectIds; } diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/RevitRootObjectBuilder.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/RevitRootObjectBuilder.cs index b519628d5..2b374c37d 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/RevitRootObjectBuilder.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/RevitRootObjectBuilder.cs @@ -56,6 +56,13 @@ public async Task Build( SendInfo sendInfo, IProgress onOperationProgressed, CancellationToken ct = default + ) => await RevitTask.RunAsync(() => BuildSync(objects, sendInfo, onOperationProgressed, ct)).ConfigureAwait(false); + + private RootObjectBuilderResult BuildSync( + IReadOnlyList objects, + SendInfo sendInfo, + IProgress onOperationProgressed, + CancellationToken ct = default ) { var doc = _converterSettings.Current.Document; @@ -110,7 +117,7 @@ public async Task Build( } else { - converted = await RevitTask.RunAsync(() => _converter.Convert(revitElement)).ConfigureAwait(false); // Could we run these batched? Is there maybe a performance penalty for running these to speckle conversions individually in revittask.runasync? + converted = _converter.Convert(revitElement); converted.applicationId = applicationId; } @@ -136,8 +143,9 @@ public async Task Build( var idsAndSubElementIds = _elementUnpacker.GetElementsAndSubelementIdsFromAtomicObjects(atomicObjects); var materialProxies = _revitToSpeckleCacheSingleton.GetRenderMaterialProxyListForObjects(idsAndSubElementIds); rootObject[ProxyKeys.RENDER_MATERIAL] = materialProxies; - // NOTE: these are currently not used anywhere, so we could even skip them (?). - rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions; + + // NOTE: these are currently not used anywhere, we'll skip them until someone calls for it back + // rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions; return new RootObjectBuilderResult(rootObject, results); } diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs index 05cd646d7..96ce3fde7 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs @@ -36,7 +36,7 @@ ElementUnpacker elementUnpacker _sendConversionCache = sendConversionCache; } - public async Task GetDetailLevelSetting(SenderModelCard modelCard) + public DetailLevelType GetDetailLevelSetting(SenderModelCard modelCard) { var fidelityString = modelCard.Settings?.First(s => s.Id == "detailLevel").Value as string; if ( @@ -48,7 +48,7 @@ fidelityString is not null { if (previousType != fidelity) { - await EvictCacheForModelCard(modelCard).ConfigureAwait(false); + EvictCacheForModelCard(modelCard); } } _detailLevelCache[modelCard.ModelCardId.NotNull()] = fidelity; @@ -58,7 +58,7 @@ fidelityString is not null throw new ArgumentException($"Invalid geometry fidelity value: {fidelityString}"); } - public async Task GetReferencePointSetting(SenderModelCard modelCard) + public Transform? GetReferencePointSetting(SenderModelCard modelCard) { var referencePointString = modelCard.Settings?.First(s => s.Id == "referencePoint").Value as string; if ( @@ -78,7 +78,7 @@ out ReferencePointType referencePoint // invalidate conversion cache if the transform has changed if (previousTransform != currentTransform) { - await EvictCacheForModelCard(modelCard).ConfigureAwait(false); + EvictCacheForModelCard(modelCard); } } @@ -89,7 +89,7 @@ out ReferencePointType referencePoint throw new ArgumentException($"Invalid reference point value: {referencePointString}"); } - public async Task GetSendParameterNullOrEmptyStringsSetting(SenderModelCard modelCard) + public bool GetSendParameterNullOrEmptyStringsSetting(SenderModelCard modelCard) { var value = modelCard.Settings?.First(s => s.Id == "nullemptyparams").Value as bool?; var returnValue = value != null && value.NotNull(); @@ -97,7 +97,7 @@ public async Task GetSendParameterNullOrEmptyStringsSetting(SenderModelCar { if (previousValue != returnValue) { - await EvictCacheForModelCard(modelCard).ConfigureAwait(false); + EvictCacheForModelCard(modelCard); } } @@ -105,12 +105,9 @@ public async Task GetSendParameterNullOrEmptyStringsSetting(SenderModelCar return returnValue; } - private async Task EvictCacheForModelCard(SenderModelCard modelCard) + private void EvictCacheForModelCard(SenderModelCard modelCard) { - var objectIds = - modelCard.SendFilter != null - ? await _apiContext.Run(_ => modelCard.SendFilter.NotNull().GetObjectIds()).ConfigureAwait(false) - : []; + var objectIds = modelCard.SendFilter != null ? modelCard.SendFilter.NotNull().SelectedObjectIds : []; var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objectIds); _sendConversionCache.EvictObjects(unpackedObjectIds); } diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems b/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems index 963a2ee23..350c552f7 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems @@ -35,6 +35,8 @@ + + diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index 8039e2693..69add5f06 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.converters.rhino7": { @@ -347,18 +347,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 9aaedae10..2153fe47a 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.converters.rhino8": { @@ -347,18 +347,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs index 54abe87a7..769eb48ae 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs @@ -90,7 +90,7 @@ public async Task HighlightModel(string modelCardId) if (myModel is SenderModelCard sender) { - objectIds = sender.SendFilter.NotNull().GetObjectIds(); + objectIds = sender.SendFilter.NotNull().RefreshObjectIds(); } if (myModel is ReceiverModelCard receiver && receiver.BakedObjectIds != null) diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs index 698fe7c2e..fa16144f8 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs @@ -178,7 +178,7 @@ public async Task Send(string modelCardId) List rhinoObjects = modelCard .SendFilter.NotNull() - .GetObjectIds() + .RefreshObjectIds() .Select(id => RhinoDoc.ActiveDoc.Objects.FindId(new Guid(id))) .Where(obj => obj != null) .ToList(); @@ -238,7 +238,7 @@ private async Task RunExpirationChecks() foreach (SenderModelCard modelCard in senders) { - var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objectIdsList).ToList(); + var intersection = modelCard.SendFilter.NotNull().SelectedObjectIds.Intersect(objectIdsList).ToList(); var isExpired = intersection.Count != 0; if (isExpired) { diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Filters/RhinoSelectionFilter.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Filters/RhinoSelectionFilter.cs index d66b13347..699536ed0 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Filters/RhinoSelectionFilter.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Filters/RhinoSelectionFilter.cs @@ -9,5 +9,5 @@ public RhinoSelectionFilter() IsDefault = true; } - public override List GetObjectIds() => SelectedObjectIds; + public override List RefreshObjectIds() => SelectedObjectIds; } diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Properties/launchSettings.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/Properties/launchSettings.json new file mode 100644 index 000000000..b998d5de2 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "Tekla2023": { + "commandName": "Executable", + "executablePath": "C:\\TeklaStructures\\2023.0\\bin\\TeklaStructures.exe" + } + } +} + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj new file mode 100644 index 000000000..04402ca45 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj @@ -0,0 +1,59 @@ + + + + net48 + 2023 + true + $(DefineConstants);TEKLA2023 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json new file mode 100644 index 000000000..bd8f3e6ff --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json @@ -0,0 +1,479 @@ +{ + "version": 2, + "dependencies": { + ".NETFramework,Version=v4.8": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.6, )", + "resolved": "0.9.6", + "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w==" + }, + "Speckle.Objects": { + "type": "Direct", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", + "dependencies": { + "Speckle.Sdk": "3.1.0-dev.181" + } + }, + "Tekla.Structures.Dialog": { + "type": "Direct", + "requested": "[2023.0.0, )", + "resolved": "2023.0.0", + "contentHash": "DPwrFnmhnaQJT0HmuormXow/b0jgyUSJ6llW1If8Vp8EQJlk/+VyelwqTFGCE3kNQrw0BPGvZ/fgUYaxjHcfdw==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Catalogs": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0", + "Tekla.Structures.Model": "2023.0.0", + "Tekla.Structures.Plugins": "2023.0.0" + } + }, + "Tekla.Structures.Drawing": { + "type": "Direct", + "requested": "[2023.0.0, )", + "resolved": "2023.0.0", + "contentHash": "22WqaO0GKxFOOEctU92ZmNCSzNJGjFwzDC/Px0+4Iimh6A3WL5Z7lvYSUhyCeF64YA7QbvK5PZKrtdhrB7Illg==", + "dependencies": { + "DotNetZip": "1.13.7", + "Newtonsoft.Json": "13.0.1", + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0", + "Tekla.Structures.Dialog": "2023.0.0", + "Tekla.Structures.Model": "2023.0.0", + "Tekla.Structures.Plugins": "2023.0.0", + "Tekla.Technology.Akit5": "5.8.17235.1", + "Tekla.Technology.Scripting": "5.0.20041" + } + }, + "Tekla.Structures.Model": { + "type": "Direct", + "requested": "[2023.0.0, )", + "resolved": "2023.0.0", + "contentHash": "dkw8cA4kqE/Jc6WAq8Zrzcn49Vs7kh0YNXuEBpcx6J76lv6jSl4n+EsIvxE8NEBJnEHsGoG67uLTaTkiKAmuXQ==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0" + } + }, + "Tekla.Structures.Plugins": { + "type": "Direct", + "requested": "[2023.0.0, )", + "resolved": "2023.0.0", + "contentHash": "8mD7XoH03QnHTTkHHICjdXJk8MrvhMNt74LmwtiYgYm/bF7TErGIzDEyl/MFgBPjji9m2I+mUJmCUvOde+A6NQ==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Technology.Akit5": "5.8.17235.1", + "Tekla.Technology.Scripting": "5.0.20041", + "Tekla.Technology.Scripting.Plugins": "5.3.17206" + } + }, + "DotNetZip": { + "type": "Transitive", + "resolved": "1.13.7", + "contentHash": "MGXK1jFJlxCWId2xcXnEdUov7M1oSMk+Gc/rF1psLOoqWNhCkfCqAIhIk1rSxeRCAGRt7JztQRMLC+DTapxc6g==" + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0", + "GraphQL.Client.Abstractions.Websocket": "6.0.0", + "System.Net.WebSockets.Client.Managed": "1.0.22", + "System.Reactive": "5.0.0" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "2.2.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Primitives": "2.2.0", + "System.ComponentModel.Annotations": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==", + "dependencies": { + "System.Memory": "4.5.1", + "System.Runtime.CompilerServices.Unsafe": "4.5.1" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net48": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Mono.Cecil": { + "type": "Transitive", + "resolved": "0.9.6.1", + "contentHash": "yMsurNaOxxKIjyW9pEB+tRrR1S3DFnN1+iBgKvYvXG8kW0Y6yknJeMAe/tl3+P78/2C6304TgF7aVqpqXgEQ9Q==" + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "Speckle.DoubleNumerics": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.dynamic_cdecl": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw==" + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + } + }, + "System.Net.WebSockets.Client.Managed": { + "type": "Transitive", + "resolved": "1.0.22", + "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "Tekla.Structures": { + "type": "Transitive", + "resolved": "2023.0.0", + "contentHash": "tSO+SQZMoxA25t0a0SZj4U3Nw44nUdS/XetSZGUky1j0OYiHUOuA6EGMq+NMUapRJlWfL9lmlPOPPmVvVVHluQ==" + }, + "Tekla.Structures.Catalogs": { + "type": "Transitive", + "resolved": "2023.0.0", + "contentHash": "CMzgDBTeVOYGCQfpzJxjnkSZ7h64PWR/CcIQCC5W3vU8xokV4vR4XFp7ecU/ckz7olex9IZE1xmSGaC0LCXYQA==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0", + "Tekla.Structures.Model": "2023.0.0" + } + }, + "Tekla.Structures.Datatype": { + "type": "Transitive", + "resolved": "2023.0.0", + "contentHash": "5q/7OvUTFgJrXfkcUrrRzF5yJqxHuVyFZvf1M5smC/RgF5zFqJsfUXxxFlhk03pc0pu+f6cD/QjRTVopAMU9Aw==" + }, + "Tekla.Technology.Akit5": { + "type": "Transitive", + "resolved": "5.8.17235.1", + "contentHash": "MVvgt7lcJDYj9xqyZfVIfXXCUKodIL+F3y3Rvp7rc/46ukTzEtwuiW+IIlId1IQqtO3/WCZBPBQmBxfwhx9sFA==" + }, + "Tekla.Technology.Scripting": { + "type": "Transitive", + "resolved": "5.0.20041", + "contentHash": "PXD4j7++eEWxmL7K7JxqEcwLmIfjDgbM4DsA1m9iw9NcSWj3DAx4V/luWRfEcUTYvV0cRgD6/nGoiCQQTVbiZQ==" + }, + "Tekla.Technology.Scripting.Plugins": { + "type": "Transitive", + "resolved": "5.3.17206", + "contentHash": "GbdMWQjGufzB637bzfoQiP5N+MCbuTs5WqBEyOLvY7dA22zkKlwnwoPnW3Hy2hXPGhywNlcKmWCn4oKOcj22Uw==", + "dependencies": { + "Mono.Cecil": "0.9.6.1" + } + }, + "speckle.connectors.common": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", + "Speckle.Connectors.Logging": "[1.0.0, )", + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" + } + }, + "speckle.connectors.dui": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", + "Speckle.Connectors.Common": "[1.0.0, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )" + } + }, + "speckle.connectors.dui.webview": { + "type": "Project", + "dependencies": { + "Microsoft.Web.WebView2": "[1.0.1938.49, )", + "Speckle.Connectors.DUI": "[1.0.0, )" + } + }, + "speckle.connectors.logging": { + "type": "Project" + }, + "speckle.converter.tekla2023": { + "type": "Project", + "dependencies": { + "Speckle.Converters.Common": "[1.0.0, )", + "Tekla.Structures.Drawing": "[2023.0.0, )", + "Tekla.Structures.Model": "[2023.0.0, )" + } + }, + "speckle.converters.common": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", + "Speckle.Objects": "[3.1.0-dev.181, )" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + } + }, + "Microsoft.Extensions.Logging": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==" + }, + "Microsoft.Web.WebView2": { + "type": "CentralTransitive", + "requested": "[1.0.1938.49, )", + "resolved": "1.0.1938.49", + "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw==" + }, + "Speckle.Sdk": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", + "dependencies": { + "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.CSharp": "4.7.0", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.0.1", + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" + } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" + }, + "System.Threading.Tasks.Dataflow": { + "type": "CentralTransitive", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA==" + } + } + } +} \ No newline at end of file diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/DevDocs/InputObjectDependency.NOT_DEPENDENT.png b/Connectors/Tekla/Speckle.Connector.Tekla2024/DevDocs/InputObjectDependency.NOT_DEPENDENT.png deleted file mode 100644 index a95b73cb5..000000000 Binary files a/Connectors/Tekla/Speckle.Connector.Tekla2024/DevDocs/InputObjectDependency.NOT_DEPENDENT.png and /dev/null differ diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj index 914db3857..5fe48282f 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj @@ -12,23 +12,24 @@ - - - + + + - + + + - @@ -52,4 +53,6 @@ + + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json index bc2e07ca9..a69b31e4c 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json @@ -35,25 +35,25 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Tekla.Structures.Dialog": { "type": "Direct", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "VY1n7ROsUMHomHwJBYbmTt58M9qSuGqkcdWS8GTJUU5NOZsIsoS746fT7E+YBpUyP+9tyzibv4OW9vQj1sDEAA==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "pBovjVxSzm9k87637Jaw684M4LdXZgolJv2xsPYcgBrVzNaoLojwag1YzTXXR+/iqM3XBy7/J0F3czkh3aZj1Q==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", - "Tekla.Structures": "2024.0.2", - "Tekla.Structures.Catalogs": "2024.0.2", - "Tekla.Structures.Datatype": "2024.0.2", - "Tekla.Structures.Model": "2024.0.2", - "Tekla.Structures.Plugins": "2024.0.2", + "Tekla.Structures": "2024.0.4", + "Tekla.Structures.Catalogs": "2024.0.4", + "Tekla.Structures.Datatype": "2024.0.4", + "Tekla.Structures.Model": "2024.0.4", + "Tekla.Structures.Plugins": "2024.0.4", "Tekla.Technology.Akit5": "5.15.0", "Tekla.Technology.Scripting.Plugins": "5.5.0", "Tekla.Technology.Serialization": "4.1.1", @@ -63,39 +63,39 @@ }, "Tekla.Structures.Drawing": { "type": "Direct", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "1/rlqkt/Wy9sdMvGXm8GH6fUm9fEASnRPCftvAn0nrtV5qinKbbwEpcxfWrlDneoSVAZY8qL/V8UsXztqO2YRQ==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "66xsZ+WTNlKgFEh2oa2+cc+F2XK/UrbiwUnp4vgEgTVbxMwquAKIVvnW/PYaGs55393FiS3fIGSfG/lHUp7qHA==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", - "Tekla.Structures": "2024.0.2", - "Tekla.Structures.Datatype": "2024.0.2", - "Tekla.Structures.Model": "2024.0.2", - "Tekla.Structures.Plugins": "2024.0.2", + "Tekla.Structures": "2024.0.4", + "Tekla.Structures.Datatype": "2024.0.4", + "Tekla.Structures.Model": "2024.0.4", + "Tekla.Structures.Plugins": "2024.0.4", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" } }, "Tekla.Structures.Model": { "type": "Direct", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "GV7mqc3TX7h3QeCLmjCI8GlnbhAMYOvLMEED1TY+hpdeWtMuHxGS7GwfLgG10iUdjumqy5Qmn2VE3PIRhw5hWg==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "cjSNpSEtz6kB9SwMry/t5m7xrgYHsL5G5JhLqcpBW0W9Id9GnC0hn6rEfJIld2y4dHuA2UvVDvjIX9RBSfZg3A==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", - "Tekla.Structures": "2024.0.2", - "Tekla.Structures.Datatype": "2024.0.2", + "Tekla.Structures": "2024.0.4", + "Tekla.Structures.Datatype": "2024.0.4", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" } }, "Tekla.Structures.Plugins": { "type": "Direct", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "40Dn4sAcfLJc1Gi6sK95tVz8BwmB4vvRjcZcFJ55F3HMr2mwtcJhvDQED0exlZuU3pbibjhUZaNz0/I16Mms/w==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "GUzN5Vs/PwgusrTMRFDnfoW+LNmbjquqCFRIuslbswMSJDA1kLUs8pJAFHGBl6ZuarQ37O4Wb2n8hudQ+lluGg==", "dependencies": { - "Tekla.Structures": "2024.0.2", + "Tekla.Structures": "2024.0.4", "Tekla.Technology.Scripting.Plugins": "5.5.0", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" @@ -338,8 +338,8 @@ }, "Tekla.Structures": { "type": "Transitive", - "resolved": "2024.0.2", - "contentHash": "m7URRYK7sEzumr/+TJRNd4q2nutF9qMUbIIPmbr36cbaKiBGW0xxAgveTL8+7kkDqodhAGyUTVai5gOtvYi2SQ==", + "resolved": "2024.0.4", + "contentHash": "Y55enG2I2C0drdHubnAavjzUjEPyTRjOMfoce63F4cM7Oqb5KS8j4v9/iE1bENmJ0Yyt5f7z3o7a8Bv9dWE1Pw==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", "Tekla.Technology.Serialization": "4.1.1", @@ -348,21 +348,21 @@ }, "Tekla.Structures.Catalogs": { "type": "Transitive", - "resolved": "2024.0.2", - "contentHash": "1VUbPKtzTUMwUP21jqN+c1gLEtxi31+KYPis/n2Plty2k5Zj4gM3Q428KhjMgyHOoc7bWJX/kjfUQBCYuhqAsQ==", + "resolved": "2024.0.4", + "contentHash": "sqQjP3t+3NSS606Pj85jf6Ao/zxOEG4VDhAzoJGtm9NBbwIWeBjl5CySNaaAVsBUdQDnQM29tC8u8sBQsZ7bRw==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", - "Tekla.Structures": "2024.0.2", - "Tekla.Structures.Datatype": "2024.0.2", - "Tekla.Structures.Model": "2024.0.2", + "Tekla.Structures": "2024.0.4", + "Tekla.Structures.Datatype": "2024.0.4", + "Tekla.Structures.Model": "2024.0.4", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" } }, "Tekla.Structures.Datatype": { "type": "Transitive", - "resolved": "2024.0.2", - "contentHash": "LtLUtkYuni+R1F0UAPXWmgjAPBZORabG+/2YVOhJBj6+0x6Fg0PxgDtABNMNniN7A7BFXaYQRI/fuP35VL8BFQ==" + "resolved": "2024.0.4", + "contentHash": "mtJQmPBQ4d+LnJdpgjljGeNmnFTkZoZhYJhRmU3I4nCo6vzvuKb+eIAlzBQ6QJnHnTdpyUT7Hr/Xph5YZbCKVw==" }, "Tekla.Technology.Akit5": { "type": "Transitive", @@ -413,9 +413,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -442,15 +442,15 @@ "type": "Project", "dependencies": { "Speckle.Converters.Common": "[1.0.0, )", - "Tekla.Structures.Drawing": "[2024.0.2, )", - "Tekla.Structures.Model": "[2024.0.2, )" + "Tekla.Structures.Drawing": "[2024.0.4, )", + "Tekla.Structures.Model": "[2024.0.4, )" } }, "speckle.converters.common": { "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -488,9 +488,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaBasicConnectorBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaBasicConnectorBinding.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSelectionBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSelectionBinding.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs similarity index 88% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs index 25404b3e7..0f5367949 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Bindings/TeklaSendBinding.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs @@ -1,6 +1,7 @@ using System.Collections.Concurrent; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Speckle.Connector.Tekla2024.Operations.Send.Settings; using Speckle.Connectors.Common.Caching; using Speckle.Connectors.Common.Cancellation; using Speckle.Connectors.Common.Operations; @@ -42,6 +43,7 @@ public sealed class TeklaSendBinding : ISendBinding, IDisposable private readonly ISdkActivityFactory _activityFactory; private readonly Model _model; private readonly Events _events; + private readonly ToSpeckleSettingsManager _toSpeckleSettingsManager; private ConcurrentDictionary ChangedObjectIds { get; set; } = new(); @@ -57,7 +59,8 @@ public TeklaSendBinding( ILogger logger, ITeklaConversionSettingsFactory teklaConversionSettingsFactory, ISpeckleApplication speckleApplication, - ISdkActivityFactory activityFactory + ISdkActivityFactory activityFactory, + ToSpeckleSettingsManager toSpeckleSettingsManager ) { _store = store; @@ -73,6 +76,7 @@ ISdkActivityFactory activityFactory Parent = parent; Commands = new SendBindingUICommands(parent); _activityFactory = activityFactory; + _toSpeckleSettingsManager = toSpeckleSettingsManager; _model = new Model(); _events = new Events(); @@ -103,15 +107,11 @@ private void ModelHandler_OnChange(List changes) public List GetSendFilters() => _sendFilters; - public List GetSendSettings() => []; + public List GetSendSettings() => [new SendRebarsAsSolidSetting(false)]; public async Task Send(string modelCardId) { using var activity = _activityFactory.Start(); - using var scope = _serviceProvider.CreateScope(); - scope - .ServiceProvider.GetRequiredService>() - .Initialize(_teklaConversionSettingsFactory.Create(_model)); try { @@ -119,12 +119,18 @@ public async Task Send(string modelCardId) { throw new InvalidOperationException("No publish model card was found."); } + using var scope = _serviceProvider.CreateScope(); + scope + .ServiceProvider.GetRequiredService>() + .Initialize( + _teklaConversionSettingsFactory.Create(_model, _toSpeckleSettingsManager.GetSendRebarsAsSolid(modelCard)) + ); CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId); List teklaObjects = modelCard .SendFilter.NotNull() - .GetObjectIds() + .RefreshObjectIds() .Select(id => _model.SelectModelObject(new Identifier(new Guid(id)))) .Where(obj => obj != null) .ToList(); @@ -177,7 +183,7 @@ private async Task RunExpirationChecks() foreach (SenderModelCard modelCard in senders) { - var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objectIdsList).ToList(); + var intersection = modelCard.SendFilter.NotNull().RefreshObjectIds().Intersect(objectIdsList).ToList(); var isExpired = intersection.Count != 0; if (isExpired) { diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Extensions/ModelObjectExtension.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Extensions/ModelObjectExtension.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Extensions/ModelObjectExtension.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Extensions/ModelObjectExtension.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Extensions/SpeckleApplicationIdExtensions.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Extensions/SpeckleApplicationIdExtensions.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Extensions/SpeckleApplicationIdExtensions.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Extensions/SpeckleApplicationIdExtensions.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Filters/TeklaSelectionFilter.cs similarity index 76% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Filters/TeklaSelectionFilter.cs index 339371f8b..f593ff117 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Filters/TeklaSelectionFilter.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Filters/TeklaSelectionFilter.cs @@ -9,5 +9,5 @@ public TeklaSelectionFilter() IsDefault = true; } - public override List GetObjectIds() => SelectedObjectIds; + public override List RefreshObjectIds() => SelectedObjectIds; } diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/GlobalUsing.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/GlobalUsing.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/GlobalUsing.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/GlobalUsing.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaDocumentModelStore.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaDocumentModelStore.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaDocumentModelStore.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaDocumentModelStore.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaIdleManager.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaIdleManager.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaIdleManager.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaIdleManager.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaMaterialUnpacker.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaMaterialUnpacker.cs diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/Settings/SendRebarsAsSolidSetting.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/Settings/SendRebarsAsSolidSetting.cs new file mode 100644 index 000000000..0d1f8f31e --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/Settings/SendRebarsAsSolidSetting.cs @@ -0,0 +1,12 @@ +using Speckle.Connectors.DUI.Settings; + +namespace Speckle.Connector.Tekla2024.Operations.Send.Settings; + +public class SendRebarsAsSolidSetting(bool value) : ICardSetting +{ + public string? Id { get; set; } = "sendRebarsAsSolid"; + public string? Title { get; set; } = "Send Rebars As Solid"; + public string? Type { get; set; } = "boolean"; + public object? Value { get; set; } = value; + public List? Enum { get; set; } +} diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs new file mode 100644 index 000000000..84cb7db37 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs @@ -0,0 +1,39 @@ +using Speckle.Connectors.Common.Caching; +using Speckle.Connectors.DUI.Models.Card; +using Speckle.InterfaceGenerator; +using Speckle.Sdk.Common; + +namespace Speckle.Connector.Tekla2024.Operations.Send.Settings; + +[GenerateAutoInterface] +public class ToSpeckleSettingsManager : IToSpeckleSettingsManager +{ + private readonly ISendConversionCache _sendConversionCache; + private readonly Dictionary _sendRebarsAsSolidCache = new(); + + public ToSpeckleSettingsManager(ISendConversionCache sendConversionCache) + { + _sendConversionCache = sendConversionCache; + } + + public bool GetSendRebarsAsSolid(SenderModelCard modelCard) + { + var value = modelCard.Settings?.First(s => s.Id == "sendRebarsAsSolid").Value as bool?; + var returnValue = value != null && value.NotNull(); + if (_sendRebarsAsSolidCache.TryGetValue(modelCard.ModelCardId.NotNull(), out bool? previousValue)) + { + if (previousValue != returnValue) + { + EvictCacheForModelCard(modelCard); + } + } + _sendRebarsAsSolidCache[modelCard.ModelCardId] = returnValue; + return returnValue; + } + + private void EvictCacheForModelCard(SenderModelCard modelCard) + { + var objectIds = modelCard.SendFilter != null ? modelCard.SendFilter.NotNull().RefreshObjectIds() : []; + _sendConversionCache.EvictObjects(objectIds); + } +} diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Operations/Send/TeklaRootObjectBuilder.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/TeklaRootObjectBuilder.cs similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Operations/Send/TeklaRootObjectBuilder.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/TeklaRootObjectBuilder.cs diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs similarity index 95% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs index a91a00fb0..901e2c479 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Plugin/TeklaPlugin.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Plugin/TeklaPlugin.cs @@ -2,7 +2,7 @@ namespace Speckle.Connector.Tekla2024.Plugin; -[Plugin("Speckle")] +[Plugin("Speckle (Beta)")] [PluginUserInterface("Speckle.Connector.Tekla2024.SpeckleTeklaPanelHost")] [InputObjectDependency(InputObjectDependency.NOT_DEPENDENT)] // See DevDocs/InputObjectDependency.NOT_DEPENDENT.png public class TeklaPlugin : PluginBase diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Assets/et_element_Speckle.bmp b/Connectors/Tekla/Speckle.Connector.TeklaShared/Resources/et_element_Speckle.bmp similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/Assets/et_element_Speckle.bmp rename to Connectors/Tekla/Speckle.Connector.TeklaShared/Resources/et_element_Speckle.bmp diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs similarity index 96% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs index 5e02984c3..9c3621c7e 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/ServiceRegistration.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs @@ -3,6 +3,7 @@ using Speckle.Connector.Tekla2024.Filters; using Speckle.Connector.Tekla2024.HostApp; using Speckle.Connector.Tekla2024.Operations.Send; +using Speckle.Connector.Tekla2024.Operations.Send.Settings; using Speckle.Connectors.Common; using Speckle.Connectors.Common.Builders; using Speckle.Connectors.Common.Caching; @@ -58,6 +59,8 @@ public static IServiceCollection AddTekla(this IServiceCollection services) services.AddScoped, TeklaRootObjectBuilder>(); services.AddScoped>(); + services.AddSingleton(); + services.AddTransient(); services.AddSingleton(); diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems b/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems new file mode 100644 index 000000000..a86ba6eb7 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems @@ -0,0 +1,38 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {3AB9028B-B2D2-464B-9BA3-39C192441E50} + + + Speckle.Connectors.Tekla + + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.shproj b/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.shproj new file mode 100644 index 000000000..d9209e349 --- /dev/null +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.shproj @@ -0,0 +1,13 @@ + + + + {3AB9028B-B2D2-464B-9BA3-39C192441E50} + 14.0 + + + + + + + + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs similarity index 93% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs rename to Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs index 1f8e2f7cf..1eddf7d91 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/SpeckleTeklaPanelHost.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs @@ -22,8 +22,8 @@ public class SpeckleTeklaPanelHost : PluginFormBase public SpeckleTeklaPanelHost() { - this.Text = "Speckle Beta"; - this.Name = "Speckle Beta"; + this.Text = "Speckle (Beta)"; + this.Name = "Speckle (Beta)"; //TODO: Add Speckle icon // TODO: Add thumbnail to connector var services = new ServiceCollection(); @@ -57,6 +57,8 @@ private HostAppVersion GetVersion() { #if TEKLA2024 return HostAppVersion.v2024; +#elif TEKLA2023 + return HostAppVersion.v2023; #else throw new NotImplementedException(); #endif diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/app.config b/Connectors/Tekla/Speckle.Connector.TeklaShared/app.config similarity index 100% rename from Connectors/Tekla/Speckle.Connector.Tekla2024/app.config rename to Connectors/Tekla/Speckle.Connector.TeklaShared/app.config diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json index 7f355e74a..a33a718e3 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -247,18 +247,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index 3e25b8dfc..c2d2387fd 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index 9af315ba7..6db323c6a 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index 03e3f3966..fcc3dddac 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -331,18 +331,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 f6684e1c7..d6d32e2ff 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 d82950ff6..6cd8f5372 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json index d58fe235d..be6ed138c 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index 0de2de741..79ce9c051 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -295,18 +295,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json index e238cdf69..2bf08adb0 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 6019ad499..c665a217f 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json @@ -4,27 +4,27 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -140,8 +140,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -225,18 +225,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index 31ca15702..bf3ce4ad3 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json index e7d61e065..9e5f24091 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json @@ -4,27 +4,27 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -140,8 +140,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -225,18 +225,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index ad8638c4d..10191bd5e 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json index a4676bade..96c7d27f6 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json @@ -4,27 +4,27 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -140,8 +140,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -225,18 +225,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index 90463e862..18dfbe7b7 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 7db6acfed..cfe770149 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -242,18 +242,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs index bab62ec78..c2fbc6fd9 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs @@ -152,7 +152,7 @@ private void SortGeometry(DB.Element element, List solids, List + diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/LocalToGlobalToDirectShapeConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/LocalToGlobalToDirectShapeConverter.cs index c33972225..840e9e999 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/LocalToGlobalToDirectShapeConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/LocalToGlobalToDirectShapeConverter.cs @@ -29,11 +29,11 @@ public LocalToGlobalToDirectShapeConverter( public DB.DirectShape Convert((Base atomicObject, List matrix) target) { // 1- set ds category - var category = target.atomicObject["category"] as string; + var category = target.atomicObject["builtinCategory"] as string; var dsCategory = DB.BuiltInCategory.OST_GenericModel; if (category is not null) { - var res = Enum.TryParse($"OST_{category}", out DB.BuiltInCategory cat); + var res = Enum.TryParse(category, out DB.BuiltInCategory cat); if (res) { var c = DB.Category.GetCategory(_converterSettings.Current.Document, cat); diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterDefinitionHandler.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterDefinitionHandler.cs index 19eacbace..957113614 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterDefinitionHandler.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterDefinitionHandler.cs @@ -22,31 +22,30 @@ DB.Parameter parameter { var definition = parameter.Definition; var internalDefinitionName = definition.Name; // aka real, internal name - var humanReadableName = definition.Name; + var humanReadableName = internalDefinitionName; + var isShared = parameter.IsShared; - if (parameter.IsShared) + if (isShared) { internalDefinitionName = parameter.GUID.ToString(); // Note: unsure it's needed } - if ( - definition is DB.InternalDefinition internalDefinition - && internalDefinition.BuiltInParameter != DB.BuiltInParameter.INVALID - ) + if (definition is DB.InternalDefinition internalDefinition) { - internalDefinitionName = internalDefinition.BuiltInParameter.ToString(); + var builtInParameter = internalDefinition.BuiltInParameter; + if (builtInParameter != DB.BuiltInParameter.INVALID) + { + internalDefinitionName = builtInParameter.ToString(); + } } -#pragma warning disable CA1854 // swapping leads to nullability errors; should be resolved once we type this more strongly. - if (Definitions.ContainsKey(internalDefinitionName)) -#pragma warning restore CA1854 + if (Definitions.TryGetValue(internalDefinitionName, out var def)) { - var def = Definitions[internalDefinitionName]; return ( internalDefinitionName, humanReadableName, - def["group"]! as string ?? "unknown group", - def["units"]! as string + def["group"] as string ?? "unknown group", + def["units"] as string ); } @@ -56,14 +55,14 @@ definition is DB.InternalDefinition internalDefinition units = DB.LabelUtils.GetLabelForUnit(parameter.GetUnitTypeId()); } - var group = DB.LabelUtils.GetLabelForGroup(parameter.Definition.GetGroupTypeId()); + var group = DB.LabelUtils.GetLabelForGroup(definition.GetGroupTypeId()); Definitions[internalDefinitionName] = new Dictionary() { ["definitionName"] = internalDefinitionName, ["name"] = humanReadableName, ["units"] = units, - ["isShared"] = parameter.IsShared, + ["isShared"] = isShared, ["isReadOnly"] = parameter.IsReadOnly, ["group"] = group }; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterExtractor.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterExtractor.cs index 5175d34a4..aff5b88bc 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterExtractor.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Parameters/ParameterExtractor.cs @@ -125,7 +125,7 @@ ILogger logger _parameterDefinitionHandler.HandleDefinition(parameter); // NOTE: ids don't really have much meaning; if we discover the opposite, we can bring them back. See [CNX-556: All ID Parameters are send as Name](https://linear.app/speckle/issue/CNX-556/all-id-parameters-are-send-as-name) - if (internalDefinitionName.Contains("_ID")) + if (internalDefinitionName.EndsWith("_ID") || internalDefinitionName.EndsWith("_PARAM_ID")) { continue; } @@ -199,9 +199,17 @@ ILogger logger case DB.StorageType.Double: return _scalingServiceToSpeckle.Scale(parameter.AsDouble(), parameter.GetUnitTypeId()); case DB.StorageType.Integer: - return parameter.AsInteger().ToString() == parameter.AsValueString() - ? parameter.AsInteger() - : parameter.AsValueString(); + var integer = parameter.AsInteger(); + var valueString = parameter.AsValueString(); + if (integer.ToString() == valueString) + { + return integer; + } + else + { + return valueString; + } + case DB.StorageType.ElementId: var elId = parameter.AsElementId()!; if (elId == DB.ElementId.InvalidElementId) diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs index 04cf03bb3..421fd7d14 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/MaterialQuantitiesToSpeckle.cs @@ -31,7 +31,7 @@ IConverterSettingsStore converterSettings public Dictionary Convert(DB.Element target) { Dictionary quantities = new(); - if (target.Category.HasMaterialQuantities) + if (target.Category?.HasMaterialQuantities ?? false) //category can be null { foreach (DB.ElementId matId in target.GetMaterialIds(false)) { diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ElementTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ElementTopLevelConverterToSpeckle.cs index ba70f6c99..cb38a7464 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ElementTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ElementTopLevelConverterToSpeckle.cs @@ -27,7 +27,7 @@ public override RevitElement Convert(DB.Element target) ? symbol.FamilyName : "no family"; string category = target.Category?.Name ?? "no category"; - List displayValue = _displayValueExtractor.GetDisplayValue(target); + List displayValue = _displayValueExtractor.GetDisplayValue(target); RevitElement speckleElement = new() diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RailingTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RailingTopLevelConverterToSpeckle.cs new file mode 100644 index 000000000..e7f08d676 --- /dev/null +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/RailingTopLevelConverterToSpeckle.cs @@ -0,0 +1,49 @@ +using Speckle.Converters.Common; +using Speckle.Converters.RevitShared.Helpers; +using Speckle.Converters.RevitShared.Settings; +using Speckle.Converters.RevitShared.ToSpeckle; + +namespace Speckle.Converters.Revit2023.ToSpeckle.TopLevel; + +[NameAndRankValue(nameof(DBA.Railing), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)] +public class RailingTopLevelConverterToSpeckle : BaseTopLevelConverterToSpeckle +{ + private readonly DisplayValueExtractor _displayValueExtractor; + private readonly IConverterSettingsStore _converterSettings; + + public RailingTopLevelConverterToSpeckle( + DisplayValueExtractor displayValueExtractor, + IConverterSettingsStore converterSettings + ) + { + _displayValueExtractor = displayValueExtractor; + _converterSettings = converterSettings; + } + + public override SOBR.RevitElement Convert(DBA.Railing target) + { + string family = target.Document.GetElement(target.GetTypeId()) is DB.FamilySymbol symbol + ? symbol.FamilyName + : "no family"; + string category = target.Category?.Name ?? "no category"; + var displayValue = _displayValueExtractor.GetDisplayValue(target); + + var topRail = _converterSettings.Current.Document.GetElement(target.TopRail); + var topRailDisplayValue = _displayValueExtractor.GetDisplayValue(topRail); + + displayValue.AddRange(topRailDisplayValue); + + SOBR.RevitElement speckleElement = + new() + { + type = target.Name, + category = category, + family = family, + displayValue = displayValue + }; + + speckleElement["units"] = _converterSettings.Current.SpeckleUnits; + + return speckleElement; + } +} diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json index 3ea5c770d..c04f6aff9 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json @@ -4,27 +4,27 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -140,8 +140,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -225,18 +225,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -345,7 +345,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.testing": { @@ -375,18 +375,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index 6e0163d2d..f94b9648a 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index 055b33f9d..744934530 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.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/Properties/AssemblyInfo.cs b/Converters/Tekla/Speckle.Converter.Tekla2023/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..6787b95f3 --- /dev/null +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Speckle.Converter.Tekla2023")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Speckle.Converter.Tekla2023")] +[assembly: AssemblyCopyright("Copyright © 2023")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("ACF75860-7FCE-4AE9-8C45-68AD1043550B")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj new file mode 100644 index 000000000..2090a6391 --- /dev/null +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj @@ -0,0 +1,22 @@ + + + + net48 + x64 + true + Debug;Release;Local + false + + + + + + + + + + + + + + diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json new file mode 100644 index 000000000..ab82fcf09 --- /dev/null +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json @@ -0,0 +1,420 @@ +{ + "version": 2, + "dependencies": { + ".NETFramework,Version=v4.8": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.6, )", + "resolved": "0.9.6", + "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w==" + }, + "Tekla.Structures.Drawing": { + "type": "Direct", + "requested": "[2023.0.0, )", + "resolved": "2023.0.0", + "contentHash": "22WqaO0GKxFOOEctU92ZmNCSzNJGjFwzDC/Px0+4Iimh6A3WL5Z7lvYSUhyCeF64YA7QbvK5PZKrtdhrB7Illg==", + "dependencies": { + "DotNetZip": "1.13.7", + "Newtonsoft.Json": "13.0.1", + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0", + "Tekla.Structures.Dialog": "2023.0.0", + "Tekla.Structures.Model": "2023.0.0", + "Tekla.Structures.Plugins": "2023.0.0", + "Tekla.Technology.Akit5": "5.8.17235.1", + "Tekla.Technology.Scripting": "5.0.20041" + } + }, + "Tekla.Structures.Model": { + "type": "Direct", + "requested": "[2023.0.0, )", + "resolved": "2023.0.0", + "contentHash": "dkw8cA4kqE/Jc6WAq8Zrzcn49Vs7kh0YNXuEBpcx6J76lv6jSl4n+EsIvxE8NEBJnEHsGoG67uLTaTkiKAmuXQ==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0" + } + }, + "DotNetZip": { + "type": "Transitive", + "resolved": "1.13.7", + "contentHash": "MGXK1jFJlxCWId2xcXnEdUov7M1oSMk+Gc/rF1psLOoqWNhCkfCqAIhIk1rSxeRCAGRt7JztQRMLC+DTapxc6g==" + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0", + "GraphQL.Client.Abstractions.Websocket": "6.0.0", + "System.Net.WebSockets.Client.Managed": "1.0.22", + "System.Reactive": "5.0.0" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "2.2.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Primitives": "2.2.0", + "System.ComponentModel.Annotations": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==", + "dependencies": { + "System.Memory": "4.5.1", + "System.Runtime.CompilerServices.Unsafe": "4.5.1" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net48": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Mono.Cecil": { + "type": "Transitive", + "resolved": "0.9.6.1", + "contentHash": "yMsurNaOxxKIjyW9pEB+tRrR1S3DFnN1+iBgKvYvXG8kW0Y6yknJeMAe/tl3+P78/2C6304TgF7aVqpqXgEQ9Q==" + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "Speckle.DoubleNumerics": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.dynamic_cdecl": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw==" + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" + } + }, + "System.Net.WebSockets.Client.Managed": { + "type": "Transitive", + "resolved": "1.0.22", + "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.3", + "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "Tekla.Structures": { + "type": "Transitive", + "resolved": "2023.0.0", + "contentHash": "tSO+SQZMoxA25t0a0SZj4U3Nw44nUdS/XetSZGUky1j0OYiHUOuA6EGMq+NMUapRJlWfL9lmlPOPPmVvVVHluQ==" + }, + "Tekla.Structures.Catalogs": { + "type": "Transitive", + "resolved": "2023.0.0", + "contentHash": "CMzgDBTeVOYGCQfpzJxjnkSZ7h64PWR/CcIQCC5W3vU8xokV4vR4XFp7ecU/ckz7olex9IZE1xmSGaC0LCXYQA==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0", + "Tekla.Structures.Model": "2023.0.0" + } + }, + "Tekla.Structures.Datatype": { + "type": "Transitive", + "resolved": "2023.0.0", + "contentHash": "5q/7OvUTFgJrXfkcUrrRzF5yJqxHuVyFZvf1M5smC/RgF5zFqJsfUXxxFlhk03pc0pu+f6cD/QjRTVopAMU9Aw==" + }, + "Tekla.Technology.Akit5": { + "type": "Transitive", + "resolved": "5.8.17235.1", + "contentHash": "MVvgt7lcJDYj9xqyZfVIfXXCUKodIL+F3y3Rvp7rc/46ukTzEtwuiW+IIlId1IQqtO3/WCZBPBQmBxfwhx9sFA==" + }, + "Tekla.Technology.Scripting": { + "type": "Transitive", + "resolved": "5.0.20041", + "contentHash": "PXD4j7++eEWxmL7K7JxqEcwLmIfjDgbM4DsA1m9iw9NcSWj3DAx4V/luWRfEcUTYvV0cRgD6/nGoiCQQTVbiZQ==" + }, + "Tekla.Technology.Scripting.Plugins": { + "type": "Transitive", + "resolved": "5.3.17206", + "contentHash": "GbdMWQjGufzB637bzfoQiP5N+MCbuTs5WqBEyOLvY7dA22zkKlwnwoPnW3Hy2hXPGhywNlcKmWCn4oKOcj22Uw==", + "dependencies": { + "Mono.Cecil": "0.9.6.1" + } + }, + "speckle.converters.common": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", + "Speckle.Objects": "[3.1.0-dev.181, )" + } + }, + "Microsoft.Extensions.Logging": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==" + }, + "Speckle.Objects": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", + "dependencies": { + "Speckle.Sdk": "3.1.0-dev.181" + } + }, + "Speckle.Sdk": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", + "dependencies": { + "GraphQL.Client": "6.0.0", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "Microsoft.CSharp": "4.7.0", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.0.1", + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" + } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" + }, + "Tekla.Structures.Dialog": { + "type": "CentralTransitive", + "requested": "[2024.0.4, )", + "resolved": "2023.0.0", + "contentHash": "DPwrFnmhnaQJT0HmuormXow/b0jgyUSJ6llW1If8Vp8EQJlk/+VyelwqTFGCE3kNQrw0BPGvZ/fgUYaxjHcfdw==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Structures.Catalogs": "2023.0.0", + "Tekla.Structures.Datatype": "2023.0.0", + "Tekla.Structures.Model": "2023.0.0", + "Tekla.Structures.Plugins": "2023.0.0" + } + }, + "Tekla.Structures.Plugins": { + "type": "CentralTransitive", + "requested": "[2024.0.4, )", + "resolved": "2023.0.0", + "contentHash": "8mD7XoH03QnHTTkHHICjdXJk8MrvhMNt74LmwtiYgYm/bF7TErGIzDEyl/MFgBPjji9m2I+mUJmCUvOde+A6NQ==", + "dependencies": { + "Tekla.Structures": "2023.0.0", + "Tekla.Technology.Akit5": "5.8.17235.1", + "Tekla.Technology.Scripting": "5.0.20041", + "Tekla.Technology.Scripting.Plugins": "5.3.17206" + } + } + } + } +} \ No newline at end of file diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj b/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj index 54c7e3760..6dfdf7d0b 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj +++ b/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj @@ -17,4 +17,6 @@ + + diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaConversionSettings.cs b/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaConversionSettings.cs deleted file mode 100644 index c2e45b95f..000000000 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaConversionSettings.cs +++ /dev/null @@ -1,5 +0,0 @@ -using Tekla.Structures.Model; - -namespace Speckle.Converter.Tekla2024; - -public record TeklaConversionSettings(Model Document, string SpeckleUnits); diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Helpers/DisplayValueExtractor.cs b/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Helpers/DisplayValueExtractor.cs deleted file mode 100644 index 03cb8b2bc..000000000 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Helpers/DisplayValueExtractor.cs +++ /dev/null @@ -1,81 +0,0 @@ -using Speckle.Converters.Common.Objects; -using Speckle.Sdk.Models; - -namespace Speckle.Converter.Tekla2024.ToSpeckle.Helpers; - -public sealed class DisplayValueExtractor -{ - private readonly ITypedConverter _meshConverter; - private readonly ITypedConverter _lineConverter; - private readonly ITypedConverter _arcConverter; - - public DisplayValueExtractor( - ITypedConverter meshConverter, - ITypedConverter lineConverter, - ITypedConverter arcConverter - ) - { - _meshConverter = meshConverter; - _lineConverter = lineConverter; - _arcConverter = arcConverter; - } - - public IEnumerable GetDisplayValue(TSM.ModelObject modelObject) - { - switch (modelObject) - { - // both beam and contour plate are child classes of part - // its simpler to use part for common methods - case TSM.Part part: - if (part.GetSolid() is TSM.Solid partSolid) - { - yield return _meshConverter.Convert(partSolid); - } - break; - - case TSM.BoltGroup boltGroup: - if (boltGroup.GetSolid() is TSM.Solid boltSolid) - { - yield return _meshConverter.Convert(boltSolid); - } - break; - - // this is the logic to send rebars as lines and arcs - case TSM.Reinforcement reinforcement: - var rebarGeometries = reinforcement.GetRebarComplexGeometries( - withHooks: true, - withoutClashes: true, - lengthAdjustments: true, - TSM.Reinforcement.RebarGeometrySimplificationTypeEnum.RATIONALIZED - ); - - foreach (TSM.RebarComplexGeometry barGeometry in rebarGeometries) - { - foreach (var leg in barGeometry.Legs) - { - if (leg.Curve is TG.LineSegment legLine) - { - yield return _lineConverter.Convert(legLine); - } - else if (leg.Curve is TG.Arc legArc) - { - yield return _arcConverter.Convert(legArc); - } - } - } - - break; - - // we can switch to volumetric using the logic below - // case TSM.Reinforcement reinforcement: - // if (reinforcement.GetSolid() is TSM.Solid reinforcementSolid) - // { - // yield return _meshConverter.Convert(reinforcementSolid); - // } - // break; - - default: - yield break; - } - } -} diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Helpers/PropertyExtractor.cs b/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Helpers/PropertyExtractor.cs deleted file mode 100644 index 6552c9100..000000000 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Helpers/PropertyExtractor.cs +++ /dev/null @@ -1,46 +0,0 @@ -namespace Speckle.Converter.Tekla2024.ToSpeckle.Helpers; - -public class PropertyExtractor -{ - public PropertyExtractor() { } - - public Dictionary GetProperties(TSM.ModelObject modelObject) - { - Dictionary properties = new(); - - switch (modelObject) - { - case TSM.Beam beam: - AddBeamProperties(beam, properties); - break; - case TSM.ContourPlate plate: - AddContourPlateProperties(plate, properties); - break; - case TSM.BoltGroup boltGroup: - AddBoltGroupProperties(boltGroup, properties); - break; - } - - return properties; - } - - private void AddBeamProperties(TSM.Beam beam, Dictionary properties) - { - properties["profile"] = beam.Profile.ProfileString; - properties["material"] = beam.Material.MaterialString; - properties["class"] = beam.Class; - } - - private void AddContourPlateProperties(TSM.ContourPlate plate, Dictionary properties) - { - properties["profile"] = plate.Profile.ProfileString; - properties["material"] = plate.Material.MaterialString; - properties["class"] = plate.Class; - } - - private void AddBoltGroupProperties(TSM.BoltGroup boltGroup, Dictionary properties) - { - properties["boltSize"] = boltGroup.BoltSize; - properties["bolt"] = boltGroup.Bolt; - } -} diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json index 827129b68..e65272b26 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json @@ -35,28 +35,28 @@ }, "Tekla.Structures.Drawing": { "type": "Direct", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "1/rlqkt/Wy9sdMvGXm8GH6fUm9fEASnRPCftvAn0nrtV5qinKbbwEpcxfWrlDneoSVAZY8qL/V8UsXztqO2YRQ==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "66xsZ+WTNlKgFEh2oa2+cc+F2XK/UrbiwUnp4vgEgTVbxMwquAKIVvnW/PYaGs55393FiS3fIGSfG/lHUp7qHA==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", - "Tekla.Structures": "2024.0.2", - "Tekla.Structures.Datatype": "2024.0.2", - "Tekla.Structures.Model": "2024.0.2", - "Tekla.Structures.Plugins": "2024.0.2", + "Tekla.Structures": "2024.0.4", + "Tekla.Structures.Datatype": "2024.0.4", + "Tekla.Structures.Model": "2024.0.4", + "Tekla.Structures.Plugins": "2024.0.4", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" } }, "Tekla.Structures.Model": { "type": "Direct", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "GV7mqc3TX7h3QeCLmjCI8GlnbhAMYOvLMEED1TY+hpdeWtMuHxGS7GwfLgG10iUdjumqy5Qmn2VE3PIRhw5hWg==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "cjSNpSEtz6kB9SwMry/t5m7xrgYHsL5G5JhLqcpBW0W9Id9GnC0hn6rEfJIld2y4dHuA2UvVDvjIX9RBSfZg3A==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", - "Tekla.Structures": "2024.0.2", - "Tekla.Structures.Datatype": "2024.0.2", + "Tekla.Structures": "2024.0.4", + "Tekla.Structures.Datatype": "2024.0.4", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" } @@ -298,8 +298,8 @@ }, "Tekla.Structures": { "type": "Transitive", - "resolved": "2024.0.2", - "contentHash": "m7URRYK7sEzumr/+TJRNd4q2nutF9qMUbIIPmbr36cbaKiBGW0xxAgveTL8+7kkDqodhAGyUTVai5gOtvYi2SQ==", + "resolved": "2024.0.4", + "contentHash": "Y55enG2I2C0drdHubnAavjzUjEPyTRjOMfoce63F4cM7Oqb5KS8j4v9/iE1bENmJ0Yyt5f7z3o7a8Bv9dWE1Pw==", "dependencies": { "Tekla.Common.Geometry": "4.6.2", "Tekla.Technology.Serialization": "4.1.1", @@ -308,8 +308,8 @@ }, "Tekla.Structures.Datatype": { "type": "Transitive", - "resolved": "2024.0.2", - "contentHash": "LtLUtkYuni+R1F0UAPXWmgjAPBZORabG+/2YVOhJBj6+0x6Fg0PxgDtABNMNniN7A7BFXaYQRI/fuP35VL8BFQ==" + "resolved": "2024.0.4", + "contentHash": "mtJQmPBQ4d+LnJdpgjljGeNmnFTkZoZhYJhRmU3I4nCo6vzvuKb+eIAlzBQ6QJnHnTdpyUT7Hr/Xph5YZbCKVw==" }, "Tekla.Technology.Scripting.Plugins": { "type": "Transitive", @@ -341,7 +341,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "Microsoft.Extensions.Logging": { @@ -364,18 +364,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -385,22 +385,22 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "Tekla.Structures.Plugins": { "type": "CentralTransitive", - "requested": "[2024.0.2, )", - "resolved": "2024.0.2", - "contentHash": "40Dn4sAcfLJc1Gi6sK95tVz8BwmB4vvRjcZcFJ55F3HMr2mwtcJhvDQED0exlZuU3pbibjhUZaNz0/I16Mms/w==", + "requested": "[2024.0.4, )", + "resolved": "2024.0.4", + "contentHash": "GUzN5Vs/PwgusrTMRFDnfoW+LNmbjquqCFRIuslbswMSJDA1kLUs8pJAFHGBl6ZuarQ37O4Wb2n8hudQ+lluGg==", "dependencies": { - "Tekla.Structures": "2024.0.2", + "Tekla.Structures": "2024.0.4", "Tekla.Technology.Scripting.Plugins": "5.5.0", "Tekla.Technology.Serialization": "4.1.1", "Trimble.Remoting": "1.0.2" diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/Extensions/ModelObjectExtension.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/Extensions/ModelObjectExtension.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/Extensions/ModelObjectExtension.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/Extensions/ModelObjectExtension.cs diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/Extensions/SpeckleApplicationIdExtensions.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/Extensions/SpeckleApplicationIdExtensions.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/Extensions/SpeckleApplicationIdExtensions.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/Extensions/SpeckleApplicationIdExtensions.cs diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/GlobalUsing.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/GlobalUsing.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/GlobalUsing.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/GlobalUsing.cs diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ServiceRegistration.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ServiceRegistration.cs similarity index 90% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ServiceRegistration.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ServiceRegistration.cs index b4701695d..17e45adee 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ServiceRegistration.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ServiceRegistration.cs @@ -18,7 +18,8 @@ public static IServiceCollection AddTeklaConverters(this IServiceCollection serv serviceCollection.AddTransient(); serviceCollection.AddScoped(); - serviceCollection.AddScoped(); + serviceCollection.AddScoped(); + serviceCollection.AddScoped(); serviceCollection.AddRootCommon(converterAssembly); serviceCollection.AddApplicationConverters(converterAssembly); diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/Speckle.Converters.TeklaShared.projitems b/Converters/Tekla/Speckle.Converters.TeklaShared/Speckle.Converters.TeklaShared.projitems new file mode 100644 index 000000000..243bd38cf --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/Speckle.Converters.TeklaShared.projitems @@ -0,0 +1,14 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + af88104a-f808-4751-b01b-326b86fc5694 + + + Speckle.Converters.TeklaShared + + + + + \ No newline at end of file diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/Speckle.Converters.TeklaShared.shproj b/Converters/Tekla/Speckle.Converters.TeklaShared/Speckle.Converters.TeklaShared.shproj new file mode 100644 index 000000000..f3bef29a4 --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/Speckle.Converters.TeklaShared.shproj @@ -0,0 +1,13 @@ + + + + {52666479-5401-47D6-B7BA-D554784439EA} + 14.0 + + + + + + + + \ No newline at end of file diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaConversionSettings.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaConversionSettings.cs new file mode 100644 index 000000000..7bd6f4930 --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaConversionSettings.cs @@ -0,0 +1,5 @@ +using Tekla.Structures.Model; + +namespace Speckle.Converter.Tekla2024; + +public record TeklaConversionSettings(Model Document, bool SendRebarsAsSolid, string SpeckleUnits); diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaConversionSettingsFactory.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaConversionSettingsFactory.cs similarity index 74% rename from Converters/Tekla/Speckle.Converter.Tekla2024/TeklaConversionSettingsFactory.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/TeklaConversionSettingsFactory.cs index fcf071622..f2c9fae60 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaConversionSettingsFactory.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaConversionSettingsFactory.cs @@ -14,6 +14,6 @@ IConverterSettingsStore settingsStore public TeklaConversionSettings Current => settingsStore.Current; // only handles automatic rn - public TeklaConversionSettings Create(Model document) => - new(document, unitsConverter.ConvertOrThrow(TSD.Units.Automatic)); + public TeklaConversionSettings Create(Model document, bool sendRebarsAsSolid) => + new(document, sendRebarsAsSolid, unitsConverter.ConvertOrThrow(TSD.Units.Automatic)); } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaRootToSpeckleConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaRootToSpeckleConverter.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/TeklaRootToSpeckleConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/TeklaRootToSpeckleConverter.cs diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/TeklaToSpeckleUnitConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/TeklaToSpeckleUnitConverter.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/TeklaToSpeckleUnitConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/TeklaToSpeckleUnitConverter.cs diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/ClassPropertyExtractor.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/ClassPropertyExtractor.cs new file mode 100644 index 000000000..7869838ec --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/ClassPropertyExtractor.cs @@ -0,0 +1,76 @@ +namespace Speckle.Converter.Tekla2024.ToSpeckle.Helpers; + +public class ClassPropertyExtractor +{ + public ClassPropertyExtractor() { } + + public Dictionary GetProperties(TSM.ModelObject modelObject) + { + Dictionary properties = new(); + + switch (modelObject) + { + case TSM.Beam beam: + AddBeamProperties(beam, properties); + break; + case TSM.ContourPlate plate: + AddContourPlateProperties(plate, properties); + break; + case TSM.BoltArray boltArray: + AddBoltArrayProperties(boltArray, properties); + break; + case TSM.SingleRebar singleRebar: + AddSingleRebarProperties(singleRebar, properties); + break; + case TSM.RebarMesh rebarMesh: + AddRebarMeshProperties(rebarMesh, properties); + break; + case TSM.RebarGroup rebarGroup: + AddRebarGroupProperties(rebarGroup, properties); + break; + } + + return properties; + } + + private void AddBeamProperties(TSM.Beam beam, Dictionary properties) + { + properties["Name"] = beam.Name; + properties["profile"] = beam.Profile.ProfileString; + properties["material"] = beam.Material.MaterialString; + } + + private void AddContourPlateProperties(TSM.ContourPlate plate, Dictionary properties) + { + properties["Name"] = plate.Name; + properties["profile"] = plate.Profile.ProfileString; + properties["material"] = plate.Material.MaterialString; + } + + private void AddBoltArrayProperties(TSM.BoltArray boltArray, Dictionary properties) + { + properties["boltSize"] = boltArray.BoltSize.ToString(); + properties["boltCount"] = boltArray.BoltPositions.Count.ToString(); + properties["boltStandard"] = boltArray.BoltStandard; + } + + private void AddSingleRebarProperties(TSM.SingleRebar singleRebar, Dictionary properties) + { + properties["name"] = singleRebar.Name; + properties["grade"] = singleRebar.Grade; + properties["size"] = singleRebar.Size; + } + + private void AddRebarMeshProperties(TSM.RebarMesh rebarMesh, Dictionary properties) + { + properties["name"] = rebarMesh.Name; + properties["grade"] = rebarMesh.Grade; + } + + private void AddRebarGroupProperties(TSM.RebarGroup rebarGroup, Dictionary properties) + { + properties["name"] = rebarGroup.Name; + properties["grade"] = rebarGroup.Grade; + properties["size"] = rebarGroup.Size; + } +} diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/DisplayValueExtractor.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/DisplayValueExtractor.cs new file mode 100644 index 000000000..c6be8659a --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/DisplayValueExtractor.cs @@ -0,0 +1,104 @@ +using Speckle.Converters.Common; +using Speckle.Converters.Common.Objects; +using Speckle.Sdk.Common.Exceptions; +using Speckle.Sdk.Models; + +namespace Speckle.Converter.Tekla2024.ToSpeckle.Helpers; + +public sealed class DisplayValueExtractor +{ + private readonly ITypedConverter _meshConverter; + private readonly ITypedConverter _pointConverter; + private readonly ITypedConverter _lineConverter; + private readonly IConverterSettingsStore _settingsStore; + private readonly ITypedConverter _arcConverter; + private readonly ITypedConverter> _gridConverter; + + public DisplayValueExtractor( + ITypedConverter meshConverter, + ITypedConverter pointConverter, + ITypedConverter lineConverter, + ITypedConverter arcConverter, + ITypedConverter> gridConverter, + IConverterSettingsStore settingsStore + ) + { + _meshConverter = meshConverter; + _pointConverter = pointConverter; + _lineConverter = lineConverter; + _settingsStore = settingsStore; + _lineConverter = lineConverter; + _arcConverter = arcConverter; + _gridConverter = gridConverter; + } + + public IEnumerable GetDisplayValue(TSM.ModelObject modelObject) + { + switch (modelObject) + { + case TSM.Part part: + if (part.GetSolid() is TSM.Solid partSolid) + { + yield return _meshConverter.Convert(partSolid); + } + break; + + case TSM.BoltGroup boltGroup: + if (boltGroup.GetSolid() is TSM.Solid boltSolid) + { + yield return _meshConverter.Convert(boltSolid); + } + break; + + case TSM.Reinforcement reinforcement: + if (_settingsStore.Current.SendRebarsAsSolid) + { + if (reinforcement.GetSolid() is TSM.Solid reinforcementSolid) + { + yield return _meshConverter.Convert(reinforcementSolid); + } + else + { + throw new ConversionException("The type has no solid."); + } + } + else + { + var rebarGeometries = reinforcement.GetRebarComplexGeometries( + withHooks: true, + withoutClashes: true, + lengthAdjustments: true, + TSM.Reinforcement.RebarGeometrySimplificationTypeEnum.RATIONALIZED + ); + + foreach (TSM.RebarComplexGeometry barGeometry in rebarGeometries) + { + foreach (var leg in barGeometry.Legs) + { + if (leg.Curve is TG.LineSegment legLine) + { + yield return _lineConverter.Convert(legLine); + } + else if (leg.Curve is TG.Arc legArc) + { + yield return _arcConverter.Convert(legArc); + } + } + } + } + + break; + + case TSM.Grid grid: + foreach (var gridLine in _gridConverter.Convert(grid)) + { + yield return gridLine; + } + + break; + + default: + yield break; + } + } +} diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/ReportPropertyExtractor.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/ReportPropertyExtractor.cs new file mode 100644 index 000000000..3d354fd7c --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Helpers/ReportPropertyExtractor.cs @@ -0,0 +1,88 @@ +namespace Speckle.Converter.Tekla2024.ToSpeckle.Helpers; + +public class ReportPropertyExtractor +{ + private static readonly Dictionary s_typeSpecificProperties = + new() + { + { + typeof(TSM.Beam), + new[] + { + "VOLUME", + "WEIGHT", + "LENGTH", + "HEIGHT", + "WIDTH", + "AREA", + "PROFILE_TYPE", + "MATERIAL_TYPE", + "CLASS", + "PREFIX", + "ASSEMBLY_POS", + "ASSEMBLY_NAME", + "PHASE" + } + }, + { + typeof(TSM.ContourPlate), + new[] + { + "VOLUME", + "WEIGHT", + "AREA", + "PROFILE_TYPE", + "MATERIAL_TYPE", + "CLASS", + "PREFIX", + "ASSEMBLY_POS", + "PHASE" + } + }, + { typeof(TSM.RebarGroup), new[] { "NUMBER_OF_REBARS", "TOTAL_LENGTH", "WEIGHT", "SIZE", "GRADE", "CLASS" } }, + { typeof(TSM.SingleRebar), new[] { "LENGTH", "WEIGHT", "SIZE", "GRADE", "CLASS" } }, + { typeof(TSM.BoltArray), new[] { "BOLT_SIZE", "NUMBER_OF_BOLTS", "BOLT_STANDARD", "BOLT_TYPE", "LENGTH" } } + }; + + public Dictionary GetProperties(TSM.ModelObject modelObject) + { + var properties = new Dictionary(); + + if (!s_typeSpecificProperties.TryGetValue(modelObject.GetType(), out var propertyNames)) + { + // if no specific properties defined, return empty dictionary + return properties; + } + + foreach (string propertyName in propertyNames) + { + TryGetReportProperty(modelObject, propertyName, properties); + } + + return properties; + } + + private void TryGetReportProperty( + TSM.ModelObject modelObject, + string propertyName, + Dictionary properties + ) + { + double doubleValue = 0.0; + int intValue = 0; + string stringValue = ""; + + if (modelObject.GetReportProperty(propertyName, ref doubleValue)) + { + properties[propertyName] = doubleValue; + } + else if (modelObject.GetReportProperty(propertyName, ref intValue)) + { + properties[propertyName] = intValue; + } + else if (modelObject.GetReportProperty(propertyName, ref stringValue) && !string.IsNullOrEmpty(stringValue)) + { + properties[propertyName] = stringValue; + } + } +} diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/ArcToSpeckleRawConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs similarity index 92% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/ArcToSpeckleRawConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs index 17ef1c976..89f4e2375 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/ArcToSpeckleRawConverter.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/ArcToSpeckleConverter.cs @@ -3,13 +3,13 @@ namespace Speckle.Converter.Tekla2024.ToSpeckle.Raw; -public class ArcToSpeckleRawConverter : ITypedConverter +public class ArcToSpeckleConverter : ITypedConverter { private readonly IConverterSettingsStore _settingsStore; private readonly ITypedConverter _pointConverter; private readonly ITypedConverter _vectorConverter; - public ArcToSpeckleRawConverter( + public ArcToSpeckleConverter( IConverterSettingsStore settingsStore, ITypedConverter pointConverter, ITypedConverter vectorConverter diff --git a/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/GridToSpeckleConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/GridToSpeckleConverter.cs new file mode 100644 index 000000000..07cec2e2d --- /dev/null +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/GridToSpeckleConverter.cs @@ -0,0 +1,97 @@ +using Speckle.Converters.Common; +using Speckle.Converters.Common.Objects; +using Speckle.Sdk.Models; + +namespace Speckle.Converter.Tekla2024.ToSpeckle.Raw; + +public class GridToSpeckleConverter : ITypedConverter> +{ + private readonly IConverterSettingsStore _settingsStore; + private readonly ITypedConverter _lineConverter; + + public GridToSpeckleConverter( + IConverterSettingsStore settingsStore, + ITypedConverter lineConverter + ) + { + _settingsStore = settingsStore; + _lineConverter = lineConverter; + } + + private IEnumerable ParseCoordinateString(string coordinateString) + { + if (string.IsNullOrEmpty(coordinateString)) + { + yield break; + } + + var parts = coordinateString.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + double lastValue = 0; + + foreach (var part in parts) + { + if (part.Contains("*")) + { + var repetitionParts = part.Split(new[] { '*' }, StringSplitOptions.RemoveEmptyEntries); + if ( + repetitionParts.Length == 2 + && int.TryParse(repetitionParts[0], out int count) + && double.TryParse(repetitionParts[1], out double increment) + ) + { + double baseValue = lastValue; + for (int i = 1; i <= count; i++) + { + double value = baseValue + (increment * i); + yield return value; + lastValue = value; + } + } + } + else + { + if (double.TryParse(part, out double value)) + { + yield return value; + lastValue = value; + } + } + } + } + + public IEnumerable Convert(TSM.Grid target) + { + var coordinateSystem = target.GetCoordinateSystem(); + if (coordinateSystem == null) + { + yield break; + } + + var xCoordinates = ParseCoordinateString(target.CoordinateX).ToList(); + var yCoordinates = ParseCoordinateString(target.CoordinateY).ToList(); + + double minX = xCoordinates.Min(); + double maxX = xCoordinates.Max(); + double minY = yCoordinates.Min(); + double maxY = yCoordinates.Max(); + + double extendedMinX = minX - target.ExtensionLeftX; + double extendedMaxX = maxX + target.ExtensionRightX; + double extendedMinY = minY - target.ExtensionLeftY; + double extendedMaxY = maxY + target.ExtensionRightY; + + foreach (var x in xCoordinates) + { + var startPoint = new TG.Point(x, extendedMinY, coordinateSystem.Origin.Z); + var endPoint = new TG.Point(x, extendedMaxY, coordinateSystem.Origin.Z); + yield return _lineConverter.Convert(new TG.LineSegment(startPoint, endPoint)); + } + + foreach (var y in yCoordinates) + { + var startPoint = new TG.Point(extendedMinX, y, coordinateSystem.Origin.Z); + var endPoint = new TG.Point(extendedMaxX, y, coordinateSystem.Origin.Z); + yield return _lineConverter.Convert(new TG.LineSegment(startPoint, endPoint)); + } + } +} diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/LineToSpeckleConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/LineToSpeckleConverter.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/LineToSpeckleConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/LineToSpeckleConverter.cs diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/PointToSpeckleConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/PointToSpeckleConverter.cs similarity index 100% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/PointToSpeckleConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/PointToSpeckleConverter.cs diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/PolycurveToSpeckleRawConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/PolycurveToSpeckleConverter.cs similarity index 90% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/PolycurveToSpeckleRawConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/PolycurveToSpeckleConverter.cs index 3efb20477..33427499d 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/PolycurveToSpeckleRawConverter.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/PolycurveToSpeckleConverter.cs @@ -3,13 +3,13 @@ namespace Speckle.Converter.Tekla2024.ToSpeckle.Raw; -public class PolycurveToSpeckleRawConverter : ITypedConverter +public class PolycurveToSpeckleConverter : ITypedConverter { private readonly ITypedConverter _lineConverter; private readonly ITypedConverter _arcConverter; private readonly IConverterSettingsStore _settingsStore; - public PolycurveToSpeckleRawConverter( + public PolycurveToSpeckleConverter( ITypedConverter lineConverter, ITypedConverter arcConverter, IConverterSettingsStore settingsStore diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/SolidToSpeckleConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/SolidToSpeckleConverter.cs similarity index 87% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/SolidToSpeckleConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/SolidToSpeckleConverter.cs index 86721b205..937f3fff8 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/SolidToSpeckleConverter.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/SolidToSpeckleConverter.cs @@ -57,7 +57,12 @@ public SOG.Mesh Convert(TSM.Solid target) if (faceVertices.Count >= 3) { faces.Add(faceVertices.Count); - faces.AddRange(faceVertices); + // NOTE: normals were flipped in tekla logic + // we changed the order of the vertices here + for (int i = faceVertices.Count - 1; i >= 0; i--) + { + faces.Add(faceVertices[i]); + } } } } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/VectorToSpeckleRawConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/VectorToSpeckleConverter.cs similarity index 67% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/VectorToSpeckleRawConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/VectorToSpeckleConverter.cs index efb6102f5..a0e1d0e5e 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/Raw/VectorToSpeckleRawConverter.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/Raw/VectorToSpeckleConverter.cs @@ -3,11 +3,11 @@ namespace Speckle.Converter.Tekla2024.ToSpeckle.Raw; -public class VectorToSpeckleRawConverter : ITypedConverter +public class VectorToSpeckleConverter : ITypedConverter { private readonly IConverterSettingsStore _settingsStore; - public VectorToSpeckleRawConverter(IConverterSettingsStore settingsStore) + public VectorToSpeckleConverter(IConverterSettingsStore settingsStore) { _settingsStore = settingsStore; } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/TopLevel/ModelObjectToSpeckleConverter.cs b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/TopLevel/ModelObjectToSpeckleConverter.cs similarity index 68% rename from Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/TopLevel/ModelObjectToSpeckleConverter.cs rename to Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/TopLevel/ModelObjectToSpeckleConverter.cs index 57954f54f..27aa6ce38 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/ToSpeckle/TopLevel/ModelObjectToSpeckleConverter.cs +++ b/Converters/Tekla/Speckle.Converters.TeklaShared/ToSpeckle/TopLevel/ModelObjectToSpeckleConverter.cs @@ -11,17 +11,20 @@ public class ModelObjectToSpeckleConverter : IToSpeckleTopLevelConverter { private readonly IConverterSettingsStore _settingsStore; private readonly DisplayValueExtractor _displayValueExtractor; - private readonly PropertyExtractor _propertyExtractor; + private readonly ClassPropertyExtractor _propertyExtractor; + private readonly ReportPropertyExtractor _reportPropertyExtractor; public ModelObjectToSpeckleConverter( IConverterSettingsStore settingsStore, DisplayValueExtractor displayValueExtractor, - PropertyExtractor propertyExtractor + ClassPropertyExtractor propertyExtractor, + ReportPropertyExtractor reportPropertyExtractor ) { _settingsStore = settingsStore; _displayValueExtractor = displayValueExtractor; _propertyExtractor = propertyExtractor; + _reportPropertyExtractor = reportPropertyExtractor; } public Base Convert(object target) @@ -44,6 +47,13 @@ public Base Convert(object target) result[prop.Key] = prop.Value; } + // get report properties + var reportProperties = GetObjectReportProperties(modelObject); + if (reportProperties.Count > 0) + { + result["properties"] = reportProperties; + } + // get display value var displayValue = _displayValueExtractor.GetDisplayValue(modelObject).ToList(); if (displayValue.Count > 0) @@ -51,6 +61,23 @@ public Base Convert(object target) result["displayValue"] = displayValue; } + // get report properties + Dictionary GetObjectReportProperties(TSM.ModelObject modelObject) + { + Dictionary properties = new(); + + // get report properties + var reportProperties = _reportPropertyExtractor.GetProperties(modelObject); + if (reportProperties.Count > 0) + { + properties["report"] = reportProperties; + } + + // POC: might add user defined properties here + + return properties; + } + // get children // POC: This logic should be same in the material unpacker in connector List children = new(); diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json index 404f519ef..db41362cc 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -4,27 +4,27 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -131,8 +131,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -216,18 +216,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -324,9 +324,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -378,18 +378,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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 ccb054c3c..7e272c523 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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -311,18 +311,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "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.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -619,18 +619,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "System.Threading.Tasks.Dataflow": { "type": "CentralTransitive", diff --git a/DUI3/Speckle.Connectors.DUI/Bindings/SendBindingUICommands.cs b/DUI3/Speckle.Connectors.DUI/Bindings/SendBindingUICommands.cs index 75b892fc2..047eb62ce 100644 --- a/DUI3/Speckle.Connectors.DUI/Bindings/SendBindingUICommands.cs +++ b/DUI3/Speckle.Connectors.DUI/Bindings/SendBindingUICommands.cs @@ -9,6 +9,7 @@ public class SendBindingUICommands(IBrowserBridge bridge) : BasicConnectorBindin private const string REFRESH_SEND_FILTERS_UI_COMMAND_NAME = "refreshSendFilters"; private const string SET_MODELS_EXPIRED_UI_COMMAND_NAME = "setModelsExpired"; private const string SET_MODEL_SEND_RESULT_UI_COMMAND_NAME = "setModelSendResult"; + private const string SET_ID_MAP_COMMAND_NAME = "setIdMap"; // POC.. the only reasons this needs the bridge is to send? realtionship to these messages and the bridge is unclear public async Task RefreshSendFilters() => @@ -17,6 +18,9 @@ public async Task RefreshSendFilters() => public async Task SetModelsExpired(IEnumerable expiredModelIds) => await Bridge.Send(SET_MODELS_EXPIRED_UI_COMMAND_NAME, expiredModelIds).ConfigureAwait(false); + public async Task SetFilterObjectIds(string modelCardId, Dictionary idMap) => + await Bridge.Send(SET_ID_MAP_COMMAND_NAME, new { modelCardId, idMap }).ConfigureAwait(false); + public async Task SetModelSendResult( string modelCardId, string versionId, diff --git a/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/DirectSelectionSendFilter.cs b/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/DirectSelectionSendFilter.cs index b87219b69..a716cbdf3 100644 --- a/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/DirectSelectionSendFilter.cs +++ b/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/DirectSelectionSendFilter.cs @@ -9,5 +9,6 @@ public abstract class DirectSelectionSendFilter : DiscriminatedObject, ISendFilt public string? Summary { get; set; } public bool IsDefault { get; set; } public List SelectedObjectIds { get; set; } = new(); - public abstract List GetObjectIds(); + public Dictionary? IdMap { get; set; } + public abstract List RefreshObjectIds(); } diff --git a/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/EverythingSendFilter.cs b/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/EverythingSendFilter.cs deleted file mode 100644 index 5aa300eb2..000000000 --- a/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/EverythingSendFilter.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Speckle.Connectors.DUI.Utils; - -namespace Speckle.Connectors.DUI.Models.Card.SendFilter; - -public abstract class EverythingSendFilter : DiscriminatedObject, ISendFilter -{ - public string Id { get; set; } = "everything"; - public string Name { get; set; } = "Everything"; - public string? Summary { get; set; } = "All supported objects in the file."; - public bool IsDefault { get; set; } - public abstract List GetObjectIds(); - public abstract bool CheckExpiry(string[] changedObjectIds); -} diff --git a/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/ISendFilter.cs b/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/ISendFilter.cs index 6e74c68a1..b48140506 100644 --- a/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/ISendFilter.cs +++ b/DUI3/Speckle.Connectors.DUI/Models/Card/SendFilter/ISendFilter.cs @@ -6,10 +6,15 @@ public interface ISendFilter public string Name { get; set; } public string? Summary { get; set; } public bool IsDefault { get; set; } + public List SelectedObjectIds { get; set; } + public Dictionary? IdMap { get; set; } /// - /// Gets the ids of the objects targeted by the filter from the host application. + /// Refreshes the ids of the objects from the filter. + /// In Revit we re-fetch the new objects before send or whenever new element added into specific type of filter. + /// i.e. we have category filter with "Walls" selected, whenever user added new wall we need to update the ObjectIds before + /// running expiration checks to be able to catch the model card is not up-to-date anymore /// /// - public List GetObjectIds(); + public List RefreshObjectIds(); } diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index e599c86a9..022145f98 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.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "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.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "speckle.connectors.logging": { @@ -351,11 +351,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index b91a88842..528f69971 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,15 +1,15 @@ - + - + - - + + @@ -20,10 +20,10 @@ - - - - + + + + @@ -39,9 +39,9 @@ - - - + + + @@ -49,4 +49,4 @@ - + \ No newline at end of file diff --git a/Local.sln b/Local.sln index 54a2216ba..738e2b396 100644 --- a/Local.sln +++ b/Local.sln @@ -160,8 +160,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Common.T EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tekla", "Tekla", "{AB1AD13B-163E-45F8-8F96-52A921501FA0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connector.Tekla2024", "Connectors\Tekla\Speckle.Connector.Tekla2024\Speckle.Connector.Tekla2024.csproj", "{8077B6A7-86BD-4E87-8B23-6D168D0E14D9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2022", "Connectors\Autocad\Speckle.Connectors.Civil3d2022\Speckle.Connectors.Civil3d2022.csproj", "{C3879337-CD00-4011-89C5-585DD2CC3ED5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2023", "Connectors\Autocad\Speckle.Connectors.Civil3d2023\Speckle.Connectors.Civil3d2023.csproj", "{FE4CB79D-4E59-4070-871C-108545537E6C}" @@ -176,7 +174,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2 EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Connectors.Civil3dShared", "Connectors\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.shproj", "{EFD01520-93E8-4CCA-8E03-9CDC635F55F4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converter.Tekla2024", "Converters\Tekla\Speckle.Converter.Tekla2024\Speckle.Converter.Tekla2024.csproj", "{FBE49C59-F69E-4809-BB3A-F150BC408BB4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Dependencies", "..\speckle-sharp-sdk\src\Speckle.Sdk.Dependencies\Speckle.Sdk.Dependencies.csproj", "{B4679D71-F2F5-4759-8FDD-E305C1370306}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2024", "2024", "{474752C4-3D2A-4A7D-B8E0-B7A43FC3694C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2023", "2023", "{AF303676-6068-49A8-A574-D72E3B074716}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0B47C151-3B4E-4EB5-AB21-02FD096A2024}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Connector.Tekla2023", "Connectors\Tekla\Speckle.Connector.Tekla2023\Speckle.Connector.Tekla2023.csproj", "{A277CDF6-7C8F-4870-8D15-AF35F4749CAA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converter.Tekla2023", "Converters\Tekla\Speckle.Converter.Tekla2023\Speckle.Converter.Tekla2023.csproj", "{B236750B-CFE5-4640-9073-77A27A7257F6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Connector.Tekla2024", "Connectors\Tekla\Speckle.Connector.Tekla2024\Speckle.Connector.Tekla2024.csproj", "{2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converter.Tekla2024", "Converters\Tekla\Speckle.Converter.Tekla2024\Speckle.Converter.Tekla2024.csproj", "{4C373FD0-E3F3-478B-AD32-CDBF340D21A9}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Connectors.TeklaShared", "Connectors\Tekla\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.shproj", "{3AB9028B-B2D2-464B-9BA3-39C192441E50}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Converters.TeklaShared", "Converters\Tekla\Speckle.Converters.TeklaShared\Speckle.Converters.TeklaShared.shproj", "{52666479-5401-47D6-B7BA-D554784439EA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -425,12 +441,6 @@ Global {13225611-10EE-41BB-9198-C88D6E978DA6}.Local|Any CPU.Build.0 = Local|Any CPU {13225611-10EE-41BB-9198-C88D6E978DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {13225611-10EE-41BB-9198-C88D6E978DA6}.Release|Any CPU.Build.0 = Release|Any CPU - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9}.Local|Any CPU.ActiveCfg = Debug|Any CPU - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9}.Local|Any CPU.Build.0 = Debug|Any CPU - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9}.Release|Any CPU.Build.0 = Release|Any CPU {C3879337-CD00-4011-89C5-585DD2CC3ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3879337-CD00-4011-89C5-585DD2CC3ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3879337-CD00-4011-89C5-585DD2CC3ED5}.Local|Any CPU.ActiveCfg = Local|Any CPU @@ -467,12 +477,36 @@ Global {AE75B68F-3594-403B-9719-9C36DA0E3F8A}.Local|Any CPU.Build.0 = Local|Any CPU {AE75B68F-3594-403B-9719-9C36DA0E3F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {AE75B68F-3594-403B-9719-9C36DA0E3F8A}.Release|Any CPU.Build.0 = Release|Any CPU - {FBE49C59-F69E-4809-BB3A-F150BC408BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBE49C59-F69E-4809-BB3A-F150BC408BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBE49C59-F69E-4809-BB3A-F150BC408BB4}.Local|Any CPU.ActiveCfg = Local|Any CPU - {FBE49C59-F69E-4809-BB3A-F150BC408BB4}.Local|Any CPU.Build.0 = Local|Any CPU - {FBE49C59-F69E-4809-BB3A-F150BC408BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBE49C59-F69E-4809-BB3A-F150BC408BB4}.Release|Any CPU.Build.0 = Release|Any CPU + {B4679D71-F2F5-4759-8FDD-E305C1370306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4679D71-F2F5-4759-8FDD-E305C1370306}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4679D71-F2F5-4759-8FDD-E305C1370306}.Local|Any CPU.ActiveCfg = Local|Any CPU + {B4679D71-F2F5-4759-8FDD-E305C1370306}.Local|Any CPU.Build.0 = Local|Any CPU + {B4679D71-F2F5-4759-8FDD-E305C1370306}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4679D71-F2F5-4759-8FDD-E305C1370306}.Release|Any CPU.Build.0 = Release|Any CPU + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA}.Local|Any CPU.ActiveCfg = Debug|Any CPU + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA}.Local|Any CPU.Build.0 = Debug|Any CPU + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA}.Release|Any CPU.Build.0 = Release|Any CPU + {B236750B-CFE5-4640-9073-77A27A7257F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B236750B-CFE5-4640-9073-77A27A7257F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B236750B-CFE5-4640-9073-77A27A7257F6}.Local|Any CPU.ActiveCfg = Local|Any CPU + {B236750B-CFE5-4640-9073-77A27A7257F6}.Local|Any CPU.Build.0 = Local|Any CPU + {B236750B-CFE5-4640-9073-77A27A7257F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B236750B-CFE5-4640-9073-77A27A7257F6}.Release|Any CPU.Build.0 = Release|Any CPU + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}.Local|Any CPU.ActiveCfg = Debug|Any CPU + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}.Local|Any CPU.Build.0 = Debug|Any CPU + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3}.Release|Any CPU.Build.0 = Release|Any CPU + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9}.Local|Any CPU.ActiveCfg = Local|Any CPU + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9}.Local|Any CPU.Build.0 = Local|Any CPU + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -543,7 +577,6 @@ Global {3747C01B-343E-4425-A973-4D9D181BE468} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {13225611-10EE-41BB-9198-C88D6E978DA6} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {AB1AD13B-163E-45F8-8F96-52A921501FA0} = {42826721-9A18-4762-8BA9-F1429DD5C5B1} - {8077B6A7-86BD-4E87-8B23-6D168D0E14D9} = {AB1AD13B-163E-45F8-8F96-52A921501FA0} {C3879337-CD00-4011-89C5-585DD2CC3ED5} = {B9CE43B9-31C9-4F02-A92C-658681AD75C6} {FE4CB79D-4E59-4070-871C-108545537E6C} = {B32A4121-C9A1-4098-81CD-D799E1491F54} {D4566BF1-56CF-477A-8769-63299A9F45A3} = {48B7AC68-AA4D-4B36-A5DE-7F19607892A6} @@ -551,7 +584,15 @@ Global {1F93164A-42EE-4D72-B7CD-9CA831F60E09} = {B32A4121-C9A1-4098-81CD-D799E1491F54} {AE75B68F-3594-403B-9719-9C36DA0E3F8A} = {48B7AC68-AA4D-4B36-A5DE-7F19607892A6} {EFD01520-93E8-4CCA-8E03-9CDC635F55F4} = {6186EF63-4978-4FA9-9893-7074F9FD0BA4} - {FBE49C59-F69E-4809-BB3A-F150BC408BB4} = {AB1AD13B-163E-45F8-8F96-52A921501FA0} + {474752C4-3D2A-4A7D-B8E0-B7A43FC3694C} = {AB1AD13B-163E-45F8-8F96-52A921501FA0} + {AF303676-6068-49A8-A574-D72E3B074716} = {AB1AD13B-163E-45F8-8F96-52A921501FA0} + {0B47C151-3B4E-4EB5-AB21-02FD096A2024} = {AB1AD13B-163E-45F8-8F96-52A921501FA0} + {A277CDF6-7C8F-4870-8D15-AF35F4749CAA} = {AF303676-6068-49A8-A574-D72E3B074716} + {B236750B-CFE5-4640-9073-77A27A7257F6} = {AF303676-6068-49A8-A574-D72E3B074716} + {2CBC9A3D-8AC6-4127-ADA5-C6D7F07A35E3} = {474752C4-3D2A-4A7D-B8E0-B7A43FC3694C} + {4C373FD0-E3F3-478B-AD32-CDBF340D21A9} = {474752C4-3D2A-4A7D-B8E0-B7A43FC3694C} + {3AB9028B-B2D2-464B-9BA3-39C192441E50} = {0B47C151-3B4E-4EB5-AB21-02FD096A2024} + {52666479-5401-47D6-B7BA-D554784439EA} = {0B47C151-3B4E-4EB5-AB21-02FD096A2024} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EE253116-7070-4E9A-BCE8-2911C251B8C8} diff --git a/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs b/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs index 639194f5d..6208c5ea1 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/ProgressDisplayManager.cs @@ -55,8 +55,6 @@ public string CalculateSpeed(ProgressArgs args) return $"{ToFileSize(countPerSecond)} / sec"; case ProgressEvent.DeserializeObject: case ProgressEvent.SerializeObject: - case ProgressEvent.DownloadObject: - case ProgressEvent.UploadObject: return $"{ThreeNonZeroDigits(countPerSecond)} objects / sec"; default: return string.Empty; diff --git a/Sdk/Speckle.Connectors.Common/Operations/RootObjectSender.cs b/Sdk/Speckle.Connectors.Common/Operations/RootObjectSender.cs index cffee904c..bbab5bb30 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/RootObjectSender.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/RootObjectSender.cs @@ -69,6 +69,7 @@ ISdkActivityFactory activityFactory using var transport = _transportFactory.Create(account, sendInfo.ProjectId, 60, null); + string previousSpeed = string.Empty; _progressDisplayManager.Begin(); var sendResult = await _operations .Send( @@ -77,6 +78,15 @@ ISdkActivityFactory activityFactory true, onProgressAction: new PassthroughProgress(args => { + if (args.ProgressEvent == ProgressEvent.UploadBytes) + { + switch (args.ProgressEvent) + { + case ProgressEvent.UploadBytes: + previousSpeed = _progressDisplayManager.CalculateSpeed(args); + break; + } + } if (!_progressDisplayManager.ShouldUpdate()) { return; @@ -84,23 +94,15 @@ ISdkActivityFactory activityFactory switch (args.ProgressEvent) { - case ProgressEvent.UploadBytes: //TODO: These progress calls are not awaited - onOperationProgressed.Report( - new( - $"Uploading ({_progressDisplayManager.CalculateSpeed(args)})", - _progressDisplayManager.CalculatePercentage(args) - ) - ); + case ProgressEvent.CachedToLocal: + onOperationProgressed.Report(new($"Checking... ({args.ProgressEvent})", null)); break; - case ProgressEvent.UploadObject: - onOperationProgressed.Report(new("Uploading Root Object...", null)); + case ProgressEvent.UploadBytes: + onOperationProgressed.Report(new($"Uploading... ({previousSpeed})", null)); break; - case ProgressEvent.SerializeObject: + case ProgressEvent.FromCacheOrSerialized: onOperationProgressed.Report( - new( - $"Serializing ({_progressDisplayManager.CalculateSpeed(args)})", - _progressDisplayManager.CalculatePercentage(args) - ) + new($"Loading cache and Serializing... ({_progressDisplayManager.CalculateSpeed(args)})", null) ); break; } diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json index 36fcf0d79..2848c0f13 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.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" }, "GraphQL.Client": { "type": "Transitive", diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json index 8d0c9ed3d..b1e0f40e2 100644 --- a/Sdk/Speckle.Connectors.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json @@ -4,27 +4,27 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -131,8 +131,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -216,18 +216,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -324,9 +324,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )", - "Speckle.Sdk": "[3.1.0-dev.174, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )", + "Speckle.Sdk": "[3.1.0-dev.181, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.181, )" } }, "speckle.connectors.logging": { @@ -368,18 +368,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json index da52fe1b8..05fb937c6 100644 --- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json @@ -4,15 +4,15 @@ "net8.0": { "altcover": { "type": "Direct", - "requested": "[8.8.173, )", - "resolved": "8.8.173", - "contentHash": "iejmqWdC9H9ShTtsT7vSLpZ74RG4sDhheW7wllczXWl6WZAaCqGXMFGRRHi8TZGCzV/7Ah5gjXZ4GRlfAef4Eg==" + "requested": "[8.9.3, )", + "resolved": "8.9.3", + "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w==" }, "FluentAssertions": { "type": "Direct", - "requested": "[6.12.0, )", - "resolved": "6.12.0", - "contentHash": "ZXhHT2YwP9lajrwSKbLlFqsmCCvFJMoRSK9t7sImfnCyd0OB3MhgxdoMcVqxbq1iyxD6mD2fiackWmBb7ayiXQ==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==", "dependencies": { "System.Configuration.ConfigurationManager": "4.4.0" } @@ -28,12 +28,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.10.0, )", - "resolved": "17.10.0", - "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==", + "requested": "[17.11.1, )", + "resolved": "17.11.1", + "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==", "dependencies": { - "Microsoft.CodeCoverage": "17.10.0", - "Microsoft.TestPlatform.TestHost": "17.10.0" + "Microsoft.CodeCoverage": "17.11.1", + "Microsoft.TestPlatform.TestHost": "17.11.1" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -140,8 +140,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA==" + "resolved": "17.11.1", + "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -225,18 +225,18 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==", + "resolved": "17.11.1", + "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.10.0", - "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==", + "resolved": "17.11.1", + "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.10.0", + "Microsoft.TestPlatform.ObjectModel": "17.11.1", "Newtonsoft.Json": "13.0.1" } }, @@ -332,7 +332,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.174, )" + "Speckle.Objects": "[3.1.0-dev.181, )" } }, "speckle.testing": { @@ -362,18 +362,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index 0814f6f7f..3a5e3b928 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.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "9SCFVbVle2+fPxx2l0sIiWQMLxw1S++V7DrDPnq/0fq5jKJNzaeT7w4VwLX7AzhTvnplpY/fhi9qUCR27nO9VA==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "r6GGA7Pq4CPGYOu6OmmLW/hhhREo/l44RUFhsoYmpHNGpOg1UjF45dwyfLgaU38wrNxQoURjLUQDkxGfhb8liA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.174" + "Speckle.Sdk": "3.1.0-dev.181" } }, "GraphQL.Client": { @@ -309,9 +309,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "sj0RdxcORCNxT7KdXtUYV1E+dsNfdAnNQElTv77DN5O9p4grFxkV1Wymu3XH5nkQ5HrwqBWbfRU9ycK7QruIYg==", + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "VmRRphUJm+qfcjtdzxkTstAD0opaIP57tP6GJ2YnalyRj3wBTGBQuy7gwhGjWyAvsMnkugpKFEfAVuNm/zHQ2A==", "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.174" + "Speckle.Sdk.Dependencies": "3.1.0-dev.181" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.174, )", - "resolved": "3.1.0-dev.174", - "contentHash": "I3a1XHewuT+QUTYWHiTcDy5KtKBlpztWFbA+rKplBq6pj/sBdOu/QLEDkhSK4tKhYkFrGh/3LrDeYq4TpOIGUw==" + "requested": "[3.1.0-dev.181, )", + "resolved": "3.1.0-dev.181", + "contentHash": "W7Nb3hAPlLXGZmEFWdf9vyhXKGZk3M+lypEKB+IWQVwr3NL+bzPgfw2130kTuMr/9zGx8jUbSfx2ulTql9mZxw==" } } } diff --git a/Speckle.Connectors.sln b/Speckle.Connectors.sln index a7b16cf0b..e63d5a8dd 100644 --- a/Speckle.Connectors.sln +++ b/Speckle.Connectors.sln @@ -173,7 +173,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2025", "Converters\Civil3d\Speckle.Converters.Civil3d2025\Speckle.Converters.Civil3d2025.csproj", "{DB31E57B-60FC-49BE-91E0-1374290BCF03}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converter.Tekla2024", "Converters\Tekla\Speckle.Converter.Tekla2024\Speckle.Converter.Tekla2024.csproj", "{ACF75860-7FCE-4AE9-8C45-68AD1043550B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converter.Tekla2024", "Converters\Tekla\Speckle.Converter.Tekla2024\Speckle.Converter.Tekla2024.csproj", "{ACF75860-7FCE-4AE9-8C45-68AD1043550B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2024", "2024", "{26403A46-A8C2-4761-A41D-BCB994C46B70}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0C895EA7-5FEF-44B8-85AC-A9D4858FA59F}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Connectors.TeklaShared", "Connectors\Tekla\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.shproj", "{3AB9028B-B2D2-464B-9BA3-39C192441E50}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Converters.TeklaShared", "Converters\Tekla\Speckle.Converters.TeklaShared\Speckle.Converters.TeklaShared.shproj", "{52666479-5401-47D6-B7BA-D554784439EA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2023", "2023", "{C552C165-5023-47AB-9EE1-1EA61819D2B1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connector.Tekla2023", "Connectors\Tekla\Speckle.Connector.Tekla2023\Speckle.Connector.Tekla2023.csproj", "{025C85F8-F741-4600-BC46-5FEAD754B65D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converter.Tekla2023", "Converters\Tekla\Speckle.Converter.Tekla2023\Speckle.Converter.Tekla2023.csproj", "{8F9181C2-1808-44C0-A33A-5BAE40C49E63}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -458,6 +472,18 @@ Global {ACF75860-7FCE-4AE9-8C45-68AD1043550B}.Local|Any CPU.Build.0 = Debug|Any CPU {ACF75860-7FCE-4AE9-8C45-68AD1043550B}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACF75860-7FCE-4AE9-8C45-68AD1043550B}.Release|Any CPU.Build.0 = Release|Any CPU + {025C85F8-F741-4600-BC46-5FEAD754B65D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {025C85F8-F741-4600-BC46-5FEAD754B65D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {025C85F8-F741-4600-BC46-5FEAD754B65D}.Local|Any CPU.ActiveCfg = Debug|Any CPU + {025C85F8-F741-4600-BC46-5FEAD754B65D}.Local|Any CPU.Build.0 = Debug|Any CPU + {025C85F8-F741-4600-BC46-5FEAD754B65D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {025C85F8-F741-4600-BC46-5FEAD754B65D}.Release|Any CPU.Build.0 = Release|Any CPU + {8F9181C2-1808-44C0-A33A-5BAE40C49E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F9181C2-1808-44C0-A33A-5BAE40C49E63}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F9181C2-1808-44C0-A33A-5BAE40C49E63}.Local|Any CPU.ActiveCfg = Local|Any CPU + {8F9181C2-1808-44C0-A33A-5BAE40C49E63}.Local|Any CPU.Build.0 = Local|Any CPU + {8F9181C2-1808-44C0-A33A-5BAE40C49E63}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F9181C2-1808-44C0-A33A-5BAE40C49E63}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -527,7 +553,7 @@ Global {5B9A550A-9314-4E91-884E-E54960F589FB} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {8098BAFC-DF1C-4AFA-A93E-08121E6D09D4} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {696086E4-D8CC-4FE0-A9B3-5F10B9089B55} = {42826721-9A18-4762-8BA9-F1429DD5C5B1} - {2319C00F-B268-4E4C-9F88-6B379E2BBD22} = {696086E4-D8CC-4FE0-A9B3-5F10B9089B55} + {2319C00F-B268-4E4C-9F88-6B379E2BBD22} = {26403A46-A8C2-4761-A41D-BCB994C46B70} {9EF292C6-1333-4502-AD9C-224D99847185} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {A1B72EC1-5BC4-41FD-850F-5DA87DF49616} = {4721AA15-AF6E-4A62-A2C3-65564DC563E6} {81FCEE13-FEAC-475D-9EF9-71132EF26909} = {52D71CA4-AE77-4DD4-9456-1E1489413607} @@ -536,7 +562,14 @@ Global {842F4BFD-3997-485D-BAB5-9419C1D982F2} = {52D71CA4-AE77-4DD4-9456-1E1489413607} {4459F2B1-A340-488E-A856-EB2AE9C72AD4} = {B2BF1FAE-D0F4-4961-84CB-A00D3CABD236} {DB31E57B-60FC-49BE-91E0-1374290BCF03} = {B2BF1FAE-D0F4-4961-84CB-A00D3CABD236} - {ACF75860-7FCE-4AE9-8C45-68AD1043550B} = {696086E4-D8CC-4FE0-A9B3-5F10B9089B55} + {ACF75860-7FCE-4AE9-8C45-68AD1043550B} = {26403A46-A8C2-4761-A41D-BCB994C46B70} + {26403A46-A8C2-4761-A41D-BCB994C46B70} = {696086E4-D8CC-4FE0-A9B3-5F10B9089B55} + {0C895EA7-5FEF-44B8-85AC-A9D4858FA59F} = {696086E4-D8CC-4FE0-A9B3-5F10B9089B55} + {3AB9028B-B2D2-464B-9BA3-39C192441E50} = {0C895EA7-5FEF-44B8-85AC-A9D4858FA59F} + {52666479-5401-47D6-B7BA-D554784439EA} = {0C895EA7-5FEF-44B8-85AC-A9D4858FA59F} + {C552C165-5023-47AB-9EE1-1EA61819D2B1} = {696086E4-D8CC-4FE0-A9B3-5F10B9089B55} + {025C85F8-F741-4600-BC46-5FEAD754B65D} = {C552C165-5023-47AB-9EE1-1EA61819D2B1} + {8F9181C2-1808-44C0-A33A-5BAE40C49E63} = {C552C165-5023-47AB-9EE1-1EA61819D2B1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EE253116-7070-4E9A-BCE8-2911C251B8C8} @@ -544,16 +577,20 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Connectors\Revit\Speckle.Connectors.RevitShared.Cef\Speckle.Connectors.RevitShared.Cef.projitems*{01f98733-7352-47ad-a594-537d979de3de}*SharedItemsImports = 5 Connectors\Revit\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems*{01f98733-7352-47ad-a594-537d979de3de}*SharedItemsImports = 5 + Connectors\Tekla\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.projitems*{025c85f8-f741-4600-bc46-5fead754b65d}*SharedItemsImports = 5 Converters\Revit\Speckle.Converters.RevitShared\Speckle.Converters.RevitShared.projitems*{19424b55-058c-4e9c-b86f-700aef9eaec3}*SharedItemsImports = 5 Connectors\Rhino\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems*{1e2644a9-6b31-4350-8772-ceaad6ee0b21}*SharedItemsImports = 5 + Connectors\Tekla\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.projitems*{2319c00f-b268-4e4c-9f88-6b379e2bbd22}*SharedItemsImports = 5 Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{25172c49-7aa4-4739-bb07-69785094c379}*SharedItemsImports = 5 Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{25172c49-7aa4-4739-bb07-69785094c379}*SharedItemsImports = 5 Converters\Revit\Speckle.Converters.RevitShared\Speckle.Converters.RevitShared.projitems*{26391930-f86f-47e0-a5f6-b89919e38ce1}*SharedItemsImports = 5 Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{35175682-da83-4c0a-a49d-b191f5885d8e}*SharedItemsImports = 13 + Connectors\Tekla\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.projitems*{3ab9028b-b2d2-464b-9ba3-39c192441e50}*SharedItemsImports = 13 Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{41bc679f-887f-44cf-971d-a5502ee87db0}*SharedItemsImports = 13 Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{4459f2b1-a340-488e-a856-eb2ae9c72ad4}*SharedItemsImports = 5 Connectors\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems*{4459f2b1-a340-488e-a856-eb2ae9c72ad4}*SharedItemsImports = 5 Converters\Revit\Speckle.Converters.RevitShared\Speckle.Converters.RevitShared.projitems*{4d40a101-07e6-4ff2-8934-83434932591d}*SharedItemsImports = 5 + Converters\Tekla\Speckle.Converters.TeklaShared\Speckle.Converters.TeklaShared.projitems*{52666479-5401-47d6-b7ba-d554784439ea}*SharedItemsImports = 13 Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{5505b953-d434-49ce-8ebd-efd7b3c378f7}*SharedItemsImports = 5 Converters\Rhino\Speckle.Converters.RhinoShared\Speckle.Converters.RhinoShared.projitems*{56a909ae-6e99-4d4d-a22e-38bdc5528b8e}*SharedItemsImports = 5 Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{5cdec958-708e-4d19-a79e-0c1db23a6039}*SharedItemsImports = 5 @@ -573,6 +610,7 @@ Global Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{842f4bfd-3997-485d-bab5-9419c1d982f2}*SharedItemsImports = 5 Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{842f4bfd-3997-485d-bab5-9419c1d982f2}*SharedItemsImports = 5 Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{89c4cbc7-1606-40de-b6da-fbe3aac98395}*SharedItemsImports = 5 + Converters\Tekla\Speckle.Converters.TeklaShared\Speckle.Converters.TeklaShared.projitems*{8f9181c2-1808-44c0-a33a-5bae40c49e63}*SharedItemsImports = 5 Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{9166cc10-12e1-4a0f-916b-61f6f2004f5a}*SharedItemsImports = 5 Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{9add1b7a-6401-4202-8613-f668e2fbc0a4}*SharedItemsImports = 13 Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{9d66ede4-afc2-4f00-b40c-a7e878a2972f}*SharedItemsImports = 5 @@ -581,6 +619,7 @@ Global Connectors\Revit\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems*{a6de3da0-b242-4f49-aef0-4e26af92d16c}*SharedItemsImports = 5 Connectors\Rhino\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems*{a6e3a82f-4696-4d92-aba1-38aa80752067}*SharedItemsImports = 5 Converters\Rhino\Speckle.Converters.RhinoShared\Speckle.Converters.RhinoShared.projitems*{ac2db416-f05c-4296-9040-56d6ad4fcd27}*SharedItemsImports = 5 + Converters\Tekla\Speckle.Converters.TeklaShared\Speckle.Converters.TeklaShared.projitems*{acf75860-7fce-4ae9-8c45-68ad1043550b}*SharedItemsImports = 5 Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{afab80bd-a4dd-4cad-9937-acbfed668a48}*SharedItemsImports = 5 Connectors\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems*{afab80bd-a4dd-4cad-9937-acbfed668a48}*SharedItemsImports = 5 Connectors\Rhino\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems*{b37d4b9a-8d3f-4fa5-b9c8-e6c5f8a0c1e2}*SharedItemsImports = 13