diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..2505756 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,210 @@ +root = true +# Don't use tabs for indentation. +[*] +indent_style = space + +# Microsoft .NET properties +csharp_using_directive_placement = outside_namespace:silent + +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none + +# ReSharper properties +resharper_align_linq_query = false +resharper_align_multiline_calls_chain = true +resharper_align_multiline_extends_list = true +resharper_align_multiline_for_stmt = true +resharper_align_multiline_parameter = true +resharper_align_multiple_declaration = true +resharper_align_multline_type_parameter_constrains = true +resharper_align_multline_type_parameter_list = true +resharper_braces_for_dowhile = not_required +resharper_braces_for_fixed = not_required +resharper_braces_for_lock = not_required +resharper_braces_for_using = not_required +resharper_csharp_align_multiline_calls_chain = false +resharper_csharp_align_multiline_extends_list = false +resharper_csharp_align_multiline_parameter = false +resharper_csharp_int_align_comments = false +resharper_csharp_outdent_commas = true +resharper_csharp_outdent_dots = false +resharper_csharp_wrap_after_declaration_lpar = true +resharper_csharp_wrap_after_invocation_lpar = true +resharper_csharp_wrap_arguments_style = chop_if_long +resharper_csharp_wrap_before_declaration_rpar = true +resharper_csharp_wrap_before_invocation_rpar = false +resharper_csharp_wrap_extends_list_style = chop_if_long +resharper_csharp_wrap_parameters_style = chop_if_long +resharper_force_attribute_style = join +resharper_indent_nested_fixed_stmt = false +resharper_indent_nested_foreach_stmt = true +resharper_indent_nested_for_stmt = true +resharper_indent_nested_lock_stmt = false +resharper_indent_nested_usings_stmt = false +resharper_indent_nested_while_stmt = true +resharper_int_align = false +resharper_int_align_nested_ternary = false +resharper_int_align_switch_expressions = false +resharper_keep_existing_declaration_block_arrangement = true +resharper_keep_existing_declaration_parens_arrangement = false +resharper_keep_existing_embedded_block_arrangement = true +resharper_keep_existing_enum_arrangement = true +resharper_keep_existing_expr_member_arrangement = true +resharper_keep_existing_initializer_arrangement = false +resharper_local_function_body = expression_body +resharper_max_attribute_length_for_same_line = 20 +resharper_max_formal_parameters_on_line = 5 +resharper_max_initializer_elements_on_line = 0 +resharper_max_invocation_arguments_on_line = 5 +resharper_outdent_binary_ops = true +resharper_outdent_dots = false +resharper_place_constructor_initializer_on_same_line = false +resharper_place_simple_initializer_on_single_line = true +resharper_prefer_explicit_discard_declaration = false +resharper_wrap_after_declaration_lpar = false +resharper_wrap_before_invocation_rpar = false +resharper_wrap_chained_binary_expressions = chop_if_long +resharper_wrap_chained_binary_patterns = chop_if_long +resharper_wrap_chained_method_calls = chop_if_long +resharper_xmldoc_indent_text = ZeroIndent + +# Standard properties +insert_final_newline = true + +# (Please don't specify an indent_size here; that has too many unintended consequences.) + +# Code files +[*.{cs,csx,vb,vbx}] +indent_size = 4 +charset = utf-8 + +# Xml project files +[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] +indent_size = 2 +space_after_last_pi_attribute = false +# Xml config files +[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] +indent_size = 2 +space_after_last_pi_attribute = false + +# JSON files +[*.json] +indent_size = 2 + +# Dotnet code style settings: +[*.{cs,vb}] +# Sort using and Import directives with System.* appearing first +dotnet_sort_system_directives_first = true +dotnet_separate_import_directive_groups = false + +# Avoid "this." and "Me." if not necessary +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +# Use language keywords instead of framework type names for type references +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent +dotnet_style_readonly_field = true:suggestion + +# Expression-level preferences +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_auto_properties = true:warning +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent + + +# CSharp code style settings: +[*.cs] +# Prefer "var" everywhere +csharp_style_var_elsewhere = false:none +csharp_style_var_for_built_in_types = false:none +csharp_style_var_when_type_is_apparent = false:none + +# Prefer method-like constructs to have a block body +csharp_style_expression_bodied_methods = false:suggestion +csharp_style_expression_bodied_constructors = false:suggestion +csharp_style_expression_bodied_operators = true:suggestion + +# Prefer property-like constructs to have an expression-body +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion + +# Suggest more modern language features when available +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion + +# Newline settings +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_members_in_anonymous_types = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_around_binary_operators = before_and_after +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false + +# Wrapping preferences +csharp_preserve_single_line_statements = true +csharp_preserve_single_line_blocks = true + +# Analyzer settings +dotnet_diagnostic.ide0055.severity = none + +# Maintainability rules +dotnet_diagnostic.ca1501.severity = warning +dotnet_diagnostic.ca1502.severity = warning +dotnet_diagnostic.ca1505.severity = warning +dotnet_diagnostic.ca1506.severity = warning +dotnet_diagnostic.ca1507.severity = warning +dotnet_diagnostic.ca1508.severity = warning +dotnet_diagnostic.ca1509.severity = warning + +# Misc +dotnet_diagnostic.ca1051.severity = none # Do not declare visible instance fields +dotnet_diagnostic.ca1062.severity = none # Public method must check all parameters for null +dotnet_diagnostic.ca1707.severity = none # Remove underscores in names + + +dotnet_analyzer_diagnostic.category-globalization.severity = none +dotnet_analyzer_diagnostic.category-security.severity = none +dotnet_analyzer_diagnostic.category-interoperability.severity = none +dotnet_analyzer_diagnostic.category-singlefile.severity = none + +[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}] +indent_style = space +indent_size = 4 +tab_width = 2 diff --git a/.gitignore b/.gitignore index 2af74cf..0f46ef7 100644 --- a/.gitignore +++ b/.gitignore @@ -45,14 +45,14 @@ ExportedObj/ *.pidb *.booproj *.svd -*.pdb +#*.pdb *.mdb *.opendb *.VC.db # Unity3D generated meta files *.pidb.meta -*.pdb.meta +#*.pdb.meta *.mdb.meta # Unity3D generated file on crash reports diff --git a/Assets/Extra/PerformanceTestSender.cs b/Assets/Extra/PerformanceTestSender.cs new file mode 100644 index 0000000..5b0cd99 --- /dev/null +++ b/Assets/Extra/PerformanceTestSender.cs @@ -0,0 +1,79 @@ +using System.Threading; +using System.Threading.Tasks; +using Speckle.ConnectorUnity.Components; +using Speckle.Core.Api; +using Speckle.Core.Models; +using Speckle.Core.Transports; +using UnityEngine; + +namespace Extra +{ + /// + /// Script used to generate streams for performance benchmarking in other hostApps. + /// Will send several several commits with a varying number of copies on a GameObject (with children) + /// + [ExecuteAlways] + [RequireComponent(typeof(SpeckleSender))] + public sealed class PerformanceTestSender : MonoBehaviour + { + [Range(0, 100)] + public int numberOfIterations = 10; + + public Vector3 translation = Vector3.forward * 100; + + public GameObject objectToSend; + + private SpeckleSender sender; + private void Awake() + { + sender = GetComponent(); + } + + public async Task SendIterations() + { + GameObject go = new GameObject(); + for (int i = 0; i < numberOfIterations; i++) + { + Instantiate(objectToSend, translation * i, Quaternion.identity, go.transform); + + Base b = sender.Converter.RecursivelyConvertToSpeckle(go, _ => true); + await Send(b, $"{i}"); + } + Debug.Log("Done!"); + } + + private async Task Send(Base data, string branchName) + { + var client = sender.Account.Client; + var stream = sender.Stream.Selected; + ServerTransport transport = new ServerTransport(sender.Account.Selected, stream!.id); + + await client.BranchCreate(new BranchCreateInput(){streamId = stream.id, name = branchName}); + + return await SpeckleSender.SendDataAsync(CancellationToken.None, + remoteTransport: transport, + data: data, + client: client!, + branchName: branchName, + createCommit: true, + onProgressAction: null, + onErrorAction: (m, e) => throw e); + } + } + +#if UNITY_EDITOR + [UnityEditor.CustomEditor(typeof(PerformanceTestSender))] + public sealed class PerformanceTestSenderEditor : UnityEditor.Editor + { + public override async void OnInspectorGUI() + { + DrawDefaultInspector(); + + if (GUILayout.Button("Create and send")) + { + await ((PerformanceTestSender)target).SendIterations(); + } + } + } +#endif +} diff --git a/Assets/Extra/PerformanceTestSender.cs.meta b/Assets/Extra/PerformanceTestSender.cs.meta new file mode 100644 index 0000000..9655547 --- /dev/null +++ b/Assets/Extra/PerformanceTestSender.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c98b93e32c844fb488992e2e376447a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Extra/Speckle.Extra.asmdef b/Assets/Extra/Speckle.Extra.asmdef index 8ad356d..8aca4ca 100644 --- a/Assets/Extra/Speckle.Extra.asmdef +++ b/Assets/Extra/Speckle.Extra.asmdef @@ -1,4 +1,4 @@ { "name": "Speckle.Extra", - "references":[ "GUID:eed1b8b83e2c0074d9e5de2348e3ff72", "GUID:e6adfdc4e436206479f48eafc82f32b5" ] + "references":[ "GUID:eed1b8b83e2c0074d9e5de2348e3ff72", "GUID:e6adfdc4e436206479f48eafc82f32b5", "GUID:d274441ecc3eb3f43b093eec1503d681" ] } diff --git a/Packages/manifest.json b/Packages/manifest.json index 7833ac9..39aa6e1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,9 +1,9 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "1.17.6", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.collab-proxy": "2.0.1", + "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f79ee66..a961555 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,12 +7,10 @@ "dependencies": {} }, "com.unity.collab-proxy": { - "version": "1.17.6", + "version": "2.0.1", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -23,7 +21,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -32,7 +30,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -47,24 +45,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.services.core": { - "version": "1.6.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.sysroot": { "version": "2.0.3", "depth": 1, diff --git a/Packages/systems.speckle.speckle-unity/Editor/Components/SpeckleReceiverEditor.cs b/Packages/systems.speckle.speckle-unity/Editor/Components/SpeckleReceiverEditor.cs index 9625981..a354208 100644 --- a/Packages/systems.speckle.speckle-unity/Editor/Components/SpeckleReceiverEditor.cs +++ b/Packages/systems.speckle.speckle-unity/Editor/Components/SpeckleReceiverEditor.cs @@ -71,10 +71,9 @@ namespace Speckle.ConnectorUnity.Components.Editor //TODO: Draw events in a collapsed region - if (receive) { - await ReceiveAndConvert(speckleReceiver); + await ReceiveAndConvert(speckleReceiver).ConfigureAwait(false);; } } @@ -93,7 +92,7 @@ namespace Speckle.ConnectorUnity.Components.Editor return null; } - Base? commitObject = await ReceiveCommit(speckleReceiver, client.ServerUrl); + Base? commitObject = await ReceiveCommit(speckleReceiver, client.ServerUrl).ConfigureAwait(true);; if (commitObject == null) return null; @@ -167,7 +166,7 @@ namespace Speckle.ConnectorUnity.Components.Editor speckleReceiver.OnTotalChildrenCountKnown.AddListener(OnTotalChildrenKnown); speckleReceiver.OnReceiveProgressAction.AddListener(OnProgress); speckleReceiver.OnErrorAction.AddListener(OnError); - commitObject = await speckleReceiver.ReceiveAsync(); + commitObject = await speckleReceiver.ReceiveAsync().ConfigureAwait(false);; if (commitObject == null) { Debug.LogWarning($"Receive warning: Receive operation returned null", speckleReceiver); diff --git a/Packages/systems.speckle.speckle-unity/Editor/Components/StreamManagerEditor.cs b/Packages/systems.speckle.speckle-unity/Editor/Components/StreamManagerEditor.cs index c070163..3adffa0 100644 --- a/Packages/systems.speckle.speckle-unity/Editor/Components/StreamManagerEditor.cs +++ b/Packages/systems.speckle.speckle-unity/Editor/Components/StreamManagerEditor.cs @@ -26,7 +26,7 @@ namespace Speckle.ConnectorUnity.Components.Editor private static bool generateAssets; public int StreamsLimit { get; set; } = 30; - public int BranchesLimit { get; set; } = 30; + public int BranchesLimit { get; set; } = 75; public int CommitsLimit { get; set; } = 25; private int SelectedAccountIndex @@ -364,4 +364,4 @@ namespace Speckle.ConnectorUnity.Components.Editor } } } -} \ No newline at end of file +} diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Components/RecursiveConverter.ToNative.cs b/Packages/systems.speckle.speckle-unity/Runtime/Components/RecursiveConverter.ToNative.cs index d83cee1..d5f676c 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Components/RecursiveConverter.ToNative.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Components/RecursiveConverter.ToNative.cs @@ -3,13 +3,58 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using Speckle.ConnectorUnity.NativeCache; using Speckle.Core.Models; +using Speckle.Core.Models.GraphTraversal; using UnityEngine; namespace Speckle.ConnectorUnity.Components { public partial class RecursiveConverter { + + public IEnumerator ConvertToNative(Base rootObject, Transform? parent, IDictionary outCreatedObjects) + { + + InitializeAssetCache(); + var traversalFunc = DefaultTraversal.CreateBIMTraverseFunc(ConverterInstance); + + var convertableObjects = traversalFunc.Traverse(rootObject) + .Where(tc => ConverterInstance.CanConvertToNative(tc.current)); + + foreach (TraversalContext tc in convertableObjects) + { + Transform? nativeParent = parent; + if (tc.parent != null && outCreatedObjects.TryGetValue(tc.parent.current, out GameObject p)) + nativeParent = p.transform; + + GameObject? go = ConverterInstance.ConvertToNative(tc.current) as GameObject; + if (go == null) continue; + + go.transform.SetParent(parent, true); + outCreatedObjects.Add(tc.current, go); + + //Set some common for all created GameObjects + //TODO add support for more unity specific props + if(go.name == "New Game Object" || string.IsNullOrWhiteSpace(go.name)) + go.name = AssetHelpers.GenerateObjectName(tc.current); + //if (baseObject["tag"] is string t) go.tag = t; + if (tc.current["physicsLayer"] is string layerName) + { + int layer = LayerMask.NameToLayer(layerName); //TODO: check how this can be interoperable with Unreal and Blender + if (layer > -1) go.layer = layer; + } + //if (baseObject["isStatic"] is bool isStatic) go.isStatic = isStatic; + + yield return go; + } + } + + + + + + public IEnumerator ConvertCoroutine(Base rootObject, Transform? parent, List outCreatedObjects) => ConvertCoroutine(rootObject, parent, outCreatedObjects,b => ConverterInstance.CanConvertToNative(b)); @@ -36,14 +81,9 @@ namespace Speckle.ConnectorUnity.Components /// A function to determine if an object should be converted public virtual List RecursivelyConvertToNative(object? o, Transform? parent, Func predicate) { - //Ensure we have A native cache - if (AssetCache.nativeCaches.Any(x => x == null)) - { - AssetCache.nativeCaches = NativeCacheFactory.GetStandaloneCacheSetup(); - } + InitializeAssetCache(); var createdGameObjects = new List(); - ConverterInstance.SetContextDocument(AssetCache); try { AssetCache.BeginWrite(); @@ -61,23 +101,16 @@ namespace Speckle.ConnectorUnity.Components } - protected string[] namePropertyAliases = {"name", "Name"}; - - protected virtual string GenerateObjectName(Base baseObject) + private void InitializeAssetCache() { - // 1. Use explicit name - foreach (var nameAlias in namePropertyAliases) + //Ensure we have A native cache + if (AssetCache.nativeCaches.Any(x => x == null)) { - string? s = baseObject[nameAlias] as string; - if (!string.IsNullOrWhiteSpace(s)) return s; //TODO any sanitization needed? + AssetCache.nativeCaches = NativeCacheFactory.GetStandaloneCacheSetup(); } - - // 2. Use type + id as fallback name - // Only take the most derived type from the speckle type - string speckleType = baseObject.speckle_type.Split(':').Last(); - return $"{speckleType} - {baseObject.id}"; + ConverterInstance.SetContextDocument(AssetCache); } - + public virtual void RecurseTreeToNative(Base baseObject, Transform? parent, Func predicate, IList outCreatedObjects) { object? converted = null; @@ -96,7 +129,7 @@ namespace Speckle.ConnectorUnity.Components //Set some common for all created GameObjects //TODO add support for more unity specific props if(go.name == "New Game Object" || string.IsNullOrWhiteSpace(go.name)) - go.name = GenerateObjectName(baseObject); + go.name = AssetHelpers.GenerateObjectName(baseObject); //if (baseObject["tag"] is string t) go.tag = t; if (baseObject["physicsLayer"] is string layerName) { @@ -127,35 +160,13 @@ namespace Speckle.ConnectorUnity.Components protected virtual void ConvertChild(object? value, Transform? parent, Func predicate, IList outCreatedObjects) { - if(value == null) return; - if(value.GetType().IsPrimitive) return; - if (value is string) return; - - if(value is Base o) + foreach (Base b in GraphTraversal.TraverseMember(value)) { - RecurseTreeToNative(o, parent, predicate, outCreatedObjects); - } - else if (value is IDictionary dictionary) - { - foreach (object v in dictionary.Keys) - { - ConvertChild(v, parent, predicate, outCreatedObjects); - } - } - else if (value is IList collection) - { - foreach (object v in collection) - { - ConvertChild(v, parent, predicate, outCreatedObjects); - } - } - else if(!value.GetType().IsValueType) //don't want to output errors for structs - { - Debug.Log($"Unknown type {value.GetType()} found when traversing tree, will be safely ignored"); + RecurseTreeToNative(b, parent, predicate, outCreatedObjects); } } - [Obsolete("Use RecursivelyConvertToNative instead")] + [Obsolete("Use " + nameof(RecursivelyConvertToNative), true)] public GameObject ConvertRecursivelyToNative(Base @base, string name) { var parentObject = new GameObject(name); diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs index 159e248..573e50d 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleReceiver.cs @@ -90,7 +90,7 @@ namespace Speckle.ConnectorUnity.Components onProgressAction: dict => OnReceiveProgressAction.Invoke(dict), onErrorAction: (m, e) => OnErrorAction.Invoke(m, e), onTotalChildrenCountKnown: c => OnTotalChildrenCountKnown.Invoke(c) - ); + ).ConfigureAwait(false); } /// @@ -114,13 +114,13 @@ namespace Speckle.ConnectorUnity.Components Action? onErrorAction = null, Action? onTotalChildrenCountKnown = null) { - ServerTransport transport = new ServerTransport(client.Account, streamId); + using var transport = new ServerTransportV2(client.Account, streamId); + transport.CancellationToken = token; Base? ret = null; try { - Analytics.TrackEvent(client.Account, Analytics.Events.Receive); token.ThrowIfCancellationRequested(); @@ -131,9 +131,11 @@ namespace Speckle.ConnectorUnity.Components onProgressAction: onProgressAction, onErrorAction: onErrorAction, onTotalChildrenCountKnown: onTotalChildrenCountKnown, - disposeTransports: true - ); + disposeTransports: false + ).ConfigureAwait(false); + Analytics.TrackEvent(client.Account, Analytics.Events.Receive); + token.ThrowIfCancellationRequested(); //Read receipt @@ -145,7 +147,7 @@ namespace Speckle.ConnectorUnity.Components commitId = commitId, message = $"received commit from {Application.unityVersion}", sourceApplication = HostApplications.Unity.GetVersion(CoreUtils.GetHostAppVersion()) - }); + }).ConfigureAwait(false); } catch (Exception e) { @@ -157,11 +159,7 @@ namespace Speckle.ConnectorUnity.Components { onErrorAction?.Invoke(e.Message, e); } - finally - { - transport?.Dispose(); - } - + return ret; } @@ -293,13 +291,13 @@ namespace Speckle.ConnectorUnity.Components public void Awake() { - CoreUtils.SetupInit(); Converter = GetComponent(); Initialise(true); } protected void Initialise(bool forceRefresh = false) { + CoreUtils.SetupInit(); Account ??= new AccountSelection(); Stream ??= new StreamSelection(Account); Branch ??= new BranchSelection(Stream); diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs index 667d986..43867ae 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Components/SpeckleSender.cs @@ -179,13 +179,13 @@ namespace Speckle.ConnectorUnity.Components public void Awake() { - CoreUtils.SetupInit(); Initialise(true); Converter = GetComponent(); } protected void Initialise(bool forceRefresh = false) { + CoreUtils.SetupInit(); Account ??= new AccountSelection(); Stream ??= new StreamSelection(Account); Branch ??= new BranchSelection(Stream); diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs index 0c6f6ba..155097a 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Geometry.cs @@ -9,6 +9,7 @@ using Speckle.ConnectorUnity.Utils; using Speckle.ConnectorUnity.Wrappers; using Speckle.Core.Logging; using Speckle.Core.Models; +using Speckle.Core.Models.GraphTraversal; using UnityEditor; using UnityEngine; using Mesh = UnityEngine.Mesh; @@ -211,29 +212,35 @@ namespace Objects.Converter.Unity return sobject; } - public GameObject? BlockToNative(BlockInstance block) + public GameObject? InstanceToNative(Instance instance) { - if (block.blockDefinition == null) + if (instance.definition == null) { - Debug.Log($"Skipping {typeof(BlockInstance)} {block.id}, block definition was null"); + Debug.Log($"Skipping {typeof(BlockInstance)} {instance.id}, block definition was null"); return null; } + var defName = instance.definition["name"] as string ?? ""; // Check for existing converted object - if(LoadedAssets.TryGetObject(block.blockDefinition, out GameObject? existingGo)) + if(LoadedAssets.TryGetObject(instance.definition, out GameObject? existingGo)) { var go = InstantiateCopy(existingGo); - go.name = block.blockDefinition.name ?? ""; - TransformToNativeTransform(go.transform, block.transform); + go.name = defName; + TransformToNativeTransform(go.transform, instance.transform); return go; } // Convert the block definition - GameObject native = new GameObject(block.blockDefinition.name ?? ""); + GameObject native = new GameObject(defName); List meshes = new(); List others = new(); - foreach (Base geo in block.blockDefinition.geometry) + + var geometry = instance.definition is BlockDefinition b + ? b.geometry + : GraphTraversal.TraverseMember(instance.definition["elements"]); + + foreach (Base geo in geometry) { if (geo is SMesh m) meshes.Add(m); else if (geo is IDisplayValue> s) meshes.AddRange(s.displayValue); @@ -242,12 +249,12 @@ namespace Objects.Converter.Unity if (meshes.Any()) { - if(!TryGetMeshFromCache(block.blockDefinition, meshes, out Mesh? nativeMesh, out _)) + if(!TryGetMeshFromCache(instance.definition, meshes, out Mesh? nativeMesh, out _)) { MeshToNativeMesh(meshes, out nativeMesh); - string name = AssetHelpers.GetObjectName(block.blockDefinition); + string name = AssetHelpers.GenerateObjectName(instance.definition); nativeMesh.name = name; - LoadedAssets.TrySaveObject(block.blockDefinition, nativeMesh); + LoadedAssets.TrySaveObject(instance.definition, nativeMesh); } var nativeMaterials = RenderMaterialsToNative(meshes); native.SafeMeshSet(nativeMesh, nativeMaterials); @@ -260,10 +267,10 @@ namespace Objects.Converter.Unity c.transform.SetParent(native.transform, false); } - LoadedAssets.TrySaveObject(block.blockDefinition, native); + LoadedAssets.TrySaveObject(instance.definition, native); - TransformToNativeTransform(native.transform, block.transform); - if (block["name"] is string instanceName) native.name = instanceName; + TransformToNativeTransform(native.transform, instance.transform); + if (instance["name"] is string instanceName) native.name = instanceName; return native; } @@ -296,36 +303,34 @@ namespace Objects.Converter.Unity /// Transformation matrix in Unity's coordinate system public Matrix4x4 TransformToNativeMatrix(STransform speckleTransform) { - double VD(int i) => speckleTransform.value[i]; - float V(int i) => (float) VD(i); - var sf = Speckle.Core.Kits.Units.GetConversionFactor(speckleTransform.units, ModelUnits); - + var smatrix = speckleTransform.matrix; + return new Matrix4x4 { // Left (X -> X) - [0, 0] = V(0), - [2, 0] = V(4), - [1, 0] = V(8), - [3, 0] = V(12), + [0, 0] = smatrix.M11, + [2, 0] = smatrix.M21, + [1, 0] = smatrix.M31, + [3, 0] = smatrix.M41, //Up (Z -> Y) - [0, 2] = V(1), - [2, 2] = V(5), - [1, 2] = V(9), - [3, 2] = V(13), + [0, 2] = smatrix.M12, + [2, 2] = smatrix.M22, + [1, 2] = smatrix.M32, + [3, 2] = smatrix.M42, //Forwards (Y -> Z) - [0, 1] = V(2), - [2, 1] = V(6), - [1, 1] = V(10), - [3, 1] = V(14), + [0, 1] = smatrix.M13, + [2, 1] = smatrix.M23, + [1, 1] = smatrix.M33, + [3, 1] = smatrix.M43, //Translation - [0, 3] = (float) (VD(3) * sf), - [2, 3] = (float) (VD(7) * sf), - [1, 3] = (float) (VD(11) * sf), - [3, 3] = V(15), + [0, 3] = (float) (smatrix.M14 * sf), + [2, 3] = (float) (smatrix.M24 * sf), + [1, 3] = (float) (smatrix.M34 * sf), + [3, 3] = smatrix.M44, }; } diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs index f4f60fe..4c15d03 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.Mesh.cs @@ -223,7 +223,7 @@ namespace Objects.Converter.Unity { //Convert a new one MeshToNativeMesh(meshes, out nativeMesh, out center); - string name = AssetHelpers.GetObjectName(element); + string name = AssetHelpers.GenerateObjectName(element); nativeMesh.name = name; LoadedAssets.TrySaveObject(element, nativeMesh); } @@ -262,7 +262,7 @@ namespace Objects.Converter.Unity if (LoadedAssets.TryGetObject(element, out Mesh? existing)) { nativeMesh = existing; - //todo This is pretty inefficient, having to the mesh data anyway just to get the center... eek + //todo This is pretty inefficient, having to convert the mesh data anyway just to get the center... eek MeshDataToNative(meshes, out List verts, out _, @@ -483,7 +483,7 @@ namespace Objects.Converter.Unity var c = renderMaterial.diffuse.ToUnityColor(); mat.color = new Color(c.r, c.g, c.b, (float) renderMaterial.opacity); - mat.name = AssetHelpers.GetObjectName(renderMaterial); + mat.name = AssetHelpers.GenerateObjectName(renderMaterial); mat.SetFloat(Metallic, (float) renderMaterial.metalness); mat.SetFloat(Glossiness, 1 - (float) renderMaterial.roughness); if (renderMaterial.emissive != SColor.Black.ToArgb()) mat.EnableKeyword("_EMISSION"); diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.cs b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.cs index a5436fd..d773194 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Converter/Unity/ConverterUnity.cs @@ -112,7 +112,7 @@ namespace Objects.Converter.Unity case Mesh o: return MeshToNative(o); case BlockInstance o: - return BlockToNative(o); + return InstanceToNative(o); default: //Object is not a raw geometry, convert it as display value element diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.Websocket.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.Websocket.dll index bf0645b..dad05e1 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.Websocket.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.Websocket.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.dll index 457765b..44bca97 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.Abstractions.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.dll index 5fd189f..40645ec 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Client.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Primitives.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Primitives.dll index ec644fb..240ad5e 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Primitives.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/GraphQL.Primitives.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll new file mode 100644 index 0000000..a862191 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll.meta new file mode 100644 index 0000000..6de5d35 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 3e49710593731cc49b9d22a0ba82b5d1 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll new file mode 100644 index 0000000..841753d Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll.meta new file mode 100644 index 0000000..b5b9758 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: b875f05888babdd4db73c70d39a33feb +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll new file mode 100644 index 0000000..7f34171 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll.meta new file mode 100644 index 0000000..22ffdf0 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: c822f631fa258514f8b76cdcaacc1b36 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll new file mode 100644 index 0000000..b137a58 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll.meta new file mode 100644 index 0000000..17a53a9 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 5e6c835b7544a374095e58eddb5d2f1c +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Data.Sqlite.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Data.Sqlite.dll index a49d9ec..3b16c3b 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Data.Sqlite.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Data.Sqlite.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll new file mode 100644 index 0000000..7d8769b Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll.meta new file mode 100644 index 0000000..2aede26 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: f4e83b55b28720a47a937b987aba6b02 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll new file mode 100644 index 0000000..5fcdb35 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll.meta new file mode 100644 index 0000000..bfbec64 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 49715c68e5dbf254ca4ca7bc11292537 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Options.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Options.dll new file mode 100644 index 0000000..065d015 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Options.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Options.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Options.dll.meta new file mode 100644 index 0000000..d5fdc94 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Options.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: c84f8458a24050a48b32654c570e7acc +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Primitives.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Primitives.dll new file mode 100644 index 0000000..1999bac Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Primitives.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Primitives.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Primitives.dll.meta new file mode 100644 index 0000000..c7e8fdb --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.Primitives.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: f741667477576f444a8a566e2a1f4ce9 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Net.Http.Headers.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Net.Http.Headers.dll new file mode 100644 index 0000000..a9dd435 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Net.Http.Headers.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Net.Http.Headers.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Net.Http.Headers.dll.meta new file mode 100644 index 0000000..4eeb59b --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Net.Http.Headers.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 5f1430ebe15696242a6b437faa8b8666 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Contrib.WaitAndRetry.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Contrib.WaitAndRetry.dll new file mode 100644 index 0000000..2fdd86c Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Contrib.WaitAndRetry.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Contrib.WaitAndRetry.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Contrib.WaitAndRetry.dll.meta new file mode 100644 index 0000000..832b386 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Contrib.WaitAndRetry.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 6f16b872bea64534a87c7229fa49ac30 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Extensions.Http.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Extensions.Http.dll new file mode 100644 index 0000000..ef47032 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Extensions.Http.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Extensions.Http.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Extensions.Http.dll.meta new file mode 100644 index 0000000..78901ed --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.Extensions.Http.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 817747ee0314c9441bac48ea74d34d42 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.dll new file mode 100644 index 0000000..6443e71 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.dll.meta new file mode 100644 index 0000000..5cb81dd --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Polly.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 38b2c99acc4856c4186972b73c6fc332 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.batteries_v2.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.batteries_v2.dll index 80a658c..48430f9 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.batteries_v2.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.batteries_v2.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.core.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.core.dll index 200ea89..c1c3ed2 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.core.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.core.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.provider.e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.provider.e_sqlite3.dll index 5ac9b3a..af32013 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.provider.e_sqlite3.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/SQLitePCLRaw.provider.e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.Serilog.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.Serilog.dll new file mode 100644 index 0000000..42bd69f Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.Serilog.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.Serilog.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.Serilog.dll.meta new file mode 100644 index 0000000..c6ec9b9 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.Serilog.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: a2d9231f2f78f0d4ea8786452ac71598 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.dll index 57b76ae..306f981 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Sentry.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.ClientInfo.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.ClientInfo.dll new file mode 100644 index 0000000..a1c24e0 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.ClientInfo.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.ClientInfo.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.ClientInfo.dll.meta new file mode 100644 index 0000000..d92bf7e --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.ClientInfo.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: b8ebfa0955817084a887b7a704d43545 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.GlobalLogContext.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.GlobalLogContext.dll new file mode 100644 index 0000000..12edb91 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.GlobalLogContext.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.GlobalLogContext.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.GlobalLogContext.dll.meta new file mode 100644 index 0000000..af3f9d3 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Enrichers.GlobalLogContext.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 2c0b2a3a645b5844faa74f29d90cff65 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Exceptions.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Exceptions.dll new file mode 100644 index 0000000..83d3d6f Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Exceptions.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Exceptions.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Exceptions.dll.meta new file mode 100644 index 0000000..d61a7f4 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Exceptions.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 3d1e392b0c6fd8f4a9e494675b787a9a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Formatting.Compact.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Formatting.Compact.dll new file mode 100644 index 0000000..7e6d49c Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Formatting.Compact.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Formatting.Compact.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Formatting.Compact.dll.meta new file mode 100644 index 0000000..ad8cde5 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Formatting.Compact.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: b0e1bc6a04c09e54188d8d8244b876e4 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Console.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Console.dll new file mode 100644 index 0000000..ede6c8b Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Console.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Console.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Console.dll.meta new file mode 100644 index 0000000..264f719 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Console.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: d3a7df0fa5bb87b43ac372cfefb11aca +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.File.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.File.dll new file mode 100644 index 0000000..2bc86a8 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.File.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.File.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.File.dll.meta new file mode 100644 index 0000000..a4c1d53 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.File.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 3855fc1a60cef174fb322913390b6fd8 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.PeriodicBatching.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.PeriodicBatching.dll new file mode 100644 index 0000000..40787b9 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.PeriodicBatching.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.PeriodicBatching.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.PeriodicBatching.dll.meta new file mode 100644 index 0000000..9f17892 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.PeriodicBatching.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: abe52d099c937594c8788655f4c2d181 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Seq.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Seq.dll new file mode 100644 index 0000000..e1b265e Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Seq.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Seq.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Seq.dll.meta new file mode 100644 index 0000000..a88f543 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.Sinks.Seq.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: d6653fb426e962248abae72e30dd2f59 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.dll new file mode 100644 index 0000000..52cb2e4 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.dll.meta new file mode 100644 index 0000000..6452f75 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/Serilog.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 1c5ef0b3d673fad46939969a3da4d610 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/Speckle.Newtonsoft.Json.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/Speckle.Newtonsoft.Json.dll index 59a0dfc..69bc627 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/Speckle.Newtonsoft.Json.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/Speckle.Newtonsoft.Json.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.deps.json b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.deps.json index b5c17b5..5b77ab7 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.deps.json +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.deps.json @@ -7,59 +7,119 @@ "targets": { ".NETStandard,Version=v2.0": {}, ".NETStandard,Version=v2.0/": { - "SpeckleCore2/2.1.0": { + "SpeckleCore2/2.0.999-local": { "dependencies": { - "GraphQL.Client": "4.0.2", + "GraphQL.Client": "5.1.1", "Microsoft.CSharp": "4.7.0", - "Microsoft.Data.Sqlite": "6.0.8", + "Microsoft.Data.Sqlite": "7.0.3", "NETStandard.Library": "2.0.3", - "Sentry": "3.20.1", - "Speckle.Newtonsoft.Json": "12.0.3.1" + "Polly": "7.2.3", + "Polly.Contrib.WaitAndRetry": "1.1.1", + "Polly.Extensions.Http": "3.0.0", + "Sentry": "3.29.0", + "Sentry.Serilog": "3.29.0", + "Serilog": "2.12.0", + "Serilog.Enrichers.ClientInfo": "1.2.0", + "Serilog.Enrichers.GlobalLogContext": "3.0.0", + "Serilog.Exceptions": "8.4.0", + "Serilog.Sinks.Console": "4.1.0", + "Serilog.Sinks.Seq": "5.2.2", + "Speckle.Newtonsoft.Json": "13.0.2" }, "runtime": { "SpeckleCore2.dll": {} } }, - "GraphQL.Client/4.0.2": { + "GraphQL.Client/5.1.1": { "dependencies": { - "GraphQL.Client.Abstractions": "4.0.2", - "GraphQL.Client.Abstractions.Websocket": "4.0.2" + "GraphQL.Client.Abstractions": "5.1.1", + "GraphQL.Client.Abstractions.Websocket": "5.1.1", + "System.Reactive": "5.0.0" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" } } }, - "GraphQL.Client.Abstractions/4.0.2": { + "GraphQL.Client.Abstractions/5.1.1": { "dependencies": { - "GraphQL.Primitives": "4.0.2", - "System.Reactive": "4.3.2" + "GraphQL.Primitives": "5.1.1" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.Abstractions.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" } } }, - "GraphQL.Client.Abstractions.Websocket/4.0.2": { + "GraphQL.Client.Abstractions.Websocket/5.1.1": { "dependencies": { - "GraphQL.Client.Abstractions": "4.0.2" + "GraphQL.Client.Abstractions": "5.1.1" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.Abstractions.Websocket.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" } } }, - "GraphQL.Primitives/4.0.2": { + "GraphQL.Primitives/5.1.1": { "runtime": { "lib/netstandard2.0/GraphQL.Primitives.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" + } + } + }, + "Microsoft.AspNetCore.Http/2.1.1": { + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.AspNetCore.WebUtilities": "2.1.1", + "Microsoft.Extensions.ObjectPool": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.Http.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.AspNetCore.Http.Abstractions/2.1.1": { + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "System.Text.Encodings.Web": "5.0.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.AspNetCore.Http.Features/2.1.1": { + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.AspNetCore.WebUtilities/2.1.1": { + "dependencies": { + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Text.Encodings.Web": "5.0.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" } } }, @@ -82,20 +142,72 @@ } } }, - "Microsoft.Data.Sqlite/6.0.8": { + "Microsoft.Data.Sqlite/7.0.3": { "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.8", - "SQLitePCLRaw.bundle_e_sqlite3": "2.0.6" + "Microsoft.Data.Sqlite.Core": "7.0.3", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" } }, - "Microsoft.Data.Sqlite.Core/6.0.8": { + "Microsoft.Data.Sqlite.Core/7.0.3": { "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.4" }, "runtime": { "lib/netstandard2.0/Microsoft.Data.Sqlite.dll": { - "assemblyVersion": "6.0.8.0", - "fileVersion": "6.0.822.36205" + "assemblyVersion": "7.0.3.0", + "fileVersion": "7.0.323.6302" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Extensions.ObjectPool/2.1.1": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.ObjectPool.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Extensions.Options/2.1.1": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1", + "Microsoft.Extensions.Primitives": "2.1.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Extensions.Primitives/2.1.1": { + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Net.Http.Headers/2.1.1": { + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1", + "System.Buffers": "4.5.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" } } }, @@ -106,7 +218,34 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, - "Sentry/3.20.1": { + "Polly/7.2.3": { + "runtime": { + "lib/netstandard2.0/Polly.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.2.3.0" + } + } + }, + "Polly.Contrib.WaitAndRetry/1.1.1": { + "runtime": { + "lib/netstandard2.0/Polly.Contrib.WaitAndRetry.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.1.1.0" + } + } + }, + "Polly.Extensions.Http/3.0.0": { + "dependencies": { + "Polly": "7.2.3" + }, + "runtime": { + "lib/netstandard2.0/Polly.Extensions.Http.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.0.0.0" + } + } + }, + "Sentry/3.29.0": { "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "System.Buffers": "4.5.1", @@ -116,52 +255,164 @@ }, "runtime": { "lib/netstandard2.0/Sentry.dll": { - "assemblyVersion": "3.20.1.0", - "fileVersion": "3.20.1.0" + "assemblyVersion": "3.29.0.0", + "fileVersion": "3.29.0.0" } } }, - "Speckle.Newtonsoft.Json/12.0.3.1": { + "Sentry.Serilog/3.29.0": { + "dependencies": { + "Sentry": "3.29.0", + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Sentry.Serilog.dll": { + "assemblyVersion": "3.29.0.0", + "fileVersion": "3.29.0.0" + } + } + }, + "Serilog/2.12.0": { + "runtime": { + "lib/netstandard2.0/Serilog.dll": { + "assemblyVersion": "2.0.0.0", + "fileVersion": "2.12.0.0" + } + } + }, + "Serilog.Enrichers.ClientInfo/1.2.0": { + "dependencies": { + "Microsoft.AspNetCore.Http": "2.1.1", + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Enrichers.ClientInfo.dll": { + "assemblyVersion": "0.0.0.0", + "fileVersion": "0.0.0.0" + } + } + }, + "Serilog.Enrichers.GlobalLogContext/3.0.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Enrichers.GlobalLogContext.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.0.0.0" + } + } + }, + "Serilog.Exceptions/8.4.0": { + "dependencies": { + "Serilog": "2.12.0", + "System.Reflection.TypeExtensions": "4.7.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Exceptions.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.4.0.0" + } + } + }, + "Serilog.Formatting.Compact/1.1.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Formatting.Compact.dll": { + "assemblyVersion": "1.1.0.0", + "fileVersion": "1.1.0.0" + } + } + }, + "Serilog.Sinks.Console/4.1.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.Console.dll": { + "assemblyVersion": "4.1.0.0", + "fileVersion": "4.1.0.0" + } + } + }, + "Serilog.Sinks.File/5.0.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.File.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.0.0" + } + } + }, + "Serilog.Sinks.PeriodicBatching/3.1.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.PeriodicBatching.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.1.0.0" + } + } + }, + "Serilog.Sinks.Seq/5.2.2": { + "dependencies": { + "Serilog": "2.12.0", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Sinks.File": "5.0.0", + "Serilog.Sinks.PeriodicBatching": "3.1.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.Seq.dll": { + "assemblyVersion": "5.2.2.0", + "fileVersion": "5.2.2.0" + } + } + }, + "Speckle.Newtonsoft.Json/13.0.2": { "runtime": { "lib/netstandard2.0/Speckle.Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.3.0", + "assemblyVersion": "11.0.0.0", "fileVersion": "11.0.1.0" } } }, - "SQLitePCLRaw.bundle_e_sqlite3/2.0.6": { + "SQLitePCLRaw.bundle_e_sqlite3/2.1.4": { "dependencies": { - "SQLitePCLRaw.core": "2.0.6", - "SQLitePCLRaw.lib.e_sqlite3": "2.0.6", - "SQLitePCLRaw.provider.e_sqlite3": "2.0.6" + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.4" }, "runtime": { "lib/netstandard2.0/SQLitePCLRaw.batteries_v2.dll": { - "assemblyVersion": "2.0.6.1341", - "fileVersion": "2.0.6.1341" + "assemblyVersion": "2.1.4.1835", + "fileVersion": "2.1.4.1835" } } }, - "SQLitePCLRaw.core/2.0.6": { + "SQLitePCLRaw.core/2.1.4": { "dependencies": { "System.Memory": "4.5.4" }, "runtime": { "lib/netstandard2.0/SQLitePCLRaw.core.dll": { - "assemblyVersion": "2.0.6.1341", - "fileVersion": "2.0.6.1341" + "assemblyVersion": "2.1.4.1835", + "fileVersion": "2.1.4.1835" } } }, - "SQLitePCLRaw.lib.e_sqlite3/2.0.6": {}, - "SQLitePCLRaw.provider.e_sqlite3/2.0.6": { + "SQLitePCLRaw.lib.e_sqlite3/2.1.4": {}, + "SQLitePCLRaw.provider.e_sqlite3/2.1.4": { "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.4" }, "runtime": { "lib/netstandard2.0/SQLitePCLRaw.provider.e_sqlite3.dll": { - "assemblyVersion": "2.0.6.1341", - "fileVersion": "2.0.6.1341" + "assemblyVersion": "2.1.4.1835", + "fileVersion": "2.1.4.1835" } } }, @@ -205,15 +456,15 @@ } } }, - "System.Reactive/4.3.2": { + "System.Reactive/5.0.0": { "dependencies": { "System.Runtime.InteropServices.WindowsRuntime": "4.3.0", "System.Threading.Tasks.Extensions": "4.5.4" }, "runtime": { "lib/netstandard2.0/System.Reactive.dll": { - "assemblyVersion": "4.3.0.0", - "fileVersion": "4.3.2.55399" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.0.1" } } }, @@ -228,6 +479,14 @@ } } }, + "System.Reflection.TypeExtensions/4.7.0": { + "runtime": { + "lib/netstandard2.0/System.Reflection.TypeExtensions.dll": { + "assemblyVersion": "4.1.5.0", + "fileVersion": "4.700.19.56404" + } + } + }, "System.Runtime/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -296,38 +555,66 @@ } }, "libraries": { - "SpeckleCore2/2.1.0": { + "SpeckleCore2/2.0.999-local": { "type": "project", "serviceable": false, "sha512": "" }, - "GraphQL.Client/4.0.2": { + "GraphQL.Client/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-EB/icQ7QWzCQzfT6yv8L6BAW+c7DrQuwIg/nNSguOQBMs2W7aaYMpEYidEZ4U2ao0CrT6gcCY0F8xz9hoB3Pvw==", - "path": "graphql.client/4.0.2", - "hashPath": "graphql.client.4.0.2.nupkg.sha512" + "sha512": "sha512-6bfM9qU4AMcFWm4BHd2M6LE5+rLtK47/+VRtypggwb9appC8sbF58ytVBVOKpqKhKpmZERfPLGJap8O/FH3w5w==", + "path": "graphql.client/5.1.1", + "hashPath": "graphql.client.5.1.1.nupkg.sha512" }, - "GraphQL.Client.Abstractions/4.0.2": { + "GraphQL.Client.Abstractions/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-zmtHtejUacIQHAdLEsetDX27mccX0R6MfEu32Ek4l6pprJe3zdtqx+UuWz3wSmrIaj05NLEe5FCHNTjhm3MnjA==", - "path": "graphql.client.abstractions/4.0.2", - "hashPath": "graphql.client.abstractions.4.0.2.nupkg.sha512" + "sha512": "sha512-/znG7Lcz3rzG9VSCq+V2ARb63c/uIs8idGOvXyltZ32Wy570GX/I8HNUIZ1yDThmQRJ5KOGSd9Mzk37lFg49rg==", + "path": "graphql.client.abstractions/5.1.1", + "hashPath": "graphql.client.abstractions.5.1.1.nupkg.sha512" }, - "GraphQL.Client.Abstractions.Websocket/4.0.2": { + "GraphQL.Client.Abstractions.Websocket/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-1JDpd1HgvytSWf7/v1TMJ1EXm6oVuga+lJWY9b9RtmGDjEtmFLxP1663/KLe5vTMzXRpxx3saOkkjikHhQOn3w==", - "path": "graphql.client.abstractions.websocket/4.0.2", - "hashPath": "graphql.client.abstractions.websocket.4.0.2.nupkg.sha512" + "sha512": "sha512-n1gU3GlqJ0jQceb/VEEr4c0D2vpQc5AtDwthK89+yX7VpzlhJKqE5B4RJwx//Jb33mKybfJioWwDgVfSOPAwdw==", + "path": "graphql.client.abstractions.websocket/5.1.1", + "hashPath": "graphql.client.abstractions.websocket.5.1.1.nupkg.sha512" }, - "GraphQL.Primitives/4.0.2": { + "GraphQL.Primitives/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-+E7WLhaBahp+gKmavi/X/mwVXZUIl+VjVA5MKyzSOf3Zzo8DJCxvjsfybmosIRXee4Xk2YQKA+bKlPVuf1MG8g==", - "path": "graphql.primitives/4.0.2", - "hashPath": "graphql.primitives.4.0.2.nupkg.sha512" + "sha512": "sha512-RlGNsv19gbz6sQwkzif9J6Jd148nuIg1kRQf2AFOLp5K00IA+pKMdJvHF5t5llDR52Rok46ynhJv/wg+ps9ZhQ==", + "path": "graphql.primitives/5.1.1", + "hashPath": "graphql.primitives.5.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.Http/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-pPDcCW8spnyibK3krpxrOpaFHf5fjV6k1Hsl6gfh77N/8gRYlLU7MOQDUnjpEwdlHmtxwJKQJNxZqVQOmJGRUw==", + "path": "microsoft.aspnetcore.http/2.1.1", + "hashPath": "microsoft.aspnetcore.http.2.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.Http.Abstractions/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", + "path": "microsoft.aspnetcore.http.abstractions/2.1.1", + "hashPath": "microsoft.aspnetcore.http.abstractions.2.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.Http.Features/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", + "path": "microsoft.aspnetcore.http.features/2.1.1", + "hashPath": "microsoft.aspnetcore.http.features.2.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.WebUtilities/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", + "path": "microsoft.aspnetcore.webutilities/2.1.1", + "hashPath": "microsoft.aspnetcore.webutilities.2.1.1.nupkg.sha512" }, "Microsoft.Bcl.AsyncInterfaces/5.0.0": { "type": "package", @@ -343,19 +630,54 @@ "path": "microsoft.csharp/4.7.0", "hashPath": "microsoft.csharp.4.7.0.nupkg.sha512" }, - "Microsoft.Data.Sqlite/6.0.8": { + "Microsoft.Data.Sqlite/7.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-oX2Ehhy1s/5CLaXRzajASHu2bAp87QrMqPzF3MjQlAm3alUwgmeIDdbm2Mp4i4BB2oxdujyeYCGcDnbew8mBdA==", - "path": "microsoft.data.sqlite/6.0.8", - "hashPath": "microsoft.data.sqlite.6.0.8.nupkg.sha512" + "sha512": "sha512-uumx0bb4FsN7ApP0ZoQDfSJi9c2Xen0PlXCT2BF27cM+yUMFzDEhqxR7/1/DV8ck4mYtL9yShBoOa7jeJ3736w==", + "path": "microsoft.data.sqlite/7.0.3", + "hashPath": "microsoft.data.sqlite.7.0.3.nupkg.sha512" }, - "Microsoft.Data.Sqlite.Core/6.0.8": { + "Microsoft.Data.Sqlite.Core/7.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-ssJbtn9p7vXh3T4gi7g1Ir0bY4cJgVOU1MtTvnl4JvbLNmlq2q24SNK5jJHK/IPI37nhDqcPLHtfW40bscYU/Q==", - "path": "microsoft.data.sqlite.core/6.0.8", - "hashPath": "microsoft.data.sqlite.core.6.0.8.nupkg.sha512" + "sha512": "sha512-pCmzLLWTIrIv94o7JtQ1qcPD0oc1YNY9XvlO6/tOF9YCcUfDZ3Tx9Z//CM7hFnprduHFPekif7jteBc/sXQ31Q==", + "path": "microsoft.data.sqlite.core/7.0.3", + "hashPath": "microsoft.data.sqlite.core.7.0.3.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==", + "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512" + }, + "Microsoft.Extensions.ObjectPool/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==", + "path": "microsoft.extensions.objectpool/2.1.1", + "hashPath": "microsoft.extensions.objectpool.2.1.1.nupkg.sha512" + }, + "Microsoft.Extensions.Options/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-V7lXCU78lAbzaulCGFKojcCyG8RTJicEbiBkPJjFqiqXwndEBBIehdXRMWEVU3UtzQ1yDvphiWUL9th6/4gJ7w==", + "path": "microsoft.extensions.options/2.1.1", + "hashPath": "microsoft.extensions.options.2.1.1.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-scJ1GZNIxMmjpENh0UZ8XCQ6vzr/LzeF9WvEA51Ix2OQGAs9WPgPu8ABVUdvpKPLuor/t05gm6menJK3PwqOXg==", + "path": "microsoft.extensions.primitives/2.1.1", + "hashPath": "microsoft.extensions.primitives.2.1.1.nupkg.sha512" + }, + "Microsoft.Net.Http.Headers/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", + "path": "microsoft.net.http.headers/2.1.1", + "hashPath": "microsoft.net.http.headers.2.1.1.nupkg.sha512" }, "Microsoft.NETCore.Platforms/1.1.0": { "type": "package", @@ -378,47 +700,138 @@ "path": "netstandard.library/2.0.3", "hashPath": "netstandard.library.2.0.3.nupkg.sha512" }, - "Sentry/3.20.1": { + "Polly/7.2.3": { "type": "package", "serviceable": true, - "sha512": "sha512-SkI+CaRmdi5W3JA2plmJpjCQ+P49EuoCODmvrcYUGqeWMGwqa8DJWyeUDpso1DD82wYzbQ0RioSAoxG3nUhzjQ==", - "path": "sentry/3.20.1", - "hashPath": "sentry.3.20.1.nupkg.sha512" + "sha512": "sha512-DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==", + "path": "polly/7.2.3", + "hashPath": "polly.7.2.3.nupkg.sha512" }, - "Speckle.Newtonsoft.Json/12.0.3.1": { + "Polly.Contrib.WaitAndRetry/1.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-yM+DdKzI++HY4FYbloGcPGQ0yrfSv5/a5Rd+iYuzj47ATRtb2M5oCEVcxM4Xum5EDq0BMwkIY/cw/DMlRrZFDA==", - "path": "speckle.newtonsoft.json/12.0.3.1", - "hashPath": "speckle.newtonsoft.json.12.0.3.1.nupkg.sha512" + "sha512": "sha512-1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==", + "path": "polly.contrib.waitandretry/1.1.1", + "hashPath": "polly.contrib.waitandretry.1.1.1.nupkg.sha512" }, - "SQLitePCLRaw.bundle_e_sqlite3/2.0.6": { + "Polly.Extensions.Http/3.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-zssYqiaucyGArZfg74rJuzK0ewgZiidsRVrZTmP7JLNvK806gXg6PGA46XzoJGpNPPA5uRcumwvVp6YTYxtQ5w==", - "path": "sqlitepclraw.bundle_e_sqlite3/2.0.6", - "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.0.6.nupkg.sha512" + "sha512": "sha512-drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", + "path": "polly.extensions.http/3.0.0", + "hashPath": "polly.extensions.http.3.0.0.nupkg.sha512" }, - "SQLitePCLRaw.core/2.0.6": { + "Sentry/3.29.0": { "type": "package", "serviceable": true, - "sha512": "sha512-Vh8n0dTvwXkCGur2WqQTITvk4BUO8i8h9ucSx3wwuaej3s2S6ZC0R7vqCTf9TfS/I4QkXO6g3W2YQIRFkOcijA==", - "path": "sqlitepclraw.core/2.0.6", - "hashPath": "sqlitepclraw.core.2.0.6.nupkg.sha512" + "sha512": "sha512-0AQbZte9ETORcrLj+gmzZcjbB3UwLl6KmdRVC9mcFfWTPftnSqVrgWDQHR70t2EYK5w6Y1pM8FAFyLDSJWvyRA==", + "path": "sentry/3.29.0", + "hashPath": "sentry.3.29.0.nupkg.sha512" }, - "SQLitePCLRaw.lib.e_sqlite3/2.0.6": { + "Sentry.Serilog/3.29.0": { "type": "package", "serviceable": true, - "sha512": "sha512-xlstskMKalKQl0H2uLNe0viBM6fvAGLWqKZUQ3twX5y1tSOZKe0+EbXopQKYdbjJytNGI6y5WSKjpI+kVr2Ckg==", - "path": "sqlitepclraw.lib.e_sqlite3/2.0.6", - "hashPath": "sqlitepclraw.lib.e_sqlite3.2.0.6.nupkg.sha512" + "sha512": "sha512-1g+x8fkoYe3/X6qH2F5hJ6eGkfhGqkMcib0P+dGH6lndnVseP+Lgx8HeO8zk3x3bkS2/GUEV7fn/QnFdh32R4A==", + "path": "sentry.serilog/3.29.0", + "hashPath": "sentry.serilog.3.29.0.nupkg.sha512" }, - "SQLitePCLRaw.provider.e_sqlite3/2.0.6": { + "Serilog/2.12.0": { "type": "package", "serviceable": true, - "sha512": "sha512-peXLJbhU+0clVBIPirihM1NoTBqw8ouBpcUsVMlcZ4k6fcL2hwgkctVB2Nt5VsbnOJcPspQL5xQK7QvLpxkMgg==", - "path": "sqlitepclraw.provider.e_sqlite3/2.0.6", - "hashPath": "sqlitepclraw.provider.e_sqlite3.2.0.6.nupkg.sha512" + "sha512": "sha512-xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg==", + "path": "serilog/2.12.0", + "hashPath": "serilog.2.12.0.nupkg.sha512" + }, + "Serilog.Enrichers.ClientInfo/1.2.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ZJx2eJQKX6+GxjZM9Y++7DPunR7Nizk9Vdq+BqMs/YPfW3Sv+qDm3PVC88srywJMDKfRaecHFWktBjw5F2pmoQ==", + "path": "serilog.enrichers.clientinfo/1.2.0", + "hashPath": "serilog.enrichers.clientinfo.1.2.0.nupkg.sha512" + }, + "Serilog.Enrichers.GlobalLogContext/3.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-IIZcj5mAUVhIl/NTA+YI2KC+sPDzcwvs0ZMHH42jsPfl1a4LVX7ohVpw5UK+e3GxuV3Nv239Il5oM2peUIl44g==", + "path": "serilog.enrichers.globallogcontext/3.0.0", + "hashPath": "serilog.enrichers.globallogcontext.3.0.0.nupkg.sha512" + }, + "Serilog.Exceptions/8.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "path": "serilog.exceptions/8.4.0", + "hashPath": "serilog.exceptions.8.4.0.nupkg.sha512" + }, + "Serilog.Formatting.Compact/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "path": "serilog.formatting.compact/1.1.0", + "hashPath": "serilog.formatting.compact.1.1.0.nupkg.sha512" + }, + "Serilog.Sinks.Console/4.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==", + "path": "serilog.sinks.console/4.1.0", + "hashPath": "serilog.sinks.console.4.1.0.nupkg.sha512" + }, + "Serilog.Sinks.File/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "path": "serilog.sinks.file/5.0.0", + "hashPath": "serilog.sinks.file.5.0.0.nupkg.sha512" + }, + "Serilog.Sinks.PeriodicBatching/3.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NDWR7m3PalVlGEq3rzoktrXikjFMLmpwF0HI4sowo8YDdU+gqPlTHlDQiOGxHfB0sTfjPA9JjA7ctKG9zqjGkw==", + "path": "serilog.sinks.periodicbatching/3.1.0", + "hashPath": "serilog.sinks.periodicbatching.3.1.0.nupkg.sha512" + }, + "Serilog.Sinks.Seq/5.2.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-1Csmo5ua7NKUe0yXUx+zsRefjAniPWcXFhUXxXG8pwo0iMiw2gjn9SOkgYnnxbgWqmlGv236w0N/dHc2v5XwMg==", + "path": "serilog.sinks.seq/5.2.2", + "hashPath": "serilog.sinks.seq.5.2.2.nupkg.sha512" + }, + "Speckle.Newtonsoft.Json/13.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==", + "path": "speckle.newtonsoft.json/13.0.2", + "hashPath": "speckle.newtonsoft.json.13.0.2.nupkg.sha512" + }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "path": "sqlitepclraw.bundle_e_sqlite3/2.1.4", + "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512" + }, + "SQLitePCLRaw.core/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "path": "sqlitepclraw.core/2.1.4", + "hashPath": "sqlitepclraw.core.2.1.4.nupkg.sha512" + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==", + "path": "sqlitepclraw.lib.e_sqlite3/2.1.4", + "hashPath": "sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512" + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==", + "path": "sqlitepclraw.provider.e_sqlite3/2.1.4", + "hashPath": "sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512" }, "System.Buffers/4.5.1": { "type": "package", @@ -448,12 +861,12 @@ "path": "system.numerics.vectors/4.5.0", "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" }, - "System.Reactive/4.3.2": { + "System.Reactive/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-WhGkScPWxw2pp7UwRW8M1OvYZ3WUDPC2wJ0aiuaB4KRD3bt4wLkgHgYnOUu87WRhsurvv5LN0E63iWOEza2o8g==", - "path": "system.reactive/4.3.2", - "hashPath": "system.reactive.4.3.2.nupkg.sha512" + "sha512": "sha512-erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "path": "system.reactive/5.0.0", + "hashPath": "system.reactive.5.0.0.nupkg.sha512" }, "System.Reflection.Metadata/5.0.0": { "type": "package", @@ -462,6 +875,13 @@ "path": "system.reflection.metadata/5.0.0", "hashPath": "system.reflection.metadata.5.0.0.nupkg.sha512" }, + "System.Reflection.TypeExtensions/4.7.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==", + "path": "system.reflection.typeextensions/4.7.0", + "hashPath": "system.reflection.typeextensions.4.7.0.nupkg.sha512" + }, "System.Runtime/4.3.0": { "type": "package", "serviceable": true, diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.dll index f497581..0e82387 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb new file mode 100644 index 0000000..7a82b06 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb.meta new file mode 100644 index 0000000..8b9b8bc --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ad66e20e6eccb2e4d9a01d9cb2525dec +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.xml b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.xml index f49889c..8361b01 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.xml +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/SpeckleCore2.xml @@ -4,378 +4,21 @@ SpeckleCore2 - + - Gets the current user. + Base class for GraphQL API exceptions - If provided, retrieves th user with this user Id - - + - Gets the current user. + Represents a "FORBIDDEN" on "UNAUTHORIZED" GraphQL error as an exception. + https://www.apollographql.com/docs/apollo-server/v2/data/errors/#unauthenticated + https://www.apollographql.com/docs/apollo-server/v2/data/errors/#forbidden - If provided, retrieves th user with this user Id - - - - - Searches for a user on the server. - - String to search for. Must be at least 3 characters - Max number of users to return - - - - - Searches for a user on the server. - - String to search for. Must be at least 3 characters - Max number of users to return - - - - - Gets the version of the current server. Useful for guarding against unsupported api calls on newer or older servers. - - [Optional] defaults to an empty cancellation token - object excluding any strings (eg "2.7.2-alpha.6995" becomes "2.7.2.6995") - - - - - - Gets a stream by id including basic branch info (id, name, description, and total commit count). - For detailed commit and branch info, use StreamGetCommits and StreamGetBranches respectively. - - Id of the stream to get - Max number of branches to retrieve - - - - - Gets a stream by id including basic branch info (id, name, description, and total commit count). - For detailed commit and branch info, use StreamGetCommits and StreamGetBranches respectively. - - Id of the stream to get - Max number of branches to retrieve - - - - - Gets all streams for the current user - - Max number of streams to return - - - - - Gets all streams for the current user - - Max number of streams to return - - - - - Gets all favorite streams for the current user - - Max number of streams to return - - - - - Searches the user's streams by name, description, and ID - - String query to search for - Max number of streams to return - - - - - Searches the user's streams by name, description, and ID - - String query to search for - Max number of streams to return - - - - - Creates a stream. - - - The stream's id. - - - - Creates a stream. - - - The stream's id. - - - - Updates a stream. - - Note: the id field needs to be a valid stream id. - The stream's id. - - - - Updates a stream. - - - Note: the id field needs to be a valid stream id. - The stream's id. - - - - Deletes a stream. - - Id of the stream to be deleted - - - - - Deletes a stream. - - - Id of the stream to be deleted - - - - - Grants permissions to a user on a given stream. - - - - - - - Grants permissions to a user on a given stream. - - - - - - - - Revokes permissions of a user on a given stream. - - - - - - - Revokes permissions of a user on a given stream. - - - - - - - - Updates permissions for a user on a given stream. - Valid for Speckle Server >=2.6.4 - - includes the streamId, the userId of the user to update, and the user's new role - - - - - - - Sends an email invite to join a stream and assigns them a collaborator role. - - - - - - - Sends an email invite to join a stream and assigns them a collaborator role. - - - - - - - - Checks if Speckle Server version is at least v2.6.4 meaning stream invites are supported. - - - true if invites are supported - if Speckle Server version is less than v2.6.4 - - - - Accept or decline a stream invite. - Requires Speckle Server version >= 2.6 .4 - - - - - - - - - - - Get branches from a given stream - - Id of the stream to get the branches from - Max number of branches to retrieve - Max number of commits to retrieve - - - - - Get branches from a given stream - - - Id of the stream to get the branches from - Max number of branches to retrieve - Max number of commits to retrieve - - - - - - Creates a branch on a stream. - - - The stream's id. - - - - Creates a branch on a stream. - - - The branch id. - - - - Gets a given branch from a stream. - - Id of the stream to get the branch from - Name of the branch to get - - - - - Gets a given branch from a stream. - - - Id of the stream to get the branch from - Name of the branch to get - - - - - Updates a branch. - - - The stream's id. - - - - Updates a branch. - - - The stream's id. - - - - Deletes a stream. - - - - - - - Deletes a stream. - - - - - - - Gets a given commit from a stream. - - Id of the stream to get the commit from - Id of the commit to get - - - - - Gets a given commit from a stream. - - - Id of the stream to get the commit from - Id of the commit to get - - - - - Gets the latest commits from a stream - - Id of the stream to get the commits from - Max number of commits to get - - - - - Gets the latest commits from a stream - - - Id of the stream to get the commits from - Max number of commits to get - - - - - - Creates a commit on a branch. - - - The commit id. - - - - Creates a commit on a branch. - - - The commit id. - - - - Updates a commit. - - - The stream's id. - - - - Updates a commit. - - - The stream's id. - - - - Deletes a commit. - - - - - - - Deletes a commit. - - - - Gets the activity of a stream + Gets the activity of a stream Id of the stream to get the activity from Only show activity after this DateTime @@ -387,7 +30,7 @@ - Gets the activity of a stream + Gets the activity of a stream Id of the stream to get the activity from @@ -399,9 +42,88 @@ + + + Get branches from a given stream + + Id of the stream to get the branches from + Max number of branches to retrieve + Max number of commits to retrieve + + + + + Get branches from a given stream + + + Id of the stream to get the branches from + Max number of branches to retrieve + Max number of commits to retrieve + + + + + + Creates a branch on a stream. + + + The stream's id. + + + + Creates a branch on a stream. + + + The branch id. + + + + Gets a given branch from a stream. + + Id of the stream to get the branch from + Name of the branch to get + + + + + Gets a given branch from a stream. + + + Id of the stream to get the branch from + Name of the branch to get + + + + + Updates a branch. + + + The stream's id. + + + + Updates a branch. + + + The stream's id. + + + + Deletes a stream. + + + + + + + Deletes a stream. + + + + - Gets the comments on a Stream + Gets the comments on a Stream Id of the stream to get the comments from The number of comments to get @@ -410,7 +132,7 @@ - Gets the comments on a Stream + Gets the comments on a Stream Id of the stream to get the comments from @@ -421,7 +143,7 @@ - Gets the screenshot of a Comment + Gets the screenshot of a Comment Id of the comment Id of the stream to get the comment from @@ -429,7 +151,7 @@ - Gets the screenshot of a Comment + Gets the screenshot of a Comment Id of the comment @@ -437,17 +159,103 @@ + + + Gets a given commit from a stream. + + Id of the stream to get the commit from + Id of the commit to get + + + + + Gets a given commit from a stream. + + + Id of the stream to get the commit from + Id of the commit to get + + + + + Gets the latest commits from a stream + + Id of the stream to get the commits from + Max number of commits to get + + + + + Gets the latest commits from a stream + + + Id of the stream to get the commits from + Max number of commits to get + + + + + + Creates a commit on a branch. + + + The commit id. + + + + + + + + Updates a commit. + + + The stream's id. + + + + Updates a commit. + + + The stream's id. + + + + Deletes a commit. + + + + + + + Deletes a commit. + + + + + + + Sends a commitReceived mutation, affirming a commit has been received. + + Used for read receipts + + + + + + + - Gets a given object from a stream. + Gets a given object from a stream. - Id of the stream to get the object from + Id of the stream to get the object from Id of the object to get - Gets a given object from a stream. + Gets a given object from a stream. Id of the stream to get the object from @@ -456,7 +264,7 @@ - Gets a given object from a stream. + Gets a given object from a stream. @@ -464,87 +272,417 @@ - Gets a given object from a stream. + Gets a given object from a stream. + + + Gets the version of the current server. Useful for guarding against unsupported api calls on newer or older servers. + + [Optional] defaults to an empty cancellation token + object excluding any strings (eg "2.7.2-alpha.6995" becomes "2.7.2.6995") + + + + + Gets a stream by id including basic branch info (id, name, description, and total commit count). + For detailed commit and branch info, use StreamGetCommits and StreamGetBranches respectively. + + Id of the stream to get + Max number of branches to retrieve + + + + + Gets a stream by id including basic branch info (id, name, description, and total commit count). + For detailed commit and branch info, use StreamGetCommits and StreamGetBranches respectively. + + Id of the stream to get + Max number of branches to retrieve + + + + + Gets all streams for the current user + + Max number of streams to return + + + + + Gets all streams for the current user + + Max number of streams to return + + + + + Gets all favorite streams for the current user + + Max number of streams to return + + + + + Searches the user's streams by name, description, and ID + + String query to search for + Max number of streams to return + + + + + Searches the user's streams by name, description, and ID + + String query to search for + Max number of streams to return + + + + + Creates a stream. + + + The stream's id. + + + + Creates a stream. + + + The stream's id. + + + + Updates a stream. + + Note: the id field needs to be a valid stream id. + The stream's id. + + + + Updates a stream. + + + Note: the id field needs to be a valid stream id. + The stream's id. + + + + Deletes a stream. + + Id of the stream to be deleted + + + + + Deletes a stream. + + + Id of the stream to be deleted + + + + + Grants permissions to a user on a given stream. + + + + + + + Grants permissions to a user on a given stream. + + + + + + + + Revokes permissions of a user on a given stream. + + + + + + + Revokes permissions of a user on a given stream. + + + + + + + + Updates permissions for a user on a given stream. + + includes the streamId, the userId of the user to update, and the user's new role + + + + + + + Gets the pending collaborators of a stream by id. + Requires the user to be an owner of the stream. + + Id of the stream to get + + + + + Gets the pending collaborators of a stream by id. + Requires the user to be an owner of the stream. + + Id of the stream to get + Max number of branches to retrieve + + + + + Sends an email invite to join a stream and assigns them a collaborator role. + + + + + + + Sends an email invite to join a stream and assigns them a collaborator role. + + + + + + + + Cancels an invite to join a stream. + + Id of the stream + Id of the invite to cancel + + + + + + Checks if Speckle Server version is at least v2.6.4 meaning stream invites are supported. + + + true if invites are supported + if Speckle Server version is less than v2.6.4 + + + + Accept or decline a stream invite. + + + + + + + + + + + Gets the currently active user profile. + + + + + + Gets the currently active user profile. + + + + + + + + Get another user's profile by its user id. + + Id of the user you are looking for + + + + + Get another user's profile by its user id. + + + Id of the user you are looking for + + + + + + Searches for a user on the server. + + String to search for. Must be at least 3 characters + Max number of users to return + + + + + Searches for a user on the server. + + String to search for. Must be at least 3 characters + Max number of users to return + + - Subscribe to events of branch created for a stream + Subscribe to events of branch created for a stream - Subscribe to events of branch updated for a stream + Subscribe to events of branch updated for a stream - Subscribe to events of branch deleted for a stream + Subscribe to events of branch deleted for a stream - Subscribe to events of commit created for a stream + Subscribe to events of commit created for a stream - Subscribe to events of commit updated for a stream + Subscribe to events of commit updated for a stream - Subscribe to events of commit updated for a stream + Subscribe to events of commit updated for a stream - Subscribe to events of streams added for the current user + Subscribe to events of streams added for the current user - Subscribe to events of streams updated for a specific streamId + Subscribe to events of streams updated for a specific streamId streamId - Subscribe to events of streams removed for the current user + Subscribe to events of streams removed for the current user + + + Subscribe to new comment events + + - Set only in the case that you've requested this through . + Set only in the case that you've requested this through + . - Set only in the case that you've requested this through . + Set only in the case that you've requested this through + . - Set only in the case that you've requested this through + Set only in the case that you've requested this through + + + + GraphQL DTO model for active user data + + + + + User profile of the active user. + + + + + GraphQL DTO model for limited user data. Mostly referring to other user's profile. + + + + + The limited user profile of another (non active user) + + + + + OS + NOTE: do not edit order and only append new items as they are serialized to ints + + + + + Architecture + NOTE: do not edit order and only append new items as they are serialized to ints + + + + + Envirenment Variable that allows to overwrite the + /// + + + + + Returns the correct location of the Speckle installation folder. Usually this would be the user's %appdata%/Speckle + folder, unless the install was made for all users. + + The location of the Speckle installation folder + + + + Returns the correct location of the Speckle folder for the current user. Usually this would be the user's + %appdata%/Speckle folder. + + The location of the Speckle installation folder + + + + Returns the correct location of the AppData folder where Speckle is installed. Usually this would be the user's + %appdata% folder, unless the install was made for all users. + This folder contains Kits and othe data that can be shared among users of the same machine. + + The location of the AppData folder where Speckle is installed + + + + Returns the location of the User Application Data folder for the current roaming user, which contains user specific + data such as accounts and cache. + + The location of the user's `%appdata%` folder. + - Helper method to Receive from a Speckle Server. + Helper method to Receive from a Speckle Server. - Stream URL or Id to receive from. If the URL contains branchName, commitId or objectId those will be used, otherwise the latest commit from main will be received. + + Stream URL or Id to receive from. If the URL contains branchName, commitId or objectId those will + be used, otherwise the latest commit from main will be received. + Account to use. If not provided the default account will be used. Action invoked on progress iterations. Action invoked on internal errors. @@ -553,70 +691,38 @@ - Helper method to Send to a Speckle Server. + Helper method to Send to a Speckle Server. - Stream URL or Id to send to. If the URL contains branchName, commitId or objectId those will be used, otherwise the latest commit from main will be received. + + Stream URL or Id to send to. If the URL contains branchName, commitId or objectId those will be + used, otherwise the latest commit from main will be received. + Data to send Account to use. If not provided the default account will be used. - Toggle for the default cache. If set to false, it will only send to the provided transports. + + Toggle for the default cache. If set to false, it will only send to the provided + transports. + Action invoked on progress iterations. Action invoked on internal errors. - The connector slug eg. revit, rhino, etc - - - Returns the correct location of the Speckle installation folder. Usually this would be the user's %appdata%/Speckle folder, unless the install was made for all users. - - The location of the Speckle installation folder - - - - Returns the correct location of the Speckle folder for the current user. Usually this would be the user's %appdata%/Speckle folder. - - The location of the Speckle installation folder - - - - Returns the correct location of the AppData folder where Speckle is installed. Usually this would be the user's %appdata% folder, unless the install was made for all users. - - The location of the AppData folder where Speckle is installed - - - - Returns the correct location for `Environment.SpecialFolder.ApplicationData` for the current roaming user. - - The location of the user's `%appdata%` folder. - - - - Checks if the user has a valid internet connection by pinging 'https://google.com' - - True if the user is connected to the internet, false otherwise. - - - - Pings a specific url to verify it's accessible. - - The url to ping. - True if the the status code is 200, false otherwise. - - Convenience method to instantiate an instance of the default object serializer and settings pre-populated with it. - + Convenience method to instantiate an instance of the default object serializer and settings pre-populated with it. + - Receives an object from a transport. + Receives an object from a transport. The transport to receive from. @@ -628,10 +734,13 @@ - Receives an object from a transport. + Receives an object from a transport. - A cancellation token that can be used by other objects or threads to send notice of cancellation. + + A cancellation token that can be used by other objects or threads to send notice of + cancellation. + The transport to receive from. Leave null to use the default cache. Action invoked on progress iterations. @@ -641,37 +750,54 @@ - Sends an object via the provided transports. Defaults to the local cache. + Sends an object via the provided transports. Defaults to the local cache. The object you want to send. Where you want to send them. - Toggle for the default cache. If set to false, it will only send to the provided transports. + + Toggle for the default cache. If set to false, it will only send to the provided + transports. + Action that gets triggered on every progress tick (keeps track of all transports). Use this to capture and handle any errors from within the transports. The id (hash) of the object. - Sends an object via the provided transports. Defaults to the local cache. + Sends an object via the provided transports. Defaults to the local cache. The object you want to send. - A cancellation token that can be used by other objects or threads to send notice of cancellation. + + A cancellation token that can be used by other objects or threads to send notice of + cancellation. + Where you want to send them. - Toggle for the default cache. If set to false, it will only send to the provided transports. + + Toggle for the default cache. If set to false, it will only send to the provided + transports. + Action that gets triggered on every progress tick (keeps track of all transports). Use this to capture and handle any errors from within the transports. The id (hash) of the object. - Serializes a given object. Note: if you want to save and persist an object to a Speckle Transport or Server, please use any of the "Send" methods. See . + Serializes a given object. Note: if you want to save and persist an object to a Speckle Transport or Server, please + use any of the "Send" methods. See + + . A json string representation of the object. - Serializes a given object. Note: if you want to save and persist an object to Speckle Transport or Server, please use any of the "Send" methods. See . + Serializes a given object. Note: if you want to save and persist an object to Speckle Transport or Server, please use + any of the "Send" methods. See + + . Propagates notification that operations should be canceled. @@ -679,28 +805,38 @@ - Serializes a list of objects. Note: if you want to save and persist objects to speckle, please use any of the "Send" methods. + Serializes a list of objects. Note: if you want to save and persist objects to speckle, please use any of the "Send" + methods. - Serializes a list of objects. Note: if you want to save and persist objects to speckle, please use any of the "Send" methods. + Serializes a list of objects. Note: if you want to save and persist objects to speckle, please use any of the "Send" + methods. - Deserializes a given object. Note: if you want to pull an object from a Speckle Transport or Server, please use any of the . + Deserializes a given object. Note: if you want to pull an object from a Speckle Transport or Server, please use any + of the + + . The json string representation of a speckle object that you want to deserialise. - Deserializes a given object. Note: if you want to pull an object from a Speckle Transport or Server, please use any of the . + Deserializes a given object. Note: if you want to pull an object from a Speckle Transport or Server, please use any + of the + + . The json string representation of a speckle object that you want to deserialise. Propagates notification that operations should be canceled. @@ -708,33 +844,35 @@ - Deserializes a list of objects into an array. Note: if you want to pull an object from speckle (either local or remote), please use any of the "Receive" methods. + Deserializes a list of objects into an array. Note: if you want to pull an object from speckle (either local or + remote), please use any of the "Receive" methods. - Deserializes a dictionary object. Note: if you want to pull an object from speckle (either local or remote), please use any of the "Receive" methods. + Deserializes a dictionary object. Note: if you want to pull an object from speckle (either local or remote), please + use any of the "Receive" methods. - Manage accounts locally for desktop applications. + Manage accounts locally for desktop applications. - Gets the basic information about a server. + Gets the basic information about a server. Server URL - Gets basic user information given a token and a server. + Gets basic user information given a token and a server. Server URL @@ -742,7 +880,7 @@ - Gets basic user and server information given a token and a server. + Gets basic user and server information given a token and a server. Server URL @@ -750,318 +888,451 @@ - The Default Server URL for authentication, can be overridden by placing a file with the alternatrive url in the Speckle folder + The Default Server URL for authentication, can be overridden by placing a file with the alternatrive url in the + Speckle folder or with an ENV_VAR - Gets all the accounts for a given server. + Gets all the accounts for a given server. - Gets this environment's default account if any. If there is no default, the first found will be returned and set as default. + Gets this environment's default account if any. If there is no default, the first found will be returned and set as + default. The default account or null. - Gets all the accounts present in this environment. + Gets all the accounts present in this environment. - Gets the local accounts - These are accounts not handled by Manager and are stored in json format in a local directory + Gets the local accounts + These are accounts not handled by Manager and are stored in json format in a local directory - Refetches user and server info for each account + Refetches user and server info for each account - Removes an account + Removes an account ID of the account to remove - Changes the default account + Changes the default account - Adds an account by propting the user to log in via a web flow + Adds an account by propting the user to log in via a web flow Server to use to add the account, if not provied the default Server will be used - - - Determines if the current stream wrapper contains a valid stream. - - - Creates a StreamWrapper from a stream url or a stream id + Creates a StreamWrapper from a stream url or a stream id - Stream Url eg: http://speckle.server/streams/8fecc9aa6d/commits/76a23d7179 or stream ID eg: 8fecc9aa6d + + Stream Url eg: http://speckle.server/streams/8fecc9aa6d/commits/76a23d7179 or stream ID + eg: 8fecc9aa6d + - Creates a StreamWrapper by streamId, userId and serverUrl + Creates a StreamWrapper by streamId, userId and serverUrl + + + Determines if the current stream wrapper contains a valid stream. + + - Gets a valid account for this stream wrapper. - Note: this method ensures that the stream exists and/or that the user has an account which has access to that stream. If used in a sync manner, make sure it's not blocking. + Gets a valid account for this stream wrapper. + + Note: this method ensures that the stream exists and/or that the user has an account which has access to that + stream. If used in a sync manner, make sure it's not blocking. + - Throws exception if account fetching failed. This could be due to non-existent account or stream. + + Throws exception if account fetching failed. This could be due to non-existent account or + stream. + The valid account object for this stream. + + + Policy for retrying failing Http requests + + + + + Policy for retrying failing Http requests + + + + + Checks if the user has a valid internet connection by first pinging cloudfare (fast) + and then trying get from the default Speckle server (slower) + Each check is retried 3 times + + True if the user is connected to the internet, false otherwise. + + + + Pings a specific url to verify it's accessible. Retries 3 times. + + The hostname or address to ping. + True if the the status code is 200, false otherwise. + + + + Pings and tries gettign data from a specific address to verify it's online. Retries 3 times. + + The address to use + True if the the status code is successful, false otherwise. + + + + Helper class dedicated for Speckle specific Path operations. + + + + + Get the installation path. + + + + + Get the path where the Speckle applications should be installed + + + + + Get the folder where the user's Speckle data should be stored. + + + + + Get the folder where the Speckle kits should be stored. + + + + + + + + + Get the folder where the Speckle accounts data should be stored. + + + + + Override the global Speckle application name. + + + + + + Override the global Speckle application data path. + + + + + Override the global Blob storage folder name. + + + + + Override the global Kits folder name. + + + + + Override the global Accounts folder name. + + + + + + + + + Get the platform specific user configuration folder path. + + + + + Get the folder where the user's Speckle blobs should be stored. + + + + + Get the folder where the Speckle logs should be stored. + + Name of the application using this SDK ie.: "Rhino" + Public version slug of the application using this SDK ie.: "2023" + - Returns the versioned app name given a specific version + Returns the versioned app name given a specific version - List of Host Applications - their slugs should match our ghost tags and ci/cd slugs + List of Host Applications - their slugs should match our ghost tags and ci/cd slugs - Gets a HostApplication form a string. It could be the versioned name or a string coming from a process running. + Gets a HostApplication form a string. It could be the versioned name or a string coming from a process running. String with the name of the app - Used to indicate which is the main input parameter of the schema builder component. Schema info will be attached to this object. + Used to indicate which is the main input parameter of the schema builder component. Schema info will be attached to + this object. - Used to ignore properties from expand objects etc + Used to ignore properties from expand objects etc - Keeps track of the conversion process + Keeps track of the conversion process - Decides what to do when an element being received already exists + Decides what to do when an element being received already exists - Converts a native object to a Speckle one + Converts a native object to a Speckle one Native object to convert - Converts a list of objects to Speckle. + Converts a list of objects to Speckle. - Checks if it can convert a native object to a Speckle one + Checks if it can convert a native object to a Speckle one Native object to convert - Converts a Speckle object to a native one + Converts a Speckle object to a native one Speckle object to convert - Converts a list of Speckle objects to a native ones. + Converts a list of Speckle objects to a native ones. - Checks if it can convert a Speckle object to a native one + Checks if it can convert a Speckle object to a native one Speckle object to convert - Returns a list of applications serviced by this converter + Returns a list of applications serviced by this converter - Sets the application document that the converter is targeting + Sets the application document that the converter is targeting The current application document - Some converters need to know which other objects are being converted, in order to sort relationships between them (ie, Revit). Use this method to set them. + Some converters need to know which other objects are being converted, in order to sort relationships between them + (ie, Revit). Use this method to set them. - Some converters need to know which objects have been converted before in order to update them (ie, Revit). Use this method to set them. + Some converters need to know which objects have been converted before in order to update them (ie, Revit). Use this + method to set them. - Some converters need to be able to receive some settings to modify their internal behaviour (i.e. Rhino's Brep Meshing options). Use this method to set them. + Some converters need to be able to receive some settings to modify their internal behaviour (i.e. Rhino's Brep + Meshing options). Use this method to set them. The object representing the settings for your converter. - Receive modes indicate what to do and not do when receiving objects + Receive modes indicate what to do and not do when receiving objects - Attemts updating previously received objects by ID, deletes previously received objects that do not exist anymore and creates new ones + Attemts updating previously received objects by ID, deletes previously received objects that do not exist anymore and + creates new ones - Always creates new objects + Always creates new objects - Ignores updating previously received objects and does not attempt updating or deleting them, creates new objects + Ignores updating previously received objects and does not attempt updating or deleting them, creates new objects - Defines the basic interface for creating a "Speckle Kit" + Defines the basic interface for creating a "Speckle Kit" - Gets all the object types (the object model) provided by this kit. + Gets all the object types (the object model) provided by this kit. - Gets all available converters for this Kit. + Gets all available converters for this Kit. - Gets this Kit's description. + Gets this Kit's description. - Gets this Kit's name. + Gets this Kit's name. - Gets this Kit's author. + Gets this Kit's author. - Gets the website (or email) to contact the Kit's author. + Gets the website (or email) to contact the Kit's author. - Tries to load a converter for a specific app. + Tries to load a converter for a specific . - Must be one of the variables. - The converter for the specific app, or null. + + The host app string for which a is desired. see + + + The converter for the specific + Thrown if the requested converter failed to load - Needed so we can properly deserialize all the Base-derived objects from Core itself. + Needed so we can properly deserialize all the Base-derived objects from Core itself. - Local installations store kits in C:\Users\USERNAME\AppData\Roaming\Speckle\Kits - Admin/System-wide installations in C:\ProgramData\Speckle\Kits + Local installations store kits in C:\Users\USERNAME\AppData\Roaming\Speckle\Kits + Admin/System-wide installations in C:\ProgramData\Speckle\Kits + + + + + Returns a list of all the kits found on this user's device. + + + + + Returns a list of all the types found in all the kits on this user's device. - Checks wether a specific kit exists. + Checks whether a specific kit exists. - Gets a specific kit. + Gets a specific kit. - - - Returns a list of all the kits found on this user's device. - - - - - Returns a list of all the types found in all the kits on this user's device. - - - Gets the default Speckle provided kit, "Objects". + Gets the default Speckle provided kit, "Objects". - TODO: Returns all the kits with potential converters for the software app. + Returns all the kits with potential converters for the software app. - Tells the kit manager to initialise from a specific location. + Tells the kit manager to initialise from a specific location. - Indicates if a given assembly references another which is identified by its name. + Indicates if a given assembly references another which is identified by its name. The assembly which will be probed. The reference assembly name. @@ -1069,66 +1340,75 @@ - Anonymous telemetry to help us understand how to make a better Speckle. - This really helps us to deliver a better open source project and product! + Anonymous telemetry to help us understand how to make a better Speckle. + This really helps us to deliver a better open source project and product! - Default Mixpanel events + Default Mixpanel events - Event triggered when data is sent to a Speckle Server + Event triggered when data is sent to a Speckle Server - Event triggered when data is received from a Speckle Server + Event triggered when data is received from a Speckle Server - Event triggered when a node is executed in a visual programming environment, it should contain the name of the action and the host application + Event triggered when a node is executed in a visual programming environment, it should contain the name of the action + and the host application - Event triggered when an action is executed in Desktop UI, it should contain the name of the action and the host application + Event triggered when an action is executed in Desktop UI, it should contain the name of the action and the host + application - Event triggered when a node is first created in a visual programming environment, it should contain the name of the action and the host application + Event triggered when a node is first created in a visual programming environment, it should contain the name of the + action and the host application - Event triggered when the import/export alert is launched or closed + Event triggered when the import/export alert is launched or closed - Event triggered when the connector is registered + Event triggered when the connector is registered + + + + + Event triggered by the Mapping Tool - Cached email + Cached email - Cached server URL + Cached server URL - Tracks an event without specifying the email and server. - It's not always possible to know which account the user has selected, especially in visual programming. - Therefore we are caching the email and server values so that they can be used also when nodes such as "Serialize" are used. - If no account info is cached, we use the default account data. + Tracks an event without specifying the email and server. + It's not always possible to know which account the user has selected, especially in visual programming. + Therefore we are caching the email and server values so that they can be used also when nodes such as "Serialize" are + used. + If no account info is cached, we use the default account data. Name of the even Additional parameters to pass in to event @@ -1136,7 +1416,7 @@ - Tracks an event from a specified account, anonymizes personal information + Tracks an event from a specified account, anonymizes personal information Account to use, it will be anonymized Name of the event @@ -1145,7 +1425,7 @@ - Tracks an event from a specified email and server, anonymizes personal information + Tracks an event from a specified email and server, anonymizes personal information Email of the user anonymized Server URL anonymized @@ -1153,119 +1433,267 @@ Additional parameters to pass to the event True if it's an action performed by a logged user - + - Anonymous telemetry to help us understand how to make a better Speckle. - This really helps us to deliver a better open source project and product! + Anonymous telemetry to help us understand how to make a better Speckle. + This really helps us to deliver a better open source project and product! + + + Initializes Sentry + + + + + Captures an Exception and makes sure Sentry is initialized + + + + + + + + Adds a Breadcrumb and makes sure Sentry is initialized + + + - Anonymous telemetry to help us understand how to make a better Speckle. - This really helps us to deliver a better open source project and product! + Anonymous telemetry to help us understand how to make a better Speckle. + This really helps us to deliver a better open source project and product! - Set from the connectors, defines which current host application we're running on. + Set from the connectors, defines which current host application we're running on. - Set from the connectors, defines which current host application we're running on - includes the version. + Set from the connectors, defines which current host application we're running on - includes the version. + + + Configuration object for the Speckle logging system. + + + + + Flag to enable enhanced log context. This adds the following enrich calls: + - WithClientAgent + - WithClientIp + - WithExceptionDetails + + + + + Flag to enable console sink + + + + + Flag to enable File sink + + + + + Flag to enable Sentry sink + + + + + Flag to enable Seq sink + + + + + Log events bellow this level are silently dropped + + + + + Flag to override the default Sentry DNS + + + + + Default SpeckleLogConfiguration constructor. + These are the sane defaults we should be using across connectors. + + Log events bellow this level are silently dropped + Flag to enable console log sink + Flag to enable Seq log sink + Flag to enable Sentry log sink + Flag to enable File log sink + Flag to enable enhanced context on every log event + + + + Configurator class for a standardized logging system across Speckle (sharp). + + + + + Initialize logger configuration for a global Serilog.Log logger. + + + + + Create a new fully configured Logger instance. + + Name of the application using this SDK ie.: "Rhino" + Public version slug of the application using this SDK ie.: "2023" + Input configuration object. + Logger instance + - Flags an object's property as being detachable. - If set to true the default serialiser will persist it separately, and add a reference to the property's value in the original object. - Only applies to properties of types derived from the Base class. + Flags an object's property as being detachable. + + If set to true the default serialiser will persist it separately, and add a reference to the property's value + in the original object. + + Only applies to properties of types derived from the Base class. - Flags an object's property as being detachable. - If set to true the default serialiser will persist it separately, and add a reference to the property's value in the original object. - Only applies to properties of types derived from the Base class. + Flags an object's property as being detachable. + + If set to true the default serialiser will persist it separately, and add a reference to the property's value + in the original object. + + Only applies to properties of types derived from the Base class. Wether to detach the property or not. - Flags a list or array as splittable into chunks during serialisation. These chunks will be recomposed on deserialisation into the original list. Note: this attribute should be used in conjunction with . - Use this attribute on properties that can become very long and are not worth detaching into individual elements. - Objects per chunk: for simple types, like numbers, use a high value (>10000); for other objects, use a more conservative number depending on their serialised size. + Flags a list or array as splittable into chunks during serialisation. These chunks will be recomposed on + deserialisation into the original list. Note: this attribute should be used in conjunction with + . + + Use this attribute on properties that can become very long and are not worth detaching into individual + elements. + + + Objects per chunk: for simple types, like numbers, use a high value (>10000); for other objects, use a more + conservative number depending on their serialised size. + - Base class for all Speckle object definitions. Provides unified hashing, type extraction and serialisation. - When developing a speckle kit, use this class as a parent class. - Dynamic properties naming conventions: - 👉 "__" at the start of a property means it will be ignored, both for hashing and serialisation (e.g., "__ignoreMe"). - 👉 "@" at the start of a property name means it will be detached (when serialised with a transport) (e.g.((dynamic)obj)["@meshEquivalent"] = ...) . + Base class for all Speckle object definitions. Provides unified hashing, type extraction and serialisation. + When developing a speckle kit, use this class as a parent class. + + Dynamic properties naming conventions: + + + 👉 "__" at the start of a property means it will be ignored, both for hashing and serialisation (e.g., + "__ignoreMe"). + + + 👉 "@" at the start of a property name means it will be detached (when serialised with a transport) + (e.g.((dynamic)obj)["@meshEquivalent"] = ...) . + - A speckle object's id is an unique hash based on its properties. NOTE: this field will be null unless the object was deserialised from a source. Use the function to get it. + A speckle object's id is an unique hash based on its properties. + + NOTE: this field will be null unless the object was deserialised from a source. Use the + function to get it. + + + + + + This property will only be populated if the object is retreieved from storage. Use + otherwise. + + + + + Secondary, ideally host application driven, object identifier. + + + + + Holds the type information of this speckle object, derived automatically + from its assembly name and inheritance. - Gets the id (a unique hash) of this object. ⚠️ This method fully serializes the object, which in the case of large objects (with many sub-objects), has a tangible cost. Avoid using it! - Hint: Objects that are retrieved/pulled from a server/local cache do have an id (hash) property pre-populated. - Note:The hash of a decomposed object differs from the hash of a non-decomposed object. + Gets the id (a unique hash) of this object. ⚠️ This method fully serializes the object, which in the case of large + objects (with many sub-objects), has a tangible cost. Avoid using it! + + Hint: Objects that are retrieved/pulled from a server/local cache do have an id (hash) property + pre-populated. + + Note:The hash of a decomposed object differs from the hash of a non-decomposed object. If true, will decompose the object in the process of hashing. - Attempts to count the total number of detachable objects. + Attempts to count the total number of detachable objects. The total count of the detachable children + 1 (itself). - Creates a shallow copy of the current base object. - This operation does NOT copy/duplicate the data inside each prop. - The new object's property values will be pointers to the original object's property value. + Creates a shallow copy of the current base object. + This operation does NOT copy/duplicate the data inside each prop. + The new object's property values will be pointers to the original object's property value. A shallow copy of the original object. - + - This property will only be populated if the object is retreieved from storage. Use otherwise. - - - - - Secondary, ideally host application driven, object identifier. - - - - - Holds the type information of this speckle object, derived automatically - from its assembly name and inheritance. + For blobs, the id is the same as the file hash. Please note, when deserialising, the id will be set from the original + hash generated on sending. - Base class implementing a bunch of nice dynamic object methods, like adding and removing props dynamically. Makes c# feel like json. - Orginally adapted from Rick Strahl 🤘 - https://weblog.west-wind.com/posts/2012/feb/08/creating-a-dynamic-extensible-c-expando-object + Base class implementing a bunch of nice dynamic object methods, like adding and removing props dynamically. Makes c# + feel like json. + Orginally adapted from Rick Strahl 🤘 + https://weblog.west-wind.com/posts/2012/feb/08/creating-a-dynamic-extensible-c-expando-object + + + + + Default value for - The actual property bag, where dynamically added props are stored. + The actual property bag, where dynamically added props are stored. + + + Sets and gets properties using the key accessor pattern. E.g.: + +
((dynamic)myObject)["superProperty"] = 42;
+
+
+ + +
- Gets properties via the dot syntax. -
((dynamic)myObject).superProperty;
+ Gets properties via the dot syntax. + +
((dynamic)myObject).superProperty;
+
@@ -1273,234 +1701,375 @@
- Sets properties via the dot syntax. -
((dynamic)myObject).superProperty = something;
+ Sets properties via the dot syntax. + +
((dynamic)myObject).superProperty = something;
+
- - - Sets and gets properties using the key accessor pattern. E.g.: -
myObject["superProperty"] = 42;
-
- property name - property value -
- Gets all of the property names on this class, dynamic or not. + Gets all of the property names on this class, dynamic or not. - Gets the names of the defined class properties (typed). + Gets the names of the defined class properties (typed). - Gets the defined (typed) properties of this object. + Gets the defined (typed) properties of this object. - Gets the names of the typed and dynamic properties that don't have a [SchemaIgnore] attribute. + Gets the names of the typed and dynamic properties that don't have a [SchemaIgnore] attribute. - Gets the typed and dynamic properties. + Gets the typed and dynamic properties. - Specifies which members should be included in the resulting dictionary. Can be concatenated with "|" + + Specifies which members should be included in the resulting dictionary. Can be + concatenated with "|" + A dictionary containing the key's and values of the object. - Gets the dynamically added property names only. + Gets the dynamically added property names only. - This attribute is used internally to hide the this[key]{get; set;} property from inner reflection on members. - For more info see this discussion: https://speckle.community/t/why-do-i-keep-forgetting-base-objects-cant-use-item-as-a-dynamic-member/3246/5 + This attribute is used internally to hide the this[key]{get; set;} property from inner reflection on members. + For more info see this discussion: + https://speckle.community/t/why-do-i-keep-forgetting-base-objects-cant-use-item-as-a-dynamic-member/3246/5 - Represents all different types of members that can be returned by + Represents all different types of members that can be returned by - The typed members of the DynamicBase object + The typed members of the DynamicBase object - The dynamically added members of the DynamicBase object + The dynamically added members of the DynamicBase object - The typed members flagged with attribute. + The typed members flagged with attribute. - The typed members flagged with attribute. + The typed members flagged with attribute. + + + + + The typed methods flagged with TODO: + + + + + All the typed members, including ones with or + attributes. + + + + + All the members, including dynamic and instance members flagged with or + attributes - Provides access to each base object in the traverse function, and decides whether the traverse function should continue traversing it's children or not. + Provides access to each base object in the traverse function, and decides whether the traverse function should + continue traversing it's children or not. - Should return 'true' if you wish to stop the traverse behaviour, 'false' otherwise. + Should return 'true' if you wish to stop the traverse behaviour, 'false' otherwise. - Traverses through the object and its children. - Only traverses through the first occurrence of a object (to prevent infinite recursion on circular references) + Traverses through the object and its children. + Only traverses through the first occurrence of a object (to prevent infinite recursion on + circular references) The root object of the tree to flatten - Optional predicate function to determine whether to break (or continue) traversal of a object's children. - A flat List of objects. - + + Optional predicate function to determine whether to break (or continue) traversal of a + object's children. + + A flat List of objects. + - Depth-first traversal of the specified object and all of its children as a deferred Enumerable, with a function to break the traversal. + Depth-first traversal of the specified object and all of its children as a deferred + Enumerable, with a function to break the traversal. - The object to traverse. - Predicate function to determine whether to break (or continue) traversal of a object's children. - Deferred Enumerable of the objects being traversed (iterable only once). + The object to traverse. + + Predicate function to determine whether to break (or continue) traversal of a + object's children. + + Deferred Enumerable of the objects being traversed (iterable only once). - Wrapper around other, third party, classes that are not coming from a speckle kit. - Serialization and deserialization of the base object happens through default Newtonsoft converters. If your object does not de/serialize correctly, this class will not prevent that from happening. - Limitations: - - Base object needs to be serializable. - - Inline collection declarations with values do not behave correctly. - - Your class needs to have a void constructor. - - Probably more. File a bug! - - - - - The original object. + Wrapper around other, third party, classes that are not coming from a speckle kit. + + Serialization and deserialization of the base object happens through default Newtonsoft converters. If your + object does not de/serialize correctly, this class will not prevent that from happening. + + + Limitations: + + - Base object needs to be serializable. + - Inline collection declarations with values do not behave correctly. + - Your class needs to have a void constructor. + - Probably more. File a bug! - See for limitations of this approach. + See for limitations of this approach. - See for limitations of this approach. + See for limitations of this approach. + + + The original object. + + - In short, this helps you chunk big things into smaller things. - See the following reference. + In short, this helps you chunk big things into smaller things. + See the following reference. - A simple wrapper to keep track of the relationship between speckle objects and their host-application siblings in cases where the - cannot correspond with the (ie, on receiving operations). + A simple wrapper to keep track of the relationship between speckle objects and their host-application siblings in + cases where the + cannot correspond with the (ie, on + receiving operations). + + + + + ID of the object from host application that generated it. - The container for the object in the native application + The container for the object in the native application - Indicates if conversion is supported by the converter + Indicates if conversion is supported by the converter - The fallback values if direct conversion is not available, typically displayValue + The fallback values if direct conversion is not available, typically displayValue - The Speckle id (on receive) or native id (on send) + The Speckle id (on receive) or native id (on send) - Used to retrieve this object in ProgressReport.GetReportObject(), typically to pass between connectors and converters + Used to retrieve this object in ProgressReport.GetReportObject(), typically to pass between connectors + and converters - A descriptive string to describe the object. Use the object type as default. + A descriptive string to describe the object. Use the object type as default. - The created object ids associated with this object + The created object ids associated with this object - On send, this is currently left empty as generating Speckle ids would be performance expensive + On send, this is currently left empty as generating Speckle ids would be performance expensive - Conversion status of object + Conversion status of object - Conversion notes or other important information to expose to the user + Conversion notes or other important information to expose to the user - Converted objects corresponding to this object + Converted objects corresponding to this object - Used during receive for convenience, corresponds to CreatedIds + Used during receive for convenience, corresponds to CreatedIds - Keeps track of the conversion process + Keeps track of the conversion process - Keeps track of errors in the conversions. + Keeps track of errors in the conversions. - Keeps track of errors in the operations of send/receive. + Keeps track of HANDLED errors that occur during send/recieve commands. + + Handled errors specific to the conversion, should be added to ConversionErrors + Unhandleable errors (i.e. that lead to the entire send/receive failing) should be Thrown instead. + + + + + Traverses until finds a convertable object (or fallback) then traverses members + + + + + + + Traverses until finds a convertable object then HALTS deeper traversal + + + + + + + Traverses until finds a convertable object (or fallback) then traverses members + + + + + + + Given object, will recursively traverse members according to the provided traversal rules. + + The object to traverse members + + Lazily returns objects found during traversal (including ), + wrapped within a + + + + + Traverses supported Collections yielding objects. + Does not traverse , only (potentially nested) collections. + + The value to traverse + + + + Interface for a definition of conditional traversal of objects. + + + + + The member names to traverse + Return may include member names doesn't have + + + + Evaluates the traversal rule given + + + + + + + The "traverse none" rule that always holds true + + + + + A traversal rule defines the conditional traversal behaviour when traversing a given objects. + Specifies what members to traverse if any provided are met. + + Follows the builder pattern to ensure that a rule is complete before usable, see usages + + + a new Traversal Rule to be initialised using the Builder Pattern interfaces + + + + Interface for traversal rule in a building (unusable) state + + + + + Adds a condition to this rule. This rule will hold true when ANY of its conditions holds true. + + + Traversal rule in a building (unusable) state + + + + Delegate for selecting members (by member name) of an given object + + + + + Interface for traversal rule in a building (unusable) state + + + + + + Function returning the members that should be traversed for objects where this rule + holds + + Traversal rule in a usable state - Wrapper method around hashing functions. Defaults to md5. + Wrapper method around hashing functions. Defaults to md5. - Retrieves the simple type properties of an object + Retrieves the simple type properties of an object @@ -1510,7 +2079,7 @@ - Sets the properties of an object with the properties of a base object + Sets the properties of an object with the properties of a base object @@ -1518,7 +2087,7 @@ - Chunks a list into pieces. + Chunks a list into pieces. @@ -1527,229 +2096,263 @@ - Property that describes the type of the object. + Property that describes the type of the object. - The sync transport. This transport will be used synchronously. + The sync transport. This transport will be used synchronously. + + The JSON string of the object to be deserialized + A typed object deserialized from the + Thrown when + + Thrown when deserializes to a type other than + + + - Property that describes the type of the object. + Property that describes the type of the object. - The sync transport. This transport will be used synchronously. + The sync transport. This transport will be used synchronously. - List of transports to write to. - - - - - Keeps track of wether current property pointer is marked for detachment. - - - - - Keeps track of the hash chain through the object tree. - - - - - Dictionary of object if and its subsequent closure table (a dictionary of hashes and min depth at which they are found). + List of transports to write to. - Reinitializes the lineage, and other variables that get used during the - json writing process. + Reinitializes the lineage, and other variables that get used during the + json writing process. + + + + + Keeps track of wether current property pointer is marked for detachment. + + + + + Keeps track of the hash chain through the object tree. + + + + + Dictionary of object if and its subsequent closure table (a dictionary of hashes and min depth at which they are + found). - Property that describes the type of the object. + Property that describes the type of the object. - The sync transport. This transport will be used synchronously. + The sync transport. This transport will be used synchronously. - Flushes kit's (discriminator, type) cache. Useful if you're dynamically loading more kits at runtime, that provide better coverage of what you're deserialising, and it's now somehow poisoned because the higher level types were not originally available. + Flushes kit's (discriminator, type) cache. Useful if you're dynamically loading more kits at runtime, that provide + better coverage of what you're deserialising, and it's now somehow poisoned because the higher level types were not + originally available. - Interface defining the contract for transport implementations. + Interface defining the contract for transport implementations. + + + + + Human readable name for the transport + + + + + Extra descriptor properties of the given transport. + + + + + Show how much time the transport was busy for. + + + + + Show how many objects the transport saved. - Should be checked often and gracefully stop all in progress sending if requested. + Should be checked often and gracefully stop all in progress sending if requested. - Used to report progress during the transport's longer operations. + Used to report progress during the transport's longer operations. - Used to report errors during the transport's longer operations. + Used to report errors during the transport's longer operations. - Optional: signals to the transport that writes are about to begin. + Optional: signals to the transport that writes are about to begin. - Optional: signals to the transport that no more items will need to be written. + Optional: signals to the transport that no more items will need to be written. - Saves an object. + Saves an object. The hash of the object. The full string representation of the object. - Saves an object, retrieveing its serialised version from the provided transport. + Saves an object, retrieving its serialised version from the provided transport. The hash of the object. The transport from where to retrieve it. - Awaitable method to figure out whether writing is completed. + Awaitable method to figure out whether writing is completed. - Gets an object. + Gets an object. The object's hash. - Copies the parent object and all its children to the provided transport. + Copies the parent object and all its children to the provided transport. The id of the object you want to copy. The transport you want to copy the object to. - (Optional) an action that will be invoked once, when the amount of object children to be copied over is known. + + (Optional) an action that will be invoked once, when the amount of object + children to be copied over is known. + The string representation of the root object. - Checks if objects are present in the transport + Checks if objects are present in the transport List of object ids to check - A dictionary with the specified object ids as keys and boolean values, whether each object is present in the transport or not + + A dictionary with the specified object ids as keys and boolean values, whether each object is present in the + transport or not + - An in memory storage of speckle objects. + An in memory storage of speckle objects. - Sends data to a speckle server. - TODOs: - - gzip - - preflight deltas on sending data - - preflight deltas on receving/copying data to an existing transport? + Sends data to a speckle server. - https://cymbeline.ch/2014/03/16/gzip-encoding-an-http-post-request-body/ + https://cymbeline.ch/2014/03/16/gzip-encoding-an-http-post-request-body/ - https://cymbeline.ch/2014/03/16/gzip-encoding-an-http-post-request-body/ + https://cymbeline.ch/2014/03/16/gzip-encoding-an-http-post-request-body/ - Callback when sending batches. Parameters: object count, total bytes sent + Callback when sending batches. Parameters: object count, total bytes sent - Timer that ensures queue is consumed if less than MAX_TRANSACTION_SIZE objects are being sent. + Timer that ensures queue is consumed if less than MAX_TRANSACTION_SIZE objects are being sent. + + + Returns all the objects in the store. Note: do not use for large collections. + + + + + + Deletes an object. Note: do not use for any speckle object transport, as it will corrupt the database. + + + + + + Updates an object. + + + + - Awaits untill write completion (ie, the current queue is fully consumed). + Awaits untill write completion (ie, the current queue is fully consumed). - Returns true if the current write queue is empty and comitted. + Returns true if the current write queue is empty and comitted. - Adds an object to the saving queue. + Adds an object to the saving queue. - Directly saves the object in the db. + Directly saves the object in the db. - Gets an object. + Gets an object. - - - Returns all the objects in the store. Note: do not use for large collections. - - - - - - Deletes an object. Note: do not use for any speckle object transport, as it will corrupt the database. - - - - - - Updates an object. - - - - - Waits until the provided function returns true. + Waits until the provided function returns true. diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reactive.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reactive.dll index f13457c..ec69a7f 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reactive.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reactive.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reflection.TypeExtensions.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reflection.TypeExtensions.dll new file mode 100644 index 0000000..0777776 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reflection.TypeExtensions.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reflection.TypeExtensions.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reflection.TypeExtensions.dll.meta new file mode 100644 index 0000000..199eede --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Reflection.TypeExtensions.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 4a9a5d22a19d7de4f9ddff8ceed16258 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Runtime.InteropServices.WindowsRuntime.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Runtime.InteropServices.WindowsRuntime.dll new file mode 100644 index 0000000..cc35b34 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Runtime.InteropServices.WindowsRuntime.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Runtime.InteropServices.WindowsRuntime.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Runtime.InteropServices.WindowsRuntime.dll.meta new file mode 100644 index 0000000..51cd40a --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/System.Runtime.InteropServices.WindowsRuntime.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: e119960cdc84d194da40031f14a3259a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm.meta new file mode 100644 index 0000000..80180bc --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c43f6640c8cabc04195d55c6053e6f60 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets.meta new file mode 100644 index 0000000..ded0506 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29dbce8672840b84fb407b234f464e51 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0.meta new file mode 100644 index 0000000..5b6c054 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59909af605e5cf24c8c8d7750ec43726 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0/e_sqlite3.a b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0/e_sqlite3.a new file mode 100644 index 0000000..a8c038f Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0/e_sqlite3.a differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0/e_sqlite3.a.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0/e_sqlite3.a.meta new file mode 100644 index 0000000..f1698c3 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/browser-wasm/nativeassets/net6.0/e_sqlite3.a.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: d67a9dbef89a3374b9cf1c58e56dc3fb +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: X86 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so index 9294015..c24441c 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so and b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so.meta index f0c3a79..c7fb951 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so.meta +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm/native/libe_sqlite3.so.meta @@ -20,9 +20,12 @@ PluginImporter: Exclude Editor: 1 Exclude Linux64: 1 Exclude OSXUniversal: 1 - Exclude WebGL: 0 - Exclude Win: 0 - Exclude Win64: 0 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 - first: Android: Android second: @@ -32,7 +35,7 @@ PluginImporter: - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -41,7 +44,7 @@ PluginImporter: settings: CPU: AnyCPU DefaultValueInitialized: true - OS: Linux + OS: AnyOS - first: Standalone: Linux64 second: @@ -57,20 +60,42 @@ PluginImporter: - first: Standalone: Win second: - enabled: 1 + enabled: 0 settings: - CPU: x86 + CPU: None - first: Standalone: Win64 second: - enabled: 1 + enabled: 0 settings: - CPU: x86_64 + CPU: None - first: - WebGL: WebGL + Windows Store Apps: WindowsStoreApps second: - enabled: 1 - settings: {} + enabled: 0 + settings: + CPU: X86 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so index 35427ff..a336011 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so and b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so.meta index fb6a13f..009d7a2 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so.meta +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-arm64/native/libe_sqlite3.so.meta @@ -18,11 +18,14 @@ PluginImporter: settings: Exclude Android: 0 Exclude Editor: 1 - Exclude Linux64: 0 + Exclude Linux64: 1 Exclude OSXUniversal: 1 - Exclude WebGL: 0 - Exclude Win: 0 - Exclude Win64: 0 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 - first: Android: Android second: @@ -32,7 +35,7 @@ PluginImporter: - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -45,7 +48,7 @@ PluginImporter: - first: Standalone: Linux64 second: - enabled: 1 + enabled: 0 settings: CPU: None - first: @@ -57,20 +60,47 @@ PluginImporter: - first: Standalone: Win second: - enabled: 1 + enabled: 0 settings: CPU: None - first: Standalone: Win64 second: - enabled: 1 + enabled: 0 settings: CPU: None - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: ARM64 + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so index 5e97edd..62b48e9 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so and b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so.meta index 7e31711..7bac7ca 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so.meta +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x64/native/libe_sqlite3.so.meta @@ -20,9 +20,12 @@ PluginImporter: Exclude Editor: 0 Exclude Linux64: 0 Exclude OSXUniversal: 1 - Exclude WebGL: 0 + Exclude WebGL: 1 Exclude Win: 0 Exclude Win64: 0 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 - first: Android: Android second: @@ -32,7 +35,7 @@ PluginImporter: - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -47,7 +50,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: AnyCPU + CPU: x86_64 - first: Standalone: OSXUniversal second: @@ -59,18 +62,45 @@ PluginImporter: second: enabled: 1 settings: - CPU: x86 + CPU: None - first: Standalone: Win64 second: enabled: 1 settings: - CPU: x86_64 + CPU: None - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86.meta new file mode 100644 index 0000000..453fca5 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9d65916b41c9c44591f8c52fd4cf4f4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native.meta new file mode 100644 index 0000000..e766a5d --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6f61bccd2bf1924aba4b6cdef98b39b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native/libe_sqlite3.so b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native/libe_sqlite3.so new file mode 100644 index 0000000..e64474d Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native/libe_sqlite3.so differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native/libe_sqlite3.so.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native/libe_sqlite3.so.meta new file mode 100644 index 0000000..4089ac3 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/linux-x86/native/libe_sqlite3.so.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: a29f24eeac993e84babcdc69c41bcab9 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 1 + Exclude Linux64: 0 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 0 + Exclude Win64: 0 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: X86 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: Linux + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: X86 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-arm64/native/libe_sqlite3.dylib b/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-arm64/native/libe_sqlite3.dylib index e25be0b..04875eb 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-arm64/native/libe_sqlite3.dylib and b/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-arm64/native/libe_sqlite3.dylib differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-x64/native/libe_sqlite3.dylib b/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-x64/native/libe_sqlite3.dylib index 9854442..215a8d6 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-x64/native/libe_sqlite3.dylib and b/Packages/systems.speckle.speckle-unity/Runtime/Core/osx-x64/native/libe_sqlite3.dylib differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll index 71091a5..df1e054 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll.meta index 3df2ea2..26439f3 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll.meta +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x64/native/e_sqlite3.dll.meta @@ -16,23 +16,26 @@ PluginImporter: second: enabled: 0 settings: - Exclude Android: 0 + Exclude Android: 1 Exclude Editor: 0 Exclude Linux64: 0 Exclude OSXUniversal: 0 - Exclude WebGL: 0 + Exclude WebGL: 1 Exclude Win: 1 Exclude Win64: 0 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 - first: Android: Android second: - enabled: 1 + enabled: 0 settings: CPU: ARMv7 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -69,8 +72,35 @@ PluginImporter: - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll index 7e35917..cda8bbd 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll.meta index 575742b..ce5d9cb 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll.meta +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win-x86/native/e_sqlite3.dll.meta @@ -16,23 +16,26 @@ PluginImporter: second: enabled: 0 settings: - Exclude Android: 0 + Exclude Android: 1 Exclude Editor: 1 Exclude Linux64: 0 Exclude OSXUniversal: 0 - Exclude WebGL: 0 + Exclude WebGL: 1 Exclude Win: 0 - Exclude Win64: 1 + Exclude Win64: 0 + Exclude WindowsStoreApps: 1 + Exclude iOS: 1 + Exclude tvOS: 1 - first: Android: Android second: - enabled: 1 + enabled: 0 settings: CPU: ARMv7 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor @@ -47,7 +50,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: AnyCPU + CPU: None - first: Standalone: OSXUniversal second: @@ -63,14 +66,41 @@ PluginImporter: - first: Standalone: Win64 second: - enabled: 0 + enabled: 1 settings: CPU: None - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: X86 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm.meta new file mode 100644 index 0000000..6cd21b6 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7fedb8d233f2bf14aa136120cfab4f59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets.meta new file mode 100644 index 0000000..44a7089 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5144e9a454dc60e4f8e52aa88a507f4c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0.meta new file mode 100644 index 0000000..24176a8 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d857f1c2d844b2349b6c8123e5b02c60 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0/e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0/e_sqlite3.dll new file mode 100644 index 0000000..5e3d922 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0/e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0/e_sqlite3.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0/e_sqlite3.dll.meta new file mode 100644 index 0000000..c3aff55 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm/nativeassets/uap10.0/e_sqlite3.dll.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: 48e52bcd93d14ff42a36e6def9a8dfb6 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 0 + Exclude iOS: 1 + Exclude tvOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: + CPU: ARM + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64.meta new file mode 100644 index 0000000..c65e997 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd84e4c2097ecc444b99341e3af71616 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets.meta new file mode 100644 index 0000000..b29956b --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 114bd4a070790114598b6da4558a9c2c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0.meta new file mode 100644 index 0000000..26d6098 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce4b9deee13f492478ebb45e2a66be56 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0/e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0/e_sqlite3.dll new file mode 100644 index 0000000..4890bf6 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0/e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0/e_sqlite3.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0/e_sqlite3.dll.meta new file mode 100644 index 0000000..3be0c1a --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-arm64/nativeassets/uap10.0/e_sqlite3.dll.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: a8cd520f96023dd458fd7f0bd70b9057 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 0 + Exclude iOS: 1 + Exclude tvOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: + CPU: ARM64 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64.meta new file mode 100644 index 0000000..9c879f4 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dff5ee1538421d947976019d70aced9c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets.meta new file mode 100644 index 0000000..2a8ef29 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bdda9654449871c459c9ed79c703b33b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0.meta new file mode 100644 index 0000000..bb9adc1 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c0762e4394440a439a2c3c6b1b44a2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0/e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0/e_sqlite3.dll new file mode 100644 index 0000000..6c5e35b Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0/e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0/e_sqlite3.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0/e_sqlite3.dll.meta new file mode 100644 index 0000000..328e3a9 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x64/nativeassets/uap10.0/e_sqlite3.dll.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: bab49dffe103e1f4fbbe007ddd2fec0f +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 0 + Exclude iOS: 1 + Exclude tvOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: + CPU: X64 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86.meta new file mode 100644 index 0000000..3f9cf2b --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd46a4f7dd72d444593b239bbb5505bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets.meta new file mode 100644 index 0000000..9049de4 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 934b6f9f1e592e5469594deb2d6d9b2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0.meta new file mode 100644 index 0000000..b05dcb8 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec57c369185e1a549b7627beaca74ab8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0/e_sqlite3.dll b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0/e_sqlite3.dll new file mode 100644 index 0000000..92e6b69 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0/e_sqlite3.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0/e_sqlite3.dll.meta b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0/e_sqlite3.dll.meta new file mode 100644 index 0000000..9181a29 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Core/win10-x86/nativeassets/uap10.0/e_sqlite3.dll.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: 9913239c0d00edb4e8ffc60e9db67af8 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 0 + Exclude iOS: 1 + Exclude tvOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: + CPU: X86 + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs b/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs index f86f64a..34f4d55 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/NativeCache/AbstractNativeCache.cs @@ -69,16 +69,35 @@ namespace Speckle.ConnectorUnity.NativeCache public static string GetAssetName(Base speckleObject, Type nativeType) { string suffix = GetAssetSuffix(nativeType); - string name = GetObjectName(speckleObject); + string name = GenerateObjectName(speckleObject); string sanitisedName = new(name.Where(x => !InvalidChars.Contains(x)).ToArray()); return $"{sanitisedName}{suffix}"; } - public static string GetObjectName(Base speckleObject) + + public const string OBJECT_NAME_SEPERATOR = " -- "; + + /// The object to be named + /// A human-readable Object name unique to the given + public static string GenerateObjectName(Base speckleObject) { - string objectName = speckleObject["name"] as string ?? speckleObject.speckle_type.Split(':').Last(); - return $"{objectName} - {speckleObject.id}"; + var prefix = GetFriendlyObjectName(speckleObject) ?? SimplifiedSpeckleType(speckleObject); + return $"{prefix}{OBJECT_NAME_SEPERATOR}{speckleObject.id}"; + } + + public static string? GetFriendlyObjectName(Base speckleObject) + { + return speckleObject["name"] as string + ?? speckleObject["Name"] as string + ?? speckleObject["family"] as string; + } + + /// + /// The most significant type in a given + public static string SimplifiedSpeckleType(Base speckleObject) + { + return speckleObject.speckle_type.Split(':')[^1]; } @@ -88,5 +107,12 @@ namespace Speckle.ConnectorUnity.NativeCache if (nativeType == typeof(GameObject)) return ".prefab"; return ".asset"; } + + [Obsolete("use " + nameof(GenerateObjectName))] + public static string GetObjectName(Base speckleObject) + { + string objectName = speckleObject["name"] as string ?? speckleObject.speckle_type.Split(':').Last(); + return $"{objectName} - {speckleObject.id}"; + } } } diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.deps.json b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.deps.json index 8019809..1296e51 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.deps.json +++ b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.deps.json @@ -16,46 +16,96 @@ "Objects.dll": {} } }, - "GraphQL.Client/4.0.2": { + "GraphQL.Client/5.1.1": { "dependencies": { - "GraphQL.Client.Abstractions": "4.0.2", - "GraphQL.Client.Abstractions.Websocket": "4.0.2" + "GraphQL.Client.Abstractions": "5.1.1", + "GraphQL.Client.Abstractions.Websocket": "5.1.1", + "System.Reactive": "5.0.0" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" } } }, - "GraphQL.Client.Abstractions/4.0.2": { + "GraphQL.Client.Abstractions/5.1.1": { "dependencies": { - "GraphQL.Primitives": "4.0.2", - "System.Reactive": "4.3.2" + "GraphQL.Primitives": "5.1.1" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.Abstractions.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" } } }, - "GraphQL.Client.Abstractions.Websocket/4.0.2": { + "GraphQL.Client.Abstractions.Websocket/5.1.1": { "dependencies": { - "GraphQL.Client.Abstractions": "4.0.2" + "GraphQL.Client.Abstractions": "5.1.1" }, "runtime": { "lib/netstandard2.0/GraphQL.Client.Abstractions.Websocket.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" } } }, - "GraphQL.Primitives/4.0.2": { + "GraphQL.Primitives/5.1.1": { "runtime": { "lib/netstandard2.0/GraphQL.Primitives.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.0.2.0" + "assemblyVersion": "5.1.1.0", + "fileVersion": "5.1.1.0" + } + } + }, + "Microsoft.AspNetCore.Http/2.1.1": { + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.AspNetCore.WebUtilities": "2.1.1", + "Microsoft.Extensions.ObjectPool": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.Http.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.AspNetCore.Http.Abstractions/2.1.1": { + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "System.Text.Encodings.Web": "5.0.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.AspNetCore.Http.Features/2.1.1": { + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.AspNetCore.WebUtilities/2.1.1": { + "dependencies": { + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Text.Encodings.Web": "5.0.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" } } }, @@ -78,20 +128,72 @@ } } }, - "Microsoft.Data.Sqlite/6.0.8": { + "Microsoft.Data.Sqlite/7.0.3": { "dependencies": { - "Microsoft.Data.Sqlite.Core": "6.0.8", - "SQLitePCLRaw.bundle_e_sqlite3": "2.0.6" + "Microsoft.Data.Sqlite.Core": "7.0.3", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" } }, - "Microsoft.Data.Sqlite.Core/6.0.8": { + "Microsoft.Data.Sqlite.Core/7.0.3": { "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.4" }, "runtime": { "lib/netstandard2.0/Microsoft.Data.Sqlite.dll": { - "assemblyVersion": "6.0.8.0", - "fileVersion": "6.0.822.36205" + "assemblyVersion": "7.0.3.0", + "fileVersion": "7.0.323.6302" + } + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Extensions.ObjectPool/2.1.1": { + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.ObjectPool.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Extensions.Options/2.1.1": { + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1", + "Microsoft.Extensions.Primitives": "2.1.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Extensions.Primitives/2.1.1": { + "dependencies": { + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" + } + } + }, + "Microsoft.Net.Http.Headers/2.1.1": { + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1", + "System.Buffers": "4.5.1" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { + "assemblyVersion": "2.1.1.0", + "fileVersion": "2.1.1.18157" } } }, @@ -102,7 +204,34 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, - "Sentry/3.20.1": { + "Polly/7.2.3": { + "runtime": { + "lib/netstandard2.0/Polly.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.2.3.0" + } + } + }, + "Polly.Contrib.WaitAndRetry/1.1.1": { + "runtime": { + "lib/netstandard2.0/Polly.Contrib.WaitAndRetry.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.1.1.0" + } + } + }, + "Polly.Extensions.Http/3.0.0": { + "dependencies": { + "Polly": "7.2.3" + }, + "runtime": { + "lib/netstandard2.0/Polly.Extensions.Http.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.0.0.0" + } + } + }, + "Sentry/3.29.0": { "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "System.Buffers": "4.5.1", @@ -112,52 +241,164 @@ }, "runtime": { "lib/netstandard2.0/Sentry.dll": { - "assemblyVersion": "3.20.1.0", - "fileVersion": "3.20.1.0" + "assemblyVersion": "3.29.0.0", + "fileVersion": "3.29.0.0" } } }, - "Speckle.Newtonsoft.Json/12.0.3.1": { + "Sentry.Serilog/3.29.0": { + "dependencies": { + "Sentry": "3.29.0", + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Sentry.Serilog.dll": { + "assemblyVersion": "3.29.0.0", + "fileVersion": "3.29.0.0" + } + } + }, + "Serilog/2.12.0": { + "runtime": { + "lib/netstandard2.0/Serilog.dll": { + "assemblyVersion": "2.0.0.0", + "fileVersion": "2.12.0.0" + } + } + }, + "Serilog.Enrichers.ClientInfo/1.2.0": { + "dependencies": { + "Microsoft.AspNetCore.Http": "2.1.1", + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Enrichers.ClientInfo.dll": { + "assemblyVersion": "0.0.0.0", + "fileVersion": "0.0.0.0" + } + } + }, + "Serilog.Enrichers.GlobalLogContext/3.0.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Enrichers.GlobalLogContext.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.0.0.0" + } + } + }, + "Serilog.Exceptions/8.4.0": { + "dependencies": { + "Serilog": "2.12.0", + "System.Reflection.TypeExtensions": "4.7.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Exceptions.dll": { + "assemblyVersion": "8.0.0.0", + "fileVersion": "8.4.0.0" + } + } + }, + "Serilog.Formatting.Compact/1.1.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Formatting.Compact.dll": { + "assemblyVersion": "1.1.0.0", + "fileVersion": "1.1.0.0" + } + } + }, + "Serilog.Sinks.Console/4.1.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.Console.dll": { + "assemblyVersion": "4.1.0.0", + "fileVersion": "4.1.0.0" + } + } + }, + "Serilog.Sinks.File/5.0.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.File.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.0.0" + } + } + }, + "Serilog.Sinks.PeriodicBatching/3.1.0": { + "dependencies": { + "Serilog": "2.12.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.PeriodicBatching.dll": { + "assemblyVersion": "3.0.0.0", + "fileVersion": "3.1.0.0" + } + } + }, + "Serilog.Sinks.Seq/5.2.2": { + "dependencies": { + "Serilog": "2.12.0", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Sinks.File": "5.0.0", + "Serilog.Sinks.PeriodicBatching": "3.1.0" + }, + "runtime": { + "lib/netstandard2.0/Serilog.Sinks.Seq.dll": { + "assemblyVersion": "5.2.2.0", + "fileVersion": "5.2.2.0" + } + } + }, + "Speckle.Newtonsoft.Json/13.0.2": { "runtime": { "lib/netstandard2.0/Speckle.Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.3.0", + "assemblyVersion": "11.0.0.0", "fileVersion": "11.0.1.0" } } }, - "SQLitePCLRaw.bundle_e_sqlite3/2.0.6": { + "SQLitePCLRaw.bundle_e_sqlite3/2.1.4": { "dependencies": { - "SQLitePCLRaw.core": "2.0.6", - "SQLitePCLRaw.lib.e_sqlite3": "2.0.6", - "SQLitePCLRaw.provider.e_sqlite3": "2.0.6" + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.e_sqlite3": "2.1.4" }, "runtime": { "lib/netstandard2.0/SQLitePCLRaw.batteries_v2.dll": { - "assemblyVersion": "2.0.6.1341", - "fileVersion": "2.0.6.1341" + "assemblyVersion": "2.1.4.1835", + "fileVersion": "2.1.4.1835" } } }, - "SQLitePCLRaw.core/2.0.6": { + "SQLitePCLRaw.core/2.1.4": { "dependencies": { "System.Memory": "4.5.4" }, "runtime": { "lib/netstandard2.0/SQLitePCLRaw.core.dll": { - "assemblyVersion": "2.0.6.1341", - "fileVersion": "2.0.6.1341" + "assemblyVersion": "2.1.4.1835", + "fileVersion": "2.1.4.1835" } } }, - "SQLitePCLRaw.lib.e_sqlite3/2.0.6": {}, - "SQLitePCLRaw.provider.e_sqlite3/2.0.6": { + "SQLitePCLRaw.lib.e_sqlite3/2.1.4": {}, + "SQLitePCLRaw.provider.e_sqlite3/2.1.4": { "dependencies": { - "SQLitePCLRaw.core": "2.0.6" + "SQLitePCLRaw.core": "2.1.4" }, "runtime": { "lib/netstandard2.0/SQLitePCLRaw.provider.e_sqlite3.dll": { - "assemblyVersion": "2.0.6.1341", - "fileVersion": "2.0.6.1341" + "assemblyVersion": "2.1.4.1835", + "fileVersion": "2.1.4.1835" } } }, @@ -201,15 +442,15 @@ } } }, - "System.Reactive/4.3.2": { + "System.Reactive/5.0.0": { "dependencies": { "System.Runtime.InteropServices.WindowsRuntime": "4.3.0", "System.Threading.Tasks.Extensions": "4.5.4" }, "runtime": { "lib/netstandard2.0/System.Reactive.dll": { - "assemblyVersion": "4.3.0.0", - "fileVersion": "4.3.2.55399" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.0.1" } } }, @@ -224,6 +465,14 @@ } } }, + "System.Reflection.TypeExtensions/4.7.0": { + "runtime": { + "lib/netstandard2.0/System.Reflection.TypeExtensions.dll": { + "assemblyVersion": "4.1.5.0", + "fileVersion": "4.700.19.56404" + } + } + }, "System.Runtime/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -297,33 +546,61 @@ "serviceable": false, "sha512": "" }, - "GraphQL.Client/4.0.2": { + "GraphQL.Client/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-EB/icQ7QWzCQzfT6yv8L6BAW+c7DrQuwIg/nNSguOQBMs2W7aaYMpEYidEZ4U2ao0CrT6gcCY0F8xz9hoB3Pvw==", - "path": "graphql.client/4.0.2", - "hashPath": "graphql.client.4.0.2.nupkg.sha512" + "sha512": "sha512-6bfM9qU4AMcFWm4BHd2M6LE5+rLtK47/+VRtypggwb9appC8sbF58ytVBVOKpqKhKpmZERfPLGJap8O/FH3w5w==", + "path": "graphql.client/5.1.1", + "hashPath": "graphql.client.5.1.1.nupkg.sha512" }, - "GraphQL.Client.Abstractions/4.0.2": { + "GraphQL.Client.Abstractions/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-zmtHtejUacIQHAdLEsetDX27mccX0R6MfEu32Ek4l6pprJe3zdtqx+UuWz3wSmrIaj05NLEe5FCHNTjhm3MnjA==", - "path": "graphql.client.abstractions/4.0.2", - "hashPath": "graphql.client.abstractions.4.0.2.nupkg.sha512" + "sha512": "sha512-/znG7Lcz3rzG9VSCq+V2ARb63c/uIs8idGOvXyltZ32Wy570GX/I8HNUIZ1yDThmQRJ5KOGSd9Mzk37lFg49rg==", + "path": "graphql.client.abstractions/5.1.1", + "hashPath": "graphql.client.abstractions.5.1.1.nupkg.sha512" }, - "GraphQL.Client.Abstractions.Websocket/4.0.2": { + "GraphQL.Client.Abstractions.Websocket/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-1JDpd1HgvytSWf7/v1TMJ1EXm6oVuga+lJWY9b9RtmGDjEtmFLxP1663/KLe5vTMzXRpxx3saOkkjikHhQOn3w==", - "path": "graphql.client.abstractions.websocket/4.0.2", - "hashPath": "graphql.client.abstractions.websocket.4.0.2.nupkg.sha512" + "sha512": "sha512-n1gU3GlqJ0jQceb/VEEr4c0D2vpQc5AtDwthK89+yX7VpzlhJKqE5B4RJwx//Jb33mKybfJioWwDgVfSOPAwdw==", + "path": "graphql.client.abstractions.websocket/5.1.1", + "hashPath": "graphql.client.abstractions.websocket.5.1.1.nupkg.sha512" }, - "GraphQL.Primitives/4.0.2": { + "GraphQL.Primitives/5.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-+E7WLhaBahp+gKmavi/X/mwVXZUIl+VjVA5MKyzSOf3Zzo8DJCxvjsfybmosIRXee4Xk2YQKA+bKlPVuf1MG8g==", - "path": "graphql.primitives/4.0.2", - "hashPath": "graphql.primitives.4.0.2.nupkg.sha512" + "sha512": "sha512-RlGNsv19gbz6sQwkzif9J6Jd148nuIg1kRQf2AFOLp5K00IA+pKMdJvHF5t5llDR52Rok46ynhJv/wg+ps9ZhQ==", + "path": "graphql.primitives/5.1.1", + "hashPath": "graphql.primitives.5.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.Http/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-pPDcCW8spnyibK3krpxrOpaFHf5fjV6k1Hsl6gfh77N/8gRYlLU7MOQDUnjpEwdlHmtxwJKQJNxZqVQOmJGRUw==", + "path": "microsoft.aspnetcore.http/2.1.1", + "hashPath": "microsoft.aspnetcore.http.2.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.Http.Abstractions/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", + "path": "microsoft.aspnetcore.http.abstractions/2.1.1", + "hashPath": "microsoft.aspnetcore.http.abstractions.2.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.Http.Features/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", + "path": "microsoft.aspnetcore.http.features/2.1.1", + "hashPath": "microsoft.aspnetcore.http.features.2.1.1.nupkg.sha512" + }, + "Microsoft.AspNetCore.WebUtilities/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", + "path": "microsoft.aspnetcore.webutilities/2.1.1", + "hashPath": "microsoft.aspnetcore.webutilities.2.1.1.nupkg.sha512" }, "Microsoft.Bcl.AsyncInterfaces/5.0.0": { "type": "package", @@ -339,19 +616,54 @@ "path": "microsoft.csharp/4.7.0", "hashPath": "microsoft.csharp.4.7.0.nupkg.sha512" }, - "Microsoft.Data.Sqlite/6.0.8": { + "Microsoft.Data.Sqlite/7.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-oX2Ehhy1s/5CLaXRzajASHu2bAp87QrMqPzF3MjQlAm3alUwgmeIDdbm2Mp4i4BB2oxdujyeYCGcDnbew8mBdA==", - "path": "microsoft.data.sqlite/6.0.8", - "hashPath": "microsoft.data.sqlite.6.0.8.nupkg.sha512" + "sha512": "sha512-uumx0bb4FsN7ApP0ZoQDfSJi9c2Xen0PlXCT2BF27cM+yUMFzDEhqxR7/1/DV8ck4mYtL9yShBoOa7jeJ3736w==", + "path": "microsoft.data.sqlite/7.0.3", + "hashPath": "microsoft.data.sqlite.7.0.3.nupkg.sha512" }, - "Microsoft.Data.Sqlite.Core/6.0.8": { + "Microsoft.Data.Sqlite.Core/7.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-ssJbtn9p7vXh3T4gi7g1Ir0bY4cJgVOU1MtTvnl4JvbLNmlq2q24SNK5jJHK/IPI37nhDqcPLHtfW40bscYU/Q==", - "path": "microsoft.data.sqlite.core/6.0.8", - "hashPath": "microsoft.data.sqlite.core.6.0.8.nupkg.sha512" + "sha512": "sha512-pCmzLLWTIrIv94o7JtQ1qcPD0oc1YNY9XvlO6/tOF9YCcUfDZ3Tx9Z//CM7hFnprduHFPekif7jteBc/sXQ31Q==", + "path": "microsoft.data.sqlite.core/7.0.3", + "hashPath": "microsoft.data.sqlite.core.7.0.3.nupkg.sha512" + }, + "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==", + "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1", + "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512" + }, + "Microsoft.Extensions.ObjectPool/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==", + "path": "microsoft.extensions.objectpool/2.1.1", + "hashPath": "microsoft.extensions.objectpool.2.1.1.nupkg.sha512" + }, + "Microsoft.Extensions.Options/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-V7lXCU78lAbzaulCGFKojcCyG8RTJicEbiBkPJjFqiqXwndEBBIehdXRMWEVU3UtzQ1yDvphiWUL9th6/4gJ7w==", + "path": "microsoft.extensions.options/2.1.1", + "hashPath": "microsoft.extensions.options.2.1.1.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-scJ1GZNIxMmjpENh0UZ8XCQ6vzr/LzeF9WvEA51Ix2OQGAs9WPgPu8ABVUdvpKPLuor/t05gm6menJK3PwqOXg==", + "path": "microsoft.extensions.primitives/2.1.1", + "hashPath": "microsoft.extensions.primitives.2.1.1.nupkg.sha512" + }, + "Microsoft.Net.Http.Headers/2.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", + "path": "microsoft.net.http.headers/2.1.1", + "hashPath": "microsoft.net.http.headers.2.1.1.nupkg.sha512" }, "Microsoft.NETCore.Platforms/1.1.0": { "type": "package", @@ -374,47 +686,138 @@ "path": "netstandard.library/2.0.3", "hashPath": "netstandard.library.2.0.3.nupkg.sha512" }, - "Sentry/3.20.1": { + "Polly/7.2.3": { "type": "package", "serviceable": true, - "sha512": "sha512-SkI+CaRmdi5W3JA2plmJpjCQ+P49EuoCODmvrcYUGqeWMGwqa8DJWyeUDpso1DD82wYzbQ0RioSAoxG3nUhzjQ==", - "path": "sentry/3.20.1", - "hashPath": "sentry.3.20.1.nupkg.sha512" + "sha512": "sha512-DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==", + "path": "polly/7.2.3", + "hashPath": "polly.7.2.3.nupkg.sha512" }, - "Speckle.Newtonsoft.Json/12.0.3.1": { + "Polly.Contrib.WaitAndRetry/1.1.1": { "type": "package", "serviceable": true, - "sha512": "sha512-yM+DdKzI++HY4FYbloGcPGQ0yrfSv5/a5Rd+iYuzj47ATRtb2M5oCEVcxM4Xum5EDq0BMwkIY/cw/DMlRrZFDA==", - "path": "speckle.newtonsoft.json/12.0.3.1", - "hashPath": "speckle.newtonsoft.json.12.0.3.1.nupkg.sha512" + "sha512": "sha512-1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==", + "path": "polly.contrib.waitandretry/1.1.1", + "hashPath": "polly.contrib.waitandretry.1.1.1.nupkg.sha512" }, - "SQLitePCLRaw.bundle_e_sqlite3/2.0.6": { + "Polly.Extensions.Http/3.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-zssYqiaucyGArZfg74rJuzK0ewgZiidsRVrZTmP7JLNvK806gXg6PGA46XzoJGpNPPA5uRcumwvVp6YTYxtQ5w==", - "path": "sqlitepclraw.bundle_e_sqlite3/2.0.6", - "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.0.6.nupkg.sha512" + "sha512": "sha512-drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", + "path": "polly.extensions.http/3.0.0", + "hashPath": "polly.extensions.http.3.0.0.nupkg.sha512" }, - "SQLitePCLRaw.core/2.0.6": { + "Sentry/3.29.0": { "type": "package", "serviceable": true, - "sha512": "sha512-Vh8n0dTvwXkCGur2WqQTITvk4BUO8i8h9ucSx3wwuaej3s2S6ZC0R7vqCTf9TfS/I4QkXO6g3W2YQIRFkOcijA==", - "path": "sqlitepclraw.core/2.0.6", - "hashPath": "sqlitepclraw.core.2.0.6.nupkg.sha512" + "sha512": "sha512-0AQbZte9ETORcrLj+gmzZcjbB3UwLl6KmdRVC9mcFfWTPftnSqVrgWDQHR70t2EYK5w6Y1pM8FAFyLDSJWvyRA==", + "path": "sentry/3.29.0", + "hashPath": "sentry.3.29.0.nupkg.sha512" }, - "SQLitePCLRaw.lib.e_sqlite3/2.0.6": { + "Sentry.Serilog/3.29.0": { "type": "package", "serviceable": true, - "sha512": "sha512-xlstskMKalKQl0H2uLNe0viBM6fvAGLWqKZUQ3twX5y1tSOZKe0+EbXopQKYdbjJytNGI6y5WSKjpI+kVr2Ckg==", - "path": "sqlitepclraw.lib.e_sqlite3/2.0.6", - "hashPath": "sqlitepclraw.lib.e_sqlite3.2.0.6.nupkg.sha512" + "sha512": "sha512-1g+x8fkoYe3/X6qH2F5hJ6eGkfhGqkMcib0P+dGH6lndnVseP+Lgx8HeO8zk3x3bkS2/GUEV7fn/QnFdh32R4A==", + "path": "sentry.serilog/3.29.0", + "hashPath": "sentry.serilog.3.29.0.nupkg.sha512" }, - "SQLitePCLRaw.provider.e_sqlite3/2.0.6": { + "Serilog/2.12.0": { "type": "package", "serviceable": true, - "sha512": "sha512-peXLJbhU+0clVBIPirihM1NoTBqw8ouBpcUsVMlcZ4k6fcL2hwgkctVB2Nt5VsbnOJcPspQL5xQK7QvLpxkMgg==", - "path": "sqlitepclraw.provider.e_sqlite3/2.0.6", - "hashPath": "sqlitepclraw.provider.e_sqlite3.2.0.6.nupkg.sha512" + "sha512": "sha512-xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg==", + "path": "serilog/2.12.0", + "hashPath": "serilog.2.12.0.nupkg.sha512" + }, + "Serilog.Enrichers.ClientInfo/1.2.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ZJx2eJQKX6+GxjZM9Y++7DPunR7Nizk9Vdq+BqMs/YPfW3Sv+qDm3PVC88srywJMDKfRaecHFWktBjw5F2pmoQ==", + "path": "serilog.enrichers.clientinfo/1.2.0", + "hashPath": "serilog.enrichers.clientinfo.1.2.0.nupkg.sha512" + }, + "Serilog.Enrichers.GlobalLogContext/3.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-IIZcj5mAUVhIl/NTA+YI2KC+sPDzcwvs0ZMHH42jsPfl1a4LVX7ohVpw5UK+e3GxuV3Nv239Il5oM2peUIl44g==", + "path": "serilog.enrichers.globallogcontext/3.0.0", + "hashPath": "serilog.enrichers.globallogcontext.3.0.0.nupkg.sha512" + }, + "Serilog.Exceptions/8.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "path": "serilog.exceptions/8.4.0", + "hashPath": "serilog.exceptions.8.4.0.nupkg.sha512" + }, + "Serilog.Formatting.Compact/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "path": "serilog.formatting.compact/1.1.0", + "hashPath": "serilog.formatting.compact.1.1.0.nupkg.sha512" + }, + "Serilog.Sinks.Console/4.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==", + "path": "serilog.sinks.console/4.1.0", + "hashPath": "serilog.sinks.console.4.1.0.nupkg.sha512" + }, + "Serilog.Sinks.File/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "path": "serilog.sinks.file/5.0.0", + "hashPath": "serilog.sinks.file.5.0.0.nupkg.sha512" + }, + "Serilog.Sinks.PeriodicBatching/3.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NDWR7m3PalVlGEq3rzoktrXikjFMLmpwF0HI4sowo8YDdU+gqPlTHlDQiOGxHfB0sTfjPA9JjA7ctKG9zqjGkw==", + "path": "serilog.sinks.periodicbatching/3.1.0", + "hashPath": "serilog.sinks.periodicbatching.3.1.0.nupkg.sha512" + }, + "Serilog.Sinks.Seq/5.2.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-1Csmo5ua7NKUe0yXUx+zsRefjAniPWcXFhUXxXG8pwo0iMiw2gjn9SOkgYnnxbgWqmlGv236w0N/dHc2v5XwMg==", + "path": "serilog.sinks.seq/5.2.2", + "hashPath": "serilog.sinks.seq.5.2.2.nupkg.sha512" + }, + "Speckle.Newtonsoft.Json/13.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==", + "path": "speckle.newtonsoft.json/13.0.2", + "hashPath": "speckle.newtonsoft.json.13.0.2.nupkg.sha512" + }, + "SQLitePCLRaw.bundle_e_sqlite3/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "path": "sqlitepclraw.bundle_e_sqlite3/2.1.4", + "hashPath": "sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512" + }, + "SQLitePCLRaw.core/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "path": "sqlitepclraw.core/2.1.4", + "hashPath": "sqlitepclraw.core.2.1.4.nupkg.sha512" + }, + "SQLitePCLRaw.lib.e_sqlite3/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==", + "path": "sqlitepclraw.lib.e_sqlite3/2.1.4", + "hashPath": "sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512" + }, + "SQLitePCLRaw.provider.e_sqlite3/2.1.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==", + "path": "sqlitepclraw.provider.e_sqlite3/2.1.4", + "hashPath": "sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512" }, "System.Buffers/4.5.1": { "type": "package", @@ -444,12 +847,12 @@ "path": "system.numerics.vectors/4.5.0", "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" }, - "System.Reactive/4.3.2": { + "System.Reactive/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-WhGkScPWxw2pp7UwRW8M1OvYZ3WUDPC2wJ0aiuaB4KRD3bt4wLkgHgYnOUu87WRhsurvv5LN0E63iWOEza2o8g==", - "path": "system.reactive/4.3.2", - "hashPath": "system.reactive.4.3.2.nupkg.sha512" + "sha512": "sha512-erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "path": "system.reactive/5.0.0", + "hashPath": "system.reactive.5.0.0.nupkg.sha512" }, "System.Reflection.Metadata/5.0.0": { "type": "package", @@ -458,6 +861,13 @@ "path": "system.reflection.metadata/5.0.0", "hashPath": "system.reflection.metadata.5.0.0.nupkg.sha512" }, + "System.Reflection.TypeExtensions/4.7.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==", + "path": "system.reflection.typeextensions/4.7.0", + "hashPath": "system.reflection.typeextensions.4.7.0.nupkg.sha512" + }, "System.Runtime/4.3.0": { "type": "package", "serviceable": true, diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.dll b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.dll index 998124c..08e8ddf 100644 Binary files a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.dll and b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.dll differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb new file mode 100644 index 0000000..b1923ff Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb differ diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb.meta b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb.meta new file mode 100644 index 0000000..5a9017b --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.pdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 647c9275466628a42bbfb122f2fe2daa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.xml b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.xml index b1ad52f..1fb29d7 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.xml +++ b/Packages/systems.speckle.speckle-unity/Runtime/Objects/Objects.xml @@ -102,6 +102,56 @@ Assign units when using this constructor due to param + + + Indicates if this element was constructed from an MEP curve + + + + + Indicates if this element needs temporary placeholder objects to be created first when receiving + + + For example, some fittings cannot be created based on connectors, and so will be created similarly to mechanical equipment + + + + + The system category + + + + + The connector profile shape of the + + + + + The link domain + + + + + The index indicating the position of this link on the connected fitting element, if applicable + + + Revit fitting links are 1-indexed. For example, "T" fittings will have ordered links from index 1-3. + + + + + Indicates if this link needs temporary placeholder objects to be created first when receiving + + + Placeholder geometry are curves. + For example, U-bend links need temporary pipes to be created first, if one or more linked pipes have not yet been created in the network. + + + + + Indicates if this link has been connected to its elements + + SchemaBuilder constructor for a Revit shaft @@ -143,6 +193,22 @@ A generic Revit element for which we don't have direct conversions + + + Represents the FamilySymbol subclass of ElementType in Revit + + + + + The type of placement for this family symbol + + See https://www.revitapidocs.com/2023/2abb8627-1da3-4069-05c9-19e4be5e02ad.htm + + + + Subcomponents found in this family symbol + + SchemaBuilder constructor for a Revit extrusion roof @@ -221,6 +287,44 @@ Assign units when using this constructor due to param + + + Represents graph connections between built elements objects + + + Network may need to be created first in native applications before they are linked. + + + + + The elements contained in the network + + + + + The connections between + + + + + The index of the links in that are connected to this element + + + + + Retrieves the links for this element + + + + + The index of the elements in that are connected by this link + + + + + Retrieves the elements for this link + + SchemaBuilder constructor for a Room @@ -633,6 +737,65 @@ Represents a UV Trim curve for one of the 's surfaces. + + + Represents a circular curve based on a base and a as radius. + + + + + The radius of the circle + + + + + The the circle lies in. + + + + + + + + + + + + + + + + + The units this object was modeled in. + + + + + Constructs an empty instance. + + + + + Constructs a new instance. + + The plane where the circle lies + The radius of the circle + The units the circle is modeled in + The unique ID of this circle in a specific application + + + + Returns the coordinates of this as a list of numbers + + A list of values representing the + + + + Creates a new based on a list of coordinates and the unit they're drawn in. + + The list of values representing this + A new with the provided values. + OBSOLETE - This is just here for backwards compatibility. @@ -654,10 +817,62 @@ Gets or sets the knots for this . Count should be equal to count + + 1. + + + + + + + + + + + + + + + + + + The units this object was specified in. + + + + + Constructs an empty instance. + + + + + Constructs a new instance based on displayValue a polyline. + + The polyline that will be this curve's + The units this curve is be modelled in + The unique ID of this curve in a specific application + as list of s when list is malformed + + + Returns the vales of this as a list of numbers + + A list of values representing the + + + + Creates a new based on a list of coordinates and the unit they're drawn in. + + The list of values representing this + A new with the provided values. + + + + + + + Gets or sets the first radius of the . This is usually the major radius. @@ -728,6 +943,32 @@ Vertex colors as ARGB s + + + + + + + + + + + + The unit's this is in. + This should be one of + + + + + Constructs a new mesh from it's raw values. + + + + + + + + Gets a vertex as a by @@ -761,6 +1002,78 @@ , , and lists will be modified to contain no shared vertices (vertices shared between polygons) + + + + + + + + + A 3-dimensional Plane consisting of an origin , and 3 as it's X, Y and Z axis. + + + + + The s origin point. + + + + + The s Z axis. + + + + + The s X axis. + + + + + The s Y axis. + + + + + The unit's this is in. + This should be one of + + + + + Constructs an empty + + + + + Constructs a new given it's individual values. + + The point to be used as origin + The vector to be used as Z axis + The vector to be used as the X axis + The vector to be used as the Y axis + The units the coordinates are in. + The unique ID of this polyline in a specific application + + + + Returns the values of this as a list of numbers + + A list of values representing the Plane. + + + + Creates a new based on a list of values and the unit they're drawn in. + + The list of values representing this plane + A new with the provided values. + + + + + + + A 3-dimensional point @@ -848,9 +1161,6 @@ The y coordinate The z coordinate - - - Computes a point equidistant from two points. @@ -867,21 +1177,393 @@ Second point. The distance from to + + + Computes the distance between two points. + + point for distance measurement + The length of the line between this and the other point + + + + + + + A collection of points, with color and size support. + + + + + Gets or sets the list of points of this , stored as a flat list of coordinates [x1,y1,z1,x2,y2,...] + + + + + Gets or sets the list of colors of this 's points., stored as ARGB s. + + + + + Gets or sets the list of sizes of this 's points. + + + + + + + + The unit's this is in. + This should be one of + + + + + Constructs an empty + + + + Flat list of x,y,z coordinates + Optional list of colors + Optional list of sizes + as list of s when list is malformed + + + + + + + + + A curve that is comprised of multiple curves connected. + + + + + Gets or sets the list of segments that comprise this + + + + + The internal domain of this curve. + + + + + Gets or sets a Boolean value indicating if the is closed + (i.e. The start point of the first segment and the end point of the last segment coincide.) + + + + + + + + + + + + + + The unit's this is in. + This should be one of + + + + + Constructs a new empty instance. + + + + + Constructs a new empty with defined units and unique application ID. + + The units the Polycurve was modelled in. + The unique ID of this polyline in a specific application + + + + Constructs a new instance from an existing curve. + + The polyline to be used when constructing the + A with the same shape as the provided polyline. + + + + Returns the values of this as a list of numbers + + A list of values representing the polycurve. + + + + Creates a new based on a list of coordinates and the unit they're drawn in. + + The list of values representing this polycurve + A new with the provided values. + + + + + + + A polyline curve, defined by a set of vertices. + + + + + Gets or sets the raw coordinates that define this polyline. Use GetPoints instead to access this data as instances instead. + + If true, do not add the last point to the value list. Polyline first and last points should be unique. + + + The internal domain of this curve. + + + + + + + + + + + + + + The unit's this is in. + This should be one of + + + + + Constructs an empty + + + + + Constructs a new instance from a flat list of coordinates. + + The array of 3-dimensional coordinates [x1,y1,z1,x2,y2,... + The units the coordinates are in. + The unique ID of this polyline in a specific application + + + + Constructs a new instance from a flat list of coordinates. + + The list of 3-dimensional coordinates [x1,y1,z1,x2,y2,... + The units the coordinates are in. + The unique ID of this polyline in a specific application + + + + Gets the list of points representing the vertices of this polyline. + + - as List of s - when list is malformed + This function may be suboptimal for performance for polylines with many points + as List of s + when list is malformed + + + + Returns the values of this as a list of numbers + + A list of values representing the polyline. + + + + Creates a new based on a list of coordinates and the unit they're drawn in. + + The list of values representing this polyline + A new with the provided values. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A Surface in NURBS form. + + + + + The degree of the surface in the U direction + + + + + The degree of the surface in the V direction + + + + + Determines if the is rational. + + + + + + + + The raw data of the surface's control points. Use GetControlPoints or SetControlPoints instead of accessing this directly. + + + + + The number of control points in the U direction + + + + + The number of control points in the V direction + + + + + + + + The knot vector in the U direction + + + + + The knot vector in the V direction + + + + + The surface's domain in the U direction + + + + + The surface's domain in the V direction + + + + + Determines if a surface is closed around the . + + + + + Determines if a surface is closed around the + + + + + The unit's this is in. + This should be one of + + + + + Constructs a new empty + + + + + Constructs a new empty + + The units this surface is modeled in + This surface's unique identifier on a specific application + + + + Gets the control points of this s + + A 2-dimensional array representing this s control points. + The ControlPoints will be ordered following directions "[u][v]" + + + + Sets the control points of this . + + A 2-dimensional array of instances. + The must be ordered following directions "[u][v]" + + + + Returns the coordinates of this as a list of numbers + + A list of values representing the surface + + + + Creates a new based on a list of coordinates and the unit they're drawn in. + + The list of values representing this surface + A new with the provided values. + + + + + + @@ -1016,10 +1698,17 @@ Second vector. Vector result of the cross product. - + - Divides this vector by it's euclidean length. + Compute and return a unit vector from this vector + a normalized unit vector + + + + Inverses the direction of the vector, equivalent to multiplying by -1 + + A pointing in the opposite direction @@ -1139,45 +1828,56 @@ + + + Local installations store objects in C:\Users\USERNAME\AppData\Roaming\Speckle\Kits\Objects + Admin/System-wide installations in C:\ProgramData\Speckle\Kits\Objects + + - + + + + + + + A simple container for organising objects within a model and preserving object hierarchy. - A container is defined by a unique and its list of contained . - The can include an unrestricted number of objects including additional nested s. + A container is defined by a human-readable , a unique , and its list of contained . + The can include an unrestricted number of objects including additional nested s. - A correlates to eg Rhino and AutoCad Layers or Blender Collections. - While it is possible for an object to belong to multiple containers, most applications will not support this and - on receive the object will be assigned the the first container it is encountered in. + A can be for example a Layer in Rhino/AutoCad, a collection in Blender, or a Category in Revit. + The location of each collection in the hierarchy of collections in a commit will be retrieved through commit traversal. - + - The name of the container. - This should be unique within the commit. + The human-readable name of the . - TODO: standardise this behaviour across connectors - On receive, this will be prepended with the id of the stream as to not overwrite existing containers in the file. + This name is not necessarily unique within a commit. Set the applicationId for a unique identifier. - + - The elements contained in this . This can include any object including - additional nested s. + The type of this collection + + + + + The elements contained in this . - Most applications will expect all contained elements to have displayable geometry or to be another . - This means that purely data objects may be lost on receive. + This can include additional nested s. - + - Constructor for a basic container. + Constructor for a basic collection. - The unique name of this container - Any contained objects + The human-readable name of this collection @@ -1269,44 +1969,16 @@ Block definition class - + - Block instance class + The definition base point of the block - - - - - - - + - The 4x4 transform matrix. + Returns the translation transform of the base point to the internal origin [0,0,0] - - the 3x3 sub-matrix determines scaling - the 4th column defines translation, where the last value could be a divisor - - - - - Retrieves Instance insertion point by applying to - - Insertion point as a - - - - Returns the a copy of the Block Definition's geometry transformed with this BlockInstance's transform. - - The transformed geometry for this BlockInstance. - - - - Returns a plane representing the insertion point and orientation of this Block instance. - - This method will skip scaling. If you need scaling, we recommend using the transform instead. - A Plane on the insertion point of this Block Instance, with the correct 3-axis rotations. + @@ -1400,6 +2072,12 @@ Rhino object attributes uses OpenNURBS definition for linetypes and lineweights + + + The plot weight in the style units + + A value of 0 indicates a default weight, and -1 indicates an invisible line + Represents a Hatch Loop from a 's curve. @@ -1410,16 +2088,53 @@ Represents the type of a loop in a 's curves. - + - Generic class for materials containing generic parameters + The column-dominant 4x4 transform of this instance. + + Indicates transform from internal origin [0,0,0] + + + + + The units of this Instance, should be the same as the instance transform units + + + + + Generic instance class + + + + + Block instance class + + + + + Returns a plane representing the insertion point and orientation of this Block instance. + + This method will skip scaling. If you need scaling, we recommend using the transform instead. + A Plane on the insertion point of this Block Instance, with the correct 3-axis rotations. + + + + Returns a plane representing the insertion point and orientation of this revit instance. + + This method will skip scaling. If you need scaling, we recommend using the transform instead. + A Plane on the insertion point of this Block Instance, with the correct 3-axis rotations. Material in Revit defininf all revit properties from Autodesk.Revit.DB.Material + + + Generic class for materials containing generic parameters + + Area of the material on a element @@ -1427,7 +2142,7 @@ - UnitMeasure of the quantity,e.g meters implies aquaremeters for area and cubicmeters for the volume + UnitMeasure of the quantity,e.g meters implies squaremeters for area and cubicmeters for the volume @@ -1447,14 +2162,47 @@ - The 4x4 transform matrix. + Generic transform class + + + + + The column-based 4x4 transform matrix - The 3x3 sub-matrix determines scaling. - The 4th column defines translation, where the last value could be a divisor. + Graphics based apps typically use column-based matrices, where the last column defines translation. + Modelling apps may use row-based matrices, where the last row defines translation. Transpose if so. - + + + Units for translation + + + + + Construct a transform from a row-based double array of size 16 + + + + + + + + Construct a transform from a row-based float array of size 16 + + + + + + + + Construct a transform from a 4x4 matrix and translation units + + + + + Construct a transform given the x, y, and z bases and the translation vector @@ -1462,15 +2210,37 @@ - - + - Get the translation, scaling, and units out of the + Decomposes matrix into its scaling, rotation, and translation components - The 3x3 sub-matrix - The last column of the matrix (the last element being the divisor which is almost always 1) - + + + + True if successful, false otherwise + + + + Converts this transform to the input units + + The target units + A matrix array with the translation scaled by input units + If either the transform's or the given is , will return the matrix array data unscaled + + + + Returns the matrix that results from multiplying two matrices together. + + The first transform + The second transform + A transform matrix with the units of the first transform + + + + Returns the double array of the transform matrix + + @@ -1508,14 +2278,6 @@ it will not be returned. - - - Multiplies two transform matrices together - - The first source transform - The second source transform - - SchemaBuilder constructor for a structural model object diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Utils/CoreUtils.cs b/Packages/systems.speckle.speckle-unity/Runtime/Utils/CoreUtils.cs index 5705ad9..8786c5b 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Utils/CoreUtils.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Utils/CoreUtils.cs @@ -7,6 +7,7 @@ namespace Speckle.ConnectorUnity { public static void SetupInit() { + SpeckleLog.Initialize(HostApplications.Unity.Slug, HostApplications.Unity.GetVersion(CoreUtils.GetHostAppVersion())); Setup.Init(HostApplications.Unity.GetVersion(CoreUtils.GetHostAppVersion()), HostApplications.Unity.Slug); } diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Utils/ObjectExtensions.cs b/Packages/systems.speckle.speckle-unity/Runtime/Utils/ObjectExtensions.cs index a9a4320..90f2ff9 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Utils/ObjectExtensions.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Utils/ObjectExtensions.cs @@ -15,6 +15,7 @@ namespace Speckle.ConnectorUnity.Utils /// /// /// +#pragma warning disable CS0618 public static void SetDetachedPropertyChecked(this Base speckleObject, string propertyName, object? value) { if(speckleObject.GetInstanceMembersNames().Any(name => name == propertyName)) @@ -22,5 +23,6 @@ namespace Speckle.ConnectorUnity.Utils else speckleObject[$"@{propertyName}"] = value; } +#pragma warning restore CS0618 } } diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Utils/Utils.cs b/Packages/systems.speckle.speckle-unity/Runtime/Utils/Utils.cs index d9f7d41..9027c7f 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Utils/Utils.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Utils/Utils.cs @@ -1,7 +1,5 @@ using System; using System.Collections; -using System.Threading; -using System.Threading.Tasks; using UnityEngine; using UnityEngine.Networking; @@ -96,4 +94,4 @@ namespace Speckle.ConnectorUnity.Utils callback.Invoke(texture); } } -} \ No newline at end of file +} diff --git a/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs b/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs index fadd2e1..8e4849c 100644 --- a/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs +++ b/Packages/systems.speckle.speckle-unity/Runtime/Wrappers/Selection/AccountSelection.cs @@ -18,7 +18,7 @@ namespace Speckle.ConnectorUnity.Wrappers.Selection { Account? account = Selected; if (account == null) return client = null; - if (client == null || !client.Account.Equals(account)) return client = new Client(Selected); + if (client == null || !client.Account.Equals(account)) return client = new Client(account); return client; } } diff --git a/Packages/systems.speckle.speckle-unity/package.json b/Packages/systems.speckle.speckle-unity/package.json index a868f98..1aa2be8 100644 --- a/Packages/systems.speckle.speckle-unity/package.json +++ b/Packages/systems.speckle.speckle-unity/package.json @@ -1,11 +1,11 @@ { "name": "systems.speckle.speckle-unity", - "version": "2.10.0", + "version": "2.13.0", "displayName": "Speckle Unity Connector", "description": "AEC Interoperability for Unity through Speckle", "unity": "2018.4", "documentationUrl": "https://speckle.guide/user/unity.html", - "changelogUrl": "https://speckle.notion.site/Public-Changelog-45cb90c7514642ffab2e72d0288e4071", + "changelogUrl": "https://speckle.systems/blog/", "license": "Apache-2.0", "licensesUrl": "https://github.com/specklesystems/speckle-unity/blob/main/LICENSE", "keywords": [ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bacc6df..82b1eff 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 24 productGUID: 2acf9fe63872d334c991df0ec103af3a AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -178,10 +178,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -364,6 +364,140 @@ PlayerSettings: m_Height: 36 m_Kind: 0 m_SubKind: + - m_BuildTarget: tvOS + m_Icons: + - m_Textures: [] + m_Width: 1280 + m_Height: 768 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 800 + m_Height: 480 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 400 + m_Height: 240 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 4640 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 2320 + m_Height: 720 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 3840 + m_Height: 1440 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 1920 + m_Height: 720 + m_Kind: 1 + m_SubKind: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -380,6 +514,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -431,6 +566,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -537,7 +674,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -579,6 +715,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -591,6 +728,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -690,17 +828,32 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 @@ -779,6 +932,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6a95707..f8251a7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.14f1 -m_EditorVersionWithRevision: 2021.3.14f1 (eee1884e7226) +m_EditorVersion: 2021.3.22f1 +m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3)