diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json index 91519b8df..7defe50a7 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -292,7 +292,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -336,18 +336,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -357,14 +357,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json index 04d031602..d30a46ecf 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -292,7 +292,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -336,18 +336,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -357,14 +357,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json index b21f9ba3e..ab51e9fbf 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -293,7 +293,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json index 99a7dd91e..b1eab8bed 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json @@ -210,9 +210,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -244,7 +244,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -288,18 +288,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2026/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2026/packages.lock.json index 5b5f524e1..b21b93586 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2026/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2026/packages.lock.json @@ -210,9 +210,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -244,7 +244,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -288,18 +288,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -307,14 +307,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs index 263fb8a4d..0434dcc35 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs @@ -95,22 +95,19 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder x.Status == Status.ERROR)) diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json index b1e53cc56..b4a5d056a 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -346,18 +346,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -367,14 +367,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json index 1f1992619..36c50ea0f 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -346,18 +346,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -367,14 +367,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index da7fcfca5..ff9a6e7f4 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -346,18 +346,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -367,14 +367,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json index 26f4fa83d..d665b285a 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json @@ -219,9 +219,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -254,7 +254,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -298,18 +298,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2026/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2026/packages.lock.json index 06008a253..7a284237f 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2026/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2026/packages.lock.json @@ -219,9 +219,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -254,7 +254,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -298,18 +298,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs index 7acf82101..3b16da9c6 100644 --- a/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs +++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs @@ -89,8 +89,6 @@ public class CsiRootObjectBuilder : IRootObjectBuilder foreach (ICsiWrapper csiObject in csiObjects) { cancellationToken.ThrowIfCancellationRequested(); - using var _2 = _activityFactory.Start("Convert"); - var result = ConvertCsiObject(csiObject, rootObjectCollection); results.Add(result); diff --git a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json index f2092ffc4..c957245b4 100644 --- a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json +++ b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.etabs21": { @@ -335,18 +335,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -356,14 +356,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json index 120d48f5e..983fc126f 100644 --- a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json +++ b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json @@ -210,9 +210,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -236,7 +236,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.etabs22": { @@ -286,18 +286,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -305,14 +305,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json index ca382611a..94eb1a66d 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2020": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json index 7030077b7..6a8742b7f 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2021": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json index cabf37026..09a6ef8e1 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2022": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json index 04dc30aae..24c8b4c3f 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2023": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json index 38118b3b2..1adbb1daf 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2024": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json index 26a8346e3..e62eb69a7 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json @@ -265,9 +265,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -291,7 +291,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2025": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2026/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2026/packages.lock.json index 0d15845f1..b06382c5c 100644 --- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2026/packages.lock.json +++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2026/packages.lock.json @@ -266,9 +266,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -292,7 +292,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.navisworks2026": { @@ -339,18 +339,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "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.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, ".NETFramework,Version=v4.8/win-x64": { diff --git a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json index bae53b585..dd0578cd7 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json @@ -281,9 +281,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -306,7 +306,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.revit2022": { @@ -351,11 +351,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Revit.API": { @@ -366,9 +366,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -378,14 +378,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json index a5542fcbf..be9d6969c 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json @@ -281,9 +281,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -306,7 +306,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.revit2023": { @@ -351,11 +351,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Revit.API": { @@ -366,9 +366,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -378,14 +378,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json index cab9e3761..3400ebb71 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json @@ -281,9 +281,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -306,7 +306,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.revit2024": { @@ -351,11 +351,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Revit.API": { @@ -366,9 +366,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -378,14 +378,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json index 6a953e4a8..25e5a9dc6 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json @@ -226,9 +226,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -251,7 +251,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.revit2025": { @@ -296,11 +296,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Revit.API": { @@ -311,9 +311,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -321,14 +321,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Revit/Speckle.Connectors.Revit2026/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2026/packages.lock.json index 020cd6b3a..9e7059965 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2026/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2026/packages.lock.json @@ -219,9 +219,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -244,7 +244,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.revit2026": { @@ -280,11 +280,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Revit.API": { @@ -295,9 +295,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -305,14 +305,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems b/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems index 442b555bb..22ea32640 100644 --- a/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems +++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems @@ -37,9 +37,9 @@ - + - + @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/Connectors/Rhino/Directory.Build.targets b/Connectors/Rhino/Directory.Build.targets index 1ac7b7c26..0f4ef6361 100644 --- a/Connectors/Rhino/Directory.Build.targets +++ b/Connectors/Rhino/Directory.Build.targets @@ -5,7 +5,7 @@ diff --git a/Connectors/Rhino/Speckle.Connectors.Grasshopper7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Grasshopper7/packages.lock.json index 85941fcfd..3e9fab5ac 100644 --- a/Connectors/Rhino/Speckle.Connectors.Grasshopper7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Grasshopper7/packages.lock.json @@ -325,9 +325,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -337,7 +337,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.rhino7": { @@ -382,18 +382,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -403,14 +403,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Rhino/Speckle.Connectors.Grasshopper8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Grasshopper8/packages.lock.json index a6d445568..187bff815 100644 --- a/Connectors/Rhino/Speckle.Connectors.Grasshopper8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Grasshopper8/packages.lock.json @@ -325,9 +325,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -337,7 +337,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.rhino8": { @@ -382,18 +382,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -403,14 +403,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Dev/DeconstructSpeckleParam.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Dev/DeconstructSpeckleParam.cs index cdd5f4f91..393cba797 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Dev/DeconstructSpeckleParam.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Dev/DeconstructSpeckleParam.cs @@ -227,7 +227,7 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon try { // convert the base and create a wrapper for each result - List<(object, Base)> convertedBase = SpeckleConversionContext.ConvertToHost(@base); + List<(object, Base)> convertedBase = SpeckleConversionContext.Current.ConvertToHost(@base); List convertedWrappers = new(); foreach ((object o, Base b) in convertedBase) { diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/QueryProperties.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/QueryProperties.cs index 90ccdbcb0..22902d231 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/QueryProperties.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/QueryProperties.cs @@ -79,7 +79,7 @@ public class QueryProperties : GH_Component { if (current is SpecklePropertyGroupGoo dict) { - if (dict.Value.TryGetValue(key, out ISpecklePropertyGoo next)) + if (dict.Value.TryGetValue(key, out ISpecklePropertyGoo? next)) { current = next; } diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockDefinitionPassthrough.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockDefinitionPassthrough.cs index 5ef47dd53..243b08bcd 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockDefinitionPassthrough.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockDefinitionPassthrough.cs @@ -8,17 +8,15 @@ using Speckle.Connectors.GrasshopperShared.Properties; namespace Speckle.Connectors.GrasshopperShared.Components.Objects; [Guid("8D2E3F4A-1B5C-4E7F-9A8B-3C6D9E2F1A4B")] -public class SpeckleBlockDefinitionPassthrough : GH_Component +public class SpeckleBlockDefinitionPassthrough() + : SpeckleSolveInstance( + "Speckle Block Definition", + "SBD", + "Create or modify a Speckle Block Definition", + ComponentCategories.PRIMARY_RIBBON, + ComponentCategories.OBJECTS + ) { - public SpeckleBlockDefinitionPassthrough() - : base( - "Speckle Block Definition", - "SBD", - "Create or modify a Speckle Block Definition", - ComponentCategories.PRIMARY_RIBBON, - ComponentCategories.OBJECTS - ) { } - public override Guid ComponentGuid => GetType().GUID; protected override Bitmap Icon => Resources.speckle_objects_block_def; public override GH_Exposure Exposure => GH_Exposure.tertiary; diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockInstancePassthrough.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockInstancePassthrough.cs index 91bf412a9..116405c72 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockInstancePassthrough.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleBlockInstancePassthrough.cs @@ -8,17 +8,15 @@ using Speckle.Connectors.GrasshopperShared.Properties; namespace Speckle.Connectors.GrasshopperShared.Components.Objects; [Guid("2F8A9B1C-3D4E-5F6A-7B8C-9D0E1F2A3B4C")] -public class SpeckleBlockInstancePassthrough : GH_Component +public class SpeckleBlockInstancePassthrough() + : SpeckleSolveInstance( + "Speckle Block Instance", + "SBI", + "Create or modify a Speckle Block Instance", + ComponentCategories.PRIMARY_RIBBON, + ComponentCategories.OBJECTS + ) { - public SpeckleBlockInstancePassthrough() - : base( - "Speckle Block Instance", - "SBI", - "Create or modify a Speckle Block Instance", - ComponentCategories.PRIMARY_RIBBON, - ComponentCategories.OBJECTS - ) { } - public override Guid ComponentGuid => GetType().GUID; protected override Bitmap Icon => Resources.speckle_objects_block_inst; public override GH_Exposure Exposure => GH_Exposure.tertiary; diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleDataObjectPassthrough.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleDataObjectPassthrough.cs index b414f4ede..dd44ed939 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleDataObjectPassthrough.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleDataObjectPassthrough.cs @@ -7,17 +7,15 @@ using Speckle.Connectors.GrasshopperShared.Properties; namespace Speckle.Connectors.GrasshopperShared.Components.Objects; [Guid("5CE8AA40-7706-4893-853D-4C77604548FA")] -public class SpeckleDataObjectPassthrough : GH_Component +public class SpeckleDataObjectPassthrough() + : SpeckleSolveInstance( + "Speckle Data Object", + "SDO", + "Create or modify a Speckle Data Object", + ComponentCategories.PRIMARY_RIBBON, + ComponentCategories.OBJECTS + ) { - public SpeckleDataObjectPassthrough() - : base( - "Speckle Data Object", - "SDO", - "Create or modify a Speckle Data Object", - ComponentCategories.PRIMARY_RIBBON, - ComponentCategories.OBJECTS - ) { } - public override Guid ComponentGuid => GetType().GUID; protected override Bitmap Icon => Resources.speckle_objects_dataobject; public override GH_Exposure Exposure => GH_Exposure.secondary; @@ -151,20 +149,18 @@ public class SpeckleDataObjectPassthrough : GH_Component // process name if (inputName != null) { - result!.Name = inputName; + result.Name = inputName; } // process properties if (inputProperties != null) { - result!.Properties = inputProperties; + result.Properties = inputProperties; } // get the path - string path = - result!.Path.Count > 1 - ? string.Join(Constants.LAYER_PATH_DELIMITER, result!.Path) - : result!.Path.FirstOrDefault(); + string? path = + result.Path.Count > 1 ? string.Join(Constants.LAYER_PATH_DELIMITER, result.Path) : result.Path.FirstOrDefault(); // set all the data da.SetData(0, result.CreateGoo()); diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleGeometryPassthrough.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleGeometryPassthrough.cs index 5c7fe7e34..b6041cbec 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleGeometryPassthrough.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpeckleGeometryPassthrough.cs @@ -4,21 +4,20 @@ using Grasshopper.Kernel.Types; using Speckle.Connectors.GrasshopperShared.HostApp; using Speckle.Connectors.GrasshopperShared.Parameters; using Speckle.Connectors.GrasshopperShared.Properties; +using Speckle.Sdk.Common; namespace Speckle.Connectors.GrasshopperShared.Components.Objects; [Guid("F9418610-ACAE-4417-B010-19EBEA6A121F")] -public class SpeckleGeometryPassthrough : GH_Component +public class SpeckleGeometryPassthrough() + : SpeckleSolveInstance( + "Speckle Geometry", + "SG", + "Create or modify a Speckle Geometry", + ComponentCategories.PRIMARY_RIBBON, + ComponentCategories.OBJECTS + ) { - public SpeckleGeometryPassthrough() - : base( - "Speckle Geometry", - "SG", - "Create or modify a Speckle Geometry", - ComponentCategories.PRIMARY_RIBBON, - ComponentCategories.OBJECTS - ) { } - public override Guid ComponentGuid => GetType().GUID; protected override Bitmap Icon => Resources.speckle_objects_geometry; public override GH_Exposure Exposure => GH_Exposure.secondary; @@ -196,38 +195,37 @@ public class SpeckleGeometryPassthrough : GH_Component } } + result.NotNull(); // process name if (inputName != null) { - result!.Name = inputName; + result.Name = inputName; } // process properties if (inputProperties != null) { - result!.Properties = inputProperties; + result.Properties = inputProperties; } // process color (no mutation) if (inputColor != null) { - result!.Color = inputColor; + result.Color = inputColor; } // process material (no mutation) if (inputMaterial != null) { - result!.Material = inputMaterial.Value; + result.Material = inputMaterial.Value; } // no need to process application Id. // New definitions should have a new appID generated in the new() constructor, and we want to preserve old appID otherwise for changetracking. // get the path - string path = - result!.Path.Count > 1 - ? string.Join(Constants.LAYER_PATH_DELIMITER, result!.Path) - : result!.Path.FirstOrDefault(); + string? path = + result.Path.Count > 1 ? string.Join(Constants.LAYER_PATH_DELIMITER, result.Path) : result.Path.FirstOrDefault(); // set all the data da.SetData(0, result.CreateGoo()); diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpecklePropertiesPassthrough.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpecklePropertiesPassthrough.cs index 99934c69c..b01e18dc8 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpecklePropertiesPassthrough.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Objects/SpecklePropertiesPassthrough.cs @@ -10,12 +10,24 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects; /// CreateSpeckleProperties passthrough component by key value pairs /// [Guid("FED2298C-0D2B-4868-94B5-B8D17F9385A5")] -public class SpecklePropertiesPassthrough : GH_Component +public class SpecklePropertiesPassthrough : SpeckleSolveInstance { public override Guid ComponentGuid => GetType().GUID; protected override Bitmap Icon => Resources.speckle_properties_properties; public override GH_Exposure Exposure => GH_Exposure.quarternary; + public SpecklePropertiesPassthrough() + : base( + "Speckle Properties", + "SP", + "Creates or modifies a set of properties for Speckle objects by keyvalue", + ComponentCategories.PRIMARY_RIBBON, + ComponentCategories.OBJECTS + ) + { + Message = Mode.ToString(); + } + private enum PropertyMode { Merge, // this should be default mode @@ -38,18 +50,6 @@ public class SpecklePropertiesPassthrough : GH_Component } } - public SpecklePropertiesPassthrough() - : base( - "Speckle Properties", - "SP", - "Creates or modifies a set of properties for Speckle objects by keyvalue", - ComponentCategories.PRIMARY_RIBBON, - ComponentCategories.OBJECTS - ) - { - Message = Mode.ToString(); - } - protected override void RegisterInputParams(GH_InputParamManager pManager) { pManager.AddParameter(new SpecklePropertyGroupParam(), "Properties", "P", "Input properties", GH_ParamAccess.item); diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Receive/ReceiveAsyncComponent.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Receive/ReceiveAsyncComponent.cs index a229cd544..f7dd2a1d7 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Receive/ReceiveAsyncComponent.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Receive/ReceiveAsyncComponent.cs @@ -271,7 +271,7 @@ public class ReceiveAsyncComponent : GH_AsyncComponent ResetApiClient(UrlModelResource); } - private void ApiClient_OnVersionCreated(object sender, ProjectVersionsUpdatedMessage e) + private void ApiClient_OnVersionCreated(object? sender, ProjectVersionsUpdatedMessage e) { HandleNewCommit(); } diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SearchToolStripMenuItem.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SearchToolStripMenuItem.cs index ff3e26afd..97309de2b 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SearchToolStripMenuItem.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SearchToolStripMenuItem.cs @@ -1,3 +1,5 @@ +using Speckle.Sdk.Common; + namespace Speckle.Connectors.GrasshopperShared.Components.Operations.Wizard; public class SearchToolStripMenuItem @@ -124,7 +126,7 @@ public class SearchToolStripMenuItem ParentDropDown.ItemClicked += (sender, args) => { // we are not closing the dropdown only if user clicked the first item of the dropdown which is TextBox that we use for search - if (args.ClickedItem.Name == SearchItemId) + if (args.ClickedItem.NotNull().Name == SearchItemId) { return; } diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SpeckleOperationWizard.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SpeckleOperationWizard.cs index 6843d3145..9ec2bea2b 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SpeckleOperationWizard.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Operations/Wizard/SpeckleOperationWizard.cs @@ -426,28 +426,28 @@ public class SpeckleOperationWizard WorkspaceMenuHandler.RedrawMenuButton(SelectedWorkspace); } - private void OnWorkspaceSelected(object sender, WorkspaceSelectedEventArgs e) + private void OnWorkspaceSelected(object? sender, WorkspaceSelectedEventArgs e) { SelectedWorkspace = e.SelectedWorkspace; ResetProjects(); _refreshComponent.Invoke(); } - private void OnProjectSelected(object sender, ProjectSelectedEventArgs e) + private void OnProjectSelected(object? sender, ProjectSelectedEventArgs e) { SelectedProject = e.SelectedProject; ResetModels(); _refreshComponent.Invoke(); } - private void OnModelSelected(object sender, ModelSelectedEventArgs e) + private void OnModelSelected(object? sender, ModelSelectedEventArgs e) { SelectedModel = e.SelectedModel; ResetVersions(true); _refreshComponent.Invoke(); } - private void OnVersionSelected(object sender, VersionSelectedEventArgs e) + private void OnVersionSelected(object? sender, VersionSelectedEventArgs e) { SelectedVersion = e.SelectedVersion; IsLatestVersion = e.IsLatest; diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/SpeckleSolveInstance.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/SpeckleSolveInstance.cs new file mode 100644 index 000000000..586d1fdb7 --- /dev/null +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/SpeckleSolveInstance.cs @@ -0,0 +1,19 @@ +using Grasshopper.Kernel; +using Speckle.Connectors.GrasshopperShared.HostApp; + +namespace Speckle.Connectors.GrasshopperShared.Components; + +public abstract class SpeckleSolveInstance( + string name, + string nickname, + string description, + string category, + string subCategory +) : GH_Component(name, nickname, description, category, subCategory) +{ + protected override void BeforeSolveInstance() => SpeckleConversionContext.SetupCurrent(); + + protected override void AfterSolveInstance() => SpeckleConversionContext.EndCurrent(); + + protected abstract override void SolveInstance(IGH_DataAccess da); +} diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/HostApp/SpeckleConversionContext.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/HostApp/SpeckleConversionContext.cs index deb6b1520..dfcf51e40 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/HostApp/SpeckleConversionContext.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/HostApp/SpeckleConversionContext.cs @@ -3,6 +3,7 @@ using Rhino.Geometry; using Speckle.Connectors.GrasshopperShared.Registration; using Speckle.Converters.Common; using Speckle.Sdk; +using Speckle.Sdk.Common; using Speckle.Sdk.Models; namespace Speckle.Connectors.GrasshopperShared.HostApp; @@ -10,18 +11,50 @@ namespace Speckle.Connectors.GrasshopperShared.HostApp; /// /// Handles grasshopper wide converters. We don't need new converters, unless the document changes - this class should handle this (untested). /// -public static class SpeckleConversionContext +public class SpeckleConversionContext(IRootToSpeckleConverter speckleConverter, IRootToHostConverter hostConverter) { - public static Base ConvertToSpeckle(object geo) + private static IServiceScope? s_scope; + private static SpeckleConversionContext? s_currentContext; + + public static SpeckleConversionContext Current { - using var scope = PriorityLoader.CreateScopeForActiveDocument(); - return scope.ServiceProvider.GetRequiredService().Convert(geo); + get + { + if (s_currentContext == null) + { + SetupCurrent(); + } + + return s_currentContext.NotNull(); + } } - public static List<(object, Base)> ConvertToHost(Base input) + public static void SetupCurrent() { - using var scope = PriorityLoader.CreateScopeForActiveDocument(); - var result = scope.ServiceProvider.GetRequiredService().Convert(input); + if (s_currentContext != null) + { + return; + } + s_scope = PriorityLoader.CreateScopeForActiveDocument(); + s_currentContext = s_scope.Get(); + } + + public static void EndCurrent() + { + if (s_currentContext == null) + { + return; + } + s_currentContext = null; + s_scope?.Dispose(); + s_scope = null; + } + + public Base ConvertToSpeckle(object geo) => speckleConverter.Convert(geo); + + public List<(object, Base)> ConvertToHost(Base input) + { + var result = hostConverter.Convert(input); return result switch { diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperCollectionRebuilder.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperCollectionRebuilder.cs index 3ce083386..d3b840c13 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperCollectionRebuilder.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperCollectionRebuilder.cs @@ -43,7 +43,7 @@ internal sealed class GrasshopperCollectionRebuilder { // first check if cache already has this collection string fullPath = string.Concat(path); - if (_cache.TryGetValue(fullPath, out SpeckleCollectionWrapper col)) + if (_cache.TryGetValue(fullPath, out SpeckleCollectionWrapper? col)) { return col; } @@ -58,7 +58,7 @@ internal sealed class GrasshopperCollectionRebuilder string key = string.Concat(currentLayerPath); // check cache - if (_cache.TryGetValue(key, out SpeckleCollectionWrapper currentCol)) + if (_cache.TryGetValue(key, out SpeckleCollectionWrapper? currentCol)) { previousCollectionWrapper = currentCol; continue; diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperReceiveOperation.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperReceiveOperation.cs index fdff9712c..caf0c5f2a 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperReceiveOperation.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/GrasshopperReceiveOperation.cs @@ -1,5 +1,5 @@ +using Speckle.Connectors.Common.Extensions; using Speckle.Connectors.Common.Operations; -using Speckle.Connectors.Logging; using Speckle.Sdk.Api; using Speckle.Sdk.Logging; using Speckle.Sdk.Models; @@ -41,7 +41,8 @@ public class GrasshopperReceiveOperation // 2 - Check account exist var account = receiveInfo.Account; using IClient apiClient = _clientFactory.Create(account); - using var userScope = ActivityScope.SetTag(Consts.USER_ID, account.GetHashedEmail()); + + using var userScope = UserActivityScope.AddUserScope(account); Speckle.Sdk.Api.GraphQL.Models.Version? version = await apiClient .Version.Get(receiveInfo.SelectedVersionId, receiveInfo.ProjectId, cancellationToken) diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/LocalToGlobalMapHandler.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/LocalToGlobalMapHandler.cs index d7ec2d167..8f9cf9e9b 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/LocalToGlobalMapHandler.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Operations/Receive/LocalToGlobalMapHandler.cs @@ -53,7 +53,7 @@ internal sealed class LocalToGlobalMapHandler try { - List<(object, Base)> converted = SpeckleConversionContext.ConvertToHost(obj); + List<(object, Base)> converted = SpeckleConversionContext.Current.ConvertToHost(obj); if (converted.Count == 0) { @@ -71,6 +71,21 @@ internal sealed class LocalToGlobalMapHandler if (obj is Speckle.Objects.Data.DataObject dataObject) { + // get color and mat on dataobject first + Color? dataObjColor = _colorUnpacker.Cache.TryGetValue( + dataObject.applicationId ?? "", + out var cachedDataObjColor + ) + ? cachedDataObjColor + : null; + + SpeckleMaterialWrapper? dataObjMat = _materialUnpacker.Cache.TryGetValue( + dataObject.applicationId ?? "", + out var cachedDataObjMaterial + ) + ? cachedDataObjMaterial + : null; + // get geometries List geometries = new(); foreach ((object convertedObj, Base original) in converted) @@ -84,10 +99,10 @@ internal sealed class LocalToGlobalMapHandler GeometryBase = geometryBase, Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor) ? cachedObjColor - : null, + : dataObjColor, Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial) ? cachedObjMaterial - : null, + : dataObjMat, }; geometries.Add(wrapper); diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGoo.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGoo.cs index 3ecd3da72..a067b6272 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGoo.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGoo.cs @@ -57,7 +57,7 @@ public class SpecklePropertyGoo : GH_Goo, ISpecklePropertyGoo case Base @base: // this would capture cases of planes, vectors, and intervals from GH try { - Value = SpeckleConversionContext.ConvertToHost(@base!).First().Item1; + Value = SpeckleConversionContext.Current.ConvertToHost(@base!).First().Item1; return true; } catch (SpeckleException) diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGroupGoo.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGroupGoo.cs index ac1705575..c42037925 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGroupGoo.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/SpecklePropertyGroupGoo.cs @@ -88,7 +88,7 @@ public partial class SpecklePropertyGroupGoo : GH_Goo new() { - Base = InstanceDefinitionProxy.ShallowCopy(), + Base = (Base)InstanceDefinitionProxy.ShallowCopy(), ApplicationId = ApplicationId, Name = Name, Objects = Objects.Select(o => o.DeepCopy()).ToList() diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.ModelObjects.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.ModelObjects.cs index fbf7e0c69..afcfba7a0 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.ModelObjects.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.ModelObjects.cs @@ -28,43 +28,51 @@ public partial class SpeckleBlockDefinitionWrapperGoo return false; } - Value = new SpeckleBlockDefinitionWrapper() - { - Base = new InstanceDefinitionProxy - { - name = instanceDefinition.Name, - objects = objects.Select(o => o.ApplicationId!).ToList(), - maxDepth = 0 // represent newly created, top-level objects. actual depth calculation happens in GrasshopperBlockPacker - }, - Name = instanceDefinition.Name, - Objects = objects, - ApplicationId = instanceDefinition.Id.ToString() - }; - + SetValueFromDefinitionProps(objects, instanceDefinition.Name, instanceDefinition.Id.ToString()); return true; case ModelInstanceDefinition modelInstanceDef: - InstanceDefinition? instanceDef = RhinoDoc.ActiveDoc?.InstanceDefinitions.Find(modelInstanceDef.Name); - if (instanceDef == null) + List defObjs = new(); + foreach (var defObj in modelInstanceDef.Objects) + { + SpeckleGeometryWrapperGoo geoWrapperGoo = new(); + if (geoWrapperGoo.CastFrom(defObj)) + { + defObjs.Add(geoWrapperGoo.Value); + } + } + + if (defObjs.Count == 0) { - // Rhino → Model → Model Block Definition passthrough component returns type ModelInstanceDefinition - // .Objects of a ModelInstanceDefinition returns ModelObjects - // ModelObject.Geometry is internal and cannot be accessed directly. - // Only way to get geometry from a ModelObject is through RhinoDoc.Objects.FindId(), which only works for baked objects. - // Unbaked Grasshopper geometry cannot be processed through the ModelObject workflow until we get a public geometry accessor 😓 - // ⚠️ So if user defines a Model Block Definition in Grasshopper with Grasshopper (unbaked) geometry, we're stuck. - // That's why we're intercepting this case early → if the instanceDef == null don't go further throw new InvalidOperationException( - $"Block definition '{modelInstanceDef.Name}' not found in Rhino document. Please bake the definition first or use Speckle Block Definition components instead." + $"Block definition '{modelInstanceDef.Name}' did not have any valid geometry." ); } - return CastFromModelObject(instanceDef); + SetValueFromDefinitionProps(defObjs, modelInstanceDef.Name, modelInstanceDef.Id.ToString()); + return true; default: return false; } } + private void SetValueFromDefinitionProps(List objs, string name, string id) + { + string validAppId = string.IsNullOrWhiteSpace(id) ? Guid.NewGuid().ToString() : id; + Value = new SpeckleBlockDefinitionWrapper() + { + Base = new InstanceDefinitionProxy + { + name = name, + objects = objs.Select(o => o.ApplicationId!).ToList(), + maxDepth = 0 // represent newly created, top-level objects. actual depth calculation happens in GrasshopperBlockPacker + }, + Name = name, + Objects = objs, + ApplicationId = validAppId + }; + } + private bool CastToModelObject(ref T target) { var type = typeof(T); diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.cs index 9d485d186..abe26915d 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockDefinitionWrapperGoo.cs @@ -1,4 +1,5 @@ using Grasshopper.Kernel.Types; +using Speckle.Sdk.Models; using Speckle.Sdk.Models.Instances; namespace Speckle.Connectors.GrasshopperShared.Parameters; @@ -75,7 +76,7 @@ public partial class SpeckleBlockDefinitionWrapperGoo : GH_Goo new() { - Base = Value.InstanceDefinitionProxy.ShallowCopy(), + Base = (Base)Value.InstanceDefinitionProxy.ShallowCopy(), Name = Value.Name, Objects = Value.Objects.Select(o => o.DeepCopy()).ToList(), ApplicationId = Value.ApplicationId diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs index 3fd1feb0b..599c5e2a5 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs @@ -197,7 +197,7 @@ public class SpeckleBlockInstanceWrapper : SpeckleGeometryWrapper public override SpeckleGeometryWrapper DeepCopy() => new SpeckleBlockInstanceWrapper() { - Base = InstanceProxy.ShallowCopy(), + Base = (Base)InstanceProxy.ShallowCopy(), GeometryBase = GeometryBase?.Duplicate(), Color = Color, Material = Material, diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapperGoo.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapperGoo.cs index 8a1dabe1d..777c79e45 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapperGoo.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapperGoo.cs @@ -75,7 +75,7 @@ public partial class SpeckleBlockInstanceWrapperGoo : GH_Goo new() { - Base = DataObject.ShallowCopy(), + Base = (Base)DataObject.ShallowCopy(), Geometries = [.. Geometries.Select(g => g.DeepCopy())], Properties = Properties, ApplicationId = ApplicationId, diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapper.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapper.cs index 58f1a27c1..a2d2b927e 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapper.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapper.cs @@ -148,7 +148,7 @@ public class SpeckleGeometryWrapper : SpeckleWrapper, ISpeckleCollectionObject public virtual SpeckleGeometryWrapper DeepCopy() => new() { - Base = Base.ShallowCopy(), + Base = (Base)Base.ShallowCopy(), GeometryBase = GeometryBase?.Duplicate(), Color = Color, Material = Material, diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.ModelObjects.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.ModelObjects.cs index 6c18f101a..481f25b2c 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.ModelObjects.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.ModelObjects.cs @@ -35,14 +35,13 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, private bool HandleModelObject(ModelObject modelObject) { - if (RhinoDoc.ActiveDoc.Objects.FindId(modelObject.Id ?? Guid.Empty)?.Geometry is not GeometryBase geometryBase) + modelObject.CastTo(out GeometryBase? geometryBase); + if (geometryBase is null) { - throw new InvalidOperationException( - $"Could not retrieve geometry from Model Object {modelObject.ObjectType}. Did you forget to bake these objects in your document?" - ); + throw new InvalidOperationException($"Could not retrieve geometry from model object."); } - Base converted = SpeckleConversionContext.ConvertToSpeckle(geometryBase); + Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(geometryBase); // get layer, props, color, and mat SpeckleCollectionWrapper? collection = GetLayerCollectionFromModelObject(modelObject); @@ -61,7 +60,7 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, collection, color, material, - modelObject.Id.ToString(), + modelObject.Id?.ToString(), definition ); } @@ -154,7 +153,7 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, { // we need to retrieve the actual material by the material source (otherwise will return default material for anything other than by object) Guid? matId = null; - switch (modelObject.Render.Material?.Source) + switch (modelObject.Render?.Material?.Source) { case ObjectMaterialSource.MaterialFromLayer: matId = modelObject.Layer.Material.Id; @@ -177,10 +176,11 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, SpeckleCollectionWrapper? parent, Color? color, SpeckleMaterialWrapper? mat, - string appId, + string? appId, SpeckleBlockDefinitionWrapper? definition = null ) { + string validAppId = string.IsNullOrWhiteSpace(appId) ? Guid.NewGuid().ToString() : appId!; Value = geometryBase is InstanceReferenceGeometry instance ? new SpeckleBlockInstanceWrapper() { @@ -193,7 +193,7 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, Color = color, Material = mat, Properties = props, - ApplicationId = appId + ApplicationId = validAppId } : new SpeckleGeometryWrapper() { @@ -204,7 +204,7 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, Color = color, Material = mat, Properties = props, - ApplicationId = appId + ApplicationId = validAppId }; return true; @@ -272,7 +272,7 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, { // we need to retrieve the actual color by the color source (otherwise will return default color for anything other than by object) int? argb = null; - switch (modelObject.Display.Color?.Source) + switch (modelObject.Display?.Color?.Source) { case ObjectColorSource.ColorFromLayer: argb = modelObject.Layer.DisplayColor?.ToArgb(); diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.cs index d288a1fb3..6a951cefc 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleGeometryWrapperGoo.cs @@ -60,7 +60,7 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo, return CastFromDataObject(dataObjectWrapper); case IGH_GeometricGoo geometricGoo: GeometryBase gb = geometricGoo.ToGeometryBase(); - Base converted = SpeckleConversionContext.ConvertToSpeckle(gb); + Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(gb); string appId = Guid.NewGuid().ToString(); Value = gb is InstanceReferenceGeometry instance ? new SpeckleBlockInstanceWrapper() diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleMaterialWrapperGoo.ModelObjects.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleMaterialWrapperGoo.ModelObjects.cs index d283fa820..823415478 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleMaterialWrapperGoo.ModelObjects.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleMaterialWrapperGoo.ModelObjects.cs @@ -55,8 +55,10 @@ public partial class SpeckleMaterialWrapperGoo : GH_Goo return CastFromModelRenderMaterial(matRenderMaterial); } - - return false; + else + { + return CastFrom(modelMaterial.ToAttributes().RenderMaterial); + } } return false; diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Registration/PriorityLoader.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Registration/PriorityLoader.cs index e2efb5bfd..51ef699f7 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Registration/PriorityLoader.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Registration/PriorityLoader.cs @@ -9,6 +9,7 @@ using Speckle.Connectors.Common.Operations; using Speckle.Connectors.Common.Operations.Receive; using Speckle.Connectors.Common.Threading; using Speckle.Connectors.GrasshopperShared.Components; +using Speckle.Connectors.GrasshopperShared.HostApp; using Speckle.Connectors.GrasshopperShared.Operations.Receive; using Speckle.Connectors.GrasshopperShared.Operations.Send; using Speckle.Connectors.GrasshopperShared.Parameters; @@ -66,6 +67,7 @@ public class PriorityLoader : GH_AssemblyPriority InstanceObjectsManager> >(); // each send operation gets its own InstanceObjectsManager instance (scoped = per-operation) + services.AddScoped(); Container = services.BuildServiceProvider(); return GH_LoadingInstruction.Proceed; } diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperShared.projitems b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperShared.projitems index 2771ac8bd..ed2e3bb06 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperShared.projitems +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperShared.projitems @@ -40,6 +40,7 @@ + diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperSharedInfo.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperSharedInfo.cs index c2427ee75..275ae1679 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperSharedInfo.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Speckle.Connectors.GrasshopperSharedInfo.cs @@ -21,5 +21,5 @@ public class Speckle_Connectors_GrasshopperSharedInfo : GH_AssemblyInfo public override string AuthorContact => "info@speckle.systems"; // Return a string representing the version. This returns the same version as the assembly. - public override string AssemblyVersion => GetType().Assembly.GetName().Version.ToString(); + public override string? AssemblyVersion => GetType().Assembly.GetName().Version?.ToString(); } diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index 0d68453f9..505daaaa5 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json @@ -306,9 +306,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -341,7 +341,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.rhino7": { @@ -401,18 +401,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -422,14 +422,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" }, "System.Resources.Extensions": { "type": "CentralTransitive", diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json index 4286c7585..f792191ef 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json @@ -306,9 +306,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -341,7 +341,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.rhino8": { @@ -401,18 +401,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -422,14 +422,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" }, "System.Resources.Extensions": { "type": "CentralTransitive", diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceBaker.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceBaker.cs index 70795c3a0..08cd861b6 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceBaker.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceBaker.cs @@ -93,6 +93,9 @@ public class RhinoInstanceBaker : IInstanceBaker> // POC: Currently we're relying on the definition name for identification if it's coming from speckle and from which model; could we do something else? var defName = $"{definitionProxy.name}-({definitionProxy.applicationId})-{baseLayerName}"; + // we cannot place Block Definitions if we have "/" or "\" in the name + // https://linear.app/speckle/issue/CNX-2051/cant-create-instances-of-blocks-if-originating-from-speckle-sub-model + defName = RhinoUtils.CleanBlockDefinitionName(defName); var defIndex = doc.InstanceDefinitions.Add( defName, "No description", // POC: perhaps bring it along from source? We'd need to look at ACAD first diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoLayerBaker.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoLayerBaker.cs index c6bea23c3..c4f9fbb48 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoLayerBaker.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoLayerBaker.cs @@ -16,7 +16,12 @@ public class RhinoLayerBaker : TraversalContextUnpacker { private readonly RhinoMaterialBaker _materialBaker; private readonly RhinoColorBaker _colorBaker; - private readonly Dictionary _hostLayerCache = new(); + + /// + /// The layer cache storing the full name of created layers. + /// + /// The case-agnostic requirement applies to some models (eg Revit with linked models) that may have multiple collections with the same name but with different capitalizations. + private readonly Dictionary _hostLayerCache = new(StringComparer.OrdinalIgnoreCase); private static readonly string s_pathSeparator = #if RHINO8_OR_GREATER @@ -81,10 +86,10 @@ public class RhinoLayerBaker : TraversalContextUnpacker public int GetLayerIndex(Collection[] collectionPath, string baseLayerName) { var layerPath = collectionPath - .Select(o => string.IsNullOrWhiteSpace(o.name) ? "unnamed" : o.name) + .Select(o => string.IsNullOrWhiteSpace(o.name) ? "unnamed" : RhinoUtils.CleanLayerName(o.name)) .Prepend(baseLayerName); - var layerFullName = CleanLayerName(string.Join(s_pathSeparator, layerPath)); + var layerFullName = string.Join(s_pathSeparator, layerPath); if (_hostLayerCache.TryGetValue(layerFullName, out int existingLayerIndex)) { @@ -94,22 +99,6 @@ public class RhinoLayerBaker : TraversalContextUnpacker throw new ConversionException($"Did not find a layer in the cache with the name '{layerFullName}'"); } - /// - /// Cleans up layer names to be "rhino" proof. Note this can be improved, as "()[] and {}" are illegal only at the start. - /// https://docs.mcneel.com/rhino/6/help/en-us/index.htm#information/namingconventions.htm?Highlight=naming - /// - /// - /// - private string CleanLayerName(string layerName) => - layerName - .Replace("{", "") - .Replace("}", "") - .Replace("(", "") - .Replace(")", "") - .Replace("[", "") - .Replace("]", "") - .Replace(":", ""); - /// /// Creates a layer based on the given collection path and adds it to the Rhino document. /// @@ -123,16 +112,17 @@ public class RhinoLayerBaker : TraversalContextUnpacker Layer? previousLayer = currentDocument.Layers.FindName(currentLayerName); foreach (Collection collection in collectionPath) { - currentLayerName += s_pathSeparator + (string.IsNullOrWhiteSpace(collection.name) ? "unnamed" : collection.name); + currentLayerName += + s_pathSeparator + + (string.IsNullOrWhiteSpace(collection.name) ? "unnamed" : RhinoUtils.CleanLayerName(collection.name)); - currentLayerName = CleanLayerName(currentLayerName); //.Replace("{", "").Replace("}", ""); // Rhino specific cleanup for gh (see RemoveInvalidRhinoChars) if (_hostLayerCache.TryGetValue(currentLayerName, out int value)) { previousLayer = currentDocument.Layers.FindIndex(value); continue; } - var cleanNewLayerName = CleanLayerName(collection.name); //.Replace("{", "").Replace("}", "").Replace("(", "").Replace(")", ""); + var cleanNewLayerName = RhinoUtils.CleanLayerName(collection.name); Layer newLayer = new() { Name = cleanNewLayerName, ParentLayerId = previousLayer?.Id ?? Guid.Empty }; // set material @@ -162,6 +152,7 @@ public class RhinoLayerBaker : TraversalContextUnpacker { throw new SpeckleException($"Could not create layer '{currentLayerName}'."); } + _hostLayerCache.Add(currentLayerName, index); previousLayer = currentDocument.Layers.FindIndex(index); // note we need to get the correct id out, hence why we're double calling this } diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoUtils.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoUtils.cs new file mode 100644 index 000000000..c88c4460f --- /dev/null +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoUtils.cs @@ -0,0 +1,27 @@ +namespace Speckle.Connectors.Rhino.HostApp; + +public static class RhinoUtils +{ + public static string CleanBlockDefinitionName(string str) + { + return ReplaceChars(str, @"\/", "_"); + } + + // Cleans up layer names to be "rhino" proof. Note this can be improved, as "()[] and {}" are illegal only at the start. + // https://docs.mcneel.com/rhino/6/help/en-us/index.htm#information/namingconventions.htm?Highlight=naming + public static string CleanLayerName(string str) + { + str = ReplaceChars(str, @"[](){}", ""); + return ReplaceChars(str, @":;", "-"); + } + + private static string ReplaceChars(string str, string invalidChars, string replaceString) + { + foreach (char c in invalidChars) + { + str = str.Replace(c.ToString(), replaceString); + } + + return str; + } +} diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Send/RhinoRootObjectBuilder.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Send/RhinoRootObjectBuilder.cs index fd83550e6..f10b77ed0 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Send/RhinoRootObjectBuilder.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Operations/Send/RhinoRootObjectBuilder.cs @@ -99,7 +99,6 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder foreach (RhinoObject rhinoObject in atomicObjects) { cancellationToken.ThrowIfCancellationRequested(); - using var _2 = _activityFactory.Start("Convert"); // handle layer and store object layer *and all layer parents* to the version layers // this is important because we need to unpack colors and materials on intermediate layers that do not have objects as well. diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems index 75549e182..f04b4fd1d 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems @@ -24,6 +24,7 @@ + @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json index 687f020c1..1eba1fbec 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json @@ -325,9 +325,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -360,7 +360,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "LibTessDotNet": { @@ -410,18 +410,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -431,14 +431,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json index c428e6161..6dcd451fd 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json @@ -406,9 +406,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -441,7 +441,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "LibTessDotNet": { @@ -491,18 +491,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -512,14 +512,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2025/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2025/packages.lock.json index 723d395c5..db42db49e 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2025/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2025/packages.lock.json @@ -406,9 +406,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -441,7 +441,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "LibTessDotNet": { @@ -491,18 +491,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -512,14 +512,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/TeklaRootObjectBuilder.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/TeklaRootObjectBuilder.cs index 9a1bc67ac..026a4588f 100644 --- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/TeklaRootObjectBuilder.cs +++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Operations/Send/TeklaRootObjectBuilder.cs @@ -66,8 +66,6 @@ public class TeklaRootObjectBuilder : IRootObjectBuilder foreach (TSM.ModelObject teklaObject in teklaObjects) { cancellationToken.ThrowIfCancellationRequested(); - using var _2 = _activityFactory.Start("Convert"); - var result = ConvertTeklaObject(teklaObject, rootObjectCollection, projectId); results.Add(result); diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index 1339d382d..c1a26e6b8 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index a3d4548f9..c5924dff2 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index 0ad038c2d..80a4ee596 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -285,7 +285,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -329,18 +329,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -350,14 +350,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json index d1563091b..0dbaac944 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json @@ -210,9 +210,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -236,7 +236,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -280,18 +280,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -299,14 +299,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2026/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2026/packages.lock.json index 80dd16481..2b1dd3ba7 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2026/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2026/packages.lock.json @@ -210,9 +210,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -236,7 +236,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -280,18 +280,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -299,14 +299,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs index 4bca0e2db..40ba17ba5 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ServiceRegistration.cs @@ -29,5 +29,6 @@ public static class ServiceRegistration serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); + serviceCollection.AddScoped(); } } diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems b/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems index 1bdd63a9c..2fe222a07 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems @@ -54,8 +54,9 @@ + - + diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs index 7c2d00ffb..1f5565e25 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/ExtensionDictionaryExtractor.cs @@ -6,6 +6,9 @@ namespace Speckle.Converters.AutocadShared.ToSpeckle; /// /// Extracts extension dictionaries out from an element. Expects to be scoped per operation. /// +/// +/// Extension dictionary entry types are designated by their DxfCode: https://help.autodesk.com/view/OARX/2025/ENU/?guid=OARX-ManagedRefGuide-Autodesk_AutoCAD_DatabaseServices_DxfCode +/// public class ExtensionDictionaryExtractor { private readonly IConverterSettingsStore _settingsStore; @@ -40,7 +43,10 @@ public class ExtensionDictionaryExtractor Dictionary entryDict = new(); foreach (ADB.TypedValue xEntry in xRecord.Data) { - entryDict[xEntry.TypeCode.ToString()] = xEntry.Value; + if (GetValidValue(xEntry.Value) is object val) + { + entryDict[xEntry.TypeCode.ToString()] = val; + } } if (entryDict.Count > 0) @@ -55,4 +61,7 @@ public class ExtensionDictionaryExtractor return extensionDictionaryDict.Count > 0 ? extensionDictionaryDict : null; } + + // xrecord values can contain invalid serialisation types like objectIds + private object? GetValidValue(object val) => val.GetType().IsPrimitive ? val : val.ToString(); } diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/PropertiesExtractor.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/PropertiesExtractor.cs index e43fbd285..7507d1add 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/PropertiesExtractor.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/PropertiesExtractor.cs @@ -6,10 +6,12 @@ namespace Speckle.Converters.AutocadShared.ToSpeckle; public class PropertiesExtractor : IPropertiesExtractor { private readonly ExtensionDictionaryExtractor _extensionDictionaryExtractor; + private readonly XDataExtractor _xDataExtractor; - public PropertiesExtractor(ExtensionDictionaryExtractor extensionDictionaryExtractor) + public PropertiesExtractor(ExtensionDictionaryExtractor extensionDictionaryExtractor, XDataExtractor xDataExtractor) { _extensionDictionaryExtractor = extensionDictionaryExtractor; + _xDataExtractor = xDataExtractor; } public Dictionary GetProperties(ADB.Entity entity) @@ -20,6 +22,7 @@ public class PropertiesExtractor : IPropertiesExtractor "Extension Dictionary", properties ); + AddDictionaryToPropertyDictionary(_xDataExtractor.GetXData(entity), "XData", properties); return properties; } diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/XDataExtractor.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/XDataExtractor.cs new file mode 100644 index 000000000..b2b859e54 --- /dev/null +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Properties/XDataExtractor.cs @@ -0,0 +1,80 @@ +using Autodesk.AutoCAD.DatabaseServices; + +namespace Speckle.Converters.AutocadShared.ToSpeckle; + +/// +/// Extracts xdata from an element. Expects to be scoped per operation. +/// +/// +/// XData entry types are designated by their DxfCode: https://help.autodesk.com/view/OARX/2025/ENU/?guid=OARX-ManagedRefGuide-Autodesk_AutoCAD_DatabaseServices_DxfCode +/// +public class XDataExtractor +{ + public XDataExtractor() { } + + /// + /// Extracts xdata from an entity. Expects to be scoped per operation. + /// + /// + /// + public Dictionary? GetXData(ADB.Entity entity) + { + if (entity is null || entity.XData is null) + { + return null; + } + + // Xdata is applied by applications, and are stored under the application name. + // We're storing the xdata dictionary as a set of subdictionaries per application. + // in an app xdata dict, it is possible to have multiple entries of the same typecode + Dictionary xDataDict = new(); + string? currentAppName = null; + Dictionary> currentXData = new(); + + foreach (TypedValue entry in entity.XData) + { + switch (entry.TypeCode) + { + case (int)DxfCode.ExtendedDataRegAppName: + StoreAndClearCurrentAppXDataDict(currentAppName, currentXData, xDataDict); + currentAppName = entry.Value as string; + break; + case (int)DxfCode.ExtendedDataControlString: // this is the start and end brace code for this list of entries + break; + default: + if (GetValidValue(entry.Value) is object val) + { + string key = entry.TypeCode.ToString(); + if (currentXData.TryGetValue(key, out List? value)) + { + value.Add(val); + } + else + { + currentXData[key] = new() { val }; + } + } + break; + } + } + + StoreAndClearCurrentAppXDataDict(currentAppName, currentXData, xDataDict); + return xDataDict.Count > 0 ? xDataDict : null; + } + + private void StoreAndClearCurrentAppXDataDict( + string? appName, + Dictionary> appXData, + Dictionary xDataDict + ) + { + if (appName != null && appXData.Count > 0) + { + xDataDict[appName] = appXData.ToDictionary(o => o.Key, o => o.Value); + appXData.Clear(); + } + } + + // xrecord values can contain invalid serialisation types like objectIds + private object? GetValidValue(object val) => val.GetType().IsPrimitive ? val : val.ToString(); +} diff --git a/Converters/CSi/Speckle.Converters.CSiShared/CSiConversionSettings.cs b/Converters/CSi/Speckle.Converters.CSiShared/CsiConversionSettings.cs similarity index 100% rename from Converters/CSi/Speckle.Converters.CSiShared/CSiConversionSettings.cs rename to Converters/CSi/Speckle.Converters.CSiShared/CsiConversionSettings.cs diff --git a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json index 71ae495b5..14d3b7ce2 100644 --- a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json +++ b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json index 474961def..3f10bd846 100644 --- a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json +++ b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json @@ -209,7 +209,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -238,18 +238,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -257,14 +257,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json index 253eec7d6..e895e6097 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json index 980e7b4bb..122e14e8c 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index 0cf9fd5f2..9ec41bac4 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json index 03d28f626..f71119893 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json @@ -219,9 +219,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -245,7 +245,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -289,18 +289,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2026/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2026/packages.lock.json index 52377b356..96391efa9 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2026/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2026/packages.lock.json @@ -219,9 +219,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -245,7 +245,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -289,18 +289,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json index c23b44d05..7b917eadf 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -278,7 +278,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -316,18 +316,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -337,14 +337,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json index dd90205fe..6c61d9bdf 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -278,7 +278,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -316,18 +316,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -337,14 +337,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json index e3dd5563a..de60eccbf 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -278,7 +278,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -316,18 +316,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -337,14 +337,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json index ce9cb3a57..26df35434 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -278,7 +278,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -316,18 +316,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -337,14 +337,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json index edd168691..7dbfa793f 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -278,7 +278,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -316,18 +316,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -337,14 +337,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json index 92dbe81ee..be04fa828 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -278,7 +278,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -316,18 +316,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -337,14 +337,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2026/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2026/packages.lock.json index cc383c009..b12b4db09 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2026/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2026/packages.lock.json @@ -260,9 +260,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -279,7 +279,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -317,18 +317,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -338,14 +338,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index 8b1e4d45b..7dd63363f 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index 572ac48a5..6648ea204 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index eef7781cf..8f90211f3 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 13923ecbf..f39e4b75e 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json @@ -209,7 +209,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -238,18 +238,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -257,14 +257,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2026/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2026/packages.lock.json index 0af7f6b73..dc31581da 100644 --- a/Converters/Revit/Speckle.Converters.Revit2026/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2026/packages.lock.json @@ -209,7 +209,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -238,18 +238,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -257,14 +257,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems b/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems index 2102a5714..498c48c95 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems +++ b/Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems @@ -28,7 +28,7 @@ - + @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Properties/ParameterExtractor.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Properties/ParameterExtractor.cs index 9db099ad5..7438a3394 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Properties/ParameterExtractor.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Properties/ParameterExtractor.cs @@ -34,6 +34,9 @@ public class ParameterExtractor private readonly Dictionary>> _typeParameterCache = new(); + private readonly Dictionary>> _systemTypeParameterCache = + new(); + /// /// Extracts parameters out from an element and populates the cache. Expects to be scoped per operation. /// @@ -42,12 +45,20 @@ public class ParameterExtractor public Dictionary GetParameters(DB.Element element) { // NOTE: Woe and despair, I'm really abusing dictionaries here. See note at the top of class. - var instanceParameterDictionary = ParseParameterSet(element.Parameters); + return new Dictionary() + { + ["Instance Parameters"] = ParseParameterSet(element.Parameters), + ["Type Parameters"] = GetTypeParameterDictionary(element), + ["System Type Parameters"] = GetSystemTypeParameterDictionary(element) + }; + } + private Dictionary>? GetTypeParameterDictionary(DB.Element element) + { var typeId = element.GetTypeId(); if (typeId == DB.ElementId.InvalidElementId) { - return CreateParameterDictionary(instanceParameterDictionary, null); + return null; } if ( @@ -57,12 +68,12 @@ public class ParameterExtractor ) ) { - return CreateParameterDictionary(instanceParameterDictionary, typeParameterDictionary); + return typeParameterDictionary; } if (_settingsStore.Current.Document.GetElement(typeId) is not DB.ElementType type) { - return CreateParameterDictionary(instanceParameterDictionary, null); + return null; } typeParameterDictionary = ParseParameterSet(type.Parameters); // NOTE: type parameters should be ideally proxied out for a better data layout. @@ -93,26 +104,59 @@ public class ParameterExtractor } _typeParameterCache[typeId] = typeParameterDictionary; - - return CreateParameterDictionary(instanceParameterDictionary, typeParameterDictionary); + return typeParameterDictionary; } - /// - /// Internal utility to create the default parameter structure we expect all elements to have. - /// - /// - /// - /// - private Dictionary CreateParameterDictionary( - Dictionary> instanceParams, - Dictionary>? typeParams - ) + private Dictionary>? GetSystemTypeParameterDictionary(DB.Element element) { - return new Dictionary() + DB.MEPSystem? system = GetMEPSystem(element); + + if (system != null) { - ["Instance Parameters"] = instanceParams, - ["Type Parameters"] = typeParams - }; + DB.ElementId systemTypeId = system.GetTypeId(); + + if ( + _systemTypeParameterCache.TryGetValue( + systemTypeId, + out Dictionary>? systemTypeParameterDictionary + ) + ) + { + return systemTypeParameterDictionary; + } + + DB.Element systemType = _settingsStore.Current.Document.GetElement(systemTypeId); + systemTypeParameterDictionary = ParseParameterSet(systemType.Parameters); + _systemTypeParameterCache[systemTypeId] = systemTypeParameterDictionary; + return systemTypeParameterDictionary; + } + + return null; + } + + private DB.MEPSystem? GetMEPSystem(DB.Element element) + { + if (element is DB.MEPCurve curve) + { + return curve.MEPSystem; + } + + if (element is DB.FamilyInstance fi) + { + var cm = fi.MEPModel?.ConnectorManager; + if (cm != null) + { + foreach (DB.Connector conn in cm.Connectors) + { + if (conn.MEPSystem != null) + { + return conn.MEPSystem; + } + } + } + } + + return null; } private Dictionary> ParseParameterSet(DB.ParameterSet parameters) diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index 3d1aca29c..d89c0d615 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index 25ef6ca41..ffa9f732d 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -287,18 +287,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -308,14 +308,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Meshing/DisplayMeshExtractor.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Meshing/DisplayMeshExtractor.cs index 6c5b7e8bf..5a72761c8 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Meshing/DisplayMeshExtractor.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Meshing/DisplayMeshExtractor.cs @@ -81,6 +81,13 @@ public static class DisplayMeshExtractor throw new ConversionException($"Failed to meshify {geometry.GetType()} (perhaps the brep is too small?)"); } + // triangulate these resulting meshes as they may contain quads + // this saves a lot of computing time for our viewer + foreach (var mesh in renderMeshes) + { + mesh.Faces.ConvertQuadsToTriangles(); + } + joinedMesh.Append(renderMeshes); return joinedMesh; } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json index b5ddc85cc..7962cd014 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "LibTessDotNet": { @@ -337,18 +337,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -358,14 +358,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" }, "Tekla.Structures.Dialog": { "type": "CentralTransitive", diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json index 061069344..830540d22 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json @@ -343,7 +343,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "LibTessDotNet": { @@ -378,18 +378,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -399,14 +399,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" }, "Tekla.Structures.Plugins": { "type": "CentralTransitive", diff --git a/Converters/Tekla/Speckle.Converter.Tekla2025/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2025/packages.lock.json index 061069344..830540d22 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2025/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2025/packages.lock.json @@ -343,7 +343,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "LibTessDotNet": { @@ -378,18 +378,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -399,14 +399,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" }, "Tekla.Structures.Plugins": { "type": "CentralTransitive", diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json index c0736e725..2273a68ae 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -314,9 +314,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -335,7 +335,7 @@ "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Moq": "[4.20.70, )", "NUnit": "[4.1.0, )", - "Speckle.Sdk": "[3.4.5, )" + "Speckle.Sdk": "[3.4.6, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -373,18 +373,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -392,14 +392,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json index fe2eb4ff7..b0df6c058 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -309,18 +309,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -330,14 +330,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0-windows7.0": { @@ -549,9 +549,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -599,18 +599,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -618,14 +618,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs b/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs index ec869f023..9623bd428 100644 --- a/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs +++ b/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs @@ -1,6 +1,8 @@ +using System.Diagnostics.CodeAnalysis; using System.Runtime.Serialization; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Utils; +using Speckle.Connectors.Logging; using Speckle.Sdk; using Speckle.Sdk.SQLite; @@ -166,6 +168,10 @@ public class ConfigBinding : IBinding return null; } } + + [SuppressMessage("Design", "CA1024:Use properties where appropriate", Justification = "Expose to UI")] + [SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Expose to UI")] + public string GetSessionId() => Consts.StaticSessionId; } /// diff --git a/DUI3/Speckle.Connectors.DUI/Url.cs b/DUI3/Speckle.Connectors.DUI/Url.cs index 8abd176a7..5ae1f7c63 100644 --- a/DUI3/Speckle.Connectors.DUI/Url.cs +++ b/DUI3/Speckle.Connectors.DUI/Url.cs @@ -12,7 +12,7 @@ namespace Speckle.Connectors.DUI; /// public static class Url { - public static readonly Uri Netlify = new("https://boisterous-douhua-e3cefb.netlify.app/"); + public static readonly Uri Netlify = new("https://dui.speckle.systems/"); // public static readonly Uri Netlify = new("http://localhost:8082/"); diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index bafe41b18..3a6442438 100644 --- a/DUI3/Speckle.Connectors.DUI/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -296,18 +296,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -317,14 +317,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } }, "net8.0": { @@ -536,9 +536,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -573,18 +573,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -592,14 +592,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index 88eaed29a..25a4315a2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -50,9 +50,9 @@ - - - + + + diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json index 6f43767e6..cedb56b7b 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json @@ -204,9 +204,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -220,8 +220,8 @@ "Ara3D.Utils": "[1.4.5, )", "Microsoft.Extensions.DependencyInjection": "[8.0.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )" } }, "Ara3D.Buffers": { @@ -283,18 +283,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -302,14 +302,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json index 6f43767e6..cedb56b7b 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json @@ -204,9 +204,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -220,8 +220,8 @@ "Ara3D.Utils": "[1.4.5, )", "Microsoft.Extensions.DependencyInjection": "[8.0.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )" } }, "Ara3D.Buffers": { @@ -283,18 +283,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -302,14 +302,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json index 8e3b5ba94..65b8f09a0 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json @@ -68,18 +68,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -87,7 +87,7 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "GraphQL.Client": { @@ -261,9 +261,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -295,9 +295,9 @@ }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Importers/Rhino/Speckle.Importers.Rhino/Resolver.cs b/Importers/Rhino/Speckle.Importers.Rhino/Resolver.cs index 96a69c4b3..2e7194f7f 100644 --- a/Importers/Rhino/Speckle.Importers.Rhino/Resolver.cs +++ b/Importers/Rhino/Speckle.Importers.Rhino/Resolver.cs @@ -1,4 +1,5 @@ -using System.Reflection; +using System.Reflection; +using Speckle.Sdk.Common; namespace Speckle.Importers.Rhino; @@ -48,19 +49,23 @@ public static class Resolver /// public static bool UseLatest { get; set; } - private static Assembly? ResolveForRhinoAssemblies(object sender, ResolveEventArgs args) + private static Assembly? ResolveForRhinoAssemblies(object? sender, ResolveEventArgs args) { - var assemblyName = new AssemblyName(args.Name).Name; + string? assemblyName = new AssemblyName(args.Name).Name; if (RhinoSystemDirectory is null) { return null; } string path = System.IO.Path.Combine(RhinoSystemDirectory, assemblyName + ".dll"); - if (assemblyName.StartsWith("Speckle.Connectors.Rhino")) + if (assemblyName != null && assemblyName.StartsWith("Speckle.Connectors.Rhino")) { - path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), assemblyName + ".rhp"); + path = Path.Combine( + Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location).NotNull(), + assemblyName + ".rhp" + ); } + if (System.IO.File.Exists(path)) { return Assembly.LoadFrom(path); @@ -106,7 +111,7 @@ public static class Resolver { return null; } - string corePath = (string)installKey.GetValue("CoreDllPath"); + string? corePath = (string?)installKey.GetValue("CoreDllPath"); if (System.IO.File.Exists(corePath)) { return System.IO.Path.GetDirectoryName(corePath); diff --git a/Importers/Rhino/Speckle.Importers.Rhino/packages.lock.json b/Importers/Rhino/Speckle.Importers.Rhino/packages.lock.json index 50393f682..8ff5c0f1d 100644 --- a/Importers/Rhino/Speckle.Importers.Rhino/packages.lock.json +++ b/Importers/Rhino/Speckle.Importers.Rhino/packages.lock.json @@ -335,9 +335,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.dui": { @@ -377,7 +377,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.converters.rhino8": { @@ -456,18 +456,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -477,14 +477,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" }, "System.Resources.Extensions": { "type": "CentralTransitive", diff --git a/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveConversionHandlerTests.cs b/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveConversionHandlerTests.cs index c385302cb..2fce0d096 100644 --- a/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveConversionHandlerTests.cs +++ b/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveConversionHandlerTests.cs @@ -1,9 +1,7 @@ using FluentAssertions; -using Moq; using NUnit.Framework; using Speckle.Connectors.Common.Operations; using Speckle.Sdk.Common.Exceptions; -using Speckle.Sdk.Logging; namespace Speckle.Connectors.Common.Tests.Operations; @@ -12,10 +10,7 @@ public class ReceiveConversionHandlerTests [Test] public void TryConvert_ReturnsNullOnSuccess() { - var activityFactory = new Mock(); - var activity = new Mock(); - activityFactory.Setup(f => f.Start(It.IsAny(), It.IsAny())).Returns(activity.Object); - var handler = new ReceiveConversionHandler(activityFactory.Object); + var handler = new ReceiveConversionHandler(); Exception? result = handler.TryConvert( () => { /* success */ @@ -23,16 +18,12 @@ public class ReceiveConversionHandlerTests ); result.Should().BeNull(); - activity.Verify(a => a.SetStatus(SdkActivityStatusCode.Ok), Times.Once); } [Test] public void TryConvert_ReturnsConversionException() { - var activityFactory = new Mock(); - var activity = new Mock(); - activityFactory.Setup(f => f.Start(It.IsAny(), It.IsAny())).Returns(activity.Object); - var handler = new ReceiveConversionHandler(activityFactory.Object); + var handler = new ReceiveConversionHandler(); var ex = new ConversionException("fail"); Exception? result = handler.TryConvert(() => throw ex); @@ -43,10 +34,7 @@ public class ReceiveConversionHandlerTests [Test] public void TryConvert_ThrowsOperationCanceledException() { - var activityFactory = new Mock(); - var activity = new Mock(); - activityFactory.Setup(f => f.Start(It.IsAny(), It.IsAny())).Returns(activity.Object); - var handler = new ReceiveConversionHandler(activityFactory.Object); + var handler = new ReceiveConversionHandler(); Assert.Throws(() => handler.TryConvert(() => throw new OperationCanceledException())); } @@ -54,10 +42,7 @@ public class ReceiveConversionHandlerTests [Test] public void TryConvert_ReturnsNonFatalException() { - var activityFactory = new Mock(); - var activity = new Mock(); - activityFactory.Setup(f => f.Start(It.IsAny(), It.IsAny())).Returns(activity.Object); - var handler = new ReceiveConversionHandler(activityFactory.Object); + var handler = new ReceiveConversionHandler(); #pragma warning disable CA2201 var ex = new Exception("non-fatal"); #pragma warning restore CA2201 @@ -65,7 +50,5 @@ public class ReceiveConversionHandlerTests Exception? result = handler.TryConvert(() => throw ex); result.Should().Be(ex); - activity.Verify(a => a.SetStatus(SdkActivityStatusCode.Error), Times.Once); - activity.Verify(a => a.RecordException(ex), Times.Once); } } diff --git a/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveOperationTests.cs b/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveOperationTests.cs index 3c462b04d..5317ca080 100644 --- a/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveOperationTests.cs +++ b/Sdk/Speckle.Connectors.Common.Tests/Operations/ReceiveOperationTests.cs @@ -33,7 +33,7 @@ public class ReceiveOperationTests : MoqTest var threadContext = Create(); var @base = new TestBase(); - var account = new Account(); + var account = new Account { userInfo = new(), }; var version = new Speckle.Sdk.Api.GraphQL.Models.Version(); var projectName = "projectName"; var modelName = "modelName"; diff --git a/Sdk/Speckle.Connectors.Common.Tests/Operations/SendOperationTests.cs b/Sdk/Speckle.Connectors.Common.Tests/Operations/SendOperationTests.cs index 8207c8e0d..eddea617b 100644 --- a/Sdk/Speckle.Connectors.Common.Tests/Operations/SendOperationTests.cs +++ b/Sdk/Speckle.Connectors.Common.Tests/Operations/SendOperationTests.cs @@ -104,6 +104,7 @@ public class SendOperationTests : MoqTest var sourceApplication = "sourceApplication"; var account = new Account() { + userInfo = new UserInfo(), serverInfo = new ServerInfo() { url = url.ToString() }, token = token }; diff --git a/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json index eb8624c32..5d75f67a7 100644 --- a/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json @@ -308,9 +308,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.4.5, )", - "Speckle.Sdk": "[3.4.5, )", - "Speckle.Sdk.Dependencies": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )", + "Speckle.Sdk": "[3.4.6, )", + "Speckle.Sdk.Dependencies": "[3.4.8, )" } }, "speckle.connectors.logging": { @@ -322,7 +322,7 @@ "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Moq": "[4.20.70, )", "NUnit": "[4.1.0, )", - "Speckle.Sdk": "[3.4.5, )" + "Speckle.Sdk": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -366,18 +366,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -385,14 +385,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" } } } diff --git a/Sdk/Speckle.Connectors.Common/Extensions/UserAccountScopeLogging.cs b/Sdk/Speckle.Connectors.Common/Extensions/UserAccountScopeLogging.cs new file mode 100644 index 000000000..afcbb7ea4 --- /dev/null +++ b/Sdk/Speckle.Connectors.Common/Extensions/UserAccountScopeLogging.cs @@ -0,0 +1,28 @@ +using Speckle.Connectors.Logging; +using Speckle.Sdk.Credentials; + +namespace Speckle.Connectors.Common.Extensions; + +internal sealed class AggregateIDisposable(IDisposable[] disposables) : IDisposable +{ + public void Dispose() + { + foreach (var disposable in disposables) + { + disposable?.Dispose(); + } + } +} + +public static class UserActivityScope +{ + public static IDisposable AddUserScope(Account account) + { + return new AggregateIDisposable( + [ + ActivityScope.SetTag(Consts.USER_ID, account.userInfo.id), + ActivityScope.SetTag(Consts.USER_DISTINCT_ID, account.GetHashedEmail()), + ] + ); + } +} diff --git a/Sdk/Speckle.Connectors.Common/Operations/ReceiveConversionHandler.cs b/Sdk/Speckle.Connectors.Common/Operations/ReceiveConversionHandler.cs index 5a7db72cd..d9d23c2ae 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/ReceiveConversionHandler.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/ReceiveConversionHandler.cs @@ -1,20 +1,17 @@ using Speckle.InterfaceGenerator; using Speckle.Sdk; using Speckle.Sdk.Common.Exceptions; -using Speckle.Sdk.Logging; namespace Speckle.Connectors.Common.Operations; [GenerateAutoInterface] -public class ReceiveConversionHandler(ISdkActivityFactory activityFactory) : IReceiveConversionHandler +public class ReceiveConversionHandler : IReceiveConversionHandler { public Exception? TryConvert(Action conversion) { - using var convertActivity = activityFactory.Start("Converting object"); try { conversion(); - convertActivity?.SetStatus(SdkActivityStatusCode.Ok); return null; } catch (ConversionException ce) @@ -29,8 +26,6 @@ public class ReceiveConversionHandler(ISdkActivityFactory activityFactory) : IRe } catch (Exception ex) when (!ex.IsFatal()) { - convertActivity?.SetStatus(SdkActivityStatusCode.Error); - convertActivity?.RecordException(ex); return ex; } } diff --git a/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs b/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs index f5e91753a..12f7b8955 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/ReceiveOperation.cs @@ -1,6 +1,6 @@ using Speckle.Connectors.Common.Builders; +using Speckle.Connectors.Common.Extensions; using Speckle.Connectors.Common.Threading; -using Speckle.Connectors.Logging; using Speckle.InterfaceGenerator; using Speckle.Sdk; using Speckle.Sdk.Api; @@ -32,7 +32,7 @@ public sealed class ReceiveOperation( execute?.SetTag("receiveInfo", receiveInfo); // 2 - Check account exist Account account = receiveInfo.Account; - using var userScope = ActivityScope.SetTag(Consts.USER_ID, account.GetHashedEmail()); + using var userScope = UserActivityScope.AddUserScope(account); var version = await receiveVersionRetriever.GetVersion(account, receiveInfo, cancellationToken); cancellationToken.ThrowIfCancellationRequested(); diff --git a/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs b/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs index 6628387cf..1ba1667ed 100644 --- a/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs +++ b/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs @@ -1,6 +1,7 @@ using Speckle.Connectors.Common.Builders; using Speckle.Connectors.Common.Caching; using Speckle.Connectors.Common.Conversion; +using Speckle.Connectors.Common.Extensions; using Speckle.Connectors.Common.Threading; using Speckle.InterfaceGenerator; using Speckle.Sdk.Api; @@ -82,6 +83,7 @@ public sealed class SendOperation( onOperationProgressed.Report(new("Uploading...", null)); + using var userScope = UserActivityScope.AddUserScope(account); using var activity = activityFactory.Start("SendOperation"); sendProgress.Begin(); diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json index 7f226e71e..ace031ca7 100644 --- a/Sdk/Speckle.Connectors.Common/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common/packages.lock.json @@ -44,18 +44,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -65,14 +65,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" }, "GraphQL.Client": { "type": "Transitive", @@ -360,18 +360,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -379,14 +379,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.8", + "contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A==" }, "GraphQL.Client": { "type": "Transitive", diff --git a/Sdk/Speckle.Connectors.Logging/Consts.cs b/Sdk/Speckle.Connectors.Logging/Consts.cs index e4ec80d53..4478b3021 100644 --- a/Sdk/Speckle.Connectors.Logging/Consts.cs +++ b/Sdk/Speckle.Connectors.Logging/Consts.cs @@ -11,8 +11,14 @@ public static class Consts public const string OS_SLUG = "os.slug"; public const string RUNTIME_NAME = "runtime.name"; public const string USER_ID = "user.id"; + public const string USER_DISTINCT_ID = "user.distinctId"; public const string TRACING_SOURCE = "speckle"; + /// + /// A random GUID for adding to the logging context to correlate the service.instance.id + /// + public static readonly string StaticSessionId = Guid.NewGuid().ToString(); + public static string GetPackageVersion(Assembly assembly) { // MinVer https://github.com/adamralph/minver?tab=readme-ov-file#version-numbers diff --git a/Sdk/Speckle.Connectors.Logging/Internal/ResourceCreator.cs b/Sdk/Speckle.Connectors.Logging/Internal/ResourceCreator.cs index 22f2ab9b7..497544b23 100644 --- a/Sdk/Speckle.Connectors.Logging/Internal/ResourceCreator.cs +++ b/Sdk/Speckle.Connectors.Logging/Internal/ResourceCreator.cs @@ -8,17 +8,20 @@ internal static class ResourceCreator internal static ResourceBuilder Create(string applicationAndVersion, string slug, string connectorVersion) => ResourceBuilder .CreateEmpty() - .AddService(serviceName: Consts.TRACING_SOURCE, serviceVersion: connectorVersion) + .AddService( + serviceName: Consts.TRACING_SOURCE, + serviceVersion: connectorVersion, + serviceInstanceId: Consts.StaticSessionId + ) .AddAttributes( - new List> - { + [ new(Consts.SERVICE_NAME, applicationAndVersion), new(Consts.SERVICE_SLUG, slug), new(Consts.OS_NAME, Environment.OSVersion.ToString()), new(Consts.OS_TYPE, RuntimeInformation.ProcessArchitecture.ToString()), new(Consts.OS_SLUG, DetermineHostOsSlug()), - new(Consts.RUNTIME_NAME, RuntimeInformation.FrameworkDescription) - } + new(Consts.RUNTIME_NAME, RuntimeInformation.FrameworkDescription), + ] ); private static string DetermineHostOsSlug() diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json index eaa59a9c4..14c620e28 100644 --- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json @@ -322,7 +322,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.4.5, )" + "Speckle.Objects": "[3.4.6, )" } }, "speckle.testing": { @@ -331,7 +331,7 @@ "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Moq": "[4.20.70, )", "NUnit": "[4.1.0, )", - "Speckle.Sdk": "[3.4.5, )" + "Speckle.Sdk": "[3.4.6, )" } }, "Microsoft.Extensions.Logging": { @@ -360,18 +360,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -379,14 +379,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index d5677054f..71a8e8bcf 100644 --- a/Sdk/Speckle.Converters.Common/packages.lock.json +++ b/Sdk/Speckle.Converters.Common/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "GraphQL.Client": { @@ -283,9 +283,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0", @@ -295,14 +295,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } }, "net8.0": { @@ -345,11 +345,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "WMDYkTxoSbzh2WzuubMUKx37M6f7D/k/xOOV50oB9bQA0TiUAVcCFKAW0VHZZF4OhjBBxV8N2FM2yr2oaNc/Ww==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==", "dependencies": { - "Speckle.Sdk": "3.4.5" + "Speckle.Sdk": "3.4.6" } }, "GraphQL.Client": { @@ -538,9 +538,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -548,14 +548,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } } diff --git a/Sdk/Speckle.Testing/packages.lock.json b/Sdk/Speckle.Testing/packages.lock.json index 6fa1557bf..dddaed5f5 100644 --- a/Sdk/Speckle.Testing/packages.lock.json +++ b/Sdk/Speckle.Testing/packages.lock.json @@ -59,9 +59,9 @@ }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "w6vfOyckHVWqOqDjBO+PmVT5LeYu8voMMypOpa+w/2LrgMH6CxkCMYYjyOK8/rb3Ss989f2EjkpksQ3lcHPN/Q==", + "requested": "[3.4.6, )", + "resolved": "3.4.6", + "contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.Data.Sqlite": "7.0.5", @@ -69,7 +69,7 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.4.5" + "Speckle.Sdk.Dependencies": "3.4.6" } }, "Castle.Core": { @@ -277,9 +277,9 @@ }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.4.5, )", - "resolved": "3.4.5", - "contentHash": "8X9Qpksyp2MDb/G2Du7OFehdCtt0A0AclMKUFNsDSot5h8fTrvT620kW64ycm4l+PKXsPvCKDspOiGi4+9HrMQ==" + "requested": "[3.4.8, )", + "resolved": "3.4.6", + "contentHash": "UHWMZ8zQt3wF3gXfPpEKe3T8Pxo4ZRN1LOp+vZnsnohO8HKt2gNfAY2to2YRnTXnybEKsgqzIJLe372EoIQJHg==" } } }