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

Enable package node migration for Dynamo Core 2.0+ graphs #9306

Merged
merged 17 commits into from
Dec 17, 2018
Merged

Enable package node migration for Dynamo Core 2.0+ graphs #9306

Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
17588a4
enable node migration using the Migrations.xml file sometimes include…
alfarok Dec 11, 2018
5704464
cleanup logic
alfarok Dec 11, 2018
ce79a73
add additional comments
alfarok Dec 11, 2018
5f7cd98
more logic cleanup
alfarok Dec 12, 2018
0638108
enable nodeModel node migration using the `AlsoKnownAs` attribute for…
alfarok Dec 13, 2018
6ce664e
cleanup
alfarok Dec 13, 2018
14199b3
update comment
alfarok Dec 13, 2018
0deb09a
replace ContainsKey with TryGetValue
alfarok Dec 13, 2018
98a05b6
mark previously used method as [Obsolete] to prevent breaking API
alfarok Dec 13, 2018
4f819e5
more logic cleanup
alfarok Dec 13, 2018
9cc5039
testing coverage on JSON node migration for ZeroTouch and NodeModel n…
alfarok Dec 14, 2018
6a5d1f8
update [Obsolete] message
alfarok Dec 14, 2018
e17b80a
remove unnecessary pkg files
alfarok Dec 14, 2018
2007a35
remove more unnecessary pkg files
alfarok Dec 14, 2018
672b698
remove package count test as it could easily change when new tests ar…
alfarok Dec 14, 2018
bfa3302
address coding standard comments
alfarok Dec 14, 2018
e51d511
accidental commit
alfarok Dec 14, 2018
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
11 changes: 10 additions & 1 deletion src/DynamoCore/Graph/Workspaces/SerializationConverters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,16 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
else if (typeof(DSFunctionBase).IsAssignableFrom(type))
{
var mangledName = obj["FunctionSignature"].Value<string>();
var functionDescriptor = libraryServices.GetFunctionDescriptor(mangledName);
var priorNames = libraryServices.GetPriorNames();
FunctionDescriptor functionDescriptor;

// Attempt to located a newer migrated version of the node
Copy link
Member

Choose a reason for hiding this comment

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

sic(locate)?

if (priorNames.ContainsKey(mangledName))
Copy link
Contributor

Choose a reason for hiding this comment

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

Just use TryGetValue . You can check for the key and get the value at the key at the same time.

{ functionDescriptor = libraryServices.GetFunctionDescriptor(priorNames[mangledName]); }
else
{ functionDescriptor = null; }

// Use the functionDescriptor to try and restore the proper node if possible
if (functionDescriptor == null)
{
node = CreateDummyNode(obj, assemblyLocation, inPorts, outPorts);
Expand Down