Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ROBO-4338] Add Owner field to BookmarkInfo #346

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[ROBO-4338] Add Owner field to BookmarkInfo #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>6.0.0</Version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert

<Version>6.0.2</Version>
<RoslynPackageVersion>4.5.0-2.22527.10</RoslynPackageVersion>
<WarningsAsErrors>true</WarningsAsErrors>
<UseWPF Condition="$(TargetFramework) == 'net6.0-windows'">true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion src/UiPath.Workflow.Runtime/Bookmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ internal BookmarkInfo GenerateBookmarkInfo(BookmarkCallbackWrapper bookmarkCallb
scopeInfo = Scope.GenerateScopeInfo();
}

return new BookmarkInfo(_externalName, bookmarkCallback.ActivityInstance.Activity.DisplayName, scopeInfo);
return new BookmarkInfo(_externalName, bookmarkCallback.ActivityInstance.Activity.DisplayName, scopeInfo, bookmarkCallback.ActivityInstance.Activity);
}

public bool Equals(Bookmark other)
Expand Down
10 changes: 9 additions & 1 deletion src/UiPath.Workflow.Runtime/Hosting/BookmarkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ public sealed class BookmarkInfo
private string _bookmarkName;
private BookmarkScopeInfo _scopeInfo;
private string _ownerDisplayName;
private Activity _owner;

internal BookmarkInfo() { }
internal BookmarkInfo(string bookmarkName, string ownerDisplayName, BookmarkScopeInfo scopeInfo)
internal BookmarkInfo(string bookmarkName, string ownerDisplayName, BookmarkScopeInfo scopeInfo, Activity owner)
{
BookmarkName = bookmarkName;
OwnerDisplayName = ownerDisplayName;
ScopeInfo = scopeInfo;
_owner = owner;
}

public string BookmarkName
Expand All @@ -39,6 +41,12 @@ public BookmarkScopeInfo ScopeInfo
private set => _scopeInfo = value;
}

public Activity Owner
{
get => _owner;
set => _owner = value;
}

[DataMember(Name = "BookmarkName")]
internal string SerializedBookmarkName
{
Expand Down