12 Commits

Author SHA1 Message Date
Jedd Morgan 73ef71f4fd Merge pull request #95 from specklesystems/core/2.14.2
Bumped core to 2.14.2
2023-06-07 15:21:13 +01:00
Jedd Morgan 6a07ecfd5b bumped version number 2023-06-07 15:20:57 +01:00
Jedd Morgan e512df9c82 Bumped core to 2.14.2 2023-06-07 13:54:10 +01:00
Jedd Morgan 59221e89ba Merge pull request #94 from specklesystems/jrm/update-core-2.13.0
Added IsMultiplayer
2023-04-22 01:21:09 +01:00
Jedd Morgan 32533ddb21 Added IsMultiplayer 2023-04-22 01:20:08 +01:00
Jedd Morgan fc537e137f Merge pull request #92 from specklesystems/jrm/update-core-2.13.0
2.13 update
2023-04-22 00:15:01 +01:00
Jedd Morgan 2aaaf6572c Final polish 2023-04-22 00:14:40 +01:00
Jedd Morgan 9a89255ae8 Fixed build warnings 2023-04-11 21:14:35 +01:00
Jedd Morgan 9f3145eb19 2.13 testing 2023-04-11 17:55:59 +01:00
Jedd Morgan 5dde0dae60 Configure await false fixes deadlocks 2023-04-06 22:50:47 +01:00
Jedd Morgan 0794c53b24 Converter now builds 2023-04-04 20:20:07 +01:00
Jedd Morgan 2973087beb Update objects & core dlls to 2.13 2023-04-04 19:59:48 +01:00
135 changed files with 5483 additions and 1101 deletions
+210
View File
@@ -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
+2 -2
View File
@@ -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
+79
View File
@@ -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
{
/// <summary>
/// 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)
/// </summary>
[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<SpeckleSender>();
}
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<string> 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
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c98b93e32c844fb488992e2e376447a1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+1 -1
View File
@@ -1,4 +1,4 @@
{
"name": "Speckle.Extra",
"references":[ "GUID:eed1b8b83e2c0074d9e5de2348e3ff72", "GUID:e6adfdc4e436206479f48eafc82f32b5" ]
"references":[ "GUID:eed1b8b83e2c0074d9e5de2348e3ff72", "GUID:e6adfdc4e436206479f48eafc82f32b5", "GUID:d274441ecc3eb3f43b093eec1503d681" ]
}
+3 -3
View File
@@ -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",
+4 -24
View File
@@ -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,
@@ -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);
@@ -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
@@ -163,9 +163,10 @@ namespace Speckle.ConnectorUnity.Components.Editor
try
{
Commit selectedCommit = Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex];
// Receive Speckle Objects
var @base = await Operations.Receive(
Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].referencedObject,
selectedCommit.referencedObject,
remoteTransport: transport,
onProgressAction: dict =>
{
@@ -179,8 +180,15 @@ namespace Speckle.ConnectorUnity.Components.Editor
);
EditorUtility.ClearProgressBar();
Analytics.TrackEvent(SelectedAccount, Analytics.Events.Receive);
Analytics.TrackEvent(SelectedAccount, Analytics.Events.Receive, new Dictionary<string, object>()
{
{"mode", nameof(StreamManagerEditor)},
{"sourceHostApp", HostApplications.GetHostAppFromString(selectedCommit.sourceApplication).Slug},
{"sourceHostAppVersion", selectedCommit.sourceApplication ?? ""},
{"hostPlatform", Application.platform.ToString()},
{"isMultiplayer", selectedCommit.authorId != SelectedAccount.userInfo.id},
});
//Convert Speckle Objects
int childrenConverted = 0;
@@ -364,4 +372,4 @@ namespace Speckle.ConnectorUnity.Components.Editor
}
}
}
}
}
@@ -46,8 +46,8 @@ namespace Speckle.ConnectorUnity.Wrappers.Selection.Editor
("Description", s => s.description),
("Is Public", s => s.isPublic.ToString()),
("Role", s => s.role),
("Created at", s => s.createdAt),
("Updated at", s => s.updatedAt),
("Created at", s => s.createdAt.ToString()),
("Updated at", s => s.updatedAt.ToString()),
};
}
}
@@ -84,7 +84,7 @@ namespace Speckle.ConnectorUnity.Wrappers.Selection.Editor
{
("Commit Id", s => s.id),
("Author Name", s => s.authorName),
("Created At", s => s.createdAt),
("Created At", s => s.createdAt.ToString()),
("Source Application", s => s.sourceApplication),
("Reference Object Id", s => s.referencedObject),
};
@@ -5,8 +5,10 @@ using Speckle.Core.Logging;
using Speckle.Core.Transports;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Sentry;
using Speckle.ConnectorUnity.Components;
using Speckle.Core.Kits;
@@ -93,7 +95,7 @@ namespace Speckle.ConnectorUnity
if (!mainBranch.commits.items.Any())
throw new Exception("This branch has no commits");
var commit = mainBranch.commits.items[0];
GetAndConvertObject(commit.referencedObject, commit.id);
GetAndConvertObject(commit.referencedObject, commit.id, commit.sourceApplication, commit.authorId);
}
catch (Exception e)
{
@@ -116,12 +118,12 @@ namespace Speckle.ConnectorUnity
if (e.branchName == BranchName)
{
Debug.Log("New commit created");
GetAndConvertObject(e.objectId, e.id);
GetAndConvertObject(e.objectId, e.id, e.sourceApplication, e.authorId);
}
}
private async void GetAndConvertObject(string objectId, string commitId)
private async void GetAndConvertObject(string objectId, string commitId, string sourceApplication, string authorId)
{
try
{
@@ -136,7 +138,14 @@ namespace Speckle.ConnectorUnity
disposeTransports: true
);
Analytics.TrackEvent(Client.Account, Analytics.Events.Receive);
Analytics.TrackEvent(Client.Account, Analytics.Events.Receive, new Dictionary<string, object>()
{
{"mode", nameof(Receiver)},
{"sourceHostApp", HostApplications.GetHostAppFromString(sourceApplication).Slug},
{"sourceHostAppVersion", sourceApplication ?? ""},
{"hostPlatform", Application.platform.ToString()},
{"isMultiplayer", authorId != null && authorId != Client.Account.userInfo.id},
});
Dispatcher.Instance().Enqueue(() =>
{
@@ -186,4 +195,4 @@ namespace Speckle.ConnectorUnity
#endregion
}
}
}
@@ -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<Base, GameObject> 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<GameObject> outCreatedObjects)
=> ConvertCoroutine(rootObject, parent, outCreatedObjects,b => ConverterInstance.CanConvertToNative(b));
@@ -36,14 +81,9 @@ namespace Speckle.ConnectorUnity.Components
/// <param name="predicate">A function to determine if an object should be converted</param>
public virtual List<GameObject> RecursivelyConvertToNative(object? o, Transform? parent, Func<Base, bool> predicate)
{
//Ensure we have A native cache
if (AssetCache.nativeCaches.Any(x => x == null))
{
AssetCache.nativeCaches = NativeCacheFactory.GetStandaloneCacheSetup();
}
InitializeAssetCache();
var createdGameObjects = new List<GameObject>();
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<Base, bool> predicate, IList<GameObject> 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<Base, bool> predicate, IList<GameObject> 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);
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using System.Threading;
@@ -86,11 +87,11 @@ namespace Speckle.ConnectorUnity.Components
client: client,
streamId: stream.id,
objectId: commit.referencedObject,
commitId: commit.id,
commit: commit,
onProgressAction: dict => OnReceiveProgressAction.Invoke(dict),
onErrorAction: (m, e) => OnErrorAction.Invoke(m, e),
onTotalChildrenCountKnown: c => OnTotalChildrenCountKnown.Invoke(c)
);
).ConfigureAwait(false);
}
/// <summary>
@@ -100,7 +101,7 @@ namespace Speckle.ConnectorUnity.Components
/// <param name="client"></param>
/// <param name="streamId"></param>
/// <param name="objectId"></param>
/// <param name="commitId"></param>
/// <param name="commit"></param>
/// <param name="onProgressAction"></param>
/// <param name="onErrorAction"></param>
/// <param name="onTotalChildrenCountKnown"></param>
@@ -109,18 +110,18 @@ namespace Speckle.ConnectorUnity.Components
Client client,
string streamId,
string objectId,
string? commitId,
Commit? commit,
Action<ConcurrentDictionary<string, int>>? onProgressAction = null,
Action<string, Exception>? onErrorAction = null,
Action<int>? 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 +132,18 @@ namespace Speckle.ConnectorUnity.Components
onProgressAction: onProgressAction,
onErrorAction: onErrorAction,
onTotalChildrenCountKnown: onTotalChildrenCountKnown,
disposeTransports: true
);
disposeTransports: false
).ConfigureAwait(false);
Analytics.TrackEvent(client.Account, Analytics.Events.Receive, new Dictionary<string, object>()
{
{"mode", nameof(SpeckleReceiver)},
{"sourceHostApp", HostApplications.GetHostAppFromString(commit?.sourceApplication).Slug},
{"sourceHostAppVersion", commit?.sourceApplication ?? ""},
{"hostPlatform", Application.platform.ToString()},
{"isMultiplayer", commit != null && commit.authorId != client.Account.userInfo.id},
});
token.ThrowIfCancellationRequested();
//Read receipt
@@ -142,10 +152,10 @@ namespace Speckle.ConnectorUnity.Components
await client.CommitReceived(token, new CommitReceivedInput
{
streamId = streamId,
commitId = commitId,
commitId = commit?.id,
message = $"received commit from {Application.unityVersion}",
sourceApplication = HostApplications.Unity.GetVersion(CoreUtils.GetHostAppVersion())
});
}).ConfigureAwait(false);
}
catch (Exception e)
{
@@ -157,11 +167,7 @@ namespace Speckle.ConnectorUnity.Components
{
onErrorAction?.Invoke(e.Message, e);
}
finally
{
transport?.Dispose();
}
return ret;
}
@@ -293,13 +299,13 @@ namespace Speckle.ConnectorUnity.Components
public void Awake()
{
CoreUtils.SetupInit();
Converter = GetComponent<RecursiveConverter>();
Initialise(true);
}
protected void Initialise(bool forceRefresh = false)
{
CoreUtils.SetupInit();
Account ??= new AccountSelection();
Stream ??= new StreamSelection(Account);
Branch ??= new BranchSelection(Stream);
@@ -84,7 +84,11 @@ namespace Speckle.ConnectorUnity.Components
onErrorAction: onErrorAction
);
Analytics.TrackEvent(client.Account, Analytics.Events.Send);
Analytics.TrackEvent(client.Account, Analytics.Events.Send, new Dictionary<string, object>()
{
{"mode", nameof(SpeckleSender)},
{"hostPlatform", Application.platform.ToString()},
});
if (createCommit && !cancellationToken.IsCancellationRequested)
{
@@ -179,13 +183,13 @@ namespace Speckle.ConnectorUnity.Components
public void Awake()
{
CoreUtils.SetupInit();
Initialise(true);
Converter = GetComponent<RecursiveConverter>();
}
protected void Initialise(bool forceRefresh = false)
{
CoreUtils.SetupInit();
Account ??= new AccountSelection();
Stream ??= new StreamSelection(Account);
Branch ??= new BranchSelection(Stream);
@@ -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<SMesh> meshes = new();
List<Base> 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<List<SMesh>> 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
/// <returns>Transformation matrix in Unity's coordinate system</returns>
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,
};
}
@@ -349,4 +354,4 @@ namespace Objects.Converter.Unity
}
}
}
}
@@ -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<Vector3> 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");
@@ -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
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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,
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ad66e20e6eccb2e4d9a01d9cb2525dec
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -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:
@@ -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:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c43f6640c8cabc04195d55c6053e6f60
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 29dbce8672840b84fb407b234f464e51
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 59909af605e5cf24c8c8d7750ec43726
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a9d65916b41c9c44591f8c52fd4cf4f4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f6f61bccd2bf1924aba4b6cdef98b39b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -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:
@@ -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:

Some files were not shown because too many files have changed in this diff Show More