diff --git a/Directory.Packages.props b/Directory.Packages.props index 6bf24322..a2c96acf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,8 +8,6 @@ - - @@ -29,8 +27,6 @@ - - @@ -42,4 +38,4 @@ - \ No newline at end of file + diff --git a/src/Speckle.Automate.Sdk/packages.lock.json b/src/Speckle.Automate.Sdk/packages.lock.json index 5e6185c6..1a222bbb 100644 --- a/src/Speckle.Automate.Sdk/packages.lock.json +++ b/src/Speckle.Automate.Sdk/packages.lock.json @@ -86,6 +86,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "10.0.1", + "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.6.3" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -242,8 +250,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "6.1.2", + "contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw==" }, "System.Runtime.InteropServices.WindowsRuntime": { "type": "Transitive", @@ -265,10 +273,10 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "resolved": "4.6.3", + "contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==", "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, "speckle.objects": { @@ -281,14 +289,14 @@ "type": "Project", "dependencies": { "GraphQL.Client": "[6.0.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[5.0.0, )", "Microsoft.CSharp": "[4.7.0, )", "Microsoft.Data.Sqlite": "[7.0.5, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )", "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -305,15 +313,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.CSharp": { "type": "CentralTransitive", "requested": "[4.7.0, )", @@ -359,6 +358,16 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "10.0.1", + "System.Threading.Tasks.Extensions": "4.6.3" + } } }, "net8.0": { @@ -556,7 +565,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -612,6 +622,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" } } } diff --git a/src/Speckle.Objects/packages.lock.json b/src/Speckle.Objects/packages.lock.json index 2c2e04f1..5042eec7 100644 --- a/src/Speckle.Objects/packages.lock.json +++ b/src/Speckle.Objects/packages.lock.json @@ -54,6 +54,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "10.0.1", + "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.6.3" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -130,19 +138,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "Newtonsoft.Json.Bson": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", - "dependencies": { - "Newtonsoft.Json": "12.0.1" - } - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -175,8 +170,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.4.0", + "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw==" }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -185,18 +180,18 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" }, "System.Reactive": { "type": "Transitive", @@ -229,16 +224,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "10.0.1", - "contentHash": "cVAka0o1rJJ5/De0pjNs7jcaZk5hUGf1HGzUyVmE2MEB1Vf0h/8qsWxImk1zjitCbeD2Avaq2P2+usdvqgbeVQ==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.6.3", @@ -251,8 +236,6 @@ "type": "Project", "dependencies": { "GraphQL.Client": "[6.0.0, )", - "Microsoft.AspNet.WebApi.Client": "[6.0.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[10.0.1, )", "Microsoft.CSharp": "[4.7.0, )", "Microsoft.Data.Sqlite": "[7.0.5, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )", @@ -260,8 +243,6 @@ "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", "Speckle.Sdk.Dependencies": "[1.0.0, )", - "System.IO.Pipelines": "[10.0.1, )", - "System.Net.Http.Json": "[10.0.1, )", "System.Threading.Channels": "[10.0.1, )" } }, @@ -279,27 +260,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.AspNet.WebApi.Client": { - "type": "CentralTransitive", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "zXeWP03dTo67AoDHUzR+/urck0KFssdCKOC+dq7Nv1V2YbFh/nIg09L0/3wSvyRONEdwxGB/ssEGmPNIIhAcAw==", - "dependencies": { - "Newtonsoft.Json": "13.0.1", - "Newtonsoft.Json.Bson": "1.0.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, "Microsoft.CSharp": { "type": "CentralTransitive", "requested": "[4.7.0, )", @@ -346,44 +306,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "System.IO.Pipelines": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "26LbFXHKd7PmRnWlkjnYgmjd5B6HYVG+1MpTO25BdxTJnx6D0O16JPAC/S4YBqjtt4YpfGj1QO/Ss6SPMGEGQw==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Memory": "4.6.3", - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, - "System.Net.Http.Json": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "XGOWt78ccgO9esyNlCemlS2b8JZPrH85pk/MvdHJxp6KwwUY/GnDaw2fPpJa7lgotiTkWnXnhip+ULNKaP7a8A==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Memory": "4.6.3", - "System.Text.Json": "10.0.1", - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, - "System.Text.Json": { - "type": "CentralTransitive", - "requested": "[8.0.5, )", - "resolved": "10.0.1", - "contentHash": "EsgwDgU1PFqhrFA9l5n+RBu76wFhNGCEwu8ITrBNhjPP3MxLyklroU5GIF8o6JYpYg6T4KD/VICfMdgPAvNp5g==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "10.0.1", - "System.Buffers": "4.6.1", - "System.IO.Pipelines": "10.0.1", - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2", - "System.Text.Encodings.Web": "10.0.1", - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, "System.Threading.Channels": { "type": "CentralTransitive", "requested": "[10.0.1, )", @@ -505,19 +427,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "Newtonsoft.Json.Bson": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", - "dependencies": { - "Newtonsoft.Json": "12.0.1" - } - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -555,8 +464,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==" }, "System.Reactive": { "type": "Transitive", @@ -568,29 +477,16 @@ "resolved": "4.5.1", "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "10.0.1", - "contentHash": "cVAka0o1rJJ5/De0pjNs7jcaZk5hUGf1HGzUyVmE2MEB1Vf0h/8qsWxImk1zjitCbeD2Avaq2P2+usdvqgbeVQ==" - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "speckle.sdk": { "type": "Project", "dependencies": { "GraphQL.Client": "[6.0.0, )", - "Microsoft.AspNet.WebApi.Client": "[6.0.0, )", "Microsoft.Data.Sqlite": "[7.0.5, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0, )", "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", "Speckle.Sdk.Dependencies": "[1.0.0, )", - "System.IO.Pipelines": "[10.0.1, )", - "System.Net.Http.Json": "[10.0.1, )", "System.Threading.Channels": "[10.0.1, )" } }, @@ -608,18 +504,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.AspNet.WebApi.Client": { - "type": "CentralTransitive", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "zXeWP03dTo67AoDHUzR+/urck0KFssdCKOC+dq7Nv1V2YbFh/nIg09L0/3wSvyRONEdwxGB/ssEGmPNIIhAcAw==", - "dependencies": { - "Newtonsoft.Json": "13.0.1", - "Newtonsoft.Json.Bson": "1.0.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Data.Sqlite": { "type": "CentralTransitive", "requested": "[7.0.5, )", @@ -660,31 +544,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "System.IO.Pipelines": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "26LbFXHKd7PmRnWlkjnYgmjd5B6HYVG+1MpTO25BdxTJnx6D0O16JPAC/S4YBqjtt4YpfGj1QO/Ss6SPMGEGQw==" - }, - "System.Net.Http.Json": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "XGOWt78ccgO9esyNlCemlS2b8JZPrH85pk/MvdHJxp6KwwUY/GnDaw2fPpJa7lgotiTkWnXnhip+ULNKaP7a8A==", - "dependencies": { - "System.Text.Json": "10.0.1" - } - }, - "System.Text.Json": { - "type": "CentralTransitive", - "requested": "[8.0.5, )", - "resolved": "10.0.1", - "contentHash": "EsgwDgU1PFqhrFA9l5n+RBu76wFhNGCEwu8ITrBNhjPP3MxLyklroU5GIF8o6JYpYg6T4KD/VICfMdgPAvNp5g==", - "dependencies": { - "System.IO.Pipelines": "10.0.1", - "System.Text.Encodings.Web": "10.0.1" - } - }, "System.Threading.Channels": { "type": "CentralTransitive", "requested": "[10.0.1, )", diff --git a/src/Speckle.Sdk.Dependencies/packages.lock.json b/src/Speckle.Sdk.Dependencies/packages.lock.json index 1f256577..aa13bc43 100644 --- a/src/Speckle.Sdk.Dependencies/packages.lock.json +++ b/src/Speckle.Sdk.Dependencies/packages.lock.json @@ -95,6 +95,14 @@ "resolved": "2.0.33", "contentHash": "xb2h1CsOepoYwdXEPui9VcQglwABQwNf9cccZbf+acarEzF5PUp8Xx71nFXIhOgEdm6wrxAoF6xAxK4m/XFRUQ==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "10.0.1", + "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.6.3" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -151,15 +159,6 @@ "dependencies": { "System.Runtime.CompilerServices.Unsafe": "6.1.2" } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.6.3" - } } }, "net8.0": { diff --git a/src/Speckle.Sdk/Pipelines/SendPipeline.cs b/src/Speckle.Sdk/Pipelines/SendPipeline.cs index 4c580163..1079f1f7 100644 --- a/src/Speckle.Sdk/Pipelines/SendPipeline.cs +++ b/src/Speckle.Sdk/Pipelines/SendPipeline.cs @@ -21,7 +21,14 @@ public sealed class SendPipeline : IDisposable ) { _cancellationToken = cancellationToken; - _uploader = new Uploader(projectId, modelId, ingestionId, account.serverInfo.url, account.token, cancellationToken); + _uploader = new Uploader( + projectId, + modelId, + ingestionId, + new(account.serverInfo.url), + account.token, + cancellationToken + ); } private UploadItem _lastItem; diff --git a/src/Speckle.Sdk/Pipelines/Uploader.cs b/src/Speckle.Sdk/Pipelines/Uploader.cs index ec8133a4..a7bf6e7e 100644 --- a/src/Speckle.Sdk/Pipelines/Uploader.cs +++ b/src/Speckle.Sdk/Pipelines/Uploader.cs @@ -1,7 +1,8 @@ using System.IO.Compression; using System.Net.Http.Headers; -using System.Net.Http.Json; +using System.Text; using System.Threading.Channels; +using Speckle.Newtonsoft.Json; namespace Speckle.Sdk.Pipelines; @@ -19,7 +20,7 @@ public sealed class Uploader : IDisposable string projectId, string modelId, string ingestionId, - string apiEndpoint, + Uri serverUrl, string authToken, CancellationToken cancellationToken ) @@ -28,14 +29,14 @@ public sealed class Uploader : IDisposable _modelId = modelId; _ingestionId = ingestionId; _cancellationToken = cancellationToken; + Uri apiBaseUrl = new(serverUrl, "/api/v1/"); - Uri apiBaseUrl = new(new(apiEndpoint), "/api/v1/"); _client = new HttpClient { BaseAddress = apiBaseUrl, Timeout = TimeSpan.FromMinutes(30) }; _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken); _channel = Channel.CreateBounded( - new BoundedChannelOptions(1000) { FullMode = BoundedChannelFullMode.Wait } + new BoundedChannelOptions(1000) { FullMode = BoundedChannelFullMode.Wait, SingleReader = true } ); _sendTask = SendLoopAsync(); @@ -66,9 +67,11 @@ public sealed class Uploader : IDisposable { await writer.WriteLineAsync($"{item.Id}\t{item.Json}\t{item.SpeckleType}").ConfigureAwait(false); } - +#if NET8_0_OR_GREATER + await writer.FlushAsync(_cancellationToken).ConfigureAwait(false); +#else await writer.FlushAsync().ConfigureAwait(false); - await gzip.FlushAsync(_cancellationToken).ConfigureAwait(false); +#endif } // fileStream.Flush(); // fileStream.Close(); @@ -77,13 +80,18 @@ public sealed class Uploader : IDisposable // 2. Request presigned URL var signUri = new Uri($"projects/{_projectId}/models/{_modelId}/uploads/sign", UriKind.Relative); - var signResponse = await HttpClientExtensions - .PostAsJsonAsync(_client, signUri, _cancellationToken) - .ConfigureAwait(false); + using var signResponse = await _client.PostAsync(signUri, null, _cancellationToken).ConfigureAwait(false); signResponse.EnsureSuccessStatusCode(); - var presignedUpload = - await signResponse.Content.ReadFromJsonAsync(_cancellationToken).ConfigureAwait(false) +#if NET5_0_OR_GREATER + string signResponseString = await signResponse + .Content.ReadAsStringAsync(_cancellationToken) + .ConfigureAwait(false); +#else + string signResponseString = await signResponse.Content.ReadAsStringAsync().ConfigureAwait(false); +#endif + PresignedUploadResponse presignedUpload = + JsonConvert.DeserializeObject(signResponseString) ?? throw new InvalidOperationException("Failed to get presigned upload URL"); // 3. Upload to S3 @@ -109,25 +117,24 @@ public sealed class Uploader : IDisposable var processUri = new Uri($"projects/{_projectId}/models/{_modelId}/uploads/process", UriKind.Relative); var processRequest = new ProcessUploadRequest { key = presignedUpload.Key, ingestionId = _ingestionId }; - var processResponse = await HttpClientExtensions - .PostAsJsonAsync(_client, processUri, processRequest, _cancellationToken) - .ConfigureAwait(false); + using StringContent content = new(JsonConvert.SerializeObject(processRequest), Encoding.UTF8, "application/json"); + var processResponse = await _client.PostAsync(processUri, content, _cancellationToken).ConfigureAwait(false); + processResponse.EnsureSuccessStatusCode(); - var processResult = await processResponse - .Content.ReadFromJsonAsync(_cancellationToken) - .ConfigureAwait(false); +#if NET5_0_OR_GREATER + string processResult = await processResponse.Content.ReadAsStringAsync(_cancellationToken).ConfigureAwait(false); +#else + string processResult = await processResponse.Content.ReadAsStringAsync().ConfigureAwait(false); +#endif + var json = JsonConvert.DeserializeObject(processResult); - if (processResult == null) + if (json is null) { throw new InvalidOperationException("Failed to trigger upload processing"); } - return new UploadResult { IngestionId = processResult.ingestionId }; - } - catch (Exception ex) when (!ex.IsFatal()) - { - throw; + return new UploadResult { IngestionId = json.ingestionId }; } finally { diff --git a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectFlopper.cs b/src/Speckle.Sdk/Serialisation/V2/Send/ObjectFlopper.cs deleted file mode 100644 index 2027a6e3..00000000 --- a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectFlopper.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System.IO.Compression; -using System.Net.Http.Headers; -using System.Threading.Channels; - -namespace Speckle.Sdk.Serialisation.V2.Send; - -#pragma warning disable CA1001 -public sealed class ObjectFlopper -#pragma warning restore CA1001 -{ - private readonly Uri _url; - private readonly string _streamId; - private readonly HttpClient _client; - private readonly Channel _channel; - private readonly Task _sendTask; - - public ObjectFlopper(Uri _, string streamId, string? authToken) - { - _streamId = streamId; - _url = new Uri("http://zog.local:3000/api/v1/"); - _client = new HttpClient { BaseAddress = _url, Timeout = TimeSpan.FromMinutes(10) }; - - if (authToken != null) - { - _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken); - } - - _channel = Channel.CreateBounded( - new BoundedChannelOptions(1000) { FullMode = BoundedChannelFullMode.Wait } - ); - - _sendTask = SendLoopAsync(streamId, "test"); - } - - public ValueTask PushAsync(BaseItem item, CancellationToken ct = default) => _channel.Writer.WriteAsync(item, ct); - - public async Task CompleteAsync() - { - _channel.Writer.Complete(); - await _sendTask.ConfigureAwait(false); - } - - private async Task SendLoopAsync(string projectId, string modelId) - { - var content = new PushStreamContent( - async (stream, _, _) => - { - var gzip = new GZipStream(stream, CompressionLevel.Optimal); - var writer = new StreamWriter(gzip); //new StreamWriter(gzip, System.Text.Encoding.UTF8, 20 * 1024 * 1024); - try - { - await foreach (var item in _channel.Reader.ReadAllAsync().ConfigureAwait(false)) - { - await writer.WriteLineAsync($"{item.Id}\t{item.Json}").ConfigureAwait(false); - } - } - finally - { - await writer.FlushAsync().ConfigureAwait(false); - await gzip.FlushAsync().ConfigureAwait(false); - writer.Dispose(); - gzip.Dispose(); - } - }, - new MediaTypeHeaderValue("application/x-ndjson") - ); - - var uri = new Uri($"projects/{projectId}/models/{modelId}/versions", UriKind.Relative); - var request = new HttpRequestMessage(HttpMethod.Post, uri) { Content = content }; - request.Headers.TransferEncodingChunked = true; // NOTE: important for streaming to happen. - var response = await _client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false); - response.EnsureSuccessStatusCode(); - - // Consume the response body to fully complete the request - await response.Content.ReadAsStringAsync().ConfigureAwait(false); - } - - public void Dispose() => _client.Dispose(); -} diff --git a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectFlopperGandalf.cs b/src/Speckle.Sdk/Serialisation/V2/Send/ObjectFlopperGandalf.cs deleted file mode 100644 index abccd3a6..00000000 --- a/src/Speckle.Sdk/Serialisation/V2/Send/ObjectFlopperGandalf.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System.IO.Compression; -using System.IO.Pipelines; -using System.Net.Http.Headers; -using System.Threading.Channels; - -namespace Speckle.Sdk.Serialisation.V2.Send; - -#pragma warning disable CA1001 -public sealed class ObjectFlopperGandalf -#pragma warning restore CA1001 -{ - private readonly Uri _url; - private readonly string _streamId; - private readonly HttpClient _client; - private readonly Channel _channel; - private readonly Task _sendTask; - - public ObjectFlopperGandalf(Uri _, string streamId, string? authToken) - { - _streamId = streamId; - _url = new Uri("http://bender-2.local:3000/api/v1/"); - _client = new HttpClient { BaseAddress = _url, Timeout = TimeSpan.FromMinutes(10) }; - - if (authToken != null) - { - _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken); - } - - _channel = Channel.CreateBounded( - new BoundedChannelOptions(1000) { FullMode = BoundedChannelFullMode.Wait } - ); - - _sendTask = SendLoopAsync(streamId, "test"); - } - - public ValueTask PushAsync(BaseItem item, CancellationToken ct = default) => _channel.Writer.WriteAsync(item, ct); - - public async Task CompleteAsync() - { - _channel.Writer.Complete(); - await _sendTask.ConfigureAwait(false); - } - - private async Task SendLoopAsync(string projectId, string modelId) - { - var pipe = new Pipe(); - - // Start writing to pipe immediately in background - var writeTask = Task.Run(async () => - { - var gzip = new GZipStream(pipe.Writer.AsStream(), CompressionLevel.Optimal); - var writer = new StreamWriter(gzip); - - try - { - await foreach (var item in _channel.Reader.ReadAllAsync().ConfigureAwait(false)) - { - await writer.WriteLineAsync($"{item.Id}\t{item.Json}").ConfigureAwait(false); - await writer.FlushAsync().ConfigureAwait(false); - } - } - finally - { - await writer.FlushAsync().ConfigureAwait(false); - await gzip.FlushAsync().ConfigureAwait(false); - writer.Dispose(); - gzip.Dispose(); - await pipe.Writer.CompleteAsync().ConfigureAwait(false); - } - }); - - // Start HTTP request immediately, reading from pipe - var content = new StreamContent(pipe.Reader.AsStream()); - content.Headers.ContentType = new MediaTypeHeaderValue("application/x-ndjson"); - content.Headers.ContentEncoding.Add("gzip"); - - var uri = new Uri($"projects/{projectId}/models/{modelId}/objects", UriKind.Relative); - var request = new HttpRequestMessage(HttpMethod.Post, uri) { Content = content }; - - var responseTask = _client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); - - // Wait for both - await Task.WhenAll(writeTask, responseTask).ConfigureAwait(false); - - var response = await responseTask.ConfigureAwait(false); - response.EnsureSuccessStatusCode(); - } - - public void Dispose() => _client.Dispose(); -} diff --git a/src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs b/src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs index 3c56b4af..b708f4d4 100644 --- a/src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs +++ b/src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs @@ -35,8 +35,7 @@ public class SerializeProcessFactory( IServerObjectManager serverObjectManager, IProgress? progress, CancellationToken cancellationToken, - SerializeProcessOptions? options = null, - ObjectFlopper? objectFlopper = null + SerializeProcessOptions? options = null ) => new SerializeProcess( progress, diff --git a/src/Speckle.Sdk/Speckle.Sdk.csproj b/src/Speckle.Sdk/Speckle.Sdk.csproj index 664d497a..1e9cf643 100644 --- a/src/Speckle.Sdk/Speckle.Sdk.csproj +++ b/src/Speckle.Sdk/Speckle.Sdk.csproj @@ -23,12 +23,9 @@ - - - @@ -36,7 +33,6 @@ - diff --git a/src/Speckle.Sdk/packages.lock.json b/src/Speckle.Sdk/packages.lock.json index b7195702..17478611 100644 --- a/src/Speckle.Sdk/packages.lock.json +++ b/src/Speckle.Sdk/packages.lock.json @@ -13,27 +13,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.AspNet.WebApi.Client": { - "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "zXeWP03dTo67AoDHUzR+/urck0KFssdCKOC+dq7Nv1V2YbFh/nIg09L0/3wSvyRONEdwxGB/ssEGmPNIIhAcAw==", - "dependencies": { - "Newtonsoft.Json": "13.0.1", - "Newtonsoft.Json.Bson": "1.0.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Direct", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", - "dependencies": { - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, "Microsoft.CSharp": { "type": "Direct", "requested": "[4.7.0, )", @@ -111,29 +90,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "System.IO.Pipelines": { - "type": "Direct", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "26LbFXHKd7PmRnWlkjnYgmjd5B6HYVG+1MpTO25BdxTJnx6D0O16JPAC/S4YBqjtt4YpfGj1QO/Ss6SPMGEGQw==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Memory": "4.6.3", - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, - "System.Net.Http.Json": { - "type": "Direct", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "XGOWt78ccgO9esyNlCemlS2b8JZPrH85pk/MvdHJxp6KwwUY/GnDaw2fPpJa7lgotiTkWnXnhip+ULNKaP7a8A==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Memory": "4.6.3", - "System.Text.Json": "10.0.1", - "System.Threading.Tasks.Extensions": "4.6.3" - } - }, "System.Threading.Channels": { "type": "Direct", "requested": "[10.0.1, )", @@ -165,6 +121,14 @@ "resolved": "6.0.0", "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "10.0.1", + "contentHash": "E1HSLkPHXEO30JEij2pWbOuzz1Z5ND4a5l7IP1T2RgQuE0a0NzEIvtO64RNy3Otn6PFezbT80cfm3M/Cgt70PA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.6.3" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -241,19 +205,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "Newtonsoft.Json.Bson": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", - "dependencies": { - "Newtonsoft.Json": "12.0.1" - } - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -286,8 +237,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw==" + "resolved": "4.4.0", + "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw==" }, "System.ComponentModel.Annotations": { "type": "Transitive", @@ -296,18 +247,18 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.6.3", - "contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==", + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", "dependencies": { - "System.Buffers": "4.6.1", - "System.Numerics.Vectors": "4.6.1", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" } }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.6.1", - "contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q==" + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" }, "System.Reactive": { "type": "Transitive", @@ -340,16 +291,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "10.0.1", - "contentHash": "cVAka0o1rJJ5/De0pjNs7jcaZk5hUGf1HGzUyVmE2MEB1Vf0h/8qsWxImk1zjitCbeD2Avaq2P2+usdvqgbeVQ==", - "dependencies": { - "System.Buffers": "4.6.1", - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2" - } - }, "System.Threading.Tasks.Extensions": { "type": "Transitive", "resolved": "4.6.3", @@ -358,57 +299,8 @@ "System.Runtime.CompilerServices.Unsafe": "6.1.2" } }, - "speckle.connectors.common": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", - "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Converters.Common": "[1.0.0, )", - "Speckle.Objects": "[1.0.0, )" - } - }, - "speckle.connectors.logging": { - "type": "Project" - }, - "speckle.converters.common": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[1.0.0, )" - } - }, - "speckle.objects": { - "type": "Project", - "dependencies": { - "Speckle.Sdk": "[1.0.0, )" - } - }, "speckle.sdk.dependencies": { "type": "Project" - }, - "Microsoft.Extensions.DependencyInjection": { - "type": "CentralTransitive", - "requested": "[2.2.0, )", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" - } - }, - "System.Text.Json": { - "type": "CentralTransitive", - "requested": "[8.0.5, )", - "resolved": "10.0.1", - "contentHash": "EsgwDgU1PFqhrFA9l5n+RBu76wFhNGCEwu8ITrBNhjPP3MxLyklroU5GIF8o6JYpYg6T4KD/VICfMdgPAvNp5g==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "10.0.1", - "System.Buffers": "4.6.1", - "System.IO.Pipelines": "10.0.1", - "System.Memory": "4.6.3", - "System.Runtime.CompilerServices.Unsafe": "6.1.2", - "System.Text.Encodings.Web": "10.0.1", - "System.Threading.Tasks.Extensions": "4.6.3" - } } }, "net8.0": { @@ -423,18 +315,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.AspNet.WebApi.Client": { - "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "zXeWP03dTo67AoDHUzR+/urck0KFssdCKOC+dq7Nv1V2YbFh/nIg09L0/3wSvyRONEdwxGB/ssEGmPNIIhAcAw==", - "dependencies": { - "Newtonsoft.Json": "13.0.1", - "Newtonsoft.Json.Bson": "1.0.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "Microsoft.Data.Sqlite": { "type": "Direct", "requested": "[7.0.5, )", @@ -497,21 +377,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "System.IO.Pipelines": { - "type": "Direct", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "26LbFXHKd7PmRnWlkjnYgmjd5B6HYVG+1MpTO25BdxTJnx6D0O16JPAC/S4YBqjtt4YpfGj1QO/Ss6SPMGEGQw==" - }, - "System.Net.Http.Json": { - "type": "Direct", - "requested": "[10.0.1, )", - "resolved": "10.0.1", - "contentHash": "XGOWt78ccgO9esyNlCemlS2b8JZPrH85pk/MvdHJxp6KwwUY/GnDaw2fPpJa7lgotiTkWnXnhip+ULNKaP7a8A==", - "dependencies": { - "System.Text.Json": "10.0.1" - } - }, "System.Threading.Channels": { "type": "Direct", "requested": "[10.0.1, )", @@ -605,19 +470,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, - "Newtonsoft.Json.Bson": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", - "dependencies": { - "Newtonsoft.Json": "12.0.1" - } - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -655,8 +507,8 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.5.3", + "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==" }, "System.Reactive": { "type": "Transitive", @@ -668,62 +520,8 @@ "resolved": "4.5.1", "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "10.0.1", - "contentHash": "cVAka0o1rJJ5/De0pjNs7jcaZk5hUGf1HGzUyVmE2MEB1Vf0h/8qsWxImk1zjitCbeD2Avaq2P2+usdvqgbeVQ==" - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, - "speckle.connectors.common": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "[2.2.0, )", - "Speckle.Connectors.Logging": "[1.0.0, )", - "Speckle.Converters.Common": "[1.0.0, )", - "Speckle.Objects": "[1.0.0, )" - } - }, - "speckle.connectors.logging": { - "type": "Project" - }, - "speckle.converters.common": { - "type": "Project", - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )", - "Speckle.Objects": "[1.0.0, )" - } - }, - "speckle.objects": { - "type": "Project", - "dependencies": { - "Speckle.Sdk": "[1.0.0, )" - } - }, "speckle.sdk.dependencies": { "type": "Project" - }, - "Microsoft.Extensions.DependencyInjection": { - "type": "CentralTransitive", - "requested": "[2.2.0, )", - "resolved": "2.2.0", - "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0" - } - }, - "System.Text.Json": { - "type": "CentralTransitive", - "requested": "[8.0.5, )", - "resolved": "10.0.1", - "contentHash": "EsgwDgU1PFqhrFA9l5n+RBu76wFhNGCEwu8ITrBNhjPP3MxLyklroU5GIF8o6JYpYg6T4KD/VICfMdgPAvNp5g==", - "dependencies": { - "System.IO.Pipelines": "10.0.1", - "System.Text.Encodings.Web": "10.0.1" - } } } } diff --git a/tests/Speckle.Automate.Sdk.Integration/packages.lock.json b/tests/Speckle.Automate.Sdk.Integration/packages.lock.json index 78c3841b..d0818532 100644 --- a/tests/Speckle.Automate.Sdk.Integration/packages.lock.json +++ b/tests/Speckle.Automate.Sdk.Integration/packages.lock.json @@ -370,7 +370,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -491,6 +492,12 @@ "System.Text.Encodings.Web": "8.0.0" } }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" + }, "Verify.Quibble": { "type": "CentralTransitive", "requested": "[2.1.1, )", diff --git a/tests/Speckle.Objects.Tests.Unit/packages.lock.json b/tests/Speckle.Objects.Tests.Unit/packages.lock.json index fe375e71..3ef2d70b 100644 --- a/tests/Speckle.Objects.Tests.Unit/packages.lock.json +++ b/tests/Speckle.Objects.Tests.Unit/packages.lock.json @@ -348,7 +348,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -432,6 +433,12 @@ "System.Text.Encodings.Web": "8.0.0" } }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" + }, "Verify.Quibble": { "type": "CentralTransitive", "requested": "[2.1.1, )", diff --git a/tests/Speckle.Sdk.Serialization.Testing/packages.lock.json b/tests/Speckle.Sdk.Serialization.Testing/packages.lock.json index 046c2c3c..022252ea 100644 --- a/tests/Speckle.Sdk.Serialization.Testing/packages.lock.json +++ b/tests/Speckle.Sdk.Serialization.Testing/packages.lock.json @@ -74,6 +74,11 @@ "resolved": "1.17.0", "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -337,7 +342,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -380,12 +386,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "1.1.0", - "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg==" - }, "Microsoft.Data.Sqlite": { "type": "CentralTransitive", "requested": "[7.0.5, )", @@ -425,6 +425,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" } } } diff --git a/tests/Speckle.Sdk.Serialization.Tests/packages.lock.json b/tests/Speckle.Sdk.Serialization.Tests/packages.lock.json index 2ac574fb..11691412 100644 --- a/tests/Speckle.Sdk.Serialization.Tests/packages.lock.json +++ b/tests/Speckle.Sdk.Serialization.Tests/packages.lock.json @@ -393,7 +393,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -474,6 +475,12 @@ "System.Text.Encodings.Web": "8.0.0" } }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" + }, "Verify.Quibble": { "type": "CentralTransitive", "requested": "[2.1.1, )", diff --git a/tests/Speckle.Sdk.Testing/packages.lock.json b/tests/Speckle.Sdk.Testing/packages.lock.json index 6e2cfd77..9cb33c89 100644 --- a/tests/Speckle.Sdk.Testing/packages.lock.json +++ b/tests/Speckle.Sdk.Testing/packages.lock.json @@ -311,7 +311,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -376,6 +377,12 @@ "dependencies": { "System.Text.Encodings.Web": "8.0.0" } + }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" } } } diff --git a/tests/Speckle.Sdk.Tests.Integration/packages.lock.json b/tests/Speckle.Sdk.Tests.Integration/packages.lock.json index 6138bda1..59e1a4d2 100644 --- a/tests/Speckle.Sdk.Tests.Integration/packages.lock.json +++ b/tests/Speckle.Sdk.Tests.Integration/packages.lock.json @@ -370,7 +370,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -454,6 +455,12 @@ "System.Text.Encodings.Web": "8.0.0" } }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" + }, "Verify.Quibble": { "type": "CentralTransitive", "requested": "[2.1.1, )", diff --git a/tests/Speckle.Sdk.Tests.Performance/packages.lock.json b/tests/Speckle.Sdk.Tests.Performance/packages.lock.json index 16d806d9..a96f59c2 100644 --- a/tests/Speckle.Sdk.Tests.Performance/packages.lock.json +++ b/tests/Speckle.Sdk.Tests.Performance/packages.lock.json @@ -92,6 +92,11 @@ "resolved": "1.17.0", "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -355,7 +360,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -372,12 +378,6 @@ "System.Reactive": "5.0.0" } }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "CentralTransitive", - "requested": "[5.0.0, )", - "resolved": "1.1.0", - "contentHash": "1Am6l4Vpn3/K32daEqZI+FFr96OlZkgwK2LcT3pZ2zWubR5zTPW3/FkO1Rat9kb7oQOa4rxgl9LJHc5tspCWfg==" - }, "Microsoft.Data.Sqlite": { "type": "CentralTransitive", "requested": "[7.0.5, )", @@ -417,6 +417,12 @@ "requested": "[13.0.2, )", "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" } } } diff --git a/tests/Speckle.Sdk.Tests.Unit/packages.lock.json b/tests/Speckle.Sdk.Tests.Unit/packages.lock.json index 8b50e6f9..4faff1c8 100644 --- a/tests/Speckle.Sdk.Tests.Unit/packages.lock.json +++ b/tests/Speckle.Sdk.Tests.Unit/packages.lock.json @@ -363,7 +363,8 @@ "Microsoft.Extensions.Logging": "[2.2.0, )", "Speckle.DoubleNumerics": "[4.1.0, )", "Speckle.Newtonsoft.Json": "[13.0.2, )", - "Speckle.Sdk.Dependencies": "[1.0.0, )" + "Speckle.Sdk.Dependencies": "[1.0.0, )", + "System.Threading.Channels": "[10.0.1, )" } }, "speckle.sdk.dependencies": { @@ -441,6 +442,12 @@ "System.Text.Encodings.Web": "8.0.0" } }, + "System.Threading.Channels": { + "type": "CentralTransitive", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "YRqU6Y2Cl6C+HrG5h1ftgKZ5VDTSA7j1wMKs5RtlauPeQ2EZ639Jt5aOFHdX3naP01hDDWFOWPApmNDVKwOpmg==" + }, "Verify.Quibble": { "type": "CentralTransitive", "requested": "[2.1.1, )",