Merge branch 'master' into ParallelReplication

doc/distrib/NodeHelpFiles/CoreNodeModels.Input.CustomSelection.md

@@ -3,4 +3,4 @@ The Custom Dropdown node allows a user to create a dropdown selection input with
 ___
 ## Example File
 
-![Number](./CoreNodeModels.Input.CustomSelection_img.jpg)
+![Number](./CoreNodeModels.Input.CustomSelection_img.png)

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.16.0.1640")]
+[assembly: AssemblyVersion("2.17.0.2366")]
 
 
 // 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.16.0.1640")]
+[assembly: AssemblyFileVersion("2.17.0.2366")]

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 = 16;
+int MinorVersion = 17;
 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

src/Config/CS_SDK.props

@@ -50,6 +50,9 @@
       <Private>false</Private>
     </ProjectReference>
   </ItemDefinitionGroup>
+  <PropertyGroup Condition=" '$(TestProjectDefaults)' == 'true' ">
+    <TestDependenciesPath>$(OutputPath)\..\..\..\test\test_dependencies</TestDependenciesPath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition=" '$(TestProjectDefaults)' == 'true' ">
     <ProjectReference>
       <PrivateAssets>all</PrivateAssets>

src/Config/upiconfig.xml

@@ -8,13 +8,13 @@
         <upi_attribute name='id' value='DYN'/>
         <upi_element name='level'>
           <upi_attribute name='name' value='release'/>
-          <upi_attribute name='id' value='2.16.0'/>
+          <upi_attribute name='id' value='2.17.0'/>
           <upi_element name='level'>
             <upi_attribute name='name' value='master'/>
             <upi_attribute name='id' value='Win64'/>
             <upi_element name='level'>
               <upi_attribute name='name' value='build'/>
-              <upi_attribute name='id' value='2.16.0' />
+              <upi_attribute name='id' value='2.17.0' />
             </upi_element>
           </upi_element>
         </upi_element>

src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs

@@ -23,6 +23,7 @@ public partial class DocumentationBrowserView : UserControl, IDisposable
         private const string VIRTUAL_FOLDER_MAPPING = "appassets";
         static readonly string HTML_IMAGE_PATH_PREFIX = @"http://";
 
+        internal string WebBrowserUserDataFolder { get; set; }
         internal string FallbackDirectoryName { get; set; }
 
         /// <summary>
@@ -116,17 +117,22 @@ protected virtual void Dispose(bool disposing)
 
         async void InitializeAsync()
         {
+            if (!string.IsNullOrEmpty(WebBrowserUserDataFolder))
+            {
+                //This indicates in which location will be created the WebView2 cache folder
+                documentationBrowser.CreationProperties = new CoreWebView2CreationProperties()
+                {
+                    UserDataFolder = WebBrowserUserDataFolder
+                };
+            }
+
             //Initialize the CoreWebView2 component otherwise we can't navigate to a web page
             await documentationBrowser.EnsureCoreWebView2Async();
 
-            // Context menu disabled
-            documentationBrowser.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
-
             //Due that the Web Browser(WebView2 - Chromium) security CORS is blocking the load of resources like images then we need to create a virtual folder in which the image are located.
             this.documentationBrowser.CoreWebView2.SetVirtualHostNameToFolderMapping(VIRTUAL_FOLDER_MAPPING, FallbackDirectoryName, CoreWebView2HostResourceAccessKind.DenyCors);
 
-            //This will remove special characters in paths (like <img src="/path")
-            string htmlContent = HttpUtility.UrlDecode(this.viewModel.GetContent());
+            string htmlContent = this.viewModel.GetContent();
 
             Dispatcher.BeginInvoke(new Action(() =>
             {

src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs

@@ -24,6 +24,7 @@ public class DocumentationBrowserViewExtension : ViewExtensionBase, IViewExtensi
         private const string FALLBACK_DOC_DIRECTORY_NAME = "fallback_docs";
         //these fields should only be directly set by tests.
         internal DirectoryInfo fallbackDocPath;
+        internal DirectoryInfo webBrowserUserDataFolder;
 
         internal DocumentationBrowserView BrowserView { get; private set; }
         internal DocumentationBrowserViewModel ViewModel { get; private set; }
@@ -71,14 +72,29 @@ public override void Startup(ViewStartupParams viewStartupParams)
 
             if (!string.IsNullOrEmpty(pathManager.HostApplicationDirectory))
             {
-                var docsDir = new DirectoryInfo(Path.Combine(pathManager.HostApplicationDirectory, FALLBACK_DOC_DIRECTORY_NAME));
+                //when running over any host app like Revit, FormIt, Civil3D... the path to the fallback_docs can change.
+                //e.g. for Revit the variable HostApplicationDirectory = C:\Program Files\Autodesk\Revit 2023\AddIns\DynamoForRevit\Revit
+                //Then we need to remove the last folder from the path so we can find the fallback_docs directory.
+                var hostAppDirectory = Directory.GetParent(pathManager.HostApplicationDirectory).FullName;
+                var docsDir = new DirectoryInfo(Path.Combine(hostAppDirectory, FALLBACK_DOC_DIRECTORY_NAME));
                 fallbackDocPath = docsDir.Exists ? docsDir : null;
             }
 
-            if(this.BrowserView != null)
+            //When executing Dynamo as Sandbox or inside any host like Revit, FormIt, Civil3D the WebView2 cache folder will be located in the AppData folder
+            var userDataDir = new DirectoryInfo(pathManager.UserDataDirectory);
+            webBrowserUserDataFolder = userDataDir.Exists ? userDataDir : null;
+
+            if (this.BrowserView == null) return;
+
+            if(fallbackDocPath != null)
             {
                 this.BrowserView.FallbackDirectoryName = fallbackDocPath.FullName;
             }
+
+            if(webBrowserUserDataFolder != null)
+            {
+                this.BrowserView.WebBrowserUserDataFolder = webBrowserUserDataFolder.FullName;
+            }
         }
 
         public override void Loaded(ViewLoadedParams viewLoadedParams)

src/DynamoCore/Configuration/PreferenceSettings.cs

@@ -596,6 +596,11 @@ public string IronPythonResolveTargetVersion
             get { return IronPythonResolveVersion.ToString(); }
             set { IronPythonResolveVersion = Version.TryParse(value, out Version newVal) ? newVal : IronPythonResolveVersion; }
         }
+
+        /// <summary>
+        /// Stores the notification ids that was read by the user
+        /// </summary>
+        public List<string> ReadNotificationIds { get; set; }
         #endregion
 
         /// <summary>
@@ -636,7 +641,7 @@ public PreferenceSettings()
             BackupInterval = 60000; // 1 minute
             BackupFilesCount = 1;
             BackupFiles = new List<string>();
-
+                        
             CustomPackageFolders = new List<string>();
 
             PythonTemplateFilePath = "";
@@ -647,6 +652,7 @@ public PreferenceSettings()
             DefaultPythonEngine = string.Empty;
             ViewExtensionSettings = new List<ViewExtensionSettings>();
             GroupStyleItemsList = new List<GroupStyleItem>();
+            ReadNotificationIds = new List<string>();
         }
 
         /// <summary>

src/DynamoCore/Core/CrashPromptArgs.cs

@@ -116,19 +116,21 @@ public CrashErrorReportArgs(Exception e) : base(e)
         {}
 
         /// <summary>
-        /// Allow Dynamo to send the log file to the CER system.
+        /// Constructs the options class to customize what CER will collect.
         /// </summary>
-        public bool SendLogFile { get; set; } = true;
+        /// <param name="details">Crash details</param>
+        internal CrashErrorReportArgs(string details) : base(details)
+        { }
 
         /// <summary>
-        /// Allow Dynamo to send the settings file to the CER system.
+        /// Allow Dynamo to send the log file to the CER system.
         /// </summary>
-        public bool SendSettingsFile { get; set; } = true;
+        internal bool SendLogFile { get; set; } = false;
 
         /// <summary>
-        /// Allow Dynamo to send the model file to the CER system.
+        /// Allow Dynamo to send the settings file to the CER system.
         /// </summary>
-        public bool SendDynFile { get; set; } = true;
+        internal bool SendSettingsFile { get; set; } = false;
 
         /// <summary>
         /// Allow Dynamo to send the recorded commands file to the CER system.

src/DynamoCore/DynamoCore.csproj

@@ -21,20 +21,11 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.16.0.2335" GeneratePathProperty="true" />
-    <PackageReference Include="Greg" Version="2.3.0.1646" />
-	<PackageReference Include="Newtonsoft.Json" Version="8.0.3" CopyXML="true" />
-	<PackageReference Include="RestSharp" Version="106.12.0" CopyXML="true" />
-    <Reference Include="Analytics.Net.ADP, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\extern\Analytics.NET\Analytics.Net.ADP.dll</HintPath>
-    </Reference>
-    <Reference Include="Analytics.NET.Core">
-      <HintPath>..\..\extern\Analytics.NET\Analytics.NET.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Analytics.NET.Google">
-      <HintPath>..\..\extern\Analytics.NET\Analytics.NET.Google.dll</HintPath>
-    </Reference>
+    <PackageReference Include="DynamoVisualProgramming.Analytics" Version="3.0.0.2506" />
+    <PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.16.0.2365" GeneratePathProperty="true" />
+    <PackageReference Include="Greg" Version="2.3.0.2505" />
+	  <PackageReference Include="Newtonsoft.Json" Version="8.0.3" CopyXML="true" />
+	  <PackageReference Include="RestSharp" Version="106.12.0" CopyXML="true" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
@@ -137,8 +128,8 @@
       <NodeHelpFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.*" />
       <OpenSourceLicenses Include="$(SolutionDir)..\doc\distrib\Open Source Licenses\**\*.*" />
       <LocalizedResources Include="$(SolutionDir)..\extern\Localized\**\*.*" />
-      <ExternAnalytics Include="$(SolutionDir)..\extern\Analytics.NET\*.*" />
-      <LegacyBinariesToBinFolder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\*\*" />
+      <LegacyBinariesToBinFolder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\*" />
+      <LegacyBinariesToLibg227Folder Include="$(SolutionDir)..\extern\legacy_remove_me\bin\libg_227_0_0\*" />
       <LegacyBinariesToEn-USFolder Include="$(SolutionDir)..\extern\legacy_remove_me\en-US\*" />
       <LegacyBinariesToNodesFolder Include="$(SolutionDir)..\extern\legacy_remove_me\nodes\*" />
     </ItemGroup>
@@ -157,15 +148,15 @@
     <Exec Command="$(PowerShellCommand) -ExecutionPolicy ByPass -Command Copy-Item -Path $(LibGProtoGeometryLibGLocale) -Destination $(OutputPath) -Recurse -Force" />
     <Copy SourceFiles="@(LibG228)" DestinationFolder="$(OutputPath)libg_228_0_0\" />
     <Copy SourceFiles="@(ExternSimplexNoise)" DestinationFolder="$(OutputPath)" />
-    <Copy SourceFiles="@(ExternAnalytics)" DestinationFolder="$(OutputPath)" />
     <Copy SourceFiles="@(SampleFiles)" DestinationFolder="$(OutputPath)samples\%(RecursiveDir)" />
     <Copy SourceFiles="@(GalleryFiles)" DestinationFolder="$(OutputPath)gallery\%(RecursiveDir)" />
     <Copy SourceFiles="@(LocalizedResources)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
     <Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\Operators.xml" DestinationFolder="$(OutputPath)\$(UICulture)" />
     <Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\BuiltIn.xml" DestinationFolder="$(OutputPath)\$(UICulture)" />
     <Copy SourceFiles="$(ProjectDir)\BuiltInAndOperators\BuiltIn.Migrations.xml" DestinationFolder="$(OutputPath)" />
     <!--Remove these copy steps at the next launch of host products-->
-    <Copy SourceFiles="@(LegacyBinariesToBinFolder)" DestinationFolder="$(OutputPath)\%(RecursiveDir)\" />
+    <Copy SourceFiles="@(LegacyBinariesToBinFolder)" DestinationFolder="$(OutputPath)" />
+    <Copy SourceFiles="@(LegacyBinariesToLibg227Folder)" DestinationFolder="$(OutputPath)\libg_227_0_0\" />
     <Copy SourceFiles="@(LegacyBinariesToEn-USFolder)" DestinationFolder="$(OutputPath)\en-US\" />
     <Copy SourceFiles="@(LegacyBinariesToNodesFolder)" DestinationFolder="$(OutputPath)\nodes\" />
     <Copy SourceFiles="$(SolutionDir)Config\upiconfig.xml" DestinationFolder="$(OutputPath)" />

src/DynamoCore/Logging/AnalyticsService.cs

@@ -1,6 +1,6 @@
 using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
-using Analytics.NET.ADP;
+using Autodesk.Analytics.ADP;
 using Autodesk.Analytics.Core;
 using System;
 

src/DynamoCore/Logging/DynamoAnalyticsClient.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
-using Analytics.NET.Google;
-using Analytics.NET.ADP;
+using Autodesk.Analytics.Google;
+using Autodesk.Analytics.ADP;
 using Autodesk.Analytics.Core;
 using Autodesk.Analytics.Events;
 using Dynamo.Interfaces;

src/DynamoCore/Models/DynamoModel.cs

@@ -962,23 +962,26 @@ protected DynamoModel(IStartConfiguration config)
 
         private void CheckFeatureFlagTest()
         {
-            if (DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("EasterEggIcon1", false))
+            if (!DynamoModel.IsTestMode)
             {
-                this.Logger.Log("EasterEggIcon1 is true FROM MODEL");
+                if (DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("EasterEggIcon1", false))
+                {
+                    this.Logger.Log("EasterEggIcon1 is true FROM MODEL");
 
-            }
-            else
-            {
-                this.Logger.Log("EasterEggIcon1 is false FROM MODEL");
-            }
+                }
+                else
+                {
+                    this.Logger.Log("EasterEggIcon1 is false FROM MODEL");
+                }
 
-            if (DynamoModel.FeatureFlags.CheckFeatureFlag<string>("EasterEggMessage1", "NA") is var s && s != "NA")
-            {
-                this.Logger.Log("EasterEggMessage1 is enabled FROM MODEL");
-            }
-            else
-            {
-                this.Logger.Log("EasterEggMessage1 is disabled FROM MODEL");
+                if (DynamoModel.FeatureFlags.CheckFeatureFlag<string>("EasterEggMessage1", "NA") is var s && s != "NA")
+                {
+                    this.Logger.Log("EasterEggMessage1 is enabled FROM MODEL");
+                }
+                else
+                {
+                    this.Logger.Log("EasterEggMessage1 is disabled FROM MODEL");
+                }
             }
         }
 

src/DynamoCore/Properties/AssemblyInfo.cs

@@ -49,5 +49,6 @@
 [assembly: InternalsVisibleTo("IronPythonTests")]
 [assembly: InternalsVisibleTo("DynamoPackagesWPF")]
 [assembly: InternalsVisibleTo("GraphNodeManagerViewExtension")]
+[assembly: InternalsVisibleTo("ExportSampleImagesViewExtension")]
 
 [assembly: TypeForwardedTo(typeof(Dynamo.Scheduler.Disposable))]