diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 6f95dac..621596c 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/Speckle.Importer.Tester/DummyServerObjectManager.cs b/src/Speckle.Importer.Tester/DummyServerObjectManager.cs index cbca960..6f3f776 100644 --- a/src/Speckle.Importer.Tester/DummyServerObjectManager.cs +++ b/src/Speckle.Importer.Tester/DummyServerObjectManager.cs @@ -1,6 +1,6 @@ using System.Text; -using Speckle.Sdk.Dependencies.Serialization; using Speckle.Sdk.Serialisation.V2; +using Speckle.Sdk.Serialisation.V2.Send; using Speckle.Sdk.Transports; namespace Speckle.Importer.Tester; @@ -8,7 +8,7 @@ namespace Speckle.Importer.Tester; public class DummyServerObjectManager : IServerObjectManager { public IAsyncEnumerable<(string, string)> DownloadObjects( - IReadOnlyList objectIds, + IReadOnlyCollection objectIds, IProgress? progress, CancellationToken cancellationToken ) => throw new NotImplementedException(); @@ -20,7 +20,7 @@ public class DummyServerObjectManager : IServerObjectManager ) => throw new NotImplementedException(); public Task> HasObjects( - IReadOnlyList objectIds, + IReadOnlyCollection objectIds, CancellationToken cancellationToken ) => throw new NotImplementedException(); @@ -34,7 +34,7 @@ public class DummyServerObjectManager : IServerObjectManager long totalBytes = 0; foreach (var item in objects) { - totalBytes += Encoding.Default.GetByteCount(item.Json); + totalBytes += Encoding.Default.GetByteCount(item.Json.Value); } progress?.Report(new(ProgressEvent.UploadBytes, totalBytes, totalBytes)); diff --git a/src/Speckle.Importer.Tester/packages.lock.json b/src/Speckle.Importer.Tester/packages.lock.json index ab2c11a..93d0132 100644 --- a/src/Speckle.Importer.Tester/packages.lock.json +++ b/src/Speckle.Importer.Tester/packages.lock.json @@ -212,8 +212,8 @@ "Ara3D.Logging": "[1.4.5, )", "Ara3D.Utils": "[1.4.5, )", "Microsoft.Extensions.DependencyInjection": "[8.0.1, )", - "Speckle.Objects": "[3.1.0-dev.215, )", - "Speckle.Sdk": "[3.1.0-dev.215, )", + "Speckle.Objects": "[3.1.0-dev.216, )", + "Speckle.Sdk": "[3.1.0-dev.216, )", "Speckle.WebIfc": "[0.0.64-speckle1, )", "System.CommandLine": "[2.0.0-beta4.22272.1, )" } @@ -253,18 +253,18 @@ }, "Speckle.Objects": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.215, )", - "resolved": "3.1.0-dev.215", - "contentHash": "NNiTR3dp1/4WNIv2WRHm87pr4WQztt9vVRALqULEUTcYrvb34xwnKwPwt3Ah5iXW1g3qkecXto5V7Ex+IIzeRQ==", + "requested": "[3.1.0-dev.216, )", + "resolved": "3.1.0-dev.216", + "contentHash": "oHyjQ0VFFcRNjgohlNQxtg1xxI6pNfpTNHZtkfVkQftb9ijbZ4MgG8nnW3vsBO/smRtBxynncrO9d3j40Iyqiw==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.215" + "Speckle.Sdk": "3.1.0-dev.216" } }, "Speckle.Sdk": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.215, )", - "resolved": "3.1.0-dev.215", - "contentHash": "YMb7xdELiza88RSCUWcqmKJlrnoqjxlc1+Z1gEQSCfvFV0Ibvfjz08YAMkOWFc/ZaY9nBUZvshHEWYIskEk5cg==", + "requested": "[3.1.0-dev.216, )", + "resolved": "3.1.0-dev.216", + "contentHash": "tnsNOzooSIBhQk3BX3xudrRLL3A+n8ojfG81dJpKA8bSDOszdwPR2nWBJVA24KpZ6J3666jfRsi6NvAaxNFRcQ==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -273,14 +273,14 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.215" + "Speckle.Sdk.Dependencies": "3.1.0-dev.216" } }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.215, )", - "resolved": "3.1.0-dev.215", - "contentHash": "cT5HRu+pRBvfKTRJIvQBgdX2X5eeTebHe7zmNz82tFT0p65RsK9K7Ap9RjvMndbEPqFtt8/sCNa5RHyfrf+IUg==" + "requested": "[3.1.0-dev.216, )", + "resolved": "3.1.0-dev.216", + "contentHash": "v3EBevnZqcPres3xWn0mcnCCKhSLlqwTyfqUOTQSWHCCBBos8t0aBIQ21EBEkDaklaS7auj+Rk7vWByvgcrUbQ==" }, "Speckle.WebIfc": { "type": "CentralTransitive", @@ -296,4 +296,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Speckle.WebIfc.Importer/Speckle.WebIfc.Importer.csproj b/src/Speckle.WebIfc.Importer/Speckle.WebIfc.Importer.csproj index 0edc891..d149b58 100644 --- a/src/Speckle.WebIfc.Importer/Speckle.WebIfc.Importer.csproj +++ b/src/Speckle.WebIfc.Importer/Speckle.WebIfc.Importer.csproj @@ -7,7 +7,7 @@ true true - 0.0.6 + 0.0.7 diff --git a/src/Speckle.WebIfc.Importer/packages.lock.json b/src/Speckle.WebIfc.Importer/packages.lock.json index ba1db7f..878869c 100644 --- a/src/Speckle.WebIfc.Importer/packages.lock.json +++ b/src/Speckle.WebIfc.Importer/packages.lock.json @@ -53,18 +53,18 @@ }, "Speckle.Objects": { "type": "Direct", - "requested": "[3.1.0-dev.215, )", - "resolved": "3.1.0-dev.215", - "contentHash": "NNiTR3dp1/4WNIv2WRHm87pr4WQztt9vVRALqULEUTcYrvb34xwnKwPwt3Ah5iXW1g3qkecXto5V7Ex+IIzeRQ==", + "requested": "[3.1.0-dev.216, )", + "resolved": "3.1.0-dev.216", + "contentHash": "oHyjQ0VFFcRNjgohlNQxtg1xxI6pNfpTNHZtkfVkQftb9ijbZ4MgG8nnW3vsBO/smRtBxynncrO9d3j40Iyqiw==", "dependencies": { - "Speckle.Sdk": "3.1.0-dev.215" + "Speckle.Sdk": "3.1.0-dev.216" } }, "Speckle.Sdk": { "type": "Direct", - "requested": "[3.1.0-dev.215, )", - "resolved": "3.1.0-dev.215", - "contentHash": "YMb7xdELiza88RSCUWcqmKJlrnoqjxlc1+Z1gEQSCfvFV0Ibvfjz08YAMkOWFc/ZaY9nBUZvshHEWYIskEk5cg==", + "requested": "[3.1.0-dev.216, )", + "resolved": "3.1.0-dev.216", + "contentHash": "tnsNOzooSIBhQk3BX3xudrRLL3A+n8ojfG81dJpKA8bSDOszdwPR2nWBJVA24KpZ6J3666jfRsi6NvAaxNFRcQ==", "dependencies": { "GraphQL.Client": "6.0.0", "Microsoft.CSharp": "4.7.0", @@ -73,7 +73,7 @@ "Microsoft.Extensions.Logging": "2.2.0", "Speckle.DoubleNumerics": "4.0.1", "Speckle.Newtonsoft.Json": "13.0.2", - "Speckle.Sdk.Dependencies": "3.1.0-dev.215" + "Speckle.Sdk.Dependencies": "3.1.0-dev.216" } }, "Speckle.WebIfc": { @@ -277,10 +277,10 @@ }, "Speckle.Sdk.Dependencies": { "type": "CentralTransitive", - "requested": "[3.1.0-dev.215, )", - "resolved": "3.1.0-dev.215", - "contentHash": "cT5HRu+pRBvfKTRJIvQBgdX2X5eeTebHe7zmNz82tFT0p65RsK9K7Ap9RjvMndbEPqFtt8/sCNa5RHyfrf+IUg==" + "requested": "[3.1.0-dev.216, )", + "resolved": "3.1.0-dev.216", + "contentHash": "v3EBevnZqcPres3xWn0mcnCCKhSLlqwTyfqUOTQSWHCCBBos8t0aBIQ21EBEkDaklaS7auj+Rk7vWByvgcrUbQ==" } } } -} +} \ No newline at end of file