Helix upgrade PR to merge the changes from the master branch

.github/workflows/greetings.yml

@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Thank you for submitting the issue to us. We are sorry if you get stuck on your workflow. While waiting for our team member to respond, please feel free to browse our forum at https://forum.dynamobim.com/ for more Dynamo related information.'
+        pr-message: 'Thank you for contributing to Dynamo. We are thrilled to see you take a step forward and please allow up to 30 days for us to review your PR. While waiting for our team member to respond, please feel free to browse our forum at https://forum.dynamobim.com/ for more Dynamo related information.'

src/DynamoCore/Graph/Nodes/CodeBlockNode.cs

@@ -536,7 +536,7 @@ public override ProtoCore.Type GetTypeHintForOutput(int index)
             if (statement == null)
                 return type;
 
-            BinaryExpressionNode expr = statement.AstNode as BinaryExpressionNode;
+            var expr = statement.AstNode as BinaryExpressionNode;
             if (expr == null || expr.Optr != Operator.assign)
                 return type;
 
@@ -554,15 +554,21 @@ public override ProtoCore.Type GetTypeHintForOutput(int index)
                     return type;
 
                 var classIndex = core.ClassTable.IndexOf(fullyQualifiedName);
-                if (classIndex == ProtoCore.DSASM.Constants.kInvalidIndex)
+                if (classIndex == Constants.kInvalidIndex)
                     return type;
 
                 var targetClass = core.ClassTable.ClassNodes[classIndex];
-                var func = targetClass.GetFirstMemberFunctionBy(funcNode.Function.Name);
+                var funcName = funcNode.Function.Name;
+                var func = targetClass.GetFirstMemberFunctionBy(funcName);
+                if (func == null)
+                {
+                    func = targetClass.ProcTable.GetPropertyGetterByName(funcName);
+                }
                 type = func.ReturnType;
                 return type;
             }
-            else if (expr.RightNode is FunctionCallNode)
+
+            if (expr.RightNode is FunctionCallNode)
             {
                 var functionCallNode = expr.RightNode as FunctionCallNode;
                 ProtoCore.FunctionGroup funcGroup;

src/DynamoCore/Graph/Nodes/DummyNode.cs

@@ -10,6 +10,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Xml;
 
 namespace Dynamo.Graph.Nodes
@@ -250,11 +251,10 @@ private void LoadNode(XmlNode nodeElement)
             OutputCount = Int32.Parse(outputCount.Value);
             LegacyNodeName = legacyName.Value;
 
-            if (nodeElement.ChildNodes != null)
+            foreach (XmlNode childNode in nodeElement.ChildNodes)
             {
-                foreach (XmlNode childNode in nodeElement.ChildNodes)
-                    if (childNode.Name.Equals("OriginalNodeContent"))
-                        OriginalNodeContent = (XmlElement)nodeElement.FirstChild.FirstChild;
+                if (childNode.Name.Equals("OriginalNodeContent"))
+                    OriginalNodeContent = (XmlElement) nodeElement.FirstChild.FirstChild;
             }
 
             if (originalElement != null)
@@ -292,18 +292,30 @@ private void LoadNode(XmlNode nodeElement)
 
         private void UpdatePorts()
         {
+            var guids = InPorts.Select(x => x.GUID).ToArray();
             InPorts.Clear();
             for (int input = 0; input < InputCount; input++)
             {
-                var name = string.Format("Port {0}", input + 1);
-                InPorts.Add(new PortModel(PortType.Input, this, new PortData(name, "")));
+                var name = $"Port {input + 1}";
+                var pm = new PortModel(PortType.Input, this, new PortData(name, ""));
+                InPorts.Add(pm);
+                if (guids.Length == InputCount)
+                {
+                    pm.GUID = guids[input];
+                }
             }
 
+            guids = OutPorts.Select(x => x.GUID).ToArray();
             OutPorts.Clear();
             for (int output = 0; output < OutputCount; output++)
             {
-                var name = string.Format("Port {0}", output + 1);
-                OutPorts.Add(new PortModel(PortType.Output, this, new PortData(name, "")));
+                var name = $"Port {output + 1}";
+                var pm = new PortModel(PortType.Output, this, new PortData(name, ""));
+                OutPorts.Add(pm);
+                if (guids.Length == OutputCount)
+                {
+                    pm.GUID = guids[output];
+                }
             }
 
             RegisterAllPorts();

src/DynamoCore/Graph/Nodes/PortModel.cs

@@ -22,7 +22,7 @@ public enum PortType { Input, Output };
     /// <summary>
     /// PortModel represents Dynamo ports.
     /// </summary>
-    public class PortModel : ModelBase
+    public class PortModel : ModelBase, IEquatable<PortModel>
     {
         #region private fields
         ObservableCollection<ConnectorModel> connectors = new ObservableCollection<ConnectorModel>();
@@ -369,6 +369,23 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
         }
 
         #endregion
+
+        public bool Equals(PortModel other)
+        {
+            if (other == null) return false;
+
+            if (this == other) return true;
+
+            if (GUID == other.GUID) return true;
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return GUID.GetHashCode();
+        }
+
     }
 
     /// <summary>

src/DynamoCore/Logging/DynamoAnalyticsClient.cs

@@ -51,10 +51,15 @@ public void Dispose()
             else
                 StabilityCookie.WriteCleanShutdown();
 
-            Service.ShutDown();
-            //Unregister the GATrackerFactory only after shutdown is recorded.
-            //Unregister is required, so that the host app can re-start Analytics service.
-            Service.Instance.Unregister(GATrackerFactory.Name);
+            // If the Analytics Client was initialized, shut it down.
+            // Otherwise skip this step because it would cause an exception.
+            if (Service.IsInitialized)
+            {
+                Service.ShutDown();
+                // Unregister the GATrackerFactory only after shutdown is recorded.
+                // Unregister is required, so that the host app can re-start Analytics service.
+                Service.Instance.Unregister(GATrackerFactory.Name);
+            }
 
             if (null != heartbeat)
                 Heartbeat.DestroyInstance();
@@ -123,14 +128,27 @@ public void Dispose() { }
 
         public virtual IAnalyticsSession Session { get; private set; }
 
+        /// <summary>
+        /// Return if Analytics Client is allowed to send analytics info
+        /// </summary>
         public bool ReportingAnalytics
         {
-            get { return preferences != null && preferences.IsAnalyticsReportingApproved; }
+            get
+            {
+                return preferences != null 
+                    && Service.IsInitialized
+                    && preferences.IsAnalyticsReportingApproved;
+            }
         }
 
+        /// <summary>
+        /// Return if Analytics Client is allowed to send instrumentation info
+        /// </summary>
         public bool ReportingUsage
         {
-            get { return preferences != null && preferences.IsUsageReportingApproved; }
+            get { return preferences != null
+                    && Service.IsInitialized
+                    && preferences.IsUsageReportingApproved; }
         }
 
         /// <summary>
@@ -160,12 +178,14 @@ public DynamoAnalyticsClient(DynamoModel dynamoModel)
         /// </summary>
         public void Start()
         {
-            //If not ReportingAnalytics, then set the idle time as infinite so idle state is not recorded.
-            Service.StartUp(product,
-                new UserInfo(Session.UserId), ReportingAnalytics ? TimeSpan.FromMinutes(30) : TimeSpan.MaxValue);
-
-            TrackPreferenceInternal("ReportingAnalytics", "", ReportingAnalytics ? 1 : 0);
-            TrackPreferenceInternal("ReportingUsage", "", ReportingUsage ? 1 : 0);
+            if (preferences!= null && preferences.IsAnalyticsReportingApproved)
+            {
+                //If not ReportingAnalytics, then set the idle time as infinite so idle state is not recorded.
+                Service.StartUp(product,
+                    new UserInfo(Session.UserId), preferences.IsAnalyticsReportingApproved ? TimeSpan.FromMinutes(30) : TimeSpan.MaxValue);
+                TrackPreferenceInternal("ReportingAnalytics", "", ReportingAnalytics ? 1 : 0);
+                TrackPreferenceInternal("ReportingUsage", "", ReportingUsage ? 1 : 0);
+            }
         }
 
         public void ShutDown()

src/DynamoCoreWpf/Properties/Resources.en-US.resx

@@ -757,25 +757,9 @@ You will get a chance to save your work.</value>
     <value>Decimal Inch</value>
     <comment>Setting menu | Decimal inch</comment>
   </data>
-  <data name="DynamoViewSettingMenuEnableDataReporting" xml:space="preserve">
-    <value>Enable detailed usability data reporting (Instrumentation)</value>
-    <comment>Setting menu | Enable data reporting during usage</comment>
-  </data>
-  <data name="DynamoViewSettingMenuEnableDataReportingTooltip" xml:space="preserve">
-    <value>Detailed reporting sends behaviour data that we use for improving {0}.
-
-It includes the graph being created as well as errors and warnings</value>
-    <comment>Setting menu | Tooltip for enable data reporting during usage menu item</comment>
-  </data>
-  <data name="DynamoViewSettingMenuEnableSummaryReporting" xml:space="preserve">
-    <value>Enable anonymous summary reporting (Google Analytics)</value>
-    <comment>Setting menu | Enable summary reporting</comment>
-  </data>
-  <data name="DynamoViewSettingMenuEnableSummaryReportingTooltip" xml:space="preserve">
-    <value>Anonymous summary reporting sends a minimal set of data for computing user counts, stability and performance metrics.
-
-It does not contain your graph or any personal data</value>
-    <comment>Setting menu | Tooltip for enable summary reporting during usage menu item</comment>
+  <data name="DynamoViewSettingMenuShowDataReportingDialog" xml:space="preserve">
+    <value>Agreement to Collect Usability Data</value>
+    <comment>Setting menu | Show user agreement dialog about data collecting</comment>
   </data>
   <data name="DynamoViewSettingMenuFractionalFoot" xml:space="preserve">
     <value>Fractional Foot</value>
@@ -2231,4 +2215,10 @@ Uninstall the following packages: {0}?</value>
   <data name="PackageSearchViewFilterByButton" xml:space="preserve">
     <value>Filter by</value>
   </data>
+  <data name="DynamoViewSettingMenuShowDataReportingDialogTooltip" xml:space="preserve">
+    <value>Display the dialog for user to pick agreement on data collecting.</value>
+  </data>
+  <data name="CrashPromptGithubNewIssueTitle" xml:space="preserve">
+    <value>Crash report from Dynamo {0}</value>
+  </data>
 </root>

src/DynamoCoreWpf/Properties/Resources.resx

@@ -482,25 +482,9 @@
     <value>Decimal Inch</value>
     <comment>Setting menu | Decimal inch</comment>
   </data>
-  <data name="DynamoViewSettingMenuEnableDataReporting" xml:space="preserve">
-    <value>Enable detailed usability data reporting (Instrumentation)</value>
-    <comment>Setting menu | Enable data reporting during usage</comment>
-  </data>
-  <data name="DynamoViewSettingMenuEnableDataReportingTooltip" xml:space="preserve">
-    <value>Detailed reporting sends behaviour data that we use for improving {0}.
-
-It includes the graph being created as well as errors and warnings</value>
-    <comment>Setting menu | Tooltip for enable data reporting during usage menu item</comment>
-  </data>
-  <data name="DynamoViewSettingMenuEnableSummaryReporting" xml:space="preserve">
-    <value>Enable anonymous summary reporting (Google Analytics)</value>
-    <comment>Setting menu | Enable summary reporting</comment>
-  </data>
-  <data name="DynamoViewSettingMenuEnableSummaryReportingTooltip" xml:space="preserve">
-    <value>Anonymous summary reporting sends a minimal set of data for computing user counts, stability and performance metrics.
-
-It does not contain your graph or any personal data</value>
-    <comment>Setting menu | Tooltip for enable summary reporting during usage menu item</comment>
+  <data name="DynamoViewSettingMenuShowDataReportingDialog" xml:space="preserve">
+    <value>Agreement to Collect Usability Data</value>
+    <comment>Setting menu | Show user agreement dialog about data collecting</comment>
   </data>
   <data name="DynamoViewSettingShowRunPreview" xml:space="preserve">
     <value>Show Run Preview</value>
@@ -2234,4 +2218,7 @@ Uninstall the following packages: {0}?</value>
   <data name="PackageSearchViewFilterByButton" xml:space="preserve">
     <value>Filter by</value>
   </data>
+  <data name="DynamoViewSettingMenuShowDataReportingDialogTooltip" xml:space="preserve">
+    <value>Display the dialog for user to pick agreement on data collecting.</value>
+  </data>
 </root>