diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json index cef8bea34..b96e10800 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json @@ -226,9 +226,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -236,8 +236,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -261,7 +261,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -294,40 +294,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, "net6.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json index 18af670df..388e3ef17 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -294,7 +294,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -333,40 +333,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json index 4dd3d6bda..70d6abc86 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -294,7 +294,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -333,40 +333,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json index e90d4c04e..66c104728 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -295,7 +295,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json index f2788ac2c..502c34111 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json @@ -215,9 +215,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -225,8 +225,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -251,7 +251,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -290,39 +290,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json index 1df686696..e102eebd6 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -304,7 +304,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -343,40 +343,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json index da0c4c76f..ab2094f09 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -304,7 +304,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -343,40 +343,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index 3f525d607..6b0e1cb39 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -304,7 +304,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -343,40 +343,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json index 9a67b1d4a..d814bff20 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json @@ -224,9 +224,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -234,8 +234,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -261,7 +261,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -300,39 +300,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs index 7dcb841d2..e43b04302 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs +++ b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs @@ -6,7 +6,6 @@ using Speckle.Connectors.Civil3dShared.Operations.Send; using Speckle.Connectors.Common.Builders; using Speckle.Connectors.DUI.Bindings; -using Speckle.Converters.Civil3dShared.Helpers; using Speckle.Converters.Civil3dShared.ToSpeckle; using Speckle.Sdk; @@ -28,7 +27,5 @@ public static void AddCivil3d(this IServiceCollection serviceCollection) // additional classes serviceCollection.AddScoped(); - serviceCollection.AddScoped(); - serviceCollection.AddScoped(); } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Operations/Send/Civil3dRootObjectBuilder.cs b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Operations/Send/Civil3dRootObjectBuilder.cs index db9850f07..681bf23aa 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Operations/Send/Civil3dRootObjectBuilder.cs +++ b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Operations/Send/Civil3dRootObjectBuilder.cs @@ -4,7 +4,6 @@ using Speckle.Connectors.Autocad.Operations.Send; using Speckle.Connectors.Common.Caching; using Speckle.Connectors.Common.Operations; -using Speckle.Converters.Civil3dShared.Helpers; using Speckle.Converters.Civil3dShared.ToSpeckle; using Speckle.Converters.Common; using Speckle.Sdk.Logging; @@ -16,14 +15,10 @@ public sealed class Civil3dRootObjectBuilder : AutocadRootObjectBaseBuilder { private readonly AutocadLayerUnpacker _layerUnpacker; private readonly PropertySetDefinitionHandler _propertySetDefinitionHandler; - private readonly CatchmentGroupHandler _catchmentGroupHandler; - private readonly PipeNetworkHandler _pipeNetworkHandler; public Civil3dRootObjectBuilder( AutocadLayerUnpacker layerUnpacker, PropertySetDefinitionHandler propertySetDefinitionHandler, - CatchmentGroupHandler catchmentGroupHandler, - PipeNetworkHandler pipeNetworkHandler, IRootToSpeckleConverter converter, ISendConversionCache sendConversionCache, AutocadInstanceUnpacker instanceObjectManager, @@ -46,8 +41,6 @@ ISdkActivityFactory activityFactory { _layerUnpacker = layerUnpacker; _propertySetDefinitionHandler = propertySetDefinitionHandler; - _catchmentGroupHandler = catchmentGroupHandler; - _pipeNetworkHandler = pipeNetworkHandler; } public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr) @@ -61,7 +54,5 @@ public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity en public override void AddAdditionalProxiesToRoot(Collection rootObject) { rootObject[ProxyKeys.PROPERTYSET_DEFINITIONS] = _propertySetDefinitionHandler.Definitions; - rootObject["catchmentGroupProxies"] = _catchmentGroupHandler.CatchmentGroupProxiesCache.Values.ToList(); - rootObject["pipeNetworkProxies"] = _pipeNetworkHandler.PipeNetworkProxiesCache.Values.ToList(); } } diff --git a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json index 8639376f3..465699fe4 100644 --- a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json +++ b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.etabs21": { @@ -332,40 +332,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json index f360e64b1..2d03b1827 100644 --- a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json +++ b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json @@ -215,9 +215,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -225,8 +225,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -243,7 +243,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.etabs22": { @@ -288,39 +288,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json index 86f87a2ec..7d6336b64 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.navisworks2020": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, ".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 2997b90f2..a1049d3fb 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.navisworks2021": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, ".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 eec13c4f6..e0624cc9a 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.navisworks2022": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, ".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 4bf75a1dd..a7f310ad9 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.navisworks2023": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, ".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 6a6625947..3f5cf6db9 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.navisworks2024": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, ".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 378de4bf4..20efe81cf 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -275,8 +275,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -293,7 +293,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.navisworks2025": { @@ -334,40 +334,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, ".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 3feeccfb1..7a37a5f68 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json @@ -287,9 +287,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -297,8 +297,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -308,7 +308,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.revit2022": { @@ -348,16 +348,16 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Revit.API": { @@ -368,26 +368,26 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json index 052f9b9e8..077078ba1 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json @@ -287,9 +287,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -297,8 +297,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -308,7 +308,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.revit2023": { @@ -348,16 +348,16 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Revit.API": { @@ -368,26 +368,26 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json index 614ae3927..9eb020246 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json @@ -287,9 +287,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -297,8 +297,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -308,7 +308,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.revit2024": { @@ -348,16 +348,16 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Revit.API": { @@ -368,26 +368,26 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json index 1eb6e3084..89610d122 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json @@ -237,9 +237,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -247,8 +247,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.revit2025": { @@ -298,16 +298,16 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Revit.API": { @@ -318,25 +318,25 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, "net8.0-windows7.0/win-x64": { diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index 8411bff91..df15d213c 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.rhino7": { @@ -342,40 +342,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json index 4bdb8f7da..54a10e21a 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json @@ -268,9 +268,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -278,8 +278,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -296,7 +296,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.converters.rhino8": { @@ -342,40 +342,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/Properties/PropertiesExtractor.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/Properties/PropertiesExtractor.cs index 20dd47cf2..ca685cd4e 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/Properties/PropertiesExtractor.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/Properties/PropertiesExtractor.cs @@ -1,4 +1,6 @@ +using Rhino; using Rhino.DocObjects; +using Speckle.Sdk; namespace Speckle.Connectors.Rhino.HostApp.Properties; @@ -13,11 +15,18 @@ public class PropertiesExtractor var userStrings = rhObject.Attributes.GetUserStrings(); foreach (var key in userStrings.AllKeys) { - // POC: could not determine how to extract the value of a formula user string. - // So for now we are skipping them - if (userStrings[key].StartsWith("%<")) + try { - continue; + if (userStrings[key].StartsWith("%<")) + { + var value = RhinoApp.ParseTextField(userStrings[key], rhObject, null); + properties[key] = value; + continue; + } + } + catch (Exception ex) when (!ex.IsFatal()) + { + // Shh. We can fail silently here - it's not even worth logging. I expect users will complain properties are missing. } properties[key] = userStrings[key]; diff --git a/Connectors/Tekla/Directory.Build.targets b/Connectors/Tekla/Directory.Build.targets index 5362ffbe0..b9f458da8 100644 --- a/Connectors/Tekla/Directory.Build.targets +++ b/Connectors/Tekla/Directory.Build.targets @@ -1,26 +1,35 @@ - + - + + + + + + + + - - - - + + + - - - + + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj index 41b6f1c03..8b5a95910 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj @@ -3,6 +3,7 @@ net48 x64 + win-x64 2023 true $(DefineConstants);TEKLA2023 diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json index bb88f20d3..30a10d2e3 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -335,8 +335,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -362,7 +362,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "LibTessDotNet": { @@ -412,35 +412,48 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" + } + }, + ".NETFramework,Version=v4.8/win-x64": { + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "Microsoft.Web.WebView2": { + "type": "CentralTransitive", + "requested": "[1.0.1938.49, )", + "resolved": "1.0.1938.49", + "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw==" } } } diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json index ce0129cba..9720d7844 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.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -416,8 +416,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -443,7 +443,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "LibTessDotNet": { @@ -493,35 +493,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json index 950284773..5cfb1414e 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json @@ -219,7 +219,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -243,40 +243,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index 7e7818e3f..88c3ec231 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index 2037b2457..3f23d41fe 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index 8da178325..770c349d1 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -287,7 +287,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -326,40 +326,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json index 357fbde61..51c4e2da1 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json @@ -215,9 +215,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -225,8 +225,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -243,7 +243,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -282,39 +282,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json index 111fe788b..b2eb5135a 100644 --- a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json +++ b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json index 7a5c340d3..cebb748ba 100644 --- a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json +++ b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json @@ -214,7 +214,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -238,39 +238,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json index 86f9bdbb2..6c0b29c9b 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -291,40 +291,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json index 79d6387fb..f5b8108a1 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -291,40 +291,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index eb1ef5974..4f66bab97 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json @@ -267,7 +267,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -291,40 +291,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json index 534911edb..703415e75 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json @@ -224,9 +224,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -234,8 +234,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui.webview": { @@ -252,7 +252,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -291,39 +291,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs index 71b9250aa..15e2172a2 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Civil3dRootToSpeckleConverter.cs @@ -33,6 +33,11 @@ public Base Convert(object target) ); } + if (target is CDB.AlignmentLabelGroup) // TODO: this should not throw and be reported from connector instead, similar to supported categories in Revit. + { + throw new ValidationException($"Conversion of {target.GetType().Name} to Speckle is not supported yet."); + } + Type type = dbObject.GetType(); // check first for civil type objects diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs index bf52ca68f..a549a5aff 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/BaseCurveExtractor.cs @@ -54,6 +54,7 @@ IConverterSettingsStore converterSettings case CDB.FeatureLine: case CDB.Parcel: case CDB.ParcelSegment: + case CDB.Catchment: return new() { _curveConverter.Convert(entity.BaseCurve) }; // for any entities where basecurve prop doesn't make sense diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CatchmentGroupHandler.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CatchmentGroupHandler.cs deleted file mode 100644 index fd0fbf76c..000000000 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CatchmentGroupHandler.cs +++ /dev/null @@ -1,61 +0,0 @@ -using Speckle.Converters.Civil3dShared.Extensions; -using Speckle.Converters.Common; -using Speckle.Sdk.Models.Proxies; - -namespace Speckle.Converters.Civil3dShared.Helpers; - -public sealed class CatchmentGroupHandler -{ - /// - /// Keeps track of all catchment groups used by catchments in the current send operation. - /// (catchmentGroup objectId, catchmentGroupProxy). - /// This should be added to the root commit object post conversion. - /// - /// POC: Using group proxies for now - public Dictionary CatchmentGroupProxiesCache { get; } = new(); - - private readonly IConverterSettingsStore _converterSettings; - - public CatchmentGroupHandler(IConverterSettingsStore converterSettings) - { - _converterSettings = converterSettings; - } - - /// - /// Extracts the Catchment group from a catchment and stores in the appId of the catchment. - /// - /// - /// - public void HandleCatchmentGroup(CDB.Catchment catchment) - { - ADB.ObjectId catchmentGroupId = catchment.ContainingGroupId; - - if (catchmentGroupId == ADB.ObjectId.Null) - { - return; - } - - string catchmentApplicationId = catchment.GetSpeckleApplicationId(); - if (CatchmentGroupProxiesCache.TryGetValue(catchmentGroupId, out GroupProxy? value)) - { - value.objects.Add(catchmentApplicationId); - } - else - { - using (var tr = _converterSettings.Current.Document.Database.TransactionManager.StartTransaction()) - { - var catchmentGroup = (CDB.CatchmentGroup)tr.GetObject(catchmentGroupId, ADB.OpenMode.ForRead); - - CatchmentGroupProxiesCache[catchmentGroupId] = new() - { - name = catchmentGroup.Name, - objects = new() { catchmentApplicationId }, - applicationId = catchmentGroup.Handle.Value.ToString() - }; - - tr.Commit(); - } - } - return; - } -} diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs index c2e2d934a..c56ece6f0 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs @@ -65,6 +65,13 @@ public IEnumerable GetDisplayValue(CDB.Entity entity) yield return gridSurfaceMesh; break; + // catchments + case CDB.Catchment catchment: + SOG.Polyline catchmentPolyline = _pointCollectionConverter.Convert(catchment.BoundaryPolyline3d); + catchmentPolyline.closed = true; + yield return catchmentPolyline; + break; + // Corridors are complicated: their display values are extracted in the CorridorHandler when processing corridor children, since they are attached to the corridor subassemblies. case CDB.Corridor: yield break; diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/PipeNetworkHandler.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/PipeNetworkHandler.cs deleted file mode 100644 index 8ed0f2a9c..000000000 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/PipeNetworkHandler.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Speckle.Converters.Civil3dShared.Extensions; -using Speckle.Converters.Common; -using Speckle.Sdk.Models.Proxies; - -namespace Speckle.Converters.Civil3dShared.Helpers; - -public sealed class PipeNetworkHandler -{ - /// - /// Keeps track of all networks used by parts in the current send operation. - /// (network app id, network Proxy). - /// This should be added to the root commit object post conversion. - /// - /// POC: Using group proxies for now - public Dictionary PipeNetworkProxiesCache { get; } = new(); - - private readonly IConverterSettingsStore _converterSettings; - - public PipeNetworkHandler(IConverterSettingsStore converterSettings) - { - _converterSettings = converterSettings; - } - - /// - /// Extracts the pipe network from a part and stores in the appId of the part. - /// - /// - /// - public void HandlePipeNetwork(CDB.Part part) - { - if (part.NetworkId == ADB.ObjectId.Null) - { - return; - } - - string networkApplicationId = part.NetworkId.GetSpeckleApplicationId(); - string partApplicationId = part.GetSpeckleApplicationId(); - if (PipeNetworkProxiesCache.TryGetValue(networkApplicationId, out GroupProxy? value)) - { - value.objects.Add(partApplicationId); - } - else - { - using (var tr = _converterSettings.Current.Document.Database.TransactionManager.StartTransaction()) - { - var network = (CDB.Network)tr.GetObject(part.NetworkId, ADB.OpenMode.ForRead); - - PipeNetworkProxiesCache[networkApplicationId] = new() - { - name = network.Name, - objects = new() { partApplicationId }, - applicationId = networkApplicationId - }; - - tr.Commit(); - } - } - return; - } -} diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs index 0c66b2e15..462bc26d5 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ServiceRegistration.cs @@ -42,11 +42,8 @@ public static void AddCivil3dConverters(this IServiceCollection serviceCollectio serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); - serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); - serviceCollection.AddScoped(); - serviceCollection.AddScoped(); serviceCollection.AddScoped(); serviceCollection.AddScoped(); } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems index 0ab60d801..94c5d7e69 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems @@ -17,8 +17,6 @@ - - @@ -26,7 +24,6 @@ - diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs index 5961c4b9b..edc5240ea 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/ClassPropertiesExtractor.cs @@ -1,32 +1,40 @@ +using System.Reflection; +using Autodesk.Civil.Runtime; using Speckle.Converters.Civil3dShared.Extensions; -using Speckle.Converters.Civil3dShared.Helpers; -using Speckle.Converters.Common.Objects; +using Speckle.Converters.Common; namespace Speckle.Converters.Civil3dShared.ToSpeckle; /// -/// Extracts class properties deemed important from a civil entity. +/// Extracts class properties deemed important for business intelligence workflows from a civil entity. /// Should not repeat any data that would be included on property sets and general properties on the object. /// Expects to be scoped per operation. /// public class ClassPropertiesExtractor { - private readonly ITypedConverter _point3dCollectionConverter; - private readonly ITypedConverter _pointConverter; - private readonly CatchmentGroupHandler _catchmentGroupHandler; - private readonly PipeNetworkHandler _pipeNetworkHandler; - - public ClassPropertiesExtractor( - ITypedConverter point3dCollectionConverter, - ITypedConverter pointConverter, - CatchmentGroupHandler catchmentGroupHandler, - PipeNetworkHandler pipeNetworkHandler - ) + private const string ASSIGNMENT_PROP = "Assignments"; + private const string DIMENSIONAL_PROP = "Dimensional Properties"; + private const string SITEID_PROP = "siteId"; + private const string SITENAME_PROP = "siteName"; + private const string SURFACEID_PROP = "surfaceId"; + private const string SURFACENAME_PROP = "surfaceName"; + private const string NETWORKID_PROP = "networkId"; + private const string NETWORKNAME_PROP = "networkName"; + private const string ALIGNMENTID_PROP = "alignmentId"; + private const string ALIGNMENTNAME_PROP = "alignmentName"; + private const string CODES_PROP = "codes"; + private const string SHAPES_PROP = "shapes"; + private const string LINKS_PROP = "links"; + private const string POINTS_PROP = "points"; + + private readonly IConverterSettingsStore _converterSettings; + + private readonly Dictionary _catchmentGroupCache = new(); + private readonly Dictionary _networkCache = new(); + + public ClassPropertiesExtractor(IConverterSettingsStore converterSettings) { - _point3dCollectionConverter = point3dCollectionConverter; - _pointConverter = pointConverter; - _catchmentGroupHandler = catchmentGroupHandler; - _pipeNetworkHandler = pipeNetworkHandler; + _converterSettings = converterSettings; } /// @@ -34,16 +42,19 @@ PipeNetworkHandler pipeNetworkHandler /// /// /// - public Dictionary? GetClassProperties(CDB.Entity entity) + public Dictionary GetClassProperties(CDB.Entity entity) { switch (entity) { - case CDB.Catchment catchment: - return ExtractCatchmentProperties(catchment); + // site case CDB.Site site: return ExtractSiteProperties(site); + case CDB.Catchment catchment: + return ExtractCatchmentProperties(catchment); case CDB.Parcel parcel: return ExtractParcelProperties(parcel); + case CDB.Surface surface: + return ExtractSurfaceProperties(surface); // pipe networks case CDB.Pipe pipe: @@ -51,128 +62,217 @@ PipeNetworkHandler pipeNetworkHandler case CDB.Structure structure: return ExtractStructureProperties(structure); - // alignments + // corridors, alignments, profiles + case CDB.Corridor corridor: + return ExtractCorridorProperties(corridor); case CDB.Alignment alignment: return ExtractAlignmentProperties(alignment); case CDB.Profile profile: return ExtractProfileProperties(profile); - // assemblies + // assemblies, subassemblies case CDB.Subassembly subassembly: return ExtractSubassemblyProperties(subassembly); default: - return null; + return new(); } } - private Dictionary ExtractParcelProperties(CDB.Parcel parcel) + private Dictionary ExtractSiteProperties(CDB.Site site) { -#if CIVIL3D2023_OR_GREATER - return new() { ["number"] = parcel.Number, ["taxId"] = parcel.TaxId }; -#else - return new() { ["number"] = parcel.Number }; -#endif + // get general props + Dictionary properties = new() { }; + + // get assignments like catchment group, reference surface, reference pipe networks + Dictionary assignmentProps = new(); + if (site.GetAlignmentIds().Count > 0) + { + assignmentProps[ALIGNMENTID_PROP] = GetSpeckleApplicationIdsFromCollection(site.GetAlignmentIds()); + } + if (site.GetFeatureLineIds().Count > 0) + { + assignmentProps["featureLineId"] = GetSpeckleApplicationIdsFromCollection(site.GetFeatureLineIds()); + } + + AddDictionaryToDictionary(assignmentProps, properties, ASSIGNMENT_PROP); + return properties; } - private Dictionary ExtractSubassemblyProperties(CDB.Subassembly subassembly) + private Dictionary ExtractCatchmentProperties(CDB.Catchment catchment) { - Dictionary subassemblyProperties = new(); - - subassemblyProperties["origin"] = _pointConverter.Convert(subassembly.Origin); + // get general props + Dictionary properties = new() { }; - // get shapes > links > points info - Dictionary shapes = new(); - int shapeCount = 0; - foreach (CDB.Shape shape in subassembly.Shapes) + // get assignments like catchment group, reference surface, reference pipe networks + Dictionary assignmentProps = new(); + if (catchment.ContainingGroupId != ADB.ObjectId.Null) { - Dictionary links = new(); - int linkCount = 0; - foreach (CDB.Link link in shape.Links) + assignmentProps["catchmentGroupId"] = catchment.ContainingGroupId.GetSpeckleApplicationId(); + if (_catchmentGroupCache.TryGetValue(catchment.ContainingGroupId, out string? name)) { - Dictionary points = new(); - int pointCount = 0; - foreach (CDB.Point point in link.Points) + assignmentProps["catchmentGroupName"] = name; + } + else + { + using (var tr = _converterSettings.Current.Document.Database.TransactionManager.StartTransaction()) { - points[pointCount.ToString()] = new Dictionary() - { - ["elevation"] = point.Elevation, - ["codes"] = point.Codes.ToList(), - ["offset"] = point.Offset, - }; - pointCount++; + var catchmentGroup = (CDB.CatchmentGroup)tr.GetObject(catchment.ContainingGroupId, ADB.OpenMode.ForRead); + _catchmentGroupCache[catchment.ContainingGroupId] = catchmentGroup.Name; + assignmentProps["catchmentGroupName"] = catchmentGroup.Name; + tr.Commit(); } - - links[linkCount.ToString()] = new Dictionary() - { - ["codes"] = link.Codes.ToList(), - ["points"] = points - }; - - linkCount++; } + } - shapes[shapeCount.ToString()] = new Dictionary() - { - ["codes"] = shape.Codes.ToList(), - ["links"] = links - }; + if (catchment.ReferenceSurfaceId != ADB.ObjectId.Null) + { + assignmentProps[SURFACEID_PROP] = catchment.ReferenceSurfaceId.GetSpeckleApplicationId(); + assignmentProps[SURFACENAME_PROP] = catchment.ReferenceSurfaceName; } - subassemblyProperties["shapes"] = shapes; + if (catchment.ReferencePipeNetworkId != ADB.ObjectId.Null) + { + assignmentProps[NETWORKID_PROP] = catchment.ReferencePipeNetworkId.GetSpeckleApplicationId(); + assignmentProps[NETWORKNAME_PROP] = catchment.ReferencePipeNetworkName; + } - if (subassembly.HasSide) + if (catchment.ReferencePipeNetworkStructureId != ADB.ObjectId.Null) { - subassemblyProperties["side"] = subassembly.Side; + assignmentProps["networkStructureId"] = catchment.ReferencePipeNetworkStructureId.GetSpeckleApplicationId(); + assignmentProps["networkStructureName"] = catchment.ReferencePipeNetworkStructureName; } - return subassemblyProperties; - } + AddDictionaryToDictionary(assignmentProps, properties, ASSIGNMENT_PROP); - private Dictionary ExtractProfileProperties(CDB.Profile profile) - { - return new() + // get dimensional props + properties[DIMENSIONAL_PROP] = new Dictionary() { - ["offset"] = profile.Offset, - ["startingStation"] = profile.StartingStation, - ["endingStation"] = profile.EndingStation, - ["profileType"] = profile.ProfileType.ToString(), - ["elevationMin"] = profile.ElevationMin, - ["elevationMax"] = profile.ElevationMax + ["area"] = catchment.Area, + ["area2d"] = catchment.Area2d, + ["imperviousArea"] = catchment.ImperviousArea, + ["perimeter2d"] = catchment.Perimeter2d + }; + + // get hydrological props + properties["Hydrological Properties"] = new Dictionary() + { + ["timeOfConcentration"] = catchment.TimeOfConcentration, + ["timeOfConcentrationCalculationMethod"] = catchment.TimeOfConcentrationCalculationMethod, + ["hydrologicallyMostDistantPoint"] = catchment.HydrologicallyMostDistantPoint.ToArray(), + ["hydrologicallyMostDistantLength"] = catchment.HydrologicallyMostDistantLength, + ["runoffCoefficient"] = catchment.RunoffCoefficient, + ["hydrologicalSoilGroup"] = catchment.HydrologicalSoilGroup.ToString(), + ["antecedentWetness"] = catchment.AntecedentWetness + }; + + // get hydraulic props + properties["Hydraulic Properties"] = new Dictionary() + { + ["manningsCoefficient"] = catchment.ManningsCoefficient, +#if CIVIL3D2024_OR_GREATER + ["sheetFlowSegments"] = catchment.SheetFlowSegments, + ["sheetFlowTravelTime"] = catchment.SheetFlowTravelTime, + ["shallowFlowSegments"] = catchment.ShallowFlowSegments, + ["shallowFlowTravelTime"] = catchment.ShallowFlowTravelTime, + ["channelFlowSegments"] = catchment.ChannelFlowSegments, + ["channelFlowTravelTime"] = catchment.ChannelFlowTravelTime +#endif }; + + return properties; } - private Dictionary ExtractAlignmentProperties(CDB.Alignment alignment) + private Dictionary ExtractParcelProperties(CDB.Parcel parcel) { - Dictionary alignmentProperties = - new() - { - ["startingStation"] = alignment.StartingStation, - ["endingStation"] = alignment.EndingStation, - ["alignmentType"] = alignment.AlignmentType.ToString() - }; + // get general props + Dictionary properties = new() { ["number"] = parcel.Number, ["area"] = parcel.Area }; +#if CIVIL3D2023_OR_GREATER + properties["taxId"] = parcel.TaxId; +#endif + return properties; + } - if (!alignment.IsSiteless) + private Dictionary ExtractSurfaceProperties(CDB.Surface surface) + { + // get general props + Dictionary properties = new() { }; + + // get statistics props + Dictionary statisticsProps = ExtractPropertiesGeneric( + surface.GetGeneralProperties() + ); + + switch (surface) { - alignmentProperties["siteId"] = alignment.SiteId.GetSpeckleApplicationId(); + case CDB.TinSurface tinSurface: + AddDictionaryToDictionary( + ExtractPropertiesGeneric(tinSurface.GetTerrainProperties()), + statisticsProps, + "Terrain" + ); + AddDictionaryToDictionary( + ExtractPropertiesGeneric(tinSurface.GetTinProperties()), + statisticsProps, + "TIN" + ); + break; + + case CDB.TinVolumeSurface tinVolumeSurface: + AddDictionaryToDictionary( + ExtractPropertiesGeneric(tinVolumeSurface.GetTinProperties()), + statisticsProps, + "TIN" + ); + AddDictionaryToDictionary( + ExtractPropertiesGeneric(tinVolumeSurface.GetVolumeProperties()), + statisticsProps, + "Volume" + ); + break; + + case CDB.GridSurface gridSurface: + AddDictionaryToDictionary( + ExtractPropertiesGeneric(gridSurface.GetTerrainProperties()), + statisticsProps, + "Terrain" + ); + AddDictionaryToDictionary( + ExtractPropertiesGeneric(gridSurface.GetGridProperties()), + statisticsProps, + "Grid" + ); + break; + + case CDB.GridVolumeSurface gridVolumeSurface: + AddDictionaryToDictionary( + ExtractPropertiesGeneric(gridVolumeSurface.GetGridProperties()), + statisticsProps, + "Grid" + ); + AddDictionaryToDictionary( + ExtractPropertiesGeneric(gridVolumeSurface.GetVolumeProperties()), + statisticsProps, + "Volume" + ); + break; } - return alignmentProperties; + AddDictionaryToDictionary(statisticsProps, properties, "Statistics"); + return properties; } private Dictionary ExtractPipeProperties(CDB.Pipe pipe) { - Dictionary pipeProperties = + // get general props + Dictionary properties = new() { + ["domain"] = pipe.Domain.ToString(), // part prop + ["partType"] = pipe.PartType.ToString(), // part prop ["bearing"] = pipe.Bearing, - ["innerDiameterOrWidth"] = pipe.InnerDiameterOrWidth, - ["innerHeight"] = pipe.InnerHeight, ["slope"] = pipe.Slope, ["shape"] = pipe.CrossSectionalShape.ToString(), -#pragma warning disable CS0618 // Type or member is obsolete - ["length2d"] = pipe.Length2D, //Length2D was un-obsoleted in 2023, but is still marked obsolete in 2022 -#pragma warning restore CS0618 // Type or member is obsolete ["minimumCover"] = pipe.MinimumCover, ["maximumCover"] = pipe.MaximumCover, ["junctionLoss"] = pipe.JunctionLoss, @@ -180,31 +280,53 @@ PipeNetworkHandler pipeNetworkHandler ["flowRate"] = pipe.FlowRate }; + // get assignments like catchment group, reference surface, reference pipe networks + Dictionary assignmentProps = GetPartAssignments(pipe); + if (pipe.StartStructureId != ADB.ObjectId.Null) { - pipeProperties["startStructureId"] = pipe.StartStructureId.GetSpeckleApplicationId(); + assignmentProps["startStructureId"] = pipe.StartStructureId.GetSpeckleApplicationId(); } - if (pipe.EndStructureId != ADB.ObjectId.Null) { - pipeProperties["endStructureId"] = pipe.EndStructureId.GetSpeckleApplicationId(); + assignmentProps["endStructureId"] = pipe.EndStructureId.GetSpeckleApplicationId(); } - ExtractPartProperties(pipe, pipeProperties); + AddDictionaryToDictionary(assignmentProps, properties, ASSIGNMENT_PROP); - return pipeProperties; + // get dimensional props + properties[DIMENSIONAL_PROP] = new Dictionary() + { + ["innerDiameterOrWidth"] = pipe.InnerDiameterOrWidth, + ["innerHeight"] = pipe.InnerHeight, +#pragma warning disable CS0618 // Type or member is obsolete + ["length2d"] = pipe.Length2D, //Length2D was un-obsoleted in 2023, but is still marked obsolete in 2022 +#pragma warning restore CS0618 // Type or member is obsolete + }; + + return properties; } private Dictionary ExtractStructureProperties(CDB.Structure structure) { - var location = _pointConverter.Convert(structure.Location); - - Dictionary structureProperties = + // get general props + Dictionary properties = new() { - ["location"] = location, + ["domain"] = structure.Domain.ToString(), // part prop + ["partType"] = structure.PartType.ToString(), // part prop ["northing"] = structure.Northing, ["rotation"] = structure.Rotation, + }; + + // get assignments like catchment group, reference surface, reference pipe networks + Dictionary assignmentProps = GetPartAssignments(structure); + AddDictionaryToDictionary(assignmentProps, properties, ASSIGNMENT_PROP); + + // get dimensional props + Dictionary dimensionalProps = + new() + { ["sumpDepth"] = structure.SumpDepth, ["sumpElevation"] = structure.SumpElevation, ["innerDiameterOrWidth"] = structure.InnerDiameterOrWidth @@ -212,70 +334,370 @@ PipeNetworkHandler pipeNetworkHandler if (structure.BoundingShape == CDB.BoundingShapeType.Box) { - structureProperties["innerLength"] = structure.InnerLength; - structureProperties["length"] = structure.Length; + dimensionalProps["innerLength"] = structure.InnerLength; + dimensionalProps["length"] = structure.Length; } + properties[DIMENSIONAL_PROP] = dimensionalProps; - ExtractPartProperties(structure, structureProperties); + // get location + properties["Location"] = new Dictionary() + { + ["x"] = structure.Location.X, + ["y"] = structure.Location.Y, + ["z"] = structure.Location.Z, + }; - return structureProperties; + return properties; } - private void ExtractPartProperties(CDB.Part part, Dictionary dict) + private Dictionary GetPartAssignments(CDB.Part part) { - // process the part's pipe network with the pipe network handler - _pipeNetworkHandler.HandlePipeNetwork(part); + Dictionary partAssignments = new(); - dict["domain"] = part.Domain.ToString(); - dict["partType"] = part.PartType.ToString(); + // get part family + if (part.PartFamilyId != ADB.ObjectId.Null) + { + partAssignments["partFamilyId"] = part.PartFamilyId.GetSpeckleApplicationId(); + partAssignments["partFamilyName"] = part.PartFamilyName; + } + + // get network + if (part.NetworkId != ADB.ObjectId.Null) + { + partAssignments[NETWORKID_PROP] = part.NetworkId.GetSpeckleApplicationId(); + if (_networkCache.TryGetValue(part.NetworkId, out string? name)) + { + partAssignments[NETWORKNAME_PROP] = name; + } + else + { + using (var tr = _converterSettings.Current.Document.Database.TransactionManager.StartTransaction()) + { + var network = (CDB.Network)tr.GetObject(part.NetworkId, ADB.OpenMode.ForRead); + _networkCache[part.NetworkId] = network.Name; + partAssignments[NETWORKNAME_PROP] = name; + tr.Commit(); + } + } + } + + // get surface if (part.RefSurfaceId != ADB.ObjectId.Null) { - dict["surfaceId"] = part.RefSurfaceId.GetSpeckleApplicationId(); + partAssignments[SURFACEID_PROP] = part.RefSurfaceId.GetSpeckleApplicationId(); + partAssignments[SURFACENAME_PROP] = part.RefSurfaceName; + } + + // get alignment + if (part.RefAlignmentId != ADB.ObjectId.Null) + { + partAssignments[ALIGNMENTID_PROP] = part.RefAlignmentId.GetSpeckleApplicationId(); + partAssignments[ALIGNMENTNAME_PROP] = part.RefAlignmentName; } - return; + return partAssignments; } - private Dictionary ExtractSiteProperties(CDB.Site site) + private void ProcessCorridorFeaturelinePoints( + CDB.CorridorFeatureLine featureline, + Dictionary> featureLinesDict + ) { - Dictionary catchmentProperties = new(); + if (featureLinesDict.TryGetValue(featureline.CodeName, out Dictionary? value)) + { + Dictionary pointsDict = new(featureline.FeatureLinePoints.Count); + int pointCount = 0; + foreach (CDB.FeatureLinePoint point in featureline.FeatureLinePoints) + { + Dictionary pointPropertiesDict = + new() + { + ["station"] = point.Station, + ["x"] = point.XYZ.X, + ["y"] = point.XYZ.Y, + ["z"] = point.XYZ.Z, + ["isBreak"] = point.IsBreak + }; - if (site.GetAlignmentIds().Count > 0) + // not all points have offsets. Accessing the offset property in this case will throw. + try + { + pointPropertiesDict["offset"] = point.Offset; + } + catch (ArgumentException) { } // do nothing - offset property will not be included + + pointsDict[pointCount.ToString()] = pointPropertiesDict; + pointCount++; + } + + value["featureLinePoints"] = pointsDict; + } + } + + private Dictionary ExtractCorridorProperties(CDB.Corridor corridor) + { + static void AddArrayToDict(string[] array, Dictionary dict, string key) { - catchmentProperties["alignmentIds"] = GetSpeckleApplicationIdsFromCollection(site.GetAlignmentIds()); + if (array.Length > 0) + { + dict[key] = array; + } } - if (site.GetFeatureLineIds().Count > 0) + // get general props + Dictionary properties = new(); + + // get codes + Dictionary codesDict = new(); + AddArrayToDict(corridor.GetShapeCodes(), codesDict, SHAPES_PROP); + AddArrayToDict(corridor.GetLinkCodes(), codesDict, LINKS_PROP); + AddArrayToDict(corridor.GetPointCodes(), codesDict, POINTS_PROP); + AddDictionaryToDictionary(codesDict, properties, CODES_PROP); + + // get feature lines props + // this is pretty complicated: need to extract featureline points as dicts, but can only do this by iterating through baselines. Need to match the iterated featurelines with the featureline code info. + Dictionary> featureLinesDict = new(); + // first build dict from the code info + foreach (CDB.FeatureLineCodeInfo featureLineCode in corridor.FeatureLineCodeInfos) { - catchmentProperties["featureLineIds"] = GetSpeckleApplicationIdsFromCollection(site.GetFeatureLineIds()); + featureLinesDict[featureLineCode.CodeName] = new Dictionary() + { + ["codeName"] = featureLineCode.CodeName, + ["isConnected"] = featureLineCode.IsConnected, + ["payItems"] = featureLineCode.PayItems + }; } - return catchmentProperties; + // then iterate through baseline featurelines to populate point info + foreach (CDB.Baseline baseline in corridor.Baselines) + { + // main featurelines + foreach ( + CDB.FeatureLineCollection mainFeaturelineCollection in baseline + .MainBaselineFeatureLines + .FeatureLineCollectionMap + ) + { + foreach (CDB.CorridorFeatureLine featureline in mainFeaturelineCollection) + { + ProcessCorridorFeaturelinePoints(featureline, featureLinesDict); + } + } + + // offset featurelines + foreach (CDB.BaselineFeatureLines offsetFeaturelineCollection in baseline.OffsetBaselineFeatureLinesCol) + { + foreach ( + CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.FeatureLineCollectionMap + ) + { + foreach (CDB.CorridorFeatureLine featureline in featurelineCollection) + { + ProcessCorridorFeaturelinePoints(featureline, featureLinesDict); + } + } + } + } + + if (featureLinesDict.Count > 0) + { + properties["Feature Lines"] = featureLinesDict; + } + + return properties; } - private Dictionary ExtractCatchmentProperties(CDB.Catchment catchment) + private Dictionary ExtractAlignmentProperties(CDB.Alignment alignment) { - // get the bounding curve of the catchment - SOG.Polyline boundary = _point3dCollectionConverter.Convert(catchment.BoundaryPolyline3d); - boundary.closed = true; + // get general props + Dictionary properties = + new() + { + ["startingStation"] = alignment.StartingStation, + ["endingStation"] = alignment.EndingStation, + ["alignmentType"] = alignment.AlignmentType.ToString() + }; - // use the catchment group handler to process the catchment's group - _catchmentGroupHandler.HandleCatchmentGroup(catchment); + // get assignments + Dictionary assignmentProps = new(); + if (!alignment.IsSiteless) + { + assignmentProps[SITEID_PROP] = alignment.SiteId.GetSpeckleApplicationId(); + assignmentProps[SITENAME_PROP] = alignment.SiteName; + } + if (alignment.GetProfileIds().Count > 0) + { + assignmentProps["profileId"] = GetSpeckleApplicationIdsFromCollection(alignment.GetProfileIds()); + } + AddDictionaryToDictionary(assignmentProps, properties, ASSIGNMENT_PROP); + + // get station control props + Dictionary stationControlDict = new(); + + Dictionary stationEquationsDict = new(); + int equationCount = 0; + foreach (var stationEquation in alignment.StationEquations) + { + stationEquationsDict[equationCount.ToString()] = new Dictionary() + { + ["rawStationBack"] = stationEquation.RawStationBack, + ["stationBack"] = stationEquation.StationBack, + ["stationAhead"] = stationEquation.StationAhead, + ["equationType"] = stationEquation.EquationType.ToString() + }; + equationCount++; + } + AddDictionaryToDictionary(stationEquationsDict, stationControlDict, "Station Equations"); + stationControlDict["Reference Point"] = new Dictionary() + { + ["x"] = alignment.ReferencePoint.X, + ["y"] = alignment.ReferencePoint.Y, + ["station"] = alignment.ReferencePointStation + }; + + AddDictionaryToDictionary(stationControlDict, properties, "Station Control"); + + // get design speeds + Dictionary designSpeedsDict = new(); + int speedsCount = 0; + foreach (CDB.DesignSpeed designSpeed in alignment.DesignSpeeds) + { + designSpeedsDict[speedsCount.ToString()] = new Dictionary() + { + ["number"] = designSpeed.SpeedNumber, + ["station"] = designSpeed.Station, + ["value"] = designSpeed.Value + }; + speedsCount++; + } + AddDictionaryToDictionary(designSpeedsDict, properties, "Design Speeds"); + + // get offset alignment props + if (alignment.IsOffsetAlignment) + { + try + { + // accessing "OffsetAlignmentInfo" on offset alignments will sometimes throw /shrug. + // this happens when an offset alignment is unlinked from the parent and the CreateMode is still set to "ManuallyCreation" + // https://help.autodesk.com/view/CIV3D/2024/ENU/?guid=2ecbe421-4c08-cbde-d078-56a9f03b93f9 + var offsetInfo = alignment.OffsetAlignmentInfo; + properties["Offset Parameters"] = new Dictionary + { + ["side"] = offsetInfo.Side.ToString(), + ["parentAlignmentId"] = offsetInfo.ParentAlignmentId.GetSpeckleApplicationId(), + ["nominalOffset"] = offsetInfo.NominalOffset + }; + } + catch (InvalidOperationException) { } // do nothing + } + + return properties; + } + + private Dictionary ExtractProfileProperties(CDB.Profile profile) + { return new() { - ["antecedentWetness"] = catchment.AntecedentWetness, - ["area"] = catchment.Area, - ["area2d"] = catchment.Area2d, - ["boundary"] = boundary, - ["hydrologicalSoilGroup"] = catchment.HydrologicalSoilGroup.ToString(), - ["imperviousArea"] = catchment.ImperviousArea, - ["manningsCoefficient"] = catchment.ManningsCoefficient, - ["perimeter2d"] = catchment.Perimeter2d, - ["timeOfConcentration"] = catchment.TimeOfConcentration + ["offset"] = profile.Offset, + ["startingStation"] = profile.StartingStation, + ["endingStation"] = profile.EndingStation, + ["profileType"] = profile.ProfileType.ToString(), + ["elevationMin"] = profile.ElevationMin, + ["elevationMax"] = profile.ElevationMax }; } + private Dictionary ExtractSubassemblyProperties(CDB.Subassembly subassembly) + { + static void AddCodesToDict(CDB.CodeCollection codes, Dictionary dict) + { + if (codes.Count > 0) + { + dict[CODES_PROP] = codes.ToList(); + } + } + + // get general props + Dictionary properties = new(); + if (subassembly.HasSide) + { + properties["side"] = subassembly.Side.ToString(); + } + + // get assignments + Dictionary assignmentProps = new(); + if (subassembly.AssemblyId != ADB.ObjectId.Null) + { + assignmentProps["assemblyId"] = subassembly.AssemblyId.GetSpeckleApplicationId(); + } + AddDictionaryToDictionary(assignmentProps, properties, ASSIGNMENT_PROP); + + // get parameters + Dictionary parametersDict = new(); + foreach (ParamBool p in subassembly.ParamsBool) + { + parametersDict[p.DisplayName] = p.Value; + } + foreach (ParamDouble p in subassembly.ParamsDouble) + { + parametersDict[p.DisplayName] = p.Value; + } + foreach (ParamString p in subassembly.ParamsString) + { + parametersDict[p.DisplayName] = p.Value; + } + foreach (ParamLong p in subassembly.ParamsLong) + { + parametersDict[p.DisplayName] = p.Value; + } + AddDictionaryToDictionary(parametersDict, properties, "Parameters"); + + // get location + properties["Location"] = new Dictionary() + { + ["x"] = subassembly.Origin.X, + ["y"] = subassembly.Origin.Y, + ["z"] = subassembly.Origin.Z + }; + + // get shapes > links > points info + Dictionary shapes = new(); + int shapeCount = 0; + foreach (CDB.Shape shape in subassembly.Shapes) + { + Dictionary shapeDict = new(); + AddCodesToDict(shape.Codes, shapeDict); + + Dictionary links = new(); + int linkCount = 0; + foreach (CDB.Link link in shape.Links) + { + Dictionary linkDict = new(); + AddCodesToDict(link.Codes, linkDict); + + Dictionary points = new(); + int pointCount = 0; + foreach (CDB.Point point in link.Points) + { + Dictionary pointDict = new() { ["elevation"] = point.Elevation, ["offset"] = point.Offset }; + AddCodesToDict(point.Codes, pointDict); + pointCount++; + } + + AddDictionaryToDictionary(points, linkDict, POINTS_PROP); + AddDictionaryToDictionary(linkDict, links, linkCount.ToString()); + linkCount++; + } + + AddDictionaryToDictionary(links, shapeDict, LINKS_PROP); + AddDictionaryToDictionary(shapeDict, shapes, shapeCount.ToString()); + } + AddDictionaryToDictionary(shapes, properties, SHAPES_PROP); + + return properties; + } + private List GetSpeckleApplicationIdsFromCollection(ADB.ObjectIdCollection collection) { List speckleAppIds = new(collection.Count); @@ -286,4 +708,45 @@ private List GetSpeckleApplicationIdsFromCollection(ADB.ObjectIdCollecti return speckleAppIds; } + + // A generic method to create a dictionary from an object types's properties + private Dictionary ExtractPropertiesGeneric(T obj) + { + Dictionary propertiesDict = new(); + + var type = typeof(T); + PropertyInfo[] properties = type.GetProperties(); + foreach (PropertyInfo? property in properties) + { + var value = property.GetValue(obj); + if (value is ADB.ObjectId id) + { + value = id.GetSpeckleApplicationId(); + } + + propertiesDict[property.Name] = value; + } + + return propertiesDict; + } + + private void AddDictionaryToDictionary( + Dictionary dictionary, + Dictionary parentDictionary, + string name + ) + { + if (dictionary.Count == 0) + { + return; + } + + if (parentDictionary.ContainsKey(name)) + { + // TODO: log this + return; + } + + parentDictionary[name] = dictionary; + } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs deleted file mode 100644 index 753aae8ae..000000000 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs +++ /dev/null @@ -1,399 +0,0 @@ -using System.Reflection; -using Autodesk.Civil.Runtime; -using Speckle.Converters.Civil3dShared.Extensions; - -namespace Speckle.Converters.Civil3dShared.ToSpeckle; - -/// -/// Extracts general properties related to analysis, statistics, and calculations out from a civil entity. Expects to be scoped per operation. -/// -public class GeneralPropertiesExtractor -{ - public GeneralPropertiesExtractor() { } - - /// - /// Extracts general properties from a civil entity. Expects to be scoped per operation. - /// - /// - /// - public Dictionary? GetGeneralProperties(CDB.Entity entity) - { - switch (entity) - { - // catchment -> properties -> Catchment Properties - case CDB.Catchment catchment: - return ExtractCatchmentProperties(catchment); - - // surface -> properties -> statistics -> general, extended, and tin/grid properties - case CDB.Surface surface: - return ExtractSurfaceProperties(surface); - - // alignment -> properties -> station control -> station equations, station information, reference point - // alignment -> properties -> offset parameters -> parent alignment - case CDB.Alignment alignment: - return ExtractAlignmentProperties(alignment); - - // corridor -> properties -> codes, featurelines, surfaces - case CDB.Corridor corridor: - return ExtractCorridorProperties(corridor); - - // subassembly -> properties -> parameters, codes - case CDB.Subassembly subassembly: - return ExtractSubassemblyProperties(subassembly); - - default: - return null; - } - } - - private Dictionary ExtractCatchmentProperties(CDB.Catchment catchment) - { - Dictionary generalPropertiesDict = new(); - - // get catchment properties props - Dictionary catchmentPropertiesDict = new(); - - Dictionary hydrologicalProps = new() { ["runoffCoefficient"] = catchment.RunoffCoefficient }; - catchmentPropertiesDict["Hydrological Properties"] = hydrologicalProps; - -#if CIVIL3D2024_OR_GREATER - Dictionary sheetFlow = - new() - { - ["sheetFlowSegments"] = catchment.SheetFlowSegments, - ["sheetFlowTravelTime"] = catchment.SheetFlowTravelTime - }; - catchmentPropertiesDict["Sheet Flow"] = sheetFlow; - - Dictionary shallowConcentratedFlow = - new() - { - ["shallowFlowSegments"] = catchment.ShallowFlowSegments, - ["shallowFlowTravelTime"] = catchment.ShallowFlowTravelTime - }; - catchmentPropertiesDict["Shallow Concentrated Flow"] = shallowConcentratedFlow; - - Dictionary channelFlow = - new() - { - ["channelFlowSegments"] = catchment.ChannelFlowSegments, - ["channelFlowTravelTime"] = catchment.ChannelFlowTravelTime - }; - catchmentPropertiesDict["Channel Flow"] = channelFlow; -#endif - - Dictionary timeOfConcentration = - new() - { - ["timeOfConcentration"] = catchment.TimeOfConcentration, - ["timeOfConcentrationCalculationMethod"] = catchment.TimeOfConcentrationCalculationMethod, - ["hydrologicallyMostDistantPoint"] = catchment.HydrologicallyMostDistantPoint.ToArray(), - ["hydrologicallyMostDistantLength"] = catchment.HydrologicallyMostDistantLength - }; - catchmentPropertiesDict["Time of Concentration"] = timeOfConcentration; - - if (catchmentPropertiesDict.Count > 0) - { - generalPropertiesDict["Catchment Properties"] = catchmentPropertiesDict; - } - - return generalPropertiesDict; - } - - private Dictionary ExtractSubassemblyProperties(CDB.Subassembly subassembly) - { - Dictionary generalPropertiesDict = new(); - - // get parameters props - Dictionary parametersDict = new(); - foreach (ParamBool p in subassembly.ParamsBool) - { - parametersDict[p.DisplayName] = p.Value; - } - foreach (ParamDouble p in subassembly.ParamsDouble) - { - parametersDict[p.DisplayName] = p.Value; - } - foreach (ParamString p in subassembly.ParamsString) - { - parametersDict[p.DisplayName] = p.Value; - } - foreach (ParamLong p in subassembly.ParamsLong) - { - parametersDict[p.DisplayName] = p.Value; - } - if (parametersDict.Count > 0) - { - generalPropertiesDict["Parameters"] = parametersDict; - } - - return generalPropertiesDict; - } - - private void ProcessCorridorFeaturelinePoints( - CDB.CorridorFeatureLine featureline, - Dictionary> featureLinesDict - ) - { - if (featureLinesDict.TryGetValue(featureline.CodeName, out Dictionary? value)) - { - Dictionary pointsDict = new(featureline.FeatureLinePoints.Count); - int pointCount = 0; - foreach (CDB.FeatureLinePoint point in featureline.FeatureLinePoints) - { - Dictionary pointPropertiesDict = - new() - { - ["station"] = point.Station, - ["xyz"] = point.XYZ.ToArray(), - ["isBreak"] = point.IsBreak - }; - - // not all points have offsets. Accessing the offset property in this case will throw. - try - { - pointPropertiesDict["offset"] = point.Offset; - } - catch (ArgumentException) { } // do nothing - offset property will not be included - - pointsDict[pointCount.ToString()] = pointPropertiesDict; - pointCount++; - } - - value["featureLinePoints"] = pointsDict; - } - } - - private Dictionary ExtractCorridorProperties(CDB.Corridor corridor) - { - Dictionary generalPropertiesDict = new(); - - // get codes props - Dictionary codesDict = - new() - { - ["link"] = corridor.GetLinkCodes(), - ["point"] = corridor.GetPointCodes(), - ["shape"] = corridor.GetShapeCodes() - }; - generalPropertiesDict["codes"] = codesDict; - - // get feature lines props - // this is pretty complicated: need to extract featureline points as dicts, but can only do this by iterating through baselines. Need to match the iterated featurelines with the featureline code info. - Dictionary> featureLinesDict = new(); - // first build dict from the code info - foreach (CDB.FeatureLineCodeInfo featureLineCode in corridor.FeatureLineCodeInfos) - { - featureLinesDict[featureLineCode.CodeName] = new Dictionary() - { - ["codeName"] = featureLineCode.CodeName, - ["isConnected"] = featureLineCode.IsConnected, - ["payItems"] = featureLineCode.PayItems - }; - } - // then iterate through baseline featurelines to populate point info - foreach (CDB.Baseline baseline in corridor.Baselines) - { - // main featurelines - foreach ( - CDB.FeatureLineCollection mainFeaturelineCollection in baseline - .MainBaselineFeatureLines - .FeatureLineCollectionMap - ) - { - foreach (CDB.CorridorFeatureLine featureline in mainFeaturelineCollection) - { - ProcessCorridorFeaturelinePoints(featureline, featureLinesDict); - } - } - - // offset featurelines - foreach (CDB.BaselineFeatureLines offsetFeaturelineCollection in baseline.OffsetBaselineFeatureLinesCol) - { - foreach ( - CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.FeatureLineCollectionMap - ) - { - foreach (CDB.CorridorFeatureLine featureline in featurelineCollection) - { - ProcessCorridorFeaturelinePoints(featureline, featureLinesDict); - } - } - } - } - if (featureLinesDict.Count > 0) - { - generalPropertiesDict["Feature Lines"] = featureLinesDict; - } - - // get surfaces props - Dictionary surfacesDict = new(); - foreach (CDB.CorridorSurface surface in corridor.CorridorSurfaces) - { - surfacesDict[surface.Name] = new Dictionary() - { - ["name"] = surface.Name, - ["surfaceId"] = surface.SurfaceId.GetSpeckleApplicationId(), - ["description"] = surface.Description, - ["overhangCorrection"] = surface.OverhangCorrection.ToString() - }; - } - if (surfacesDict.Count > 0) - { - generalPropertiesDict["Surfaces"] = surfacesDict; - } - - return generalPropertiesDict; - } - - private Dictionary ExtractAlignmentProperties(CDB.Alignment alignment) - { - Dictionary generalPropertiesDict = new(); - - // get station control props - Dictionary stationControlDict = new(); - - Dictionary stationEquationsDict = new(); - int equationCount = 0; - foreach (var stationEquation in alignment.StationEquations) - { - stationEquationsDict[equationCount.ToString()] = new Dictionary() - { - ["rawStationBack"] = stationEquation.RawStationBack, - ["stationBack"] = stationEquation.StationBack, - ["stationAhead"] = stationEquation.StationAhead, - ["equationType"] = stationEquation.EquationType.ToString() - }; - equationCount++; - } - if (stationEquationsDict.Count > 0) - { - stationControlDict["Station Equations"] = stationEquationsDict; - } - - Dictionary referencePointDict = - new() - { - ["x"] = alignment.ReferencePoint.X, - ["y"] = alignment.ReferencePoint.Y, - ["station"] = alignment.ReferencePointStation - }; - stationControlDict["Reference Point"] = referencePointDict; - - if (stationControlDict.Count > 0) - { - generalPropertiesDict["Station Control"] = stationControlDict; - } - - // get design criteria props - Dictionary designCriteriaDict = new(); - - Dictionary designSpeedsDict = new(); - int speedsCount = 0; - foreach (CDB.DesignSpeed designSpeed in alignment.DesignSpeeds) - { - designSpeedsDict[speedsCount.ToString()] = new Dictionary() - { - ["number"] = designSpeed.SpeedNumber, - ["station"] = designSpeed.Station, - ["value"] = designSpeed.Value - }; - speedsCount++; - } - - if (designSpeedsDict.Count > 0) - { - designCriteriaDict["Design Speeds"] = designSpeedsDict; - } - - if (designCriteriaDict.Count > 0) - { - generalPropertiesDict["Design Critera"] = designCriteriaDict; - } - - // get offset alignment props. - if (alignment.IsOffsetAlignment) - { - try - { - // accessing "OffsetAlignmentInfo" on offset alignments will sometimes throw /shrug. - // this happens when an offset alignment is unlinked from the parent and the CreateMode is still set to "ManuallyCreation" - // https://help.autodesk.com/view/CIV3D/2024/ENU/?guid=2ecbe421-4c08-cbde-d078-56a9f03b93f9 - var offsetInfo = alignment.OffsetAlignmentInfo; - generalPropertiesDict["Offset Parameters"] = new Dictionary - { - ["side"] = offsetInfo.Side.ToString(), - ["parentAlignmentId"] = offsetInfo.ParentAlignmentId.GetSpeckleApplicationId(), - ["nominalOffset"] = offsetInfo.NominalOffset - }; - } - catch (InvalidOperationException) { } // do nothing - } - - return generalPropertiesDict; - } - - private Dictionary ExtractSurfaceProperties(CDB.Surface surface) - { - Dictionary generalPropertiesDict = new(); - - // get statistics props - Dictionary statisticsDict = new(); - statisticsDict["General"] = ExtractPropertiesGeneric(surface.GetGeneralProperties()); - switch (surface) - { - case CDB.TinSurface tinSurface: - statisticsDict["Terrain"] = ExtractPropertiesGeneric( - tinSurface.GetTerrainProperties() - ); - statisticsDict["TIN"] = ExtractPropertiesGeneric(tinSurface.GetTinProperties()); - - break; - case CDB.TinVolumeSurface tinVolumeSurface: - statisticsDict["TIN"] = ExtractPropertiesGeneric(tinVolumeSurface.GetTinProperties()); - statisticsDict["Volume"] = ExtractPropertiesGeneric( - tinVolumeSurface.GetVolumeProperties() - ); - break; - case CDB.GridSurface gridSurface: - statisticsDict["Terrain"] = ExtractPropertiesGeneric( - gridSurface.GetTerrainProperties() - ); - statisticsDict["Grid"] = ExtractPropertiesGeneric(gridSurface.GetGridProperties()); - break; - case CDB.GridVolumeSurface gridVolumeSurface: - statisticsDict["Grid"] = ExtractPropertiesGeneric( - gridVolumeSurface.GetGridProperties() - ); - statisticsDict["Volume"] = ExtractPropertiesGeneric( - gridVolumeSurface.GetVolumeProperties() - ); - break; - } - - // set all general props - generalPropertiesDict["Statistics"] = statisticsDict; - return generalPropertiesDict; - } - - // A generic method to create a dictionary from an object types's properties - private Dictionary ExtractPropertiesGeneric(T obj) - { - Dictionary propertiesDict = new(); - - var type = typeof(T); - PropertyInfo[] properties = type.GetProperties(); - foreach (PropertyInfo? property in properties) - { - var value = property.GetValue(obj); - if (value is ADB.ObjectId id) - { - value = id.GetSpeckleApplicationId(); - } - - propertiesDict[property.Name] = value; - } - - return propertiesDict; - } -} diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PartDataExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PartDataExtractor.cs index 338ca6650..a0f743e73 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PartDataExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PartDataExtractor.cs @@ -31,6 +31,12 @@ public PartDataExtractor() { } foreach (CDB.PartDataField field in partData.GetAllDataFields()) { var value = GetValue(field); + + if (value is null) + { + continue; // don't send null props + } + string fieldName = field.Context.ToString(); // we're using the context for the field name because it is more human-readable than the name prop var fieldDictionary = new Dictionary() diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PropertiesExtractor.cs index abdbd22a9..82ad1fbad 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PropertiesExtractor.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/PropertiesExtractor.cs @@ -5,19 +5,19 @@ namespace Speckle.Converters.Civil3dShared.ToSpeckle; /// public class PropertiesExtractor { - private readonly GeneralPropertiesExtractor _generalPropertiesExtractor; + private readonly ClassPropertiesExtractor _classPropertiesExtractor; private readonly PartDataExtractor _partDataExtractor; private readonly PropertySetExtractor _propertySetExtractor; private readonly ExtensionDictionaryExtractor _extensionDictionaryExtractor; public PropertiesExtractor( - GeneralPropertiesExtractor generalPropertiesExtractor, + ClassPropertiesExtractor classPropertiesExtractor, PartDataExtractor partDataExtractor, PropertySetExtractor propertySetExtractor, ExtensionDictionaryExtractor extensionDictionaryExtractor ) { - _generalPropertiesExtractor = generalPropertiesExtractor; + _classPropertiesExtractor = classPropertiesExtractor; _partDataExtractor = partDataExtractor; _propertySetExtractor = propertySetExtractor; _extensionDictionaryExtractor = extensionDictionaryExtractor; @@ -25,13 +25,10 @@ ExtensionDictionaryExtractor extensionDictionaryExtractor public Dictionary GetProperties(CDB.Entity entity) { - Dictionary properties = new(); + // first get all class properties, which will be at the root level of props dictionary + Dictionary properties = _classPropertiesExtractor.GetClassProperties(entity); - AddDictionaryToPropertyDictionary( - _generalPropertiesExtractor.GetGeneralProperties(entity), - "General Properties", - properties - ); + // add part data, property sets, and extension dictionaries to the properties dict AddDictionaryToPropertyDictionary(_partDataExtractor.GetPartData(entity), "Part Data", properties); AddDictionaryToPropertyDictionary(_propertySetExtractor.GetPropertySets(entity), "Property Sets", properties); AddDictionaryToPropertyDictionary( diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentitySpiralToSpeckleRawConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentitySpiralToSpeckleRawConverter.cs index 939548081..82ebbfb11 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentitySpiralToSpeckleRawConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Raw/AlignmentSubentitySpiralToSpeckleRawConverter.cs @@ -37,11 +37,10 @@ public SOG.Polyline Convert((CDB.AlignmentSubEntitySpiral, CDB.Alignment) target { double x = 0; double y = 0; - double z = 0; - alignment.PointLocation(spiral.StartStation + i * spiralSegmentLength, 0, 0.001, ref x, ref y, ref z); + alignment.PointLocation(spiral.StartStation + i * spiralSegmentLength, 0, ref x, ref y); polylineValue.Add(x); polylineValue.Add(y); - polylineValue.Add(z); + polylineValue.Add(0); } polylineValue.Add(spiral.EndPoint.X); polylineValue.Add(spiral.EndPoint.Y); diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CivilEntityToSpeckleTopLevelConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CivilEntityToSpeckleTopLevelConverter.cs index a98c9a0cd..14eac34a2 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CivilEntityToSpeckleTopLevelConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CivilEntityToSpeckleTopLevelConverter.cs @@ -78,16 +78,6 @@ public Civil3dObject Convert(CDB.Entity target) applicationId = target.GetSpeckleApplicationId() }; - // add any additional class properties - Dictionary? classProperties = _classPropertiesExtractor.GetClassProperties(target); - if (classProperties is not null) - { - foreach (string key in classProperties.Keys) - { - civilObject[$"{key}"] = classProperties[key]; - } - } - return civilObject; } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CogoPointToSpeckleTopLevelConverter.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CogoPointToSpeckleTopLevelConverter.cs index b6687737d..223e951dd 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CogoPointToSpeckleTopLevelConverter.cs +++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/TopLevel/CogoPointToSpeckleTopLevelConverter.cs @@ -41,6 +41,9 @@ public Civil3dObject Convert(CDB.CogoPoint target) // extract display value as point SOG.Point displayPoint = _pointConverter.Convert(target.Location); + // get additional class properties + Dictionary props = new() { ["number"] = target.PointNumber, ["northing"] = target.Northing }; + Civil3dObject civilObject = new() { @@ -49,15 +52,11 @@ public Civil3dObject Convert(CDB.CogoPoint target) baseCurves = null, elements = new(), displayValue = new() { displayPoint }, - properties = new(), + properties = props, units = _settingsStore.Current.SpeckleUnits, applicationId = target.Id.GetSpeckleApplicationId() }; - // add additional class properties - civilObject["pointNumber"] = target.PointNumber; - civilObject["northing"] = target.Northing; - return civilObject; } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json index b49e3232e..0a5020478 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -313,40 +313,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json index 461159d1d..f1cdc4f89 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -313,40 +313,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json index c0ac0f334..8f2072f85 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -313,40 +313,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json index 6541314f5..67face87e 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -313,40 +313,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json index f72e51b36..d53524fdf 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -313,40 +313,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json index 4ee7c9fc1..26ccd8b48 100644 --- a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json +++ b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -280,7 +280,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.DependencyInjection": { @@ -313,40 +313,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json index 266fe368a..53532a67d 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.testing": { @@ -371,39 +371,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index e353e1670..f7a26fb84 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json index ed9c77045..84f6a4644 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.testing": { @@ -371,39 +371,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index b3292a8c1..166599a18 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json index 9548bfd02..55f7030ab 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.testing": { @@ -371,39 +371,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index 99a4bffc8..ebbcd03c2 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 802d4f2a9..ad9938034 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json @@ -214,7 +214,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -238,39 +238,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs index b3a3a595d..9260fafa6 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/DisplayValueExtractor.cs @@ -16,6 +16,7 @@ private readonly ITypedConverter< List > _meshByMaterialConverter; private readonly ITypedConverter _curveConverter; + private readonly ITypedConverter, SOG.Polycurve> _boundarySegmentsConverter; private readonly ILogger _logger; private readonly IConverterSettingsStore _converterSettings; @@ -25,12 +26,14 @@ public DisplayValueExtractor( List > meshByMaterialConverter, ITypedConverter curveConverter, + ITypedConverter, SOG.Polycurve> boundarySegmentsConverter, ILogger logger, IConverterSettingsStore converterSettings ) { _meshByMaterialConverter = meshByMaterialConverter; _curveConverter = curveConverter; + _boundarySegmentsConverter = boundarySegmentsConverter; _logger = logger; _converterSettings = converterSettings; } @@ -57,7 +60,20 @@ public List GetDisplayValue(DB.Element element) // grids have curve display values case DB.Grid grid: - return GetCurveDisplayValue(grid.Curve); + return new() { (Base)_curveConverter.Convert(grid.Curve) }; + + // areas will use boundary segments for display + case DB.Area area: + List areaDisplay = new(); + using (var options = new DB.SpatialElementBoundaryOptions()) + { + var boundarySegments = area.GetBoundarySegments(options); + foreach (var boundarySegment in boundarySegments) + { + areaDisplay.Add(_boundarySegmentsConverter.Convert(boundarySegment)); + } + } + return areaDisplay; // POC: footprint roofs can have curtain walls in them. Need to check if they can also have non-curtain wall parts, bc currently not skipping anything. // case DB.FootPrintRoof footPrintRoof: @@ -67,11 +83,6 @@ public List GetDisplayValue(DB.Element element) } } - private List GetCurveDisplayValue(DB.Curve curve) - { - return new() { (Base)_curveConverter.Convert(curve) }; - } - private List GetMeshDisplayValue(DB.Element element, DB.Options? options = null) { var (solids, meshes) = GetSolidsAndMeshesFromElement(element, options); diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json index 5c3a43ead..4bcbe902f 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json @@ -340,7 +340,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.testing": { @@ -371,39 +371,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index 9baa9d439..c918b15e7 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index 00d8b90ea..7148d8a4b 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json @@ -258,7 +258,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "Microsoft.Extensions.Logging": { @@ -282,40 +282,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json index c4083cbea..c5dae2c58 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json @@ -302,7 +302,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "LibTessDotNet": { @@ -337,35 +337,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" }, "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 713722d1b..02222697e 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json @@ -343,7 +343,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "LibTessDotNet": { @@ -378,35 +378,35 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" }, "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 0f41467e3..e08052237 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -319,9 +319,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -329,8 +329,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -373,39 +373,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj b/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj index fe8a9647e..362d1a39a 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj +++ b/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj @@ -2,6 +2,9 @@ net48;net6.0-windows + + + x64 true true Debug;Release;Local diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json index e5c7e2c14..969963d7e 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json @@ -259,9 +259,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -269,8 +269,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -306,40 +306,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, "net6.0-windows7.0": { @@ -561,9 +561,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.dui": { @@ -571,8 +571,8 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", "Speckle.Connectors.Common": "[1.0.0, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -608,40 +608,40 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs b/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs index d5923dc30..c3c621a81 100644 --- a/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs +++ b/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs @@ -31,6 +31,7 @@ CancellationToken cancellationToken { var progress = new NonUIThreadProgress(args => { + Console.WriteLine($"Progress: {args.Status} - {args.Progress}"); SetModelProgress( bridge, modelCardId, diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index 7b2212461..1171c7a79 100644 --- a/DUI3/Speckle.Connectors.DUI/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json @@ -50,26 +50,26 @@ }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" }, "GraphQL.Client": { "type": "Transitive", @@ -309,9 +309,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -341,16 +341,16 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index 17b20ab63..7b1cd1381 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -46,9 +46,9 @@ - - - + + + diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs index fc4b97841..953f0cce7 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs @@ -42,7 +42,7 @@ var cache = $"C:\\Users\\adam\\Git\\temp\\{Guid.NewGuid()}.db"; using var sqlite = new SqLiteJsonCacheManager($"Data Source={cache};", 2); -using var process2 = new SerializeProcess( +await using var process2 = new SerializeProcess( new Progress(true), sqlite, new DummyServerObjectManager(), diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json index db24bd368..342b5e8b6 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json @@ -211,8 +211,8 @@ "Ara3D.Logging": "[1.4.5, )", "Ara3D.Utils": "[1.4.5, )", "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )" } }, "Ara3D.Buffers": { @@ -269,39 +269,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Program.cs b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Program.cs new file mode 100644 index 000000000..74cc8541d --- /dev/null +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Program.cs @@ -0,0 +1,33 @@ +using Ara3D.Utils; +using Microsoft.Extensions.DependencyInjection; +using Speckle.Importers.Ifc; +using Speckle.Importers.Ifc.Ara3D.IfcParser; +using Speckle.Importers.Ifc.Converters; +using Speckle.Importers.Ifc.Tester2; +using Speckle.Importers.Ifc.Types; +using Speckle.Objects.Geometry; +using Speckle.Sdk.Host; +using Speckle.Sdk.Models; + +// Settings +var filePath = new FilePath(@"C:\Users\Jedd\Desktop\231110AC11-Institute-Var-2-IFC.ifc"); +const string PROJECT_ID = "f3a42bdf24"; + +// Setup +TypeLoader.Initialize(typeof(Base).Assembly, typeof(Point).Assembly); + +var serviceCollection = new ServiceCollection(); +serviceCollection.AddIFCImporter(); +serviceCollection.AddSingleton(); +var serviceProvider = serviceCollection.BuildServiceProvider(); + +// Convert IFC to Speckle Objects +var ifcFactory = serviceProvider.GetRequiredService(); +var model = ifcFactory.Open(filePath); +var graph = IfcGraph.Load(new FilePath(filePath)); +var converter = serviceProvider.GetRequiredService(); +var b = converter.Convert(model, graph); + +//Send Speckle Objects to server +var sender = serviceProvider.GetRequiredService(); +await sender.Send(b, PROJECT_ID); diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Sender.cs b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Sender.cs new file mode 100644 index 000000000..62f83d600 --- /dev/null +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Sender.cs @@ -0,0 +1,48 @@ +using Speckle.Sdk.Api; +using Speckle.Sdk.Api.GraphQL.Inputs; +using Speckle.Sdk.Api.GraphQL.Models; +using Speckle.Sdk.Common; +using Speckle.Sdk.Credentials; +using Speckle.Sdk.Models; +using Version = Speckle.Sdk.Api.GraphQL.Models.Version; + +namespace Speckle.Importers.Ifc.Tester2; + +public class Sender(IClientFactory clientFactory, IAccountManager accountManager, IOperations operations) +{ + public const string MODEL_NAME = "IFC Import"; + + public async Task Send(Base rootObject, string projectId, CancellationToken cancellationToken = default) + { + var account = accountManager.GetDefaultAccount().NotNull(); + using var client = clientFactory.Create(account); + + var res = await operations.Send2( + new(account.serverInfo.url), + projectId, + account.token, + rootObject, + null, + cancellationToken + ); + + var t = await GetOrCreateIfcModel(client, projectId); + + CreateVersionInput input = new(res.RootId, t.id, projectId); + return await client.Version.Create(input, cancellationToken); + } + + public async Task GetOrCreateIfcModel(Client client, string projectId) + { + ProjectModelsFilter filter = new(null, null, null, null, MODEL_NAME, null); + + var existing = await client.Model.GetModels(projectId, 1, modelsFilter: filter); + if (existing.items.Count != 0) + { + return existing.items[0]; + } + + CreateModelInput input = new(MODEL_NAME, null, projectId); + return await client.Model.Create(input); + } +} diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Speckle.Importers.Ifc.Tester2.csproj b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Speckle.Importers.Ifc.Tester2.csproj new file mode 100644 index 000000000..1cf67660b --- /dev/null +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/Speckle.Importers.Ifc.Tester2.csproj @@ -0,0 +1,11 @@ + + + + Exe + net8.0 + + + + + + diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json new file mode 100644 index 000000000..342b5e8b6 --- /dev/null +++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester2/packages.lock.json @@ -0,0 +1,308 @@ +{ + "version": 2, + "dependencies": { + "net8.0": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.6, )", + "resolved": "0.9.6", + "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w==" + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0", + "GraphQL.Client.Abstractions.Websocket": "6.0.0", + "System.Reactive": "5.0.0" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "2.2.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Primitives": "2.2.0", + "System.ComponentModel.Annotations": "4.5.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==", + "dependencies": { + "System.Memory": "4.5.1", + "System.Runtime.CompilerServices.Unsafe": "4.5.1" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.ComponentModel.Annotations": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg==" + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" + }, + "speckle.importers.ifc": { + "type": "Project", + "dependencies": { + "Ara3D.Buffers": "[1.4.5, )", + "Ara3D.Logging": "[1.4.5, )", + "Ara3D.Utils": "[1.4.5, )", + "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )" + } + }, + "Ara3D.Buffers": { + "type": "CentralTransitive", + "requested": "[1.4.5, )", + "resolved": "1.4.5", + "contentHash": "SKcQqgtXukyHTlTKFPCaUW4spSkue3XfBU/GmoA7KhH6H995v6TbJxtqjs0EfSgnXEkajL8U7X1NqktScRozXw==", + "dependencies": { + "System.Memory": "4.5.5" + } + }, + "Ara3D.Logging": { + "type": "CentralTransitive", + "requested": "[1.4.5, )", + "resolved": "1.4.5", + "contentHash": "7HPCe5Dq21JoOBF1iclk9H37XFCoB2ZzCPqTMNgdg4PWFvuRsofNbiuMdiE/HKgMHCVhy1C5opB2KwDKcO7Axw==", + "dependencies": { + "Ara3D.Utils": "1.4.5" + } + }, + "Ara3D.Utils": { + "type": "CentralTransitive", + "requested": "[1.4.5, )", + "resolved": "1.4.5", + "contentHash": "yba/E7PpbWP0+RDp+KbKw/vBXnXBSIheScdpVKuDnr8ytRg8pZ2Jd6nwKES+G0FcVEB9PeOVmEW7SGrFvAwRCg==" + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" + } + }, + "Microsoft.Extensions.Logging": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "2.2.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Options": "2.2.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "CentralTransitive", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==" + }, + "Speckle.DoubleNumerics": { + "type": "CentralTransitive", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" + }, + "Speckle.Objects": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", + "dependencies": { + "Speckle.Sdk": "3.1.0-dev.270" + } + }, + "Speckle.Sdk": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", + "dependencies": { + "GraphQL.Client": "6.0.0", + "Microsoft.CSharp": "4.7.0", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", + "Speckle.Newtonsoft.Json": "13.0.2", + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" + } + }, + "Speckle.Sdk.Dependencies": { + "type": "CentralTransitive", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" + } + } + } +} \ No newline at end of file diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/GeometryConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/GeometryConverter.cs index c59ad90b9..e4215e3e1 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Converters/GeometryConverter.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Converters/GeometryConverter.cs @@ -1,20 +1,20 @@ using Speckle.Importers.Ifc.Types; using Speckle.InterfaceGenerator; -using Speckle.Sdk.Models.Collections; +using Speckle.Sdk.Models; namespace Speckle.Importers.Ifc.Converters; [GenerateAutoInterface] public class GeometryConverter(IMeshConverter meshConverter) : IGeometryConverter { - public Collection Convert(IfcGeometry geometry) + public IList Convert(IfcGeometry geometry) { - var c = new Collection(); + List ret = new(); foreach (var mesh in geometry.GetMeshes()) { - c.elements.Add(meshConverter.Convert(mesh)); + ret.Add(meshConverter.Convert(mesh)); } - return c; + return ret; } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/GraphConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/GraphConverter.cs index 3c6c3f88d..fe5b4d910 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Converters/GraphConverter.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Converters/GraphConverter.cs @@ -1,4 +1,5 @@ using Speckle.Importers.Ifc.Ara3D.IfcParser; +using Speckle.Importers.Ifc.Services; using Speckle.Importers.Ifc.Types; using Speckle.InterfaceGenerator; using Speckle.Sdk.Models; @@ -7,13 +8,18 @@ namespace Speckle.Importers.Ifc.Converters; [GenerateAutoInterface] -public class GraphConverter(INodeConverter nodeConverter) : IGraphConverter +public class GraphConverter(INodeConverter nodeConverter, IRenderMaterialProxyManager proxyManager) : IGraphConverter { public Base Convert(IfcModel model, IfcGraph graph) { var collection = new Collection(); + var children = graph.GetSources().Select(x => nodeConverter.Convert(model, x)).ToList(); collection.elements = children; + + //Grabing materials from ProxyManager + collection["renderMaterialProxies"] = proxyManager.RenderMaterialProxies.Values.ToList(); + return collection; } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/MeshConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/MeshConverter.cs index 961bc3297..79a5f6bc6 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Converters/MeshConverter.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Converters/MeshConverter.cs @@ -1,31 +1,35 @@ +using System.Drawing; +using Speckle.Importers.Ifc.Services; using Speckle.Importers.Ifc.Types; using Speckle.InterfaceGenerator; using Speckle.Objects.Geometry; +using Speckle.Objects.Other; namespace Speckle.Importers.Ifc.Converters; [GenerateAutoInterface] -public class MeshConverter : IMeshConverter +public class MeshConverter(IRenderMaterialProxyManager renderMaterialManager) : IMeshConverter { - public unsafe Mesh Convert(IfcMesh mesh) + public Mesh Convert(IfcMesh mesh) { - var m = (double*)mesh.Transform; - var vp = mesh.GetVertices(); - var ip = mesh.GetIndexes(); + var m = mesh.Transform; + var vp = mesh.Vertices; + var ip = mesh.Indices; - var vertices = new List(mesh.VertexCount * 3); - for (var i = 0; i < mesh.VertexCount; i++) + var vertices = new List(vp.Length * 3); + foreach (var vertex in vp) { - var x = vp[i].PX; - var y = vp[i].PY; - var z = vp[i].PZ; + var x = vertex.PX; + var y = vertex.PY; + var z = vertex.PZ; + vertices.Add(m[0] * x + m[4] * y + m[8] * z + m[12]); vertices.Add(-(m[2] * x + m[6] * y + m[10] * z + m[14])); vertices.Add(m[1] * x + m[5] * y + m[9] * z + m[13]); } - var faces = new List(mesh.IndexCount * 4); - for (var i = 0; i < mesh.IndexCount; i += 3) + var faces = new List(ip.Length * 4); + for (var i = 0; i < ip.Length; i += 3) { var a = ip[i]; var b = ip[i + 1]; @@ -36,14 +40,35 @@ public unsafe Mesh Convert(IfcMesh mesh) faces.Add(c); } - var color = mesh.GetColor(); - List colors = [(int)(color->A * 255), (int)(color->R * 255), (int)(color->G * 255), (int)(color->B * 255),]; - return new Mesh() + RenderMaterial renderMaterial = ConvertRenderMaterial(mesh); + Mesh converted = + new() + { + applicationId = Guid.NewGuid().ToString(), + vertices = vertices, + faces = faces, + units = "m", + }; + + renderMaterialManager.AddMeshMapping(renderMaterial, converted); + + return converted; + } + + private static RenderMaterial ConvertRenderMaterial(IfcMesh mesh) + { + var color = mesh.Color; + var diffuse = Color.FromArgb(1, To8BitValue(color.R), To8BitValue(color.G), To8BitValue(color.B)); + + var name = $"IFC_MATERIAL:{(color.A, color.R, color.G, color.B).GetHashCode()}"; + + return new RenderMaterial() { - colors = colors, - vertices = vertices, - faces = faces, - units = "m", + applicationId = name, + name = name, + diffuse = diffuse.ToArgb(), + opacity = color.A }; + static int To8BitValue(double value) => (int)(value * 255); } } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/NodeConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/NodeConverter.cs index f9b246d27..b7307a9be 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Converters/NodeConverter.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Converters/NodeConverter.cs @@ -37,8 +37,8 @@ public Base Convert(IfcModel model, IfcNode node) if (geo != null) { var c = geometryConverter.Convert(geo); - if (c.elements.Count > 0) - b["@displayValue"] = c.elements; + if (c.Count > 0) + b["@displayValue"] = c; } // Create the children diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Import.cs b/Importers/Ifc/Speckle.Importers.Ifc/Import.cs index 1f5e6a5ce..6a96a7923 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Import.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Import.cs @@ -39,10 +39,15 @@ public static ServiceProvider GetServiceProvider() { TypeLoader.Initialize(typeof(Base).Assembly, typeof(Point).Assembly); var serviceCollection = new ServiceCollection(); + serviceCollection.AddIFCImporter(); + return serviceCollection.BuildServiceProvider(); + } + + public static void AddIFCImporter(this ServiceCollection serviceCollection) + { serviceCollection.AddSpeckleSdk(HostApplications.Other, HostAppVersion.v2024, "IFC-Importer"); serviceCollection.AddSpeckleWebIfc(); serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly()); - return serviceCollection.BuildServiceProvider(); } public static async Task Ifc( diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Native/WebIfc.cs b/Importers/Ifc/Speckle.Importers.Ifc/Native/WebIfc.cs index 52f182185..0775d7605 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Native/WebIfc.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Native/WebIfc.cs @@ -4,12 +4,11 @@ namespace Speckle.Importers.Ifc.Native; [SuppressMessage("Globalization", "CA2101:Specify marshaling for P/Invoke string arguments")] -[SuppressMessage("Interoperability", "CA1401:P/Invokes should not be visible")] [SuppressMessage("Security", "CA5393:Do not use unsafe DllImportSearchPath value")] -public static class WebIfc +internal static class WebIfc { #if WINDOWS - private const string DllName = "web-ifc.dll"; + private const string DllName = "Native/web-ifc.dll"; private const CharSet Set = CharSet.Ansi; #else private const string DllName = "libweb-ifc.so"; diff --git a/Importers/Ifc/Speckle.Importers.Ifc/ServiceRegistration.cs b/Importers/Ifc/Speckle.Importers.Ifc/ServiceRegistration.cs index 129d398d6..9b8c9b4a0 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/ServiceRegistration.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/ServiceRegistration.cs @@ -1,6 +1,7 @@ using System.Reflection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using Speckle.Importers.Ifc.Services; using Speckle.Importers.Ifc.Types; using Speckle.Sdk; @@ -11,6 +12,7 @@ public static class ServiceRegistration public static void AddSpeckleWebIfc(this IServiceCollection services) { services.AddSingleton(); + services.AddSingleton(); } public static IServiceCollection AddMatchingInterfacesAsTransient( diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Services/RenderMaterialProxyManager.cs b/Importers/Ifc/Speckle.Importers.Ifc/Services/RenderMaterialProxyManager.cs new file mode 100644 index 000000000..643401f43 --- /dev/null +++ b/Importers/Ifc/Speckle.Importers.Ifc/Services/RenderMaterialProxyManager.cs @@ -0,0 +1,27 @@ +using Speckle.InterfaceGenerator; +using Speckle.Objects.Geometry; +using Speckle.Objects.Other; +using Speckle.Sdk.Common; + +namespace Speckle.Importers.Ifc.Services; + +[GenerateAutoInterface] +public sealed class RenderMaterialProxyManager : IRenderMaterialProxyManager +{ + public Dictionary RenderMaterialProxies { get; } = new(); + + public void AddMeshMapping(RenderMaterial renderMaterial, Mesh mesh) + { + string materialId = renderMaterial.applicationId.NotNull(); + string meshId = mesh.applicationId.NotNull(); + + if (RenderMaterialProxies.TryGetValue(materialId, out RenderMaterialProxy? proxy)) + { + proxy.objects.Add(meshId); + } + else + { + RenderMaterialProxies.Add(materialId, new() { objects = [meshId], value = renderMaterial, }); + } + } +} diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcColor.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcColor.cs index 508a57d48..9a99790b2 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcColor.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcColor.cs @@ -3,9 +3,9 @@ namespace Speckle.Importers.Ifc.Types; [StructLayout(LayoutKind.Sequential, Pack = 1)] -public struct IfcColor +public readonly struct IfcColor { - public double R, + public readonly double R, G, B, A; diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcFactory.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcFactory.cs index 567453924..3689ff4ed 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcFactory.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcFactory.cs @@ -3,7 +3,7 @@ namespace Speckle.Importers.Ifc.Types; [GenerateAutoInterface] -public class IfcFactory : IIfcFactory +public sealed class IfcFactory : IIfcFactory { //probably never disposing this private static readonly IntPtr _ptr = Importers.Ifc.Native.WebIfc.InitializeApi(); diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcGeometry.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcGeometry.cs index 099d94618..8cc5b48dd 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcGeometry.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcGeometry.cs @@ -1,6 +1,6 @@ namespace Speckle.Importers.Ifc.Types; -public class IfcGeometry(IntPtr geometry) +public sealed class IfcGeometry(IntPtr geometry) { public IfcMesh GetMesh(int i) => new(Importers.Ifc.Native.WebIfc.GetMesh(geometry, i)); diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcLine.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcLine.cs index a3c2306f1..12ddb010c 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcLine.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcLine.cs @@ -1,6 +1,6 @@ namespace Speckle.Importers.Ifc.Types; -public class IfcLine(IntPtr line) +public sealed class IfcLine(IntPtr line) { public uint Id => Importers.Ifc.Native.WebIfc.GetLineId(line); public IfcSchemaType Type => (IfcSchemaType)Importers.Ifc.Native.WebIfc.GetLineType(line); diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcMesh.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcMesh.cs index e0b34e73c..00543cc0f 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcMesh.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcMesh.cs @@ -1,15 +1,40 @@ +using System.Runtime.InteropServices; +using Speckle.Importers.Ifc.Native; + namespace Speckle.Importers.Ifc.Types; -public class IfcMesh(IntPtr mesh) +public sealed class IfcMesh(IntPtr mesh) { - public int VertexCount => Importers.Ifc.Native.WebIfc.GetNumVertices(mesh); + public int VerticesCount => WebIfc.GetNumVertices(mesh); + + public unsafe ReadOnlySpan Vertices + { + get + { + IfcVertex* ptr = (IfcVertex*)WebIfc.GetVertices(mesh); + return new ReadOnlySpan(ptr, VerticesCount); + } + } - public unsafe IfcVertex* GetVertices() => (IfcVertex*)Importers.Ifc.Native.WebIfc.GetVertices(mesh); + public unsafe ReadOnlySpan Transform + { + get + { + double* ptr = (double*)WebIfc.GetTransform(mesh); + return new ReadOnlySpan(ptr, 16); + } + } - public IntPtr Transform => Importers.Ifc.Native.WebIfc.GetTransform(mesh); - public int IndexCount => Importers.Ifc.Native.WebIfc.GetNumIndices(mesh); + public int IndicesCount => WebIfc.GetNumIndices(mesh); - public unsafe int* GetIndexes() => (int*)Importers.Ifc.Native.WebIfc.GetIndices(mesh); + public unsafe ReadOnlySpan Indices + { + get + { + var ptr = (int*)WebIfc.GetIndices(mesh); + return new ReadOnlySpan(ptr, IndicesCount); + } + } - public unsafe IfcColor* GetColor() => (IfcColor*)Importers.Ifc.Native.WebIfc.GetColor(mesh); + public IfcColor Color => Marshal.PtrToStructure(WebIfc.GetColor(mesh)); } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcModel.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcModel.cs index 6da106e9b..06184a04d 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcModel.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcModel.cs @@ -1,6 +1,6 @@ namespace Speckle.Importers.Ifc.Types; -public class IfcModel(IntPtr model) +public sealed class IfcModel(IntPtr model) { public int GetNumGeometries() => Importers.Ifc.Native.WebIfc.GetNumGeometries(model); diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcVertex.cs b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcVertex.cs index c4b28722e..b227f1f52 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcVertex.cs +++ b/Importers/Ifc/Speckle.Importers.Ifc/Types/IfcVertex.cs @@ -3,12 +3,12 @@ namespace Speckle.Importers.Ifc.Types; [StructLayout(LayoutKind.Sequential, Pack = 1)] -public struct IfcVertex +public readonly struct IfcVertex { - public double PX, + public readonly double PX, PY, PZ; - public double NX, + public readonly double NX, NY, NZ; } diff --git a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json index 751edc2fe..e7aa76cfa 100644 --- a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json +++ b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json @@ -68,27 +68,27 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "GraphQL.Client": { @@ -283,14 +283,14 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Local.sln b/Local.sln index ba46e6228..a1f667bf8 100644 --- a/Local.sln +++ b/Local.sln @@ -269,6 +269,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc", "Im EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester", "Importers\Ifc\Speckle.Importers.Ifc.Tester\Speckle.Importers.Ifc.Tester.csproj", "{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester2", "Importers\Ifc\Speckle.Importers.Ifc.Tester2\Speckle.Importers.Ifc.Tester2.csproj", "{867DC1A5-A886-4F49-8665-793EB9832F9E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Connectors.Common.Tests", "Sdk\Speckle.Connectors.Common.Tests\Speckle.Connectors.Common.Tests.csproj", "{C19C3EDF-D95D-4D22-9949-D99F91447AE7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Common.MeshTriangulation", "Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj", "{20BB9687-2C92-44E9-9E2F-9D2F45641354}" @@ -694,6 +695,12 @@ Global {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Local|Any CPU.Build.0 = Local|Any CPU {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Release|Any CPU.Build.0 = Release|Any CPU + {867DC1A5-A886-4F49-8665-793EB9832F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {867DC1A5-A886-4F49-8665-793EB9832F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {867DC1A5-A886-4F49-8665-793EB9832F9E}.Local|Any CPU.ActiveCfg = Debug|Any CPU + {867DC1A5-A886-4F49-8665-793EB9832F9E}.Local|Any CPU.Build.0 = Debug|Any CPU + {867DC1A5-A886-4F49-8665-793EB9832F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {867DC1A5-A886-4F49-8665-793EB9832F9E}.Release|Any CPU.Build.0 = Release|Any CPU {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU {C19C3EDF-D95D-4D22-9949-D99F91447AE7}.Local|Any CPU.ActiveCfg = Local|Any CPU @@ -829,6 +836,7 @@ Global {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} = {24750B06-C90D-43B1-B2E4-088D531D6748} {9FD99F9B-8D50-4C7A-B3A6-22E28AB5F26B} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} {B3B126CA-A419-48D1-B117-6DEE1DE1AFAD} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} + {867DC1A5-A886-4F49-8665-793EB9832F9E} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077} {C19C3EDF-D95D-4D22-9949-D99F91447AE7} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {20BB9687-2C92-44E9-9E2F-9D2F45641354} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} EndGlobalSection diff --git a/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json index 6076c4fe8..d3017bbec 100644 --- a/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common.Tests/packages.lock.json @@ -328,9 +328,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -357,39 +357,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json index a82fae35a..a8b9e7f11 100644 --- a/Sdk/Speckle.Connectors.Common/packages.lock.json +++ b/Sdk/Speckle.Connectors.Common/packages.lock.json @@ -53,35 +53,35 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" }, "GraphQL.Client": { "type": "Transitive", @@ -340,8 +340,8 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" } }, "net8.0": { @@ -387,34 +387,34 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" }, "GraphQL.Client": { "type": "Transitive", @@ -611,8 +611,8 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" } } } diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json index 613ee5cd3..5d47a3f78 100644 --- a/Sdk/Speckle.Connectors.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json @@ -319,9 +319,9 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )", - "Speckle.Sdk": "[3.1.0-dev.255, )", - "Speckle.Sdk.Dependencies": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )", + "Speckle.Sdk": "[3.1.0-dev.270, )", + "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )" } }, "speckle.connectors.logging": { @@ -364,39 +364,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json index dc06afc1f..3baa3e3ce 100644 --- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json @@ -327,7 +327,7 @@ "type": "Project", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[3.1.0-dev.255, )" + "Speckle.Objects": "[3.1.0-dev.270, )" } }, "speckle.testing": { @@ -358,39 +358,39 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index 50b906b68..ba1899607 100644 --- a/Sdk/Speckle.Converters.Common/packages.lock.json +++ b/Sdk/Speckle.Converters.Common/packages.lock.json @@ -50,11 +50,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "GraphQL.Client": { @@ -305,31 +305,31 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]", + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } }, "net8.0": { @@ -372,11 +372,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "0S9YVdu5nx7SYS0y5Gq1nwCbxfYB2UxsUUCskaGmzRAm+QzHGqCLYHgadz7Sw5mNAF3bOTLVrOYMzyLAWFWxJA==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.255" + "Speckle.Sdk": "3.1.0-dev.270" } }, "GraphQL.Client": { @@ -565,30 +565,30 @@ "Speckle.DoubleNumerics": { "type": "CentralTransitive", "requested": "[4.1.0, )", - "resolved": "4.0.1", - "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w==" + "resolved": "4.1.0", + "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A==" }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "TsFpIv8ipvOD/r0se1XmcNPo7t5dWVadwV32Z6vUqoW3s94VIE54/ZTHNkRCEYHFhfOyTcFfbLegiei+0D13bQ==", + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "[7.0.5]", - "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]", - "Microsoft.Extensions.Logging": "[2.2.0]", - "Speckle.DoubleNumerics": "4.0.1", + "Microsoft.Data.Sqlite": "7.0.5", + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging": "2.2.0", + "Speckle.DoubleNumerics": "4.1.0", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.255" + "Speckle.Sdk.Dependencies": "3.1.0-dev.270" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.255, )", - "resolved": "3.1.0-dev.255", - "contentHash": "koFeWc/EB2XrMH2aKl2Hqwrqk/fAGYEVKgxFlFpnEAsbZf7Kk57gBQ3ViV5l6X9vqMHGWFc4dWUp24diq/XPtQ==" + "requested": "[3.1.0-dev.270, )", + "resolved": "3.1.0-dev.270", + "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A==" } } } diff --git a/Speckle.Connectors.sln b/Speckle.Connectors.sln index cc65052a7..17526d835 100644 --- a/Speckle.Connectors.sln +++ b/Speckle.Connectors.sln @@ -277,6 +277,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Importers", "Importers", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester", "Importers\Ifc\Speckle.Importers.Ifc.Tester\Speckle.Importers.Ifc.Tester.csproj", "{FCD6CB79-6B41-4448-99E1-787408AD24B0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester2", "Importers\Ifc\Speckle.Importers.Ifc.Tester2\Speckle.Importers.Ifc.Tester2.csproj", "{17FB6920-DF63-4D94-86A4-F1619D501C6D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Connectors.Common.Tests", "Sdk\Speckle.Connectors.Common.Tests\Speckle.Connectors.Common.Tests.csproj", "{F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Common.MeshTriangulation", "Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj", "{B740A025-1035-4A75-865B-7825857D610C}" @@ -684,6 +685,12 @@ Global {FCD6CB79-6B41-4448-99E1-787408AD24B0}.Local|Any CPU.Build.0 = Debug|Any CPU {FCD6CB79-6B41-4448-99E1-787408AD24B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCD6CB79-6B41-4448-99E1-787408AD24B0}.Release|Any CPU.Build.0 = Release|Any CPU + {17FB6920-DF63-4D94-86A4-F1619D501C6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17FB6920-DF63-4D94-86A4-F1619D501C6D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17FB6920-DF63-4D94-86A4-F1619D501C6D}.Local|Any CPU.ActiveCfg = Debug|Any CPU + {17FB6920-DF63-4D94-86A4-F1619D501C6D}.Local|Any CPU.Build.0 = Debug|Any CPU + {17FB6920-DF63-4D94-86A4-F1619D501C6D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17FB6920-DF63-4D94-86A4-F1619D501C6D}.Release|Any CPU.Build.0 = Release|Any CPU {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6}.Local|Any CPU.ActiveCfg = Debug|Any CPU @@ -819,6 +826,7 @@ Global {E6B7A640-F85C-41C9-8226-B5310A98822D} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF} {F93052A6-6937-443F-8F1F-4A967A8A2BEF} = {336F0341-5C39-40F7-9377-122FED4E4549} {FCD6CB79-6B41-4448-99E1-787408AD24B0} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF} + {17FB6920-DF63-4D94-86A4-F1619D501C6D} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF} {F86DFA8A-E2E0-4EBE-9BAF-72AE2698EDC6} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {B740A025-1035-4A75-865B-7825857D610C} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} EndGlobalSection diff --git a/Speckle.Connectors.sln.DotSettings b/Speckle.Connectors.sln.DotSettings index 3af02c0f3..71bf7f852 100644 --- a/Speckle.Connectors.sln.DotSettings +++ b/Speckle.Connectors.sln.DotSettings @@ -1,4 +1,5 @@  DUI + IFC UI URI \ No newline at end of file