diff --git a/.editorconfig b/.editorconfig index 36ae31f9a..a133ead38 100644 --- a/.editorconfig +++ b/.editorconfig @@ -239,6 +239,9 @@ dotnet_diagnostic.ide0290.severity = suggestion # primary constructors: subjecti dotnet_diagnostic.ide0290.severity = suggestion # Use primary constructor: Subjective dotnet_diagnostic.ide0037.severity = suggestion # Use inferred member names: Sometimes its nice to be explicit dotnet_diagnostic.ide0301.severity = suggestion # Use collection expression for empty: Subjective, intent +dotnet_diagnostic.ide0021.severity = suggestion # Use expression body for constructors : Subjective +dotnet_diagnostic.ide0090.severity = suggestion # Simplify new expression : Subjective + dotnet_diagnostic.ide0047.severity = suggestion # Parentheses preferences: IDEs don't properly pick it up # Maintainability rules diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json index 07d216f8b..6286e78a3 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json @@ -180,8 +180,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -240,7 +240,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -256,8 +256,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.arcgis3": { @@ -279,7 +279,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -315,18 +315,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -336,7 +336,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json index dcb96ab04..e837f8ec3 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json @@ -189,8 +189,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -318,7 +318,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -334,8 +334,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2022": { @@ -358,7 +358,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -403,18 +403,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -424,7 +424,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json index 3553dcc35..d4cacac41 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json @@ -189,8 +189,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -318,7 +318,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -334,8 +334,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2023": { @@ -358,7 +358,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -403,18 +403,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -424,7 +424,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json index 095cb6970..5c71d4501 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json @@ -189,8 +189,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -318,7 +318,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -334,8 +334,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2024": { @@ -359,7 +359,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -404,18 +404,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -425,7 +425,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json index e601a9187..19238f160 100644 --- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json @@ -174,8 +174,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -234,7 +234,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -250,8 +250,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2025": { @@ -275,7 +275,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -317,18 +317,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -338,7 +338,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorUnpacker.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorUnpacker.cs index e82cf8ea6..537042bfe 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorUnpacker.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorUnpacker.cs @@ -110,7 +110,14 @@ private ColorProxy ConvertColorToColorProxy(AutocadColor color) string name = color.ColorNameForDisplay; string id = color.GetSpeckleApplicationId(); - ColorProxy colorProxy = new(argb, id, name) { objects = new() }; + ColorProxy colorProxy = + new() + { + value = argb, + applicationId = id, + name = name, + objects = new() + }; // add the color source as well for receiving in other apps // POC: in order to support full fidelity color support across autocad and rhino, we need to keep track of the color source property. Not sure if this is the best place to keep track of the source, vs on a ColorSourceProxy or as a property on the atomic object. diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceUnpacker.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceUnpacker.cs index c1684d7fa..e548e9b3b 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceUnpacker.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceUnpacker.cs @@ -79,7 +79,7 @@ private void UnpackInstance(BlockReference instance, int depth, Transaction tran if ( !_instanceObjectsManager.TryGetInstanceProxiesFromDefinitionId( definitionId.ToString(), - out List instanceProxiesWithSameDefinition + out List? instanceProxiesWithSameDefinition ) ) { @@ -104,7 +104,7 @@ out List instanceProxiesWithSameDefinition if ( _instanceObjectsManager.TryGetInstanceDefinitionProxy( definitionId.ToString(), - out InstanceDefinitionProxy value + out InstanceDefinitionProxy? value ) ) { diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs index 606748194..db26b6dee 100644 --- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs +++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs @@ -119,6 +119,11 @@ private RenderMaterialProxy ConvertMaterialToRenderMaterialProxy(Material materi renderMaterial["ior"] = material.Refraction.Index; renderMaterial["reflectivity"] = material.Reflectivity; - return new(renderMaterial, new()) { applicationId = id }; + return new RenderMaterialProxy() + { + value = renderMaterial, + objects = new(), + applicationId = id + }; } } diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index 0aacc1750..03235cca7 100644 --- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -198,8 +198,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -327,7 +327,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -343,8 +343,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2023": { @@ -367,7 +367,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -412,18 +412,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -433,7 +433,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json index 606936416..d12edc786 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json @@ -217,8 +217,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -346,7 +346,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -355,8 +355,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -364,7 +364,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -419,11 +419,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -434,9 +434,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -446,7 +446,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json index 6472e3233..7608a9c13 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json @@ -217,8 +217,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -346,7 +346,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -355,8 +355,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -364,7 +364,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -418,11 +418,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -433,9 +433,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -445,7 +445,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json index 8e5b63025..198c0ce10 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json @@ -217,8 +217,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -346,7 +346,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -355,8 +355,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -364,7 +364,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -418,11 +418,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -433,9 +433,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -445,7 +445,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json index f62f09643..b76e20678 100644 --- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json +++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json @@ -196,8 +196,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -256,7 +256,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -272,8 +272,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -281,7 +281,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -338,11 +338,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -353,9 +353,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -365,7 +365,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json index cd98d287d..b3b154201 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json @@ -198,8 +198,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -327,7 +327,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -343,8 +343,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -352,7 +352,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -410,18 +410,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -431,7 +431,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj b/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj index 6b25de79e..2dc006b72 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json index 75d40892b..854996cb4 100644 --- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json +++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json @@ -198,8 +198,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -327,7 +327,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -343,8 +343,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -352,7 +352,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -410,18 +410,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -431,7 +431,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoColorUnpacker.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoColorUnpacker.cs index bcec1d432..11b87fba1 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoColorUnpacker.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoColorUnpacker.cs @@ -66,7 +66,14 @@ private ColorProxy ConvertColorToColorProxy(Color color, ObjectColorSource sourc string id = color.GetSpeckleApplicationId(source); string? name = color.IsNamedColor ? color.Name : null; - ColorProxy colorProxy = new(argb, id, name) { objects = new() }; + ColorProxy colorProxy = + new() + { + value = argb, + applicationId = id, + name = name, + objects = new() + }; // add the color source as well for receiving in other apps // POC: in order to have high-fidelity color props, we need to send the source somewhere. Currently this is attached to the color proxy, but have discussed sending it as a separate proxy or as an property on the atomic object. TBD if this is the best place for it. diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceUnpacker.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceUnpacker.cs index 5b23ef556..67895ac08 100644 --- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceUnpacker.cs +++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoInstanceUnpacker.cs @@ -62,7 +62,7 @@ private void UnpackInstance(InstanceObject instance, int depth = 0) if ( !_instanceObjectsManager.TryGetInstanceProxiesFromDefinitionId( instanceDefinitionId, - out List instanceProxiesWithSameDefinition + out List? instanceProxiesWithSameDefinition ) ) { @@ -85,7 +85,7 @@ out List instanceProxiesWithSameDefinition instanceProxiesWithSameDefinition.Add(_instanceObjectsManager.GetInstanceProxy(instanceId)); if ( - _instanceObjectsManager.TryGetInstanceDefinitionProxy(instanceDefinitionId, out InstanceDefinitionProxy value) + _instanceObjectsManager.TryGetInstanceDefinitionProxy(instanceDefinitionId, out InstanceDefinitionProxy? value) ) { int depthDifference = depth - value.maxDepth; diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3.DependencyInjection/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3.DependencyInjection/packages.lock.json index 93feb8aef..1b238b030 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3.DependencyInjection/packages.lock.json +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3.DependencyInjection/packages.lock.json @@ -117,8 +117,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -183,7 +183,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -213,18 +213,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -234,7 +234,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/FakeTopLevelConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/FakeTopLevelConverter.cs deleted file mode 100644 index cac2710cd..000000000 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/FakeTopLevelConverter.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Speckle.Converters.Common; -using Speckle.Converters.Common.Objects; -using Speckle.Objects.Geometry; -using Speckle.Sdk.Models; - -namespace Speckle.Converters.ArcGIS3; - -[NameAndRankValue(nameof(String), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)] -public class FakeTopLevelConverter : IToSpeckleTopLevelConverter, ITypedConverter -{ - public Base Convert(object target) => Convert((String)target); - - public Point Convert(String target) - { - return new Point(0, 0, 100) { ["customText"] = target }; - } -} diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MeshListToHostConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MeshListToHostConverter.cs index 7d5b982fa..c0aa6b097 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MeshListToHostConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MeshListToHostConverter.cs @@ -40,10 +40,12 @@ public ACG.Multipatch Convert(List target) int ptIndex = part.faces[i]; newPatch.AddPoint( _pointConverter.Convert( - new SOG.Point(part.vertices[ptIndex * 3], part.vertices[ptIndex * 3 + 1], part.vertices[ptIndex * 3 + 2]) - { - units = part.units - } + new SOG.Point( + part.vertices[ptIndex * 3], + part.vertices[ptIndex * 3 + 1], + part.vertices[ptIndex * 3 + 2], + part.units + ) ) ); } diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MultipatchListToHostConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MultipatchListToHostConverter.cs index 44c961e9b..14cf4c965 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MultipatchListToHostConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToHost/Raw/MultipatchListToHostConverter.cs @@ -26,7 +26,7 @@ public ACG.Multipatch Convert(List target) { newPatch.AddPoint( _pointConverter.Convert( - new SOG.Point(part.vertices[i * 3], part.vertices[i * 3 + 1], part.vertices[i * 3 + 2]) + new SOG.Point(part.vertices[i * 3], part.vertices[i * 3 + 1], part.vertices[i * 3 + 2], part.units) ) ); } diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisFeatureToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisFeatureToSpeckleConverter.cs index bbb068675..953b99ead 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisFeatureToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisFeatureToSpeckleConverter.cs @@ -1,5 +1,6 @@ using ArcGIS.Core.Data; using Speckle.Converters.ArcGIS3.Utils; +using Speckle.Converters.Common; using Speckle.Converters.Common.Objects; using Speckle.Objects; using Speckle.Sdk.Models; @@ -14,6 +15,7 @@ public class GisFeatureToSpeckleConverter : ITypedConverter<(Row, string), IGisF private readonly ITypedConverter> _polygonConverter; private readonly ITypedConverter> _multipatchConverter; private readonly ITypedConverter _attributeConverter; + private readonly IConversionContextStack _contextStack; public GisFeatureToSpeckleConverter( ITypedConverter pointConverter, @@ -21,7 +23,8 @@ public GisFeatureToSpeckleConverter( ITypedConverter> polylineConverter, ITypedConverter> polygonConverter, ITypedConverter> multipatchConverter, - ITypedConverter attributeConverter + ITypedConverter attributeConverter, + IConversionContextStack contextStack ) { _pointConverter = pointConverter; @@ -30,6 +33,7 @@ ITypedConverter attributeConverter _polygonConverter = polygonConverter; _multipatchConverter = multipatchConverter; _attributeConverter = attributeConverter; + _contextStack = contextStack; } private List GetPolygonDisplayMeshes(List polygons) @@ -55,7 +59,13 @@ ITypedConverter attributeConverter // generate Mesh List faces = new() { boundaryPts.Count }; faces.AddRange(Enumerable.Range(0, boundaryPts.Count).ToList()); - SOG.Mesh mesh = new(boundaryPts.SelectMany(x => new List { x.x, x.y, x.z }).ToList(), faces); + SOG.Mesh mesh = + new() + { + vertices = boundaryPts.SelectMany(x => new List { x.x, x.y, x.z }).ToList(), + faces = faces, + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; displayVal.Add(mesh); } @@ -67,7 +77,13 @@ ITypedConverter attributeConverter List displayVal = new(); foreach (SGIS.GisMultipatchGeometry geo in multipatch) { - SOG.Mesh displayMesh = new(geo.vertices, geo.faces); + SOG.Mesh displayMesh = + new() + { + vertices = geo.vertices, + faces = geo.faces, + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; displayVal.Add(displayMesh); } diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisRasterToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisRasterToSpeckleConverter.cs index 1128426f4..89e768e04 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisRasterToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/GisRasterToSpeckleConverter.cs @@ -172,7 +172,14 @@ public RasterElement Convert(Raster target) } } - SOG.Mesh mesh = new(newCoords, newFaces, newColors, null, _contextStack.Current.SpeckleUnits, null) { }; + SOG.Mesh mesh = + new() + { + vertices = newCoords, + faces = newFaces, + colors = newColors, + units = _contextStack.Current.SpeckleUnits + }; rasterElement.displayValue = new List() { mesh }; return rasterElement; diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/MultipatchFeatureToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/MultipatchFeatureToSpeckleConverter.cs index c36ad6c6e..e814f2c75 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/MultipatchFeatureToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/MultipatchFeatureToSpeckleConverter.cs @@ -26,7 +26,8 @@ public IReadOnlyList Convert(ACG.Multipatch target) { List converted = new(); // placeholder, needs to be declared in order to be used in the Ring patch type - SGIS.PolygonGeometry3d polygonGeom = new() { }; + SGIS.PolygonGeometry3d polygonGeom = + new() { units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString }; // convert and store all multipatch points per Part List> allPoints = new(); @@ -52,19 +53,19 @@ public IReadOnlyList Convert(ACG.Multipatch target) if (patchType == ACG.PatchType.TriangleStrip) { SGIS.GisMultipatchGeometry multipatch = target.CompleteMultipatchTriangleStrip(allPoints, idx); - multipatch.units = _contextStack.Current.SpeckleUnits; + multipatch.units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString; converted.Add(multipatch); } else if (patchType == ACG.PatchType.Triangles) { SGIS.GisMultipatchGeometry multipatch = target.CompleteMultipatchTriangles(allPoints, idx); - multipatch.units = _contextStack.Current.SpeckleUnits; + multipatch.units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString; converted.Add(multipatch); } else if (patchType == ACG.PatchType.TriangleFan) { SGIS.GisMultipatchGeometry multipatch = target.CompleteMultipatchTriangleFan(allPoints, idx); - multipatch.units = _contextStack.Current.SpeckleUnits; + multipatch.units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString; converted.Add(multipatch); } // in case of RingMultipatch - return PolygonGeometry3d @@ -78,10 +79,19 @@ public IReadOnlyList Convert(ACG.Multipatch target) } // first ring means a start of a new PolygonGeometry3d - polygonGeom = new() { voids = new List() }; + polygonGeom = new() + { + voids = new List(), + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; List pointCoords = allPoints[idx].SelectMany(x => new List() { x.x, x.y, x.z }).ToList(); - SOG.Polyline polyline = new() { value = pointCoords, units = _contextStack.Current.SpeckleUnits }; + SOG.Polyline polyline = + new() + { + value = pointCoords, + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; polygonGeom.boundary = polyline; // if it's already the last part, add to list @@ -93,7 +103,12 @@ public IReadOnlyList Convert(ACG.Multipatch target) else if (patchType == ACG.PatchType.Ring) { List pointCoords = allPoints[idx].SelectMany(x => new List() { x.x, x.y, x.z }).ToList(); - SOG.Polyline polyline = new() { value = pointCoords, units = _contextStack.Current.SpeckleUnits }; + SOG.Polyline polyline = + new() + { + value = pointCoords, + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; // every outer ring is oriented clockwise bool isClockwise = polyline.IsClockwisePolygon(); @@ -106,7 +121,12 @@ public IReadOnlyList Convert(ACG.Multipatch target) { // add existing polygon to list, start a new polygon with a boundary converted.Add(polygonGeom); - polygonGeom = new() { voids = new List(), boundary = polyline }; + polygonGeom = new() + { + voids = new List(), + boundary = polyline, + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; } // if it's already the last part, add to list if (idx == target.PartCount - 1) diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/PolygonFeatureToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/PolygonFeatureToSpeckleConverter.cs index 75c1958e5..51b810c2a 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/PolygonFeatureToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/Raw/PolygonFeatureToSpeckleConverter.cs @@ -7,10 +7,15 @@ namespace Speckle.Converters.ArcGIS3.ToSpeckle.Raw; public class PolygonFeatureToSpeckleConverter : ITypedConverter> { private readonly ITypedConverter _segmentConverter; + private readonly IConversionContextStack _contextStack; - public PolygonFeatureToSpeckleConverter(ITypedConverter segmentConverter) + public PolygonFeatureToSpeckleConverter( + ITypedConverter segmentConverter, + IConversionContextStack contextStack + ) { _segmentConverter = segmentConverter; + _contextStack = contextStack; } public IReadOnlyList Convert(ACG.Polygon target) @@ -35,7 +40,12 @@ public IReadOnlyList Convert(ACG.Polygon target) bool isExteriorRing = target.IsExteriorRing(idx); if (isExteriorRing) { - polygon = new() { boundary = polyline, voids = new List() }; + polygon = new() + { + boundary = polyline, + voids = new List(), + units = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString + }; polygonList.Add(polygon); } else // interior part diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/TableToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/TableToSpeckleConverter.cs index 020a8a21c..b3d8a3a9b 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/TableToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/TableToSpeckleConverter.cs @@ -60,7 +60,7 @@ public VectorLayer Convert(StandaloneTable target) // create new element attributes from the existing attributes, based on the vector layer visible fields // POC: this should be refactored to store the feature layer properties in the context stack, so this logic can be done in the gisFeatureConverter Base elementAttributes = new(); - foreach (string elementAtt in element.attributes.GetDynamicPropertyKeys()) + foreach (string elementAtt in element.attributes.DynamicPropertyKeys) { if (visibleFields.Contains(elementAtt)) { diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/VectorLayerToSpeckleConverter.cs b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/VectorLayerToSpeckleConverter.cs index d3f5b499c..39ebe7868 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/VectorLayerToSpeckleConverter.cs +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/ToSpeckle/TopLevel/VectorLayerToSpeckleConverter.cs @@ -83,7 +83,7 @@ public VectorLayer Convert(FeatureLayer target) // create new element attributes from the existing attributes, based on the vector layer visible fields // POC: this should be refactored to store the feeature layer properties in the context stack, so this logic can be done in the gisFeatureConverter Base elementAttributes = new(); - foreach (string elementAtt in element.attributes.GetDynamicPropertyKeys()) + foreach (string elementAtt in element.attributes.DynamicPropertyKeys) { if (visibleFieldDescriptions.Contains(elementAtt)) { diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json index 4b76c7cb0..cc222d503 100644 --- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json +++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json @@ -123,8 +123,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -182,7 +182,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -199,18 +199,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -220,7 +220,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022.DependencyInjection/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022.DependencyInjection/packages.lock.json index efc2b8582..b2b59b60f 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022.DependencyInjection/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022.DependencyInjection/packages.lock.json @@ -135,8 +135,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -265,7 +265,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -289,18 +289,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -310,7 +310,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json index 4c14e3c65..ddf78f850 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -275,18 +275,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -296,7 +296,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json index bb613c481..c6c35d458 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json @@ -135,8 +135,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -265,7 +265,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -289,18 +289,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -310,7 +310,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json index 3bafebb12..0485a3387 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -275,18 +275,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -296,7 +296,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json index 59e20ad65..8b6a30b7d 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json @@ -192,8 +192,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -321,7 +321,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -337,8 +337,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2024": { @@ -354,7 +354,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -396,18 +396,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -417,7 +417,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index a9113678c..1580ee51a 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -189,8 +189,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -318,7 +318,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -334,8 +334,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -343,7 +343,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -381,18 +381,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -402,7 +402,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025.DependencyInjection/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025.DependencyInjection/packages.lock.json index bb881bada..214958132 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025.DependencyInjection/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025.DependencyInjection/packages.lock.json @@ -174,8 +174,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -234,7 +234,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -250,8 +250,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.autocad2025": { @@ -267,7 +267,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -309,18 +309,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -330,7 +330,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json index fbdddcf50..efe4b86ec 100644 --- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json +++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json @@ -174,8 +174,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -234,7 +234,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -250,8 +250,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.converters.common": { @@ -259,7 +259,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -294,18 +294,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -315,7 +315,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolyfaceMeshToSpeckleConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolyfaceMeshToSpeckleConverter.cs index 536910c54..e1f7c5c31 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolyfaceMeshToSpeckleConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/PolyfaceMeshToSpeckleConverter.cs @@ -93,8 +93,12 @@ public SOG.Mesh RawConvert(ADB.PolyFaceMesh target) SOG.Box bbox = _boxConverter.Convert(target.GeometricExtents); SOG.Mesh speckleMesh = - new(vertices, faces, colors, null, _contextStack.Current.SpeckleUnits) + new() { + vertices = vertices, + faces = faces, + colors = colors, + units = _contextStack.Current.SpeckleUnits, bbox = bbox, ["faceVisibility"] = faceVisibility }; diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/SubDMeshToSpeckleConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/SubDMeshToSpeckleConverter.cs index ccc33b05b..1a56bb9b8 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/SubDMeshToSpeckleConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Geometry/SubDMeshToSpeckleConverter.cs @@ -72,7 +72,15 @@ public SOG.Mesh RawConvert(ADB.SubDMesh target) // bbox SOG.Box bbox = _boxConverter.Convert(target.GeometricExtents); - SOG.Mesh speckleMesh = new(vertices, faces, colors, null, _contextStack.Current.SpeckleUnits) { bbox = bbox }; + SOG.Mesh speckleMesh = + new() + { + vertices = vertices, + faces = faces, + colors = colors, + units = _contextStack.Current.SpeckleUnits, + bbox = bbox + }; return speckleMesh; } diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBLineToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBLineToSpeckleRawConverter.cs index 9c70c70e3..fe34187f8 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBLineToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBLineToSpeckleRawConverter.cs @@ -24,13 +24,11 @@ public DBLineToSpeckleRawConverter( public Base Convert(object target) => Convert((ADB.Line)target); public SOG.Line Convert(ADB.Line target) => - new( - _pointConverter.Convert(target.StartPoint), - _pointConverter.Convert(target.EndPoint), - _contextStack.Current.SpeckleUnits - ) + new() { - length = target.Length, + start = _pointConverter.Convert(target.StartPoint), + end = _pointConverter.Convert(target.EndPoint), + units = _contextStack.Current.SpeckleUnits, domain = new SOP.Interval { start = 0, end = target.Length }, bbox = _boxConverter.Convert(target.GeometricExtents) }; diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBSolid3dToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBSolid3dToSpeckleRawConverter.cs index c665b574e..e647f66aa 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBSolid3dToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/DBSolid3dToSpeckleRawConverter.cs @@ -71,8 +71,10 @@ public SOG.Mesh Convert(ADB.Solid3d target) // create speckle mesh SOG.Mesh mesh = - new(convertedVertices, faces) + new() { + vertices = convertedVertices, + faces = faces, units = _contextStack.Current.SpeckleUnits, bbox = bbox, area = area, diff --git a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/LineSegment3dToSpeckleRawConverter.cs b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/LineSegment3dToSpeckleRawConverter.cs index a184159f0..1ec02437b 100644 --- a/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/LineSegment3dToSpeckleRawConverter.cs +++ b/Converters/Autocad/Speckle.Converters.AutocadShared/ToSpeckle/Raw/LineSegment3dToSpeckleRawConverter.cs @@ -18,13 +18,11 @@ public LineSegment3dToSpeckleRawConverter( } public SOG.Line Convert(AG.LineSegment3d target) => - new( - _pointConverter.Convert(target.StartPoint), - _pointConverter.Convert(target.EndPoint), - _contextStack.Current.SpeckleUnits - ) + new() { - length = target.Length, + start = _pointConverter.Convert(target.StartPoint), + end = _pointConverter.Convert(target.EndPoint), + units = _contextStack.Current.SpeckleUnits, domain = new SOP.Interval { start = 0, end = target.Length }, }; } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/packages.lock.json index aa96ac783..cebbfde38 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/packages.lock.json @@ -135,8 +135,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -266,7 +266,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -299,18 +299,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -320,7 +320,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json index b12cfb7c7..5d544105f 100644 --- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json +++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json @@ -141,8 +141,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -264,7 +264,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -284,18 +284,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -305,7 +305,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022.DependencyInjection/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.DependencyInjection/packages.lock.json index b163aa2ea..47ba74c0b 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.DependencyInjection/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.DependencyInjection/packages.lock.json @@ -126,8 +126,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -249,7 +249,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -284,11 +284,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -299,9 +299,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -311,7 +311,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json index c916d8428..5a8517161 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json @@ -218,8 +218,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -308,7 +308,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.testing": { @@ -332,18 +332,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -353,7 +353,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json index 43ae6412f..4c65e2fa9 100644 --- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -282,18 +282,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -303,7 +303,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json index 1c623ec50..c8027ac4a 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json @@ -126,8 +126,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -249,7 +249,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -283,11 +283,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -298,9 +298,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -310,7 +310,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json index bc58a32eb..8fcf0b8c1 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json @@ -218,8 +218,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -308,7 +308,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.testing": { @@ -332,18 +332,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -353,7 +353,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json index 230c1062f..b27de2139 100644 --- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -275,18 +275,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -296,7 +296,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.DependencyInjection/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.DependencyInjection/packages.lock.json index 78a4a818d..fa3430ac8 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.DependencyInjection/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.DependencyInjection/packages.lock.json @@ -126,8 +126,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -249,7 +249,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -283,11 +283,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -298,9 +298,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -310,7 +310,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json index df0868eeb..cb8165841 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json @@ -218,8 +218,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -308,7 +308,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.testing": { @@ -332,18 +332,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -353,7 +353,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json index d05968287..edac2fdf2 100644 --- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -275,18 +275,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -296,7 +296,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025.DependencyInjection/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025.DependencyInjection/packages.lock.json index 84d22454d..f7ff2fddf 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025.DependencyInjection/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025.DependencyInjection/packages.lock.json @@ -117,8 +117,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -176,7 +176,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -207,11 +207,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Revit.API": { @@ -222,9 +222,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -234,7 +234,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json index 64a398da3..6998cc396 100644 --- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json +++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json @@ -123,8 +123,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -182,7 +182,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -199,18 +199,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -220,7 +220,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/PolylineConverterToHost.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/PolylineConverterToHost.cs index b95012fd4..7ee23c845 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/PolylineConverterToHost.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/PolylineConverterToHost.cs @@ -37,7 +37,15 @@ public CurveArray Convert(Polyline target) var lastPt = pts[0]; for (var i = 1; i < pts.Count; i++) { - var success = TryAppendLineSafely(curveArray, new SOG.Line(lastPt, pts[i], target.units)); + var success = TryAppendLineSafely( + curveArray, + new SOG.Line + { + start = lastPt, + end = pts[i], + units = target.units + } + ); if (success) { lastPt = pts[i]; @@ -46,7 +54,15 @@ public CurveArray Convert(Polyline target) if (target.closed) { - TryAppendLineSafely(curveArray, new SOG.Line(pts[^1], pts[0], target.units)); + TryAppendLineSafely( + curveArray, + new SOG.Line + { + start = pts[^1], + end = pts[0], + units = target.units + } + ); } } return curveArray; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ColumnConversionToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ColumnConversionToSpeckle.cs index 1e638d39e..ffdc49aaa 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ColumnConversionToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/ColumnConversionToSpeckle.cs @@ -132,11 +132,17 @@ out var topOffset // return RevitInstanceToSpeckle(revitColumn, out notes, null); //} - return new SOG.Line( - basePoint, - new SOG.Point(basePoint.x, basePoint.y, topLevelElevation + topLevelOffset, _contextStack.Current.SpeckleUnits), - _contextStack.Current.SpeckleUnits - ); + return new SOG.Line + { + start = basePoint, + end = new SOG.Point( + basePoint.x, + basePoint.y, + topLevelElevation + topLevelOffset, + _contextStack.Current.SpeckleUnits + ), + units = _contextStack.Current.SpeckleUnits, + }; } return null; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/LineConversionToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/LineConversionToSpeckle.cs index efde9204f..b6a2b84bf 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/LineConversionToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/LineConversionToSpeckle.cs @@ -29,6 +29,5 @@ public SOG.Line Convert(DB.Line target) => start = _xyzToPointConverter.Convert(target.GetEndPoint(0)), end = _xyzToPointConverter.Convert(target.GetEndPoint(1)), domain = new Interval { start = target.GetEndParameter(0), end = target.GetEndParameter(1) }, - length = _scalingService.ScaleLength(target.Length) }; } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/MeshListConversionToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/MeshListConversionToSpeckle.cs index 5bc863a29..6fa9133bb 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/MeshListConversionToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/MeshListConversionToSpeckle.cs @@ -54,12 +54,18 @@ public SOG.Mesh Convert(List target) } } - SOG.Mesh speckleMesh = new(vertices, faces, units: _contextStack.Current.SpeckleUnits); + SOG.Mesh speckleMesh = + new() + { + vertices = vertices, + faces = faces, + units = _contextStack.Current.SpeckleUnits + }; return speckleMesh; } - private static (int vertexCount, int) GetVertexAndFaceListSize(List meshes) + private static (int vertexCount, int) GetVertexAndFaceListSize(IReadOnlyList meshes) { int numberOfVertices = 0; int numberOfFaces = 0; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/VectorToSpeckleConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/VectorToSpeckleConverter.cs index 4170d2f89..52a42e8ae 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/VectorToSpeckleConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/Raw/Geometry/VectorToSpeckleConverter.cs @@ -1,4 +1,5 @@ using Speckle.Converters.Common.Objects; +using Speckle.Converters.RevitShared.Helpers; using Speckle.Converters.RevitShared.Services; namespace Speckle.Converters.RevitShared.ToSpeckle; @@ -7,14 +8,17 @@ public class VectorToSpeckleConverter : ITypedConverter { private readonly IReferencePointConverter _referencePointConverter; private readonly ScalingServiceToSpeckle _scalingService; + private readonly IRevitConversionContextStack _contextStack; public VectorToSpeckleConverter( IReferencePointConverter referencePointConverter, - ScalingServiceToSpeckle scalingService + ScalingServiceToSpeckle scalingService, + IRevitConversionContextStack contextStack ) { _referencePointConverter = referencePointConverter; _scalingService = scalingService; + _contextStack = contextStack; } public SOG.Vector Convert(DB.XYZ target) @@ -25,7 +29,8 @@ public SOG.Vector Convert(DB.XYZ target) var pointToSpeckle = new SOG.Vector( _scalingService.ScaleLength(extPt.X), _scalingService.ScaleLength(extPt.Y), - _scalingService.ScaleLength(extPt.Z) + _scalingService.ScaleLength(extPt.Z), + _contextStack.Current.SpeckleUnits ); return pointToSpeckle; diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ExtrusionRoofToSpeckleTopLevelConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ExtrusionRoofToSpeckleTopLevelConverter.cs index 94452fd0e..b52b30a73 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ExtrusionRoofToSpeckleTopLevelConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ExtrusionRoofToSpeckleTopLevelConverter.cs @@ -39,12 +39,7 @@ IRevitConversionContextStack contextStack public override RevitExtrusionRoof Convert(DB.ExtrusionRoof target) { - var plane = target.GetProfile().get_Item(0).SketchPlane.GetPlane(); - SOG.Line referenceLine = - new( - _pointConverter.Convert(plane.Origin.Add(plane.XVec.Normalize().Negate())), - _pointConverter.Convert(plane.Origin) - ); + SOG.Line referenceLine = ConvertReferenceLine(target); var level = _parameterValueExtractor.GetValueAsDocumentObject( target, DB.BuiltInParameter.ROOF_CONSTRAINT_LEVEL_PARAM @@ -72,4 +67,17 @@ public override RevitExtrusionRoof Convert(DB.ExtrusionRoof target) return speckleExtrusionRoof; } + + private SOG.Line ConvertReferenceLine(DB.ExtrusionRoof target) + { + var plane = target.GetProfile().get_Item(0).SketchPlane.GetPlane(); + SOG.Line referenceLine = + new() + { + start = _pointConverter.Convert(plane.Origin.Add(plane.XVec.Normalize().Negate())), + end = _pointConverter.Convert(plane.Origin), + units = _contextStack.Current.SpeckleUnits, + }; + return referenceLine; + } } diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs index d62de162e..d3cdd8319 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/FloorTopLevelConverterToSpeckle.cs @@ -104,7 +104,13 @@ private void TryAssignSlopeFromSlopeArrow(DB.Floor target, SOBR.RevitFloor speck slopeParam ??= slope; speckleFloor.slope = (double)slopeParam; - speckleFloor.slopeDirection = new SOG.Line(tail, head); + speckleFloor.slopeDirection = new SOG.Line() + { + start = tail, + end = head, + units = _contextStack.Current.SpeckleUnits + }; + if ( speckleFloor["parameters"] is Base parameters && parameters["FLOOR_HEIGHTABOVELEVEL_PARAM"] is SOBR.Parameter offsetParam diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/TopographyTopLevelConverterToSpeckle.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/TopographyTopLevelConverterToSpeckle.cs index 83d879f2d..dd6348076 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/TopographyTopLevelConverterToSpeckle.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/TopographyTopLevelConverterToSpeckle.cs @@ -31,7 +31,8 @@ public override SOBR.RevitTopography Convert(DBA.TopographySurface target) { units = _contextStack.Current.SpeckleUnits, displayValue = _displayValueExtractor.GetDisplayValue(target), - elementId = target.Id.ToString().NotNull() + elementId = target.Id.ToString().NotNull(), + baseGeometry = null! //TODO: this can't be correct, see https://linear.app/speckle/issue/CNX-461/revit-check-why-topographytospeckle-sets-no-basegeometry }; // POC: shouldn't we just do this in the RevitConverter ? diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json index ed729045c..714103ef6 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json @@ -126,8 +126,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -249,7 +249,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -289,18 +289,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -310,7 +310,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json index 70c7c8e3d..df6bfc70e 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json @@ -218,8 +218,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -308,7 +308,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.testing": { @@ -332,18 +332,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -353,7 +353,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json index 4abbdcb35..ecf9cd6f9 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -275,18 +275,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -296,7 +296,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8.DependencyInjection/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8.DependencyInjection/packages.lock.json index 22f63cf92..3e1b08c16 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8.DependencyInjection/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8.DependencyInjection/packages.lock.json @@ -126,8 +126,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -249,7 +249,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "speckle.converters.common.dependencyinjection": { @@ -289,18 +289,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -310,7 +310,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json index 570a56b3c..2bbaa15ad 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json +++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json @@ -132,8 +132,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -255,7 +255,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -275,18 +275,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -296,7 +296,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/LineToSpeckleConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/LineToSpeckleConverter.cs index 923eb2ea7..a349c8846 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/LineToSpeckleConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/LineToSpeckleConverter.cs @@ -30,9 +30,11 @@ IConversionContextStack contextStack /// ⚠️ This conversion assumes the domain of a line is (0, LENGTH), as Rhino Lines do not have domain. If you want the domain preserved use LineCurve conversions instead. /// public SOG.Line Convert(RG.Line target) => - new(_pointConverter.Convert(target.From), _pointConverter.Convert(target.To), _contextStack.Current.SpeckleUnits) + new() { - length = target.Length, + start = _pointConverter.Convert(target.From), + end = _pointConverter.Convert(target.To), + units = _contextStack.Current.SpeckleUnits, domain = new SOP.Interval { start = 0, end = target.Length }, bbox = _boxConverter.Convert(new RG.Box(target.BoundingBox)) }; diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/MeshToSpeckleConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/MeshToSpeckleConverter.cs index f47682ab8..9b2d4402d 100644 --- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/MeshToSpeckleConverter.cs +++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/MeshToSpeckleConverter.cs @@ -68,8 +68,13 @@ public SOG.Mesh Convert(RG.Mesh target) double volume = target.IsClosed ? target.Volume() : 0; SOG.Box bbox = _boxConverter.Convert(new RG.Box(target.GetBoundingBox(false))); - return new SOG.Mesh(vertexCoordinates, faces, colors, textureCoordinates, _contextStack.Current.SpeckleUnits) + return new SOG.Mesh { + vertices = vertexCoordinates, + faces = faces, + colors = colors, + textureCoordinates = textureCoordinates, + units = _contextStack.Current.SpeckleUnits, volume = volume, bbox = bbox }; diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json index 6b78482d5..18589f65c 100644 --- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json @@ -255,8 +255,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -338,7 +338,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -347,8 +347,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.testing": { @@ -384,18 +384,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -405,7 +405,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json index 765ebfe0d..b729dd8c9 100644 --- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json @@ -189,8 +189,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -318,7 +318,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -327,8 +327,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -360,18 +360,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -381,7 +381,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, @@ -565,8 +565,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -625,7 +625,7 @@ "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", "Speckle.Connectors.Utils": "[1.0.0, )", - "Speckle.Sdk": "[3.0.1-rc.118, )", + "Speckle.Sdk": "[3.1.0-dev.136, )", "System.Threading.Tasks.Dataflow": "[6.0.0, )" } }, @@ -634,8 +634,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -664,18 +664,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -685,7 +685,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, diff --git a/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs b/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs index bc37d1a97..c362e9ea8 100644 --- a/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs +++ b/DUI3/Speckle.Connectors.DUI/Bindings/ConfigBinding.cs @@ -39,9 +39,9 @@ public bool GetIsDevMode() #endif } - public ConnectorConfig GetConfig() + public async Task GetConfig() { - var rawConfig = ConfigStorage.GetObject(_connectorName); + var rawConfig = await ConfigStorage.GetObject(_connectorName).ConfigureAwait(false); if (rawConfig is null) { return SeedConfig(); diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json index 6f2097d18..a49cefa20 100644 --- a/DUI3/Speckle.Connectors.DUI/packages.lock.json +++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json @@ -41,9 +41,9 @@ }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -53,7 +53,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, @@ -231,8 +231,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -362,8 +362,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "Autofac": { @@ -389,11 +389,11 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index 6d5436665..6f56bcaa3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -19,8 +19,8 @@ - - + + diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json index 4c2cef4db..3329fd673 100644 --- a/Sdk/Speckle.Connectors.Tests/packages.lock.json +++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json @@ -255,8 +255,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -337,8 +337,8 @@ "dependencies": { "Microsoft.Extensions.Logging": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )", - "Speckle.Sdk": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )", + "Speckle.Sdk": "[3.1.0-dev.136, )" } }, "speckle.testing": { @@ -368,18 +368,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -389,7 +389,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Sdk/Speckle.Connectors.Utils/Instances/IInstanceObjectsManager.cs b/Sdk/Speckle.Connectors.Utils/Instances/IInstanceObjectsManager.cs new file mode 100644 index 000000000..45fe56a38 --- /dev/null +++ b/Sdk/Speckle.Connectors.Utils/Instances/IInstanceObjectsManager.cs @@ -0,0 +1,24 @@ +using System.Diagnostics.CodeAnalysis; +using Speckle.Sdk.Models.Instances; + +namespace Speckle.Connectors.Utils.Instances; + +public interface IInstanceObjectsManager +{ + void AddInstanceProxy(string objectId, InstanceProxy instanceProxy); + void AddDefinitionProxy(string objectId, InstanceDefinitionProxy instanceDefinitionProxy); + void AddAtomicObject(string objectId, THostObjectType obj); + void AddInstanceProxiesByDefinitionId(string definitionId, List instanceProxies); + UnpackResult GetUnpackResult(); + bool TryGetInstanceProxiesFromDefinitionId( + string definitionId, + [NotNullWhen(true)] out List? instanceProxiesWithSameDefinition + ); + bool TryGetInstanceDefinitionProxy( + string definitionId, + [NotNullWhen(true)] out InstanceDefinitionProxy? instanceDefinitionProxy + ); + InstanceProxy GetInstanceProxy(string instanceId); + + void UpdateChildrenMaxDepth(InstanceDefinitionProxy definitionProxy, int depthDifference); +} diff --git a/Sdk/Speckle.Connectors.Utils/Instances/InstanceObjectsManager.cs b/Sdk/Speckle.Connectors.Utils/Instances/InstanceObjectsManager.cs index 29fad2f22..5be2ccc85 100644 --- a/Sdk/Speckle.Connectors.Utils/Instances/InstanceObjectsManager.cs +++ b/Sdk/Speckle.Connectors.Utils/Instances/InstanceObjectsManager.cs @@ -1,9 +1,8 @@ -using Speckle.InterfaceGenerator; +using System.Diagnostics.CodeAnalysis; using Speckle.Sdk.Models.Instances; namespace Speckle.Connectors.Utils.Instances; -[GenerateAutoInterface] public class InstanceObjectsManager : IInstanceObjectsManager { @@ -28,27 +27,30 @@ public UnpackResult GetUnpackResult() => public bool TryGetInstanceProxiesFromDefinitionId( string definitionId, - out List instanceProxiesWithSameDefinition + [NotNullWhen(true)] out List? instanceProxiesWithSameDefinition ) { - instanceProxiesWithSameDefinition = new List(); if (_instanceProxiesByDefinitionId.TryGetValue(definitionId, out List value)) { instanceProxiesWithSameDefinition = value; return true; } + instanceProxiesWithSameDefinition = null; return false; } - public bool TryGetInstanceDefinitionProxy(string definitionId, out InstanceDefinitionProxy instanceDefinitionProxy) + public bool TryGetInstanceDefinitionProxy( + string definitionId, + [NotNullWhen(true)] out InstanceDefinitionProxy? instanceDefinitionProxy + ) { - instanceDefinitionProxy = new InstanceDefinitionProxy(); if (_definitionProxies.TryGetValue(definitionId, out InstanceDefinitionProxy value)) { instanceDefinitionProxy = value; return true; } + instanceDefinitionProxy = null; return false; } diff --git a/Sdk/Speckle.Connectors.Utils/packages.lock.json b/Sdk/Speckle.Connectors.Utils/packages.lock.json index 8ea9a69b4..c5a213737 100644 --- a/Sdk/Speckle.Connectors.Utils/packages.lock.json +++ b/Sdk/Speckle.Connectors.Utils/packages.lock.json @@ -56,18 +56,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -77,7 +77,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }, @@ -249,8 +249,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", diff --git a/Sdk/Speckle.Converters.Common.DependencyInjection/packages.lock.json b/Sdk/Speckle.Converters.Common.DependencyInjection/packages.lock.json index 7fefe9760..932eef53e 100644 --- a/Sdk/Speckle.Converters.Common.DependencyInjection/packages.lock.json +++ b/Sdk/Speckle.Converters.Common.DependencyInjection/packages.lock.json @@ -153,8 +153,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -279,7 +279,7 @@ "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )", "Speckle.Autofac": "[1.0.0, )", - "Speckle.Objects": "[3.0.1-rc.118, )" + "Speckle.Objects": "[3.1.0-dev.136, )" } }, "Microsoft.Extensions.Logging.Abstractions": { @@ -290,18 +290,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -311,7 +311,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } } diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json index 43120b924..cf7fbec72 100644 --- a/Sdk/Speckle.Converters.Common/packages.lock.json +++ b/Sdk/Speckle.Converters.Common/packages.lock.json @@ -41,11 +41,11 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "5VgLOrOMGsdGqZJwZXjyUrLX+kO+wb6qy0nQgDWuHG+aZdPyGmjyLW3YeaCnDQBu/uDJnQu7ddj5LqbIlTif0w==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "jibrr1zEne7RVNumSd/SkFMRQw5LZS3stM3zk6ZKadAv6eRfnvPB1ZfHhqDiB07TX5Y0SuFCYkI1X5xvLrZsxg==", "dependencies": { - "Speckle.Sdk": "3.0.1-rc.118" + "Speckle.Sdk": "3.1.0-dev.136" } }, "GraphQL.Client": { @@ -159,8 +159,8 @@ }, "Speckle.Sdk.Logging": { "type": "Transitive", - "resolved": "3.0.1-rc.118", - "contentHash": "rzzJTTlTyeC7O2XOBAGqTrAbd7vk245mXat1v2okqlnEIvoAQj+kiId53v69i+3jv9svoqohkvaWJ2ZD8MkDXA==" + "resolved": "3.1.0-dev.136", + "contentHash": "X88GqPef05lRuUzxCaR/inWi7eMEpbI8SlOoUaqsNn9mwDiutppIvva3VRK5ARaASvPsunyzWV40TSD6+VH4eA==" }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", @@ -291,9 +291,9 @@ }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.0.1-rc.118, )", - "resolved": "3.0.1-rc.118", - "contentHash": "cKiVG0LMRmF4vgTWq2L8xOYoTGiAF9n8OyycmWHCdW6l7wLTre6B4AOWtW9j9NA427C3sJmZ4R9dSbNYRLxDRQ==", + "requested": "[3.1.0-dev.136, )", + "resolved": "3.1.0-dev.136", + "contentHash": "rr+TypUJCmLNYa/9TOtFrITZ+5s9AIO7mYqmDwJZQwmu7IQeherqbBPAt9LoCJXcfTQoBW4ci0PmknPbDoTKAw==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -303,7 +303,7 @@ "Polly.Extensions.Http": "3.0.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Logging": "3.0.1-rc.118", + "Speckle.Sdk.Logging": "3.1.0-dev.136", "System.Text.Json": "5.0.2" } }