Merge pull request #51 from specklesystems/bump-core-2.2.4

Bumped core to 2.2.4 and added read receipts
This commit is contained in:
Jedd Morgan
2021-11-30 17:40:14 +00:00
committed by GitHub
9 changed files with 72 additions and 9 deletions
@@ -20,6 +20,8 @@ namespace Objects.Converter.Unity
public string Name => nameof(ConverterUnity);
public string Author => "Speckle";
public string WebsiteOrEmail => "https://speckle.systems";
public ProgressReport Report { get; }
public IEnumerable<string> GetServicedApplications() => new string[] {Applications.Other}; //TODO: add unity
Binary file not shown.
@@ -13,7 +13,7 @@
"Microsoft.CSharp": "4.7.0",
"NETStandard.Library": "2.0.3",
"Piwik.Tracker": "3.0.0",
"Sentry": "3.9.0",
"Sentry": "3.9.4",
"Speckle.Newtonsoft.Json": "12.0.3.1",
"System.Data.SQLite.Core": "1.0.115"
},
@@ -98,7 +98,7 @@
}
}
},
"Sentry/3.9.0": {
"Sentry/3.9.4": {
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
"System.Buffers": "4.5.1",
@@ -108,8 +108,8 @@
},
"runtime": {
"lib/netstandard2.0/Sentry.dll": {
"assemblyVersion": "3.9.0.0",
"fileVersion": "3.9.0.0"
"assemblyVersion": "3.9.4.0",
"fileVersion": "3.9.4.0"
}
}
},
@@ -340,12 +340,12 @@
"path": "piwik.tracker/3.0.0",
"hashPath": "piwik.tracker.3.0.0.nupkg.sha512"
},
"Sentry/3.9.0": {
"Sentry/3.9.4": {
"type": "package",
"serviceable": true,
"sha512": "sha512-U++mXgv9PVz6l28XXxLY9F6T2t/QuW+PtF4MBmBF4djnKWiqv3fHEHszKdux/t7tw1/wM2k0JdDrLSnOfcXhtg==",
"path": "sentry/3.9.0",
"hashPath": "sentry.3.9.0.nupkg.sha512"
"sha512": "sha512-q7LK5E/xNNNO0hVNYjvTqOKAzzKy2+YHxtmd9WKlrp2bo9/55VMtyQmqqjacQ8Tha6ugj50Z5XWu+2IEUiN4+Q==",
"path": "sentry/3.9.4",
"hashPath": "sentry.3.9.4.nupkg.sha512"
},
"Speckle.Newtonsoft.Json/12.0.3.1": {
"type": "package",
Binary file not shown.
@@ -635,6 +635,11 @@
Used to ignore properties from expand objects etc
</summary>
</member>
<member name="P:Speckle.Core.Kits.ISpeckleConverter.Report">
<summary>
Keeps track of the conversion process
</summary>
</member>
<member name="M:Speckle.Core.Kits.ISpeckleConverter.ConvertToSpeckle(System.Object)">
<summary>
Converts a native object to a Speckle one
@@ -991,6 +996,21 @@
<see cref="P:Speckle.Core.Models.Base.applicationId"/> cannot correspond with the <see cref="P:Speckle.Core.Models.ApplicationPlaceholderObject.ApplicationGeneratedId"/> (ie, on receiving operations).
</summary>
</member>
<member name="P:Speckle.Core.Models.ProgressReport.ConversionLog">
<summary>
Keeps track of the conversion process
</summary>
</member>
<member name="P:Speckle.Core.Models.ProgressReport.ConversionErrors">
<summary>
Keeps track of errors in the conversions.
</summary>
</member>
<member name="P:Speckle.Core.Models.ProgressReport.OperationErrors">
<summary>
Keeps track of errors in the operations of send/receive.
</summary>
</member>
<member name="M:Speckle.Core.Models.Utilities.hashString(System.String,Speckle.Core.Models.Utilities.HashingFuctions)">
<summary>
Wrapper method around hashing functions. Defaults to md5.
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Sentry;
using Speckle.Core.Api;
using Speckle.Core.Credentials;
using Speckle.Core.Kits;
using Speckle.Core.Logging;
using Speckle.Core.Transports;
using UnityEditor;
@@ -175,7 +176,22 @@ namespace Speckle.ConnectorUnity
var go = _streamManager.ConvertRecursivelyToNative(@base,
Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].id);
try
{
await Client.CommitReceived(new CommitReceivedInput
{
streamId = SelectedStream.id,
commitId = Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].id,
message = $"received commit from {Applications.Unity} Editor",
sourceApplication = Applications.Unity
});
}
catch
{
// Do nothing!
}
}
catch (Exception e)
{
Binary file not shown.
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3da461ed2b4c84e44b90c3c53f225b29
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+17
View File
@@ -13,6 +13,7 @@ using System.Linq;
using System.Threading.Tasks;
using Sentry;
using Sentry.Protocol;
using Speckle.Core.Kits;
using UnityEngine;
namespace Speckle.ConnectorUnity
@@ -155,6 +156,22 @@ namespace Speckle.ConnectorUnity
{
throw new SpeckleException(e.Message, e, true, SentryLevel.Error);
}
try
{
await Client.CommitReceived(new CommitReceivedInput
{
streamId = StreamId,
commitId = commitId,
message = "received commit from " + Applications.Unity,
sourceApplication = Applications.Unity
});
}
catch
{
// Do nothing!
}
}