Merge master (#12)

* Fix sorting for number keys in List.SortByKey (DynamoDS#11241) * fix sorting for number keys in List.SortByKey * add unit test * Crash when accessing static hidden methods from zero touch nodes (DynamoDS#11238) * handle hidden static methods from zero touch nodes * add images (DynamoDS#11243) * Revert "Adding copy of missing file from LibG nuget package (DynamoDS#11218)" (DynamoDS#11254) This reverts commit a71b5c8. * Revert "Revert "Adding copy of missing file from LibG nuget package (DynamoDS#11218)" (DynamoDS#11254)" (DynamoDS#11255) This reverts commit 257ac14. * Undock/redock extension tabs to windows (DynamoDS#11246) * Somewhat working version * Pretty much working version * Finishing touches and test * Cleanup * Prevent both window and tab * Improve method name and comment * Forgot to include this in last commit * add analytics to extensions load event (DynamoDS#11258) * Revert Project Reference Changes (DynamoDS#11256) * Initial Commit * fix mono build * Update to latest libG nuget version * Cleanup entries VS Studio failed to update * Fix Mono build * Add the private flag back (modified by VS Studio) * Regressions * Add back missing resource * Change DefaultValue setter to public (DynamoDS#11251) * update load asm binaries from registry logic (DynamoDS#11261) * update load asm binaries from registry * Add coverage for docking (DynamoDS#11262) * Adding a public API on the View extension that gets triggered when the view extension is closed. (DynamoDS#11260) * Adding a public API on the View extension that gets triggered when the view extension is closed. * Update variable name * changing the name to ViewExtensionBaseClass * Addressing some comments. * Adding unit test. * Changing the name to Closed() * Some more comments. * Adding an additional test * Adding checks for the Menu items before setting its value. * Update Style (DynamoDS#11263) * CustomNodes that replicate do not access trace correctly. (DynamoDS#11244) * add failing test * this works, but seems like cheating. more tests * new tests, one failing, needs discussion * fix test - still fails but as expected * tests all pass with this change - but looking for better alternatives * add test use new field - cant find a better way currently add comments * revert internal update test * reset guid map before each test * failing test * reset * whitespace * Localize buttons (DynamoDS#11265) * update version num and tt file (DynamoDS#11269) * Fix merge error * Fix merge error * Revert "Fix merge error" This reverts commit 0a21ca4. Co-authored-by: aparajit-pratap <[email protected]> Co-authored-by: pinzart90 <[email protected]> Co-authored-by: Sylvester Knudsen <[email protected]> Co-authored-by: Aaron (Qilong) <[email protected]> Co-authored-by: Michael Kirschner <[email protected]> Co-authored-by: Martin Misol Monzo <[email protected]> Co-authored-by: Ashish Aggarwal <[email protected]> Co-authored-by: reddyashish <[email protected]>
SHKnudsen · Nov 23, 2020 · 389d6c0 · 389d6c0
1 parent c8cf9f3
commit 389d6c0
Show file tree

Hide file tree

Showing 165 changed files with 3,539 additions and 846 deletions.
diff --git a/.github/workflows/dynamoMSbuild.yml b/.github/workflows/dynamoMSbuild.yml
@@ -18,8 +18,7 @@ jobs:
       run: |
         echo "***Continue with the build, Good luck developer!***"
         cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
-           .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /t:Restore
-           .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln /t:Build
+           .\MSBuild.exe $Env:GITHUB_WORKSPACE\Dynamo\src\Dynamo.All.sln
     # look for Dynamo
     - name: Navigate to Dynamo Folder
       run: |

diff --git a/.github/workflows/dynamo_mono_build.yml b/.github/workflows/dynamo_mono_build.yml
@@ -22,8 +22,9 @@ jobs:
     - name: Build Dynamo with mono msbuild
       run: |
         echo "***Continue with the build, Good luck mono developer!***"
-           msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Restore
-           msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Build
+        msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Restore
+        msbuild $GITHUB_WORKSPACE/src/Dynamo.Mono.sln /p:Configuration=Release /t:Build
+        
     # look for Dynamo
     - name: Navigate to Dynamo Folder
       run: |

diff --git a/doc/images/CustomNodeDocumentation.png b/doc/images/CustomNodeDocumentation.png
diff --git a/doc/images/HotReload.gif b/doc/images/HotReload.gif
diff --git a/doc/images/NoDocumentationProvided.png b/doc/images/NoDocumentationProvided.png
diff --git a/doc/images/Overloads.png b/doc/images/Overloads.png
diff --git a/doc/images/helpWindow.png b/doc/images/helpWindow.png
diff --git a/doc/images/tooltipDescription.png b/doc/images/tooltipDescription.png
diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
@@ -45,7 +45,7 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("2.10.0.2945")]
+[assembly: AssemblyVersion("2.11.0.3246")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("2.10.0.2945")]
+[assembly: AssemblyFileVersion("2.11.0.3246")]
diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt
@@ -68,7 +68,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyFileVersion("<#= this.MajorVersion #>.<#= this.MinorVersion #>.<#= this.BuildNumber #>.<#= this.RevisionNumber #>")]
 <#+
 int MajorVersion = 2;
-int MinorVersion = 10;
+int MinorVersion = 11;
 int BuildNumber = 0;
 // The datetime baseline we choose using this algorithm will affect build number and all nuget packages uploaded
 // Please only change when major or minor version got incremented

diff --git a/src/Config/Cleanup.targets b/src/Config/Cleanup.targets
@@ -8,16 +8,6 @@
       <FilesToDelete Include="$(OutputPath)nodes\SharpDX*"/>
       <FilesToDelete Include="$(OutputPath)nodes\HelixToolkit*"/>
       <FilesToDelete Include="$(OutputPath)nodes\Cyotek*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\Newtonsoft.Json*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\nunit.framework*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\ProtoGeometry*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\ICSharpCode.AvalonEdit*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\IronPython*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\Microsoft*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\Moq*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\RestSharp*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\System.Collections.Immutable*"/>
-      <FilesToDelete Include="$(OutputPath)nodes\Xceed*"/>
     </ItemGroup> 
     <Delete Files="@(FilesToDelete)"/>
   </Target>

diff --git a/src/Config/GregReference.props b/src/Config/GregReference.props
diff --git a/src/Config/LibGMainReference.props b/src/Config/LibGMainReference.props
diff --git a/src/Config/LibGSupportedReference.props b/src/Config/LibGSupportedReference.props
diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs
@@ -16,7 +16,7 @@ namespace Dynamo.DocumentationBrowser
     /// The DocumentationBrowser view extension displays web or local html files on the Dynamo right panel.
     /// It reacts to documentation display request events in Dynamo to know what and when to display documentation.
     /// </summary>
-    public class DocumentationBrowserViewExtension : IViewExtension, ILogSource
+    public class DocumentationBrowserViewExtension : ViewExtensionBase, IViewExtension, ILogSource
     {
         private ViewLoadedParams viewLoadedParamsReference;
         private MenuItem documentationBrowserMenuItem;
@@ -45,6 +45,7 @@ public DocumentationBrowserViewExtension()
         #region ILogSource
 
         public event Action<ILogMessage> MessageLogged;
+
         internal void OnMessageLogged(ILogMessage msg)
         {
             MessageLogged?.Invoke(msg);
@@ -72,8 +73,6 @@ public void Loaded(ViewLoadedParams viewLoadedParams)
             this.documentationBrowserMenuItem.Unchecked += MenuItemUnCheckedHandler;
             this.viewLoadedParamsReference.AddMenuItem(MenuBarType.View, this.documentationBrowserMenuItem);
 
-            DynamoView.CloseExtension += OnCloseExtension;
-
             // subscribe to the documentation open request event from Dynamo
             this.viewLoadedParamsReference.RequestOpenDocumentationLink += HandleRequestOpenDocumentationLink;
 
@@ -119,7 +118,6 @@ public void Shutdown()
         protected virtual void Dispose(bool disposing)
         {
             // Cleanup
-            DynamoView.CloseExtension -= OnCloseExtension;
             this.viewLoadedParamsReference.RequestOpenDocumentationLink -= HandleRequestOpenDocumentationLink;
             this.ViewModel.MessageLogged -= OnViewModelMessageLogged;
             documentationBrowserMenuItem.Checked -= MenuItemCheckHandler;
@@ -163,14 +161,6 @@ public void HandleRequestOpenDocumentationLink(OpenDocumentationLinkEventArgs ar
             this.ViewModel?.HandleOpenDocumentationLinkEvent(args);
         }
 
-        private void OnCloseExtension(String extensionTabName)
-        {
-            if (extensionTabName.Equals(Name))
-            {
-                this.documentationBrowserMenuItem.IsChecked = false;
-            }
-        }
-
         private void OnViewModelMessageLogged(ILogMessage msg)
         {
             OnMessageLogged(msg);
@@ -206,5 +196,13 @@ private void HandleStartPageVisibilityChange(object sender, PropertyChangedEvent
                 ViewModel.ShowBrowser = !dynamoViewModel.ShowStartPage;
             }
         }
+
+        public override void Closed()
+        {
+            if (this.documentationBrowserMenuItem != null)
+            {
+                this.documentationBrowserMenuItem.IsChecked = false;
+            }
+        }
     }
 }
diff --git a/src/DynamoApplications/DynamoApplications.csproj b/src/DynamoApplications/DynamoApplications.csproj
@@ -3,7 +3,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config/CS.props" />
   </ImportGroup>
-  <Import Project=".\obj\DynamoApplications.csproj.nuget.g.props" Condition="Exists('.\obj\DynamoApplications.csproj.nuget.g.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -37,6 +36,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NDesk.Options, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -91,9 +93,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NDesk.Options">
-      <Version>0.2.1</Version>
-    </PackageReference>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/src/DynamoApplications/packages.config b/src/DynamoApplications/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NDesk.Options" version="0.2.1" targetFramework="net48" />
+</packages>
diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
@@ -18,12 +18,7 @@ limitations under the License.
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)/Config/CS.props" />
     <Import Project="$(SolutionDir)Config/Cleanup.targets" />
-    <Import Project="$(SolutionDir)Config/GregReference.props" />
-    <Import Project="$(SolutionDir)Config/LibGMainReference.props" />
-    <Import Project="$(SolutionDir)Config/LibGSupportedReference.props" />
   </ImportGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project=".\obj\DynamoCore.csproj.nuget.g.props" Condition="Exists('.\obj\DynamoCore.csproj.nuget.g.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -79,10 +74,24 @@ limitations under the License.
     <Reference Include="Analytics.NET.Google">
       <HintPath>..\..\extern\Analytics.NET\Analytics.NET.Google.dll</HintPath>
     </Reference>
+    <Reference Include="Greg, Version=2.0.7507.22529, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Greg.2.0.7507.22529\lib\net48\Greg.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ProtoGeometry, Version=2.9.0.3090, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\DynamoVisualProgramming.LibG_227_0_0.2.9.0.3090\lib\net48\ProtoGeometry.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core"/>
+    <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
@@ -297,6 +306,7 @@ limitations under the License.
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -359,14 +369,6 @@ limitations under the License.
   <ItemGroup>
     <Resource Include="BuiltInAndOperators\BuiltIn.Migrations.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>8.0.3</Version>
-    </PackageReference>
-    <PackageReference Include="RestSharp">
-      <Version>105.2.3</Version>
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Choose>
     <When Condition=" '$(OS)' != 'Unix' ">
@@ -382,15 +384,15 @@ limitations under the License.
   </Choose>
   <Target Name="BeforeBuild">
     <PropertyGroup>
-      <LibGProtoGeometryLibGLocale>$(PkgDynamoVisualProgramming_LibG_227_0_0)\tools\net48\libg_locale</LibGProtoGeometryLibGLocale>
+      <LibGProtoGeometryLibGLocale>$(SolutionDir)\packages\DynamoVisualProgramming.LibG_227_0_0*\tools\net48\libg_locale</LibGProtoGeometryLibGLocale>
     </PropertyGroup>
     <ItemGroup>
-      <LibGInterface Include="$(PkgDynamoVisualProgramming_LibG_227_0_0)\tools\net48\LibG.Interface.dll" />
-      <LibGProtoGeometryXml Include="$(PkgDynamoVisualProgramming_LibG_227_0_0)\lib\net48\ProtoGeometry.XML" />
-      <LibGProtoGeometryUICulture Include="$(PkgDynamoVisualProgramming_LibG_227_0_0)\tools\net48\$(UICulture)\*" />      
-      <LibG225 Include="$(PkgDynamoVisualProgramming_LibG_225_0_0)\tools\net48\LibG_225_0_0\*" />
-      <LibG226 Include="$(PkgDynamoVisualProgramming_LibG_226_0_0)\tools\net48\LibG_226_0_0\*" />
-      <LibG227 Include="$(PkgDynamoVisualProgramming_LibG_227_0_0)\tools\net48\LibG_227_0_0\*" />
+      <LibGInterface Include="$(SolutionDir)\packages\DynamoVisualProgramming.LibG_227_0_0*\tools\net48\LibG.Interface.dll" />
+      <LibGProtoGeometryXml Include="$(solutiondir)\packages\dynamovisualprogramming.libg_227_0_0*\lib\net48\protogeometry.xml" />
+      <LibGProtoGeometryUICulture Include="$(SolutionDir)\packages\DynamoVisualProgramming.LibG_227_0_0*\tools\net48\$(UICulture)\*" />
+      <LibG225 Include="$(SolutionDir)\packages\DynamoVisualProgramming.LibG_225_0_0*\tools\net48\LibG_225_0_0\*" />
+      <LibG226 Include="$(SolutionDir)\packages\DynamoVisualProgramming.LibG_226_0_0*\tools\net48\LibG_226_0_0\*" />
+      <LibG227 Include="$(SolutionDir)\packages\DynamoVisualProgramming.LibG_227_0_0*\tools\net48\LibG_227_0_0\*" />
       <ExternSimplexNoise Include="$(SolutionDir)..\extern\SimplexNoise\*" />
       <SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
       <GalleryFiles Include="$(SolutionDir)..\extern\gallery\**\*.*" />
@@ -413,7 +415,7 @@ limitations under the License.
     <Exec Command="$(PowerShellCommand) -ExecutionPolicy ByPass -Command Copy-Item -Path $(LibGProtoGeometryLibGLocale) -Destination $(OutputPath) -Recurse -Force" />
     <Copy SourceFiles="@(LibG225)" DestinationFolder="$(OutputPath)libg_225_0_0\" />
     <Copy SourceFiles="@(LibG226)" DestinationFolder="$(OutputPath)libg_226_0_0\" />
-    <Copy SourceFiles="@(LibG227)" DestinationFolder="$(OutputPath)libg_227_0_0\" />   
+    <Copy SourceFiles="@(LibG227)" DestinationFolder="$(OutputPath)libg_227_0_0\" />
     <Copy SourceFiles="@(ExternSimplexNoise)" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="@(ExternAnalytics)" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="@(SampleFiles)" DestinationFolder="$(OutputPath)samples\%(RecursiveDir)" />
@@ -452,4 +454,4 @@ limitations under the License.
     <GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)/BuiltInAndOperators/BuiltInImages.resx" OutputResources="$(ProjectDir)/BuiltInAndOperators/BuiltInImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
     <AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)/BuiltInAndOperators/BuiltInImages.resources" OutputAssembly="$(OutDir)BuiltIn.customization.dll" Version="%(DynamoCoreInfo.Version)" />
   </Target>
-</Project>
+</Project>
diff --git a/src/DynamoCore/Extensions/ExtensionLoader.cs b/src/DynamoCore/Extensions/ExtensionLoader.cs
@@ -33,6 +33,11 @@ private IExtension Load(ExtensionDefinition extension)
                 var assembly = Assembly.LoadFrom(extension.AssemblyPath);
                 var result = assembly.CreateInstance(extension.TypeName) as IExtension;
                 ExtensionLoading?.Invoke(result);
+
+                Logging.Analytics.TrackEvent(
+                Actions.Load,
+                Categories.ExtensionOperations, extension.TypeName);
+
                 return result;
             }
             catch(Exception ex)

diff --git a/src/DynamoCore/Graph/Nodes/PortModel.cs b/src/DynamoCore/Graph/Nodes/PortModel.cs
@@ -202,7 +202,7 @@ public bool UsingDefaultValue
         public AssociativeNode DefaultValue
         {
             get;
-            internal set;
+            set;
         }
 
         /// <summary>

diff --git a/src/DynamoCore/packages.config b/src/DynamoCore/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DynamoVisualProgramming.LibG_225_0_0" version="2.9.0.3110" targetFramework="net48" developmentDependency="true" />
+  <package id="DynamoVisualProgramming.LibG_226_0_0" version="2.9.0.3135" targetFramework="net48" developmentDependency="true" />
+  <package id="DynamoVisualProgramming.LibG_227_0_0" version="2.9.0.3090" targetFramework="net48" developmentDependency="true" />
+  <package id="Greg" version="2.0.7507.22529" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net48" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net48" />
+</packages>
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,7 +202,7 @@ public bool UsingDefaultValue @@
             public AssociativeNode DefaultValue
             {
                 get;
-                internal set;
+                set;
             }
             /// <summary>
@@ Expand Down @@