diff --git a/Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll b/Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll new file mode 100644 index 0000000..79fbfcc Binary files /dev/null and b/Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll differ diff --git a/Assets/Speckle Connector/Core/Sentry.PlatformAbstractions.dll b/Assets/Speckle Connector/Core/Sentry.PlatformAbstractions.dll deleted file mode 100644 index f341473..0000000 Binary files a/Assets/Speckle Connector/Core/Sentry.PlatformAbstractions.dll and /dev/null differ diff --git a/Assets/Speckle Connector/Core/Sentry.PlatformAbstractions.dll.meta b/Assets/Speckle Connector/Core/Sentry.PlatformAbstractions.dll.meta deleted file mode 100644 index cf3ba59..0000000 --- a/Assets/Speckle Connector/Core/Sentry.PlatformAbstractions.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 26893be84ad1fc44d905be05f5dcb2ca -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Speckle Connector/Core/Sentry.Protocol.dll b/Assets/Speckle Connector/Core/Sentry.Protocol.dll deleted file mode 100644 index 9d763ad..0000000 Binary files a/Assets/Speckle Connector/Core/Sentry.Protocol.dll and /dev/null differ diff --git a/Assets/Speckle Connector/Core/Sentry.Protocol.dll.meta b/Assets/Speckle Connector/Core/Sentry.Protocol.dll.meta deleted file mode 100644 index 269c034..0000000 --- a/Assets/Speckle Connector/Core/Sentry.Protocol.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 80243eb38e83f6445831ccfbe9ae5b84 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Speckle Connector/Core/Sentry.dll b/Assets/Speckle Connector/Core/Sentry.dll index 2584cd2..99c42a9 100644 Binary files a/Assets/Speckle Connector/Core/Sentry.dll and b/Assets/Speckle Connector/Core/Sentry.dll differ diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json b/Assets/Speckle Connector/Core/SpeckleCore2.deps.json index 0aec15a..65fe676 100644 --- a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json +++ b/Assets/Speckle Connector/Core/SpeckleCore2.deps.json @@ -7,60 +7,71 @@ "targets": { ".NETStandard,Version=v2.0": {}, ".NETStandard,Version=v2.0/": { - "SpeckleCore2/2.0.0": { + "SpeckleCore2/2.1.0": { "dependencies": { - "GraphQL.Client": "3.2.1", + "GraphQL.Client": "3.2.2", "Microsoft.CSharp": "4.7.0", "NETStandard.Library": "2.0.3", "Piwik.Tracker": "3.0.0", - "Sentry": "2.1.8", + "Sentry": "3.2.0", "Speckle.Newtonsoft.Json": "12.0.3.1", - "System.Data.SQLite.Core": "1.0.113.6" + "System.Data.SQLite.Core": "1.0.113.7" }, "runtime": { "SpeckleCore2.dll": {} } }, - "GraphQL.Client/3.2.1": { + "GraphQL.Client/3.2.2": { "dependencies": { - "GraphQL.Client.Abstractions": "3.2.1", - "GraphQL.Client.Abstractions.Websocket": "3.2.1" + "GraphQL.Client.Abstractions": "3.2.2", + "GraphQL.Client.Abstractions.Websocket": "3.2.2" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.dll": { - "assemblyVersion": "3.2.1.0", - "fileVersion": "3.2.1.0" + "assemblyVersion": "3.2.2.0", + "fileVersion": "3.2.2.0" } } }, - "GraphQL.Client.Abstractions/3.2.1": { + "GraphQL.Client.Abstractions/3.2.2": { "dependencies": { - "GraphQL.Primitives": "3.2.1", + "GraphQL.Primitives": "3.2.2", "System.Reactive": "4.3.2" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.Abstractions.dll": { - "assemblyVersion": "3.2.1.0", - "fileVersion": "3.2.1.0" + "assemblyVersion": "3.2.2.0", + "fileVersion": "3.2.2.0" } } }, - "GraphQL.Client.Abstractions.Websocket/3.2.1": { + "GraphQL.Client.Abstractions.Websocket/3.2.2": { "dependencies": { - "GraphQL.Client.Abstractions": "3.2.1" + "GraphQL.Client.Abstractions": "3.2.2" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.Abstractions.Websocket.dll": { - "assemblyVersion": "3.2.1.0", - "fileVersion": "3.2.1.0" + "assemblyVersion": "3.2.2.0", + "fileVersion": "3.2.2.0" } } }, - "GraphQL.Primitives/3.2.1": { + "GraphQL.Primitives/3.2.2": { "runtime": { "lib/netstandard2.0/GraphQL.Primitives.dll": { - "assemblyVersion": "3.2.1.0", - "fileVersion": "3.2.1.0" + "assemblyVersion": "3.2.2.0", + "fileVersion": "3.2.2.0" + } + } + }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Bcl.AsyncInterfaces.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, @@ -79,14 +90,6 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, - "Newtonsoft.Json/11.0.2": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "11.0.0.0", - "fileVersion": "11.0.2.21924" - } - } - }, "Piwik.Tracker/3.0.0": { "runtime": { "lib/net40/Piwik.Tracker.dll": { @@ -95,32 +98,18 @@ } } }, - "Sentry/2.1.8": { + "Sentry/3.2.0": { "dependencies": { - "Newtonsoft.Json": "11.0.2", - "Sentry.PlatformAbstractions": "1.1.1", - "Sentry.Protocol": "2.1.8" + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Reflection.Metadata": "5.0.0", + "System.Text.Json": "5.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" }, "runtime": { "lib/netstandard2.0/Sentry.dll": { - "assemblyVersion": "2.1.8.0", - "fileVersion": "2.1.8.0" - } - } - }, - "Sentry.PlatformAbstractions/1.1.1": { - "runtime": { - "lib/netstandard2.0/Sentry.PlatformAbstractions.dll": { - "assemblyVersion": "1.1.1.0", - "fileVersion": "1.1.1.0" - } - } - }, - "Sentry.Protocol/2.1.8": { - "runtime": { - "lib/netstandard2.0/Sentry.Protocol.dll": { - "assemblyVersion": "2.1.8.0", - "fileVersion": "2.1.8.0" + "assemblyVersion": "3.2.0.0", + "fileVersion": "3.2.0.0" } } }, @@ -132,7 +121,7 @@ } } }, - "Stub.System.Data.SQLite.Core.NetStandard/1.0.113.1": { + "Stub.System.Data.SQLite.Core.NetStandard/1.0.113.2": { "runtime": { "lib/netstandard2.0/System.Data.SQLite.dll": { "assemblyVersion": "1.0.113.0", @@ -140,15 +129,55 @@ } } }, - "System.Data.SQLite.Core/1.0.113.6": { + "System.Buffers/4.5.1": { + "runtime": { + "lib/netstandard2.0/System.Buffers.dll": { + "assemblyVersion": "4.0.3.0", + "fileVersion": "4.6.28619.1" + } + } + }, + "System.Collections.Immutable/5.0.0": { "dependencies": { - "Stub.System.Data.SQLite.Core.NetStandard": "1.0.113.1" + "System.Memory": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/System.Collections.Immutable.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Data.SQLite.Core/1.0.113.7": { + "dependencies": { + "Stub.System.Data.SQLite.Core.NetStandard": "1.0.113.2" + } + }, + "System.Memory/4.5.4": { + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Memory.dll": { + "assemblyVersion": "4.0.1.1", + "fileVersion": "4.6.28619.1" + } + } + }, + "System.Numerics.Vectors/4.5.0": { + "runtime": { + "lib/netstandard2.0/System.Numerics.Vectors.dll": { + "assemblyVersion": "4.1.4.0", + "fileVersion": "4.6.26515.6" + } } }, "System.Reactive/4.3.2": { "dependencies": { "System.Runtime.InteropServices.WindowsRuntime": "4.3.0", - "System.Threading.Tasks.Extensions": "4.5.3" + "System.Threading.Tasks.Extensions": "4.5.4" }, "runtime": { "lib/netstandard2.0/System.Reactive.dll": { @@ -157,17 +186,28 @@ } } }, + "System.Reflection.Metadata/5.0.0": { + "dependencies": { + "System.Collections.Immutable": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Reflection.Metadata.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, "System.Runtime/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0" } }, - "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "runtime": { "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.1", - "fileVersion": "4.6.26919.2" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, @@ -182,52 +222,87 @@ } } }, - "System.Threading.Tasks.Extensions/4.5.3": { + "System.Text.Encodings.Web/5.0.0": { "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.5.2" + "System.Memory": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/System.Text.Encodings.Web.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Text.Json/5.0.0": { + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/System.Text.Json.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Threading.Tasks.Extensions/4.5.4": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/System.Threading.Tasks.Extensions.dll": { "assemblyVersion": "4.2.0.1", - "fileVersion": "4.6.27818.1" + "fileVersion": "4.6.28619.1" } } } } }, "libraries": { - "SpeckleCore2/2.0.0": { + "SpeckleCore2/2.1.0": { "type": "project", "serviceable": false, "sha512": "" }, - "GraphQL.Client/3.2.1": { + "GraphQL.Client/3.2.2": { "type": "package", "serviceable": true, - "sha512": "sha512-zo6dQJqLHgg5eOp8BEYJvCx5Eqx4K6v2xxZau4zqA1KxDoN673y5S/HRqHpeLfqiNFjlVJF5IAS5YpZ8RBAJUg==", - "path": "graphql.client/3.2.1", - "hashPath": "graphql.client.3.2.1.nupkg.sha512" + "sha512": "sha512-CgopiGmBLs95hQrxL3FG8EOJlKiF4CU9fLdELRIgk1GagaN9mxluyErLzZfT7a6Z/26vxHYCDfnL/UZgmjxOKw==", + "path": "graphql.client/3.2.2", + "hashPath": "graphql.client.3.2.2.nupkg.sha512" }, - "GraphQL.Client.Abstractions/3.2.1": { + "GraphQL.Client.Abstractions/3.2.2": { "type": "package", "serviceable": true, - "sha512": "sha512-C8OUqwBQWRgiGilXl74u+QChFJO+wNF5xf12SeQpSvqEQGCJAM5ePFGfExX+nZjrHA01Yve9mc6hBXwlBARdtQ==", - "path": "graphql.client.abstractions/3.2.1", - "hashPath": "graphql.client.abstractions.3.2.1.nupkg.sha512" + "sha512": "sha512-fWwx/5K15BGFi6p7+kZ32fYlOPv50Sb6ta7XpAUeh9vfYjZWU+BxL9ydKRgBrj2owpx6MSV0mfrSPalMO/LeAg==", + "path": "graphql.client.abstractions/3.2.2", + "hashPath": "graphql.client.abstractions.3.2.2.nupkg.sha512" }, - "GraphQL.Client.Abstractions.Websocket/3.2.1": { + "GraphQL.Client.Abstractions.Websocket/3.2.2": { "type": "package", "serviceable": true, - "sha512": "sha512-eITgPSmMXjdM7Xo7FEm5VwRIIa9mpb0UKOuNtMypP7Ks10l8tsegvwKcNqla+Tb9O0u3nAkq9rGVzbG3+qXIpw==", - "path": "graphql.client.abstractions.websocket/3.2.1", - "hashPath": "graphql.client.abstractions.websocket.3.2.1.nupkg.sha512" + "sha512": "sha512-YdTEpy0WohAmvsu6tdHkSkh9CaWHz5NIcrZtU0O4eCD58eG0A8O6o72FoK75uxArDg8YyqxlJ8AA6LoNJIxMNg==", + "path": "graphql.client.abstractions.websocket/3.2.2", + "hashPath": "graphql.client.abstractions.websocket.3.2.2.nupkg.sha512" }, - "GraphQL.Primitives/3.2.1": { + "GraphQL.Primitives/3.2.2": { "type": "package", "serviceable": true, - "sha512": "sha512-PlGV4S9ft3uZzyR4QYK/Jld1GEtkGpucU0L5IV8jUgPdLpNHvb2EHVJtFGO3/D3cCML34a5NMTPY1a+eIfVgDg==", - "path": "graphql.primitives/3.2.1", - "hashPath": "graphql.primitives.3.2.1.nupkg.sha512" + "sha512": "sha512-JWurQzJ39/agJqrLIcRgnTtzCgn3zlGmrrYH4qznHUEq49QIMM+btTGbsE9pXmVKIk4Kl0SrDag+Y9ev8zBoXw==", + "path": "graphql.primitives/3.2.2", + "hashPath": "graphql.primitives.3.2.2.nupkg.sha512" + }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "path": "microsoft.bcl.asyncinterfaces/5.0.0", + "hashPath": "microsoft.bcl.asyncinterfaces.5.0.0.nupkg.sha512" }, "Microsoft.CSharp/4.7.0": { "type": "package", @@ -257,13 +332,6 @@ "path": "netstandard.library/2.0.3", "hashPath": "netstandard.library.2.0.3.nupkg.sha512" }, - "Newtonsoft.Json/11.0.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-IvJe1pj7JHEsP8B8J8DwlMEx8UInrs/x+9oVY+oCD13jpLu4JbJU2WCIsMRn5C4yW9+DgkaO8uiVE5VHKjpmdQ==", - "path": "newtonsoft.json/11.0.2", - "hashPath": "newtonsoft.json.11.0.2.nupkg.sha512" - }, "Piwik.Tracker/3.0.0": { "type": "package", "serviceable": true, @@ -271,26 +339,12 @@ "path": "piwik.tracker/3.0.0", "hashPath": "piwik.tracker.3.0.0.nupkg.sha512" }, - "Sentry/2.1.8": { + "Sentry/3.2.0": { "type": "package", "serviceable": true, - "sha512": "sha512-GiRDS9mUijrtGey0rNP964KhVjb3vDWQzaXnrJFwPdE3obC9wQpOzY1ppMq4LXSxVS2N8+L9hM4jrDgDRduzvQ==", - "path": "sentry/2.1.8", - "hashPath": "sentry.2.1.8.nupkg.sha512" - }, - "Sentry.PlatformAbstractions/1.1.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ug99ZPdcQQY2Q2smO5tWfxUdMQF8f90UdCKMSfhucJVOAQtKWM0rXcqLvVZRlXDzeB/xNQWLSuw56I5MuaOS9g==", - "path": "sentry.platformabstractions/1.1.1", - "hashPath": "sentry.platformabstractions.1.1.1.nupkg.sha512" - }, - "Sentry.Protocol/2.1.8": { - "type": "package", - "serviceable": true, - "sha512": "sha512-P7f3agNvXqAU+gALpMTeBK8DdfalPXXU62R4yRpFLXd9tVBEkva51HgPvXcuD37rhH6vNxydDzdQbe5+iIIgyA==", - "path": "sentry.protocol/2.1.8", - "hashPath": "sentry.protocol.2.1.8.nupkg.sha512" + "sha512": "sha512-nCKeGuy8JCofqM44+ThKXnjKU7A00mQCHrPbChEh50l+WcSJW1bV+pQDblWhQis37+cP3sV6q0QApDEK4Qy4Zw==", + "path": "sentry/3.2.0", + "hashPath": "sentry.3.2.0.nupkg.sha512" }, "Speckle.Newtonsoft.Json/12.0.3.1": { "type": "package", @@ -299,19 +353,47 @@ "path": "speckle.newtonsoft.json/12.0.3.1", "hashPath": "speckle.newtonsoft.json.12.0.3.1.nupkg.sha512" }, - "Stub.System.Data.SQLite.Core.NetStandard/1.0.113.1": { + "Stub.System.Data.SQLite.Core.NetStandard/1.0.113.2": { "type": "package", "serviceable": true, - "sha512": "sha512-qFjwuCuZlTz3yT06gaueDJwTykiblNeaLTx3sONXoNlLm2NJwghLvr+W9fvRevKcYcIRiKrq6WJ56QwZJq9fnQ==", - "path": "stub.system.data.sqlite.core.netstandard/1.0.113.1", - "hashPath": "stub.system.data.sqlite.core.netstandard.1.0.113.1.nupkg.sha512" + "sha512": "sha512-yGIM9xFyPHl79HluNTSQarvAOIJ68pmzmlMayVN6Nivu/7TiaHt7WqptolvwmuKdAXei8OzENh9RNdh7d6evjQ==", + "path": "stub.system.data.sqlite.core.netstandard/1.0.113.2", + "hashPath": "stub.system.data.sqlite.core.netstandard.1.0.113.2.nupkg.sha512" }, - "System.Data.SQLite.Core/1.0.113.6": { + "System.Buffers/4.5.1": { "type": "package", "serviceable": true, - "sha512": "sha512-8Iyo9b2iG29eYCGjnly6EdF+yw20q83vRTkK9zpJzip5QvQeRSs7rQPmaxg+R2oJKNL8w/6K274F6YHXkEjq5w==", - "path": "system.data.sqlite.core/1.0.113.6", - "hashPath": "system.data.sqlite.core.1.0.113.6.nupkg.sha512" + "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", + "path": "system.buffers/4.5.1", + "hashPath": "system.buffers.4.5.1.nupkg.sha512" + }, + "System.Collections.Immutable/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", + "path": "system.collections.immutable/5.0.0", + "hashPath": "system.collections.immutable.5.0.0.nupkg.sha512" + }, + "System.Data.SQLite.Core/1.0.113.7": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2DKMIxfZpIVzdMfx1dj9qvTm+0m0Mx6sN6CZXMQDNytU7Sk/JKo0Ox6mvHAicfHrQgqZbUZMzMMtLXD0kwmFfg==", + "path": "system.data.sqlite.core/1.0.113.7", + "hashPath": "system.data.sqlite.core.1.0.113.7.nupkg.sha512" + }, + "System.Memory/4.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "path": "system.memory/4.5.4", + "hashPath": "system.memory.4.5.4.nupkg.sha512" + }, + "System.Numerics.Vectors/4.5.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==", + "path": "system.numerics.vectors/4.5.0", + "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" }, "System.Reactive/4.3.2": { "type": "package", @@ -320,6 +402,13 @@ "path": "system.reactive/4.3.2", "hashPath": "system.reactive.4.3.2.nupkg.sha512" }, + "System.Reflection.Metadata/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", + "path": "system.reflection.metadata/5.0.0", + "hashPath": "system.reflection.metadata.5.0.0.nupkg.sha512" + }, "System.Runtime/4.3.0": { "type": "package", "serviceable": true, @@ -327,12 +416,12 @@ "path": "system.runtime/4.3.0", "hashPath": "system.runtime.4.3.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ==", - "path": "system.runtime.compilerservices.unsafe/4.5.2", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512" + "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==", + "path": "system.runtime.compilerservices.unsafe/5.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512" }, "System.Runtime.InteropServices.WindowsRuntime/4.3.0": { "type": "package", @@ -341,12 +430,26 @@ "path": "system.runtime.interopservices.windowsruntime/4.3.0", "hashPath": "system.runtime.interopservices.windowsruntime.4.3.0.nupkg.sha512" }, - "System.Threading.Tasks.Extensions/4.5.3": { + "System.Text.Encodings.Web/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==", - "path": "system.threading.tasks.extensions/4.5.3", - "hashPath": "system.threading.tasks.extensions.4.5.3.nupkg.sha512" + "sha512": "sha512-EEslUvHKll1ftizbn20mX3Ix/l4Ygk/bdJ2LY6/X6FlGaP0RIhKMo9nS6JIGnKKT6KBP2PGj6JC3B9/ZF6ErqQ==", + "path": "system.text.encodings.web/5.0.0", + "hashPath": "system.text.encodings.web.5.0.0.nupkg.sha512" + }, + "System.Text.Json/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-+luxMQNZ2WqeffBU7Ml6njIvxc8169NW2oU+ygNudXQGZiarjE7DOtN7bILiQjTZjkmwwRZGTtLzmdrSI/Ustw==", + "path": "system.text.json/5.0.0", + "hashPath": "system.text.json.5.0.0.nupkg.sha512" + }, + "System.Threading.Tasks.Extensions/4.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "path": "system.threading.tasks.extensions/4.5.4", + "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" } } } \ No newline at end of file diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.dll b/Assets/Speckle Connector/Core/SpeckleCore2.dll index 37b403e..2568fbe 100644 Binary files a/Assets/Speckle Connector/Core/SpeckleCore2.dll and b/Assets/Speckle Connector/Core/SpeckleCore2.dll differ diff --git a/Assets/Speckle Connector/Core/System.Buffers.dll b/Assets/Speckle Connector/Core/System.Buffers.dll new file mode 100644 index 0000000..c0970c0 Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Buffers.dll differ diff --git a/Assets/Speckle Connector/Core/System.Collections.Immutable.dll b/Assets/Speckle Connector/Core/System.Collections.Immutable.dll new file mode 100644 index 0000000..f737e42 Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Collections.Immutable.dll differ diff --git a/Assets/Speckle Connector/Core/System.Memory.dll b/Assets/Speckle Connector/Core/System.Memory.dll new file mode 100644 index 0000000..953a9d2 Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Memory.dll differ diff --git a/Assets/Speckle Connector/Core/System.Numerics.Vectors.dll b/Assets/Speckle Connector/Core/System.Numerics.Vectors.dll new file mode 100644 index 0000000..1020577 Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Numerics.Vectors.dll differ diff --git a/Assets/Speckle Connector/Core/System.Reflection.Metadata.dll b/Assets/Speckle Connector/Core/System.Reflection.Metadata.dll new file mode 100644 index 0000000..5d1f00d Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Reflection.Metadata.dll differ diff --git a/Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll b/Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll index 3156239..51974c7 100644 Binary files a/Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll and b/Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll differ diff --git a/Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll b/Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll new file mode 100644 index 0000000..658343d Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll differ diff --git a/Assets/Speckle Connector/Core/System.Text.Json.dll b/Assets/Speckle Connector/Core/System.Text.Json.dll new file mode 100644 index 0000000..1648e54 Binary files /dev/null and b/Assets/Speckle Connector/Core/System.Text.Json.dll differ diff --git a/Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll b/Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll index e059050..dfab234 100644 Binary files a/Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll and b/Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll differ diff --git a/Assets/Speckle Connector/Objects/Objects.dll b/Assets/Speckle Connector/Objects/Objects.dll index 5cf6035..69afc12 100644 Binary files a/Assets/Speckle Connector/Objects/Objects.dll and b/Assets/Speckle Connector/Objects/Objects.dll differ diff --git a/Assets/Speckle Connector/Receiver.cs b/Assets/Speckle Connector/Receiver.cs index eaa2055..40ea59c 100644 --- a/Assets/Speckle Connector/Receiver.cs +++ b/Assets/Speckle Connector/Receiver.cs @@ -11,6 +11,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Sentry; using Sentry.Protocol; using UnityEngine; @@ -74,14 +75,6 @@ namespace Speckle.ConnectorUnity } } - /// - /// Initializes the Receiver automatically, with t - /// To be used when the StreamId property is set on the Unity ScriptableObject - /// - public void Init() - { - Client = new Client(AccountManager.GetDefaultAccount()); - } /// /// Gets and converts the data of the last commit on the Stream @@ -89,12 +82,16 @@ namespace Speckle.ConnectorUnity /// public void Receive() { + if(Client==null || string.IsNullOrEmpty(StreamId)) + throw new Exception("Receiver has not been initialized. Please call Init()."); + Task.Run(async () => { try { - var branches = await Client.StreamGetBranches(StreamId); - var mainBranch = branches.FirstOrDefault(b => b.name == "main"); + var mainBranch = await Client.BranchGet(StreamId, "main", 1); + if(!mainBranch.commits.items.Any()) + throw new Exception("This branch has no commits"); var commit = mainBranch.commits.items[0]; GetAndConvertObject(commit.referencedObject, commit.id); } diff --git a/Assets/Speckle Connector/Sender.cs b/Assets/Speckle Connector/Sender.cs index c476c9c..32a906d 100644 --- a/Assets/Speckle Connector/Sender.cs +++ b/Assets/Speckle Connector/Sender.cs @@ -11,6 +11,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Sentry; using Sentry.Protocol; using UnityEngine; @@ -25,7 +26,13 @@ namespace Speckle.ConnectorUnity /// /// Converts and sends the data of the last commit on the Stream /// - /// + /// ID of the stream to send to + /// List of gameObjects to convert and send + /// Account to use. If not provided the default account will be used + /// Action to run after the data has been sent + /// Action to run when there is download/conversion progress + /// Action to run on error + /// public void Send(string streamId, List gameObjects, Account account = null, Action onDataSentAction = null, Action> onProgressAction = null, @@ -36,32 +43,17 @@ namespace Speckle.ConnectorUnity var data = ConvertRecursivelyToSpeckle(gameObjects); Task.Run(async () => { - var client = new Client(account ?? AccountManager.GetDefaultAccount()); - var transports = new List(); - transports.Add(new ServerTransport(client.Account, streamId)); - - var objectId = await Operations.Send(data, transports, + var res = await Helpers.Send(streamId, data, "Data from unity!", + account: account, onErrorAction: onErrorAction, onProgressAction: onProgressAction); - var branchName = "main"; - - Tracker.TrackPageview(Tracker.SEND); - var res = await client.CommitCreate( - new CommitCreateInput - { - streamId = streamId, - branchName = branchName, - objectId = objectId, - message = "Data from unity!" - }); - onDataSentAction?.Invoke(res); }); } catch (Exception e) { - throw new SpeckleException(e.Message, e, true, SentryLevel.Error); + throw new SpeckleException(e.Message, e, true, SentryLevel.Error); } } diff --git a/Assets/Speckle Connector/ServerTransport/ServerTransport.dll b/Assets/Speckle Connector/ServerTransport/ServerTransport.dll deleted file mode 100644 index e3a1d43..0000000 Binary files a/Assets/Speckle Connector/ServerTransport/ServerTransport.dll and /dev/null differ diff --git a/Assets/Speckle Connector/ServerTransport/ServerTransport.dll.meta b/Assets/Speckle Connector/ServerTransport/ServerTransport.dll.meta deleted file mode 100644 index addc3f4..0000000 --- a/Assets/Speckle Connector/ServerTransport/ServerTransport.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: e46e5cd783da8b64a9b5955e9c05c641 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: