From b2e9fe170709d85fc2196582e5599e3917eb27f4 Mon Sep 17 00:00:00 2001
From: aparajit-pratap <aparajit.pratap@autodesk.com>
Date: Fri, 1 Dec 2023 14:24:11 -0500
Subject: [PATCH 01/22] Fix Popup UI (#14668)

* remove coreclr-ncalc references

* fix popup

* rename

* cleanup

* resize line column in popup
---
 .../Views/GuidedTour/RealTimeInfoWindow.xaml  | 25 ++++++++++---------
 .../GuidedTour/RealTimeInfoWindow.xaml.cs     | 11 ++++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml b/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml
index b0488f6ad3f..17e9801107a 100644
--- a/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml
+++ b/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml
@@ -1,12 +1,10 @@
-<Popup x:Class="Dynamo.Wpf.Views.GuidedTour.RealTimeInfoWindow"
+<Popup x:Class="Dynamo.Wpf.Views.GuidedTour.RealTimeInfoWindow"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-       xmlns:local="clr-namespace:Dynamo.Wpf.Views.GuidedTour"
        xmlns:ui="clr-namespace:Dynamo.UI"
-       xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf" 
-       mc:Ignorable="d" 
+       mc:Ignorable="d"
        AllowsTransparency="True"
        Opacity="0.5"
        Width="{Binding Width}"
@@ -28,24 +26,24 @@
             Background="{StaticResource RealTimeInfoWindowBackgroundColor}"
             BorderThickness="1" 
             CornerRadius="2">
-        <Grid Background="Transparent">
+        <Grid Background="Transparent" Name="PopupGrid">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="10"/>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
             <!--This blue line is a decoration in the RealTimeInfoWindow shown at the left side of the screen, see the Figma design for more detail-->
-            <Line X1="1" 
+            <Line Name="BorderLine"
+                  X1="1" 
                   Y1="1"
                   X2="1" 
-                  Y2="63"
                   Stroke="{StaticResource RealTimeInfoWindowIconColor}"
                   StrokeThickness="3"
                   StrokeStartLineCap="Round"
                   StrokeEndLineCap="Round"
                   Grid.Column="0"/>
-            <!--This Canvas contains two elipses and one line that draw the information symbol in the RealTimeInfo Window-->
+            <!--This Canvas contains two ellipses and one line that draw the information symbol in the RealTimeInfo Window-->
             <Canvas Height="67"
                     Width="20"
                     Margin="30,0,30,0"
@@ -68,11 +66,12 @@
                       Canvas.Left="0"
                       Canvas.Top="13"
                       Stroke="{StaticResource RealTimeInfoWindowIconColor}"
-                      StrokeThickness="2"
-                      Grid.Column="0"/>
+                      StrokeThickness="2"/>
             </Canvas>
             <!--This Text block will contain the text that is shown to the user in the RealTimeInfoWindow-->
-            <TextBlock Text="{Binding TextContent}"
+            <TextBlock SizeChanged="TextBlock_SizeChanged"
+                       Margin="0,5,0,5"
+                       Text="{Binding TextContent}"
                        FontFamily="Artifakt Element"
                        FontSize="12"
                        TextWrapping="WrapWithOverflow"
@@ -81,9 +80,11 @@
                        Foreground="White"
                        Grid.Column="2"/>
             <Button Name="CloseButton"
+                    Margin="0,10,0,0"
                     Height="25"  
                     Width="25"
                     HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
                     Grid.Column="3"
                     Style="{StaticResource RealTimeInfoCloseButtonStyle}"
                     Click="CloseButton_Click">
diff --git a/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml.cs b/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml.cs
index e100c37e36a..26c67737d66 100644
--- a/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml.cs
+++ b/src/DynamoCoreWpf/Views/GuidedTour/RealTimeInfoWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows.Controls.Primitives;
+using System.Windows;
+using System.Windows.Controls.Primitives;
 using Dynamo.Wpf.UI.GuidedTour;
 
 namespace Dynamo.Wpf.Views.GuidedTour
@@ -39,7 +40,7 @@ private void GuideFlowEvents_GuidedTourStart(GuidedTourStateEventArgs args)
         {
             CleanRealTimeInfoWindow();
         }
-
+            
         /// <summary>
         /// When the Tour has finished we need to close the RealTimeInfo window and remove subscriptions to events
         /// </summary>
@@ -71,5 +72,11 @@ public void UpdateLocation()
                 positionMethod.Invoke(this, null);
             }
         }
+        private void TextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+                BorderLine.Y2 = PopupGrid.ActualHeight /*+ ((TextBlock)sender).Margin.Bottom*/;
+        }
+
+
     }
 }

From c9c76aa68de86d63ae7fb6564895e8af783c9e65 Mon Sep 17 00:00:00 2001
From: aparajit-pratap <aparajit.pratap@autodesk.com>
Date: Fri, 1 Dec 2023 14:27:36 -0500
Subject: [PATCH 02/22] Update analytics (#14669)

* remove coreclr-ncalc references

* update analytics package
---
 src/DynamoCore/DynamoCore.csproj            | 2 +-
 test/DynamoCoreTests/DynamoCoreTests.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
index 85f779d8437..c7d68ccebc2 100644
--- a/src/DynamoCore/DynamoCore.csproj
+++ b/src/DynamoCore/DynamoCore.csproj
@@ -35,7 +35,7 @@
 	<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
-    <PackageReference Include="DynamoVisualProgramming.Analytics" Version="4.1.0.2437" />
+    <PackageReference Include="DynamoVisualProgramming.Analytics" Version="4.2.0.3351" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Engine\GraphLayout\GraphLayout.csproj">
diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj
index 1ae113bca2e..a90b794d12f 100644
--- a/test/DynamoCoreTests/DynamoCoreTests.csproj
+++ b/test/DynamoCoreTests/DynamoCoreTests.csproj
@@ -25,7 +25,7 @@
         <PackageReference Include="coverlet.collector" Version="3.1.2" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" ExcludeAssets="none" />
         <PackageReference Include="JunitXml.TestLogger" Version="3.0.124" />
-        <PackageReference Include="DynamoVisualProgramming.Analytics" Version="4.1.0.2437">
+        <PackageReference Include="DynamoVisualProgramming.Analytics" Version="4.2.0.3351">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

From 7def79624912afd6fe09da88a09a33eb9af2921a Mon Sep 17 00:00:00 2001
From: "Aaron (Qilong)" <173288704@qq.com>
Date: Mon, 4 Dec 2023 05:06:02 -0500
Subject: [PATCH 03/22] DYN-5873 Removal of Update Manager (#14632)

* Removal of Update Manager

* Remove UpdateManager CleanUp

* Update

* Clean Up

* Update to rely on PathResolver so integrators can implement GetDynamoUserDataLocations() differently

* Null check for PathResolver

* Comments
---
 src/DynamoApplications/PathResolvers.cs       |   38 +-
 src/DynamoApplications/StartupUtils.cs        |   59 -
 src/DynamoCore/Configuration/IPathResolver.cs |   15 +
 src/DynamoCore/Configuration/PathManager.cs   |   21 +
 src/DynamoCore/Core/DynamoMigrator.cs         |   47 +-
 src/DynamoCore/Models/DynamoModel.cs          |   43 +-
 src/DynamoCore/Updates/UpdateManager.cs       | 1386 -----------------
 .../GraphUpdateNotificationControl.xaml       |   60 -
 .../GraphUpdateNotificationControl.xaml.cs    |   36 -
 src/DynamoCoreWpf/DynamoCoreWpf.csproj        |    7 -
 src/DynamoCoreWpf/UI/Converters.cs            |   42 -
 .../Themes/Modern/DynamoColorsAndBrushes.xaml |    4 -
 .../UI/Themes/Modern/DynamoConverters.xaml    |    2 -
 .../ViewModels/Core/DynamoViewModel.cs        |   37 +-
 .../Views/About/AboutWindow.xaml              |   13 +-
 test/DynamoCoreTests/UpdateManagerTests.cs    |  465 ------
 test/DynamoCoreTests/Updates/UpdatesTests.cs  |  238 ---
 .../DynamoCoreTests/UserDataMigrationTests.cs |   42 +-
 .../UpdateManagerUITests.cs                   |   31 -
 .../SystemTestServices/SystemTestBase.cs      |    3 -
 .../TestServices/TestPathResolver.cs          |    9 +-
 .../HelixWatch3DViewModelTests.cs             |    1 -
 22 files changed, 143 insertions(+), 2456 deletions(-)
 delete mode 100644 src/DynamoCore/Updates/UpdateManager.cs
 delete mode 100644 src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml
 delete mode 100644 src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml.cs
 delete mode 100644 test/DynamoCoreTests/UpdateManagerTests.cs
 delete mode 100644 test/DynamoCoreTests/Updates/UpdatesTests.cs
 delete mode 100644 test/DynamoCoreWpfTests/UpdateManagerUITests.cs

diff --git a/src/DynamoApplications/PathResolvers.cs b/src/DynamoApplications/PathResolvers.cs
index fa2502df346..fc8bf9b835f 100644
--- a/src/DynamoApplications/PathResolvers.cs
+++ b/src/DynamoApplications/PathResolvers.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Dynamo.Interfaces;
 
 namespace Dynamo.Applications
@@ -58,13 +60,41 @@ public IEnumerable<string> PreloadedLibraryPaths
 
         public string UserDataRootFolder
         {
-            get { return string.Empty; }
+            get { return Path.Combine(Environment.GetFolderPath(
+                Environment.SpecialFolder.ApplicationData),
+                "Dynamo", "Dynamo Core").ToString(); }
         }
 
         public string CommonDataRootFolder
         {
             get { return string.Empty; }
         }
+
+        /// <summary>
+        /// Returns the full path of user data location of all version of this
+        /// Dynamo product installed on this system. The default implementation
+        /// returns list of all subfolders in %appdata%\Dynamo as well as 
+        /// %appdata%\Dynamo\Dynamo Core\ folders.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<string> GetDynamoUserDataLocations()
+        {
+            var appDatafolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            var dynamoFolder = Path.Combine(appDatafolder, "Dynamo");
+            if (!Directory.Exists(dynamoFolder)) return Enumerable.Empty<string>();
+
+            var paths = new List<string>();
+            var coreFolder = new FileInfo(UserDataRootFolder).FullName;
+            //Dynamo Core folder has to be enumerated first to cater migration from
+            //Dynamo 1.0 to Dynamo Core 1.0
+            if (Directory.Exists(coreFolder))
+            {
+                paths.AddRange(Directory.EnumerateDirectories(coreFolder));
+            }
+
+            paths.AddRange(Directory.EnumerateDirectories(dynamoFolder));
+            return paths;
+        }
     }
 
     internal class CLIPathResolver : IPathResolver
@@ -125,5 +155,11 @@ public IEnumerable<string> PreloadedLibraryPaths
         public string UserDataRootFolder { get; private set; }
 
         public string CommonDataRootFolder { get; private set; }
+
+        public IEnumerable<string> GetDynamoUserDataLocations()
+        {
+            // Do nothing for now.
+            return Enumerable.Empty<string>();
+        }
     }
 }
diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs
index c53b4144de0..d45ba8928e0 100644
--- a/src/DynamoApplications/StartupUtils.cs
+++ b/src/DynamoApplications/StartupUtils.cs
@@ -75,48 +75,6 @@ public static class StartupUtils
         /// </summary>
         public static event Action<string> ASMPreloadFailure;
 
-#if NET6_0_OR_GREATER
-        [System.Runtime.Versioning.SupportedOSPlatform("windows")]
-#endif
-        internal class SandboxLookUp : DynamoLookUp
-        {
-            public override IEnumerable<string> GetDynamoInstallLocations()
-            {
-                const string regKey64 = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\";
-                //Open HKLM for 64bit registry
-                var regKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
-                //Open Windows/CurrentVersion/Uninstall registry key
-                regKey = regKey.OpenSubKey(regKey64);
-
-                //Get "InstallLocation" value as string for all the subkey that starts with "Dynamo"
-                return regKey.GetSubKeyNames().Where(s => s.StartsWith("Dynamo")).Select(
-                    (s) => regKey.OpenSubKey(s).GetValue("InstallLocation") as string);
-            }
-        }
-
-        /// <summary>
-        ///this class is left unimplemented,unclear how to
-        ///lookup installation locations on nix/mac
-        /// </summary>
-        internal class CLILookUp : DynamoLookUp
-        {
-            public override IEnumerable<string> GetDynamoInstallLocations()
-            {
-                throw new NotImplementedException();
-                int p = (int)Environment.OSVersion.Platform;
-                if ((p == 4) || (p == 6) || (p == 128))
-                {
-                    Console.WriteLine("Running on Unix");
-                }
-                else
-                {
-                    Console.WriteLine("NOT running on Unix");
-                }
-
-                return null;
-            }
-        }
-
         public struct CommandLineArguments
         {
             public static CommandLineArguments Parse(string[] args)
@@ -211,22 +169,6 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin
             preloaderLocation = preloader.PreloaderLocation;
         }
 
-        /// <summary>
-        ///if we are building a model for CLI mode, then we don't want to start an updateManager
-        ///for now, building an updatemanager instance requires finding Dynamo install location
-        ///which if we are running on mac os or *nix will use different logic then SandboxLookup 
-        /// </summary>
-#if NET6_0_OR_GREATER
-        [System.Runtime.Versioning.SupportedOSPlatform("windows")]
-#endif
-        private static IUpdateManager InitializeUpdateManager()
-        {
-            var cfg = UpdateManagerConfiguration.GetSettings(new SandboxLookUp());
-            var um = new Dynamo.Updates.UpdateManager(cfg);
-            Debug.Assert(cfg.DynamoLookUp != null);
-            return um;
-        }
-
         /// <summary>
         /// Use this overload to construct a DynamoModel in CLI context when the location of ASM to use is known, host analytics info is known and you want to set data paths.
         /// </summary>
@@ -391,7 +333,6 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
                 HostAnalyticsInfo = info,
                 CLIMode = CLImode,
                 AuthProvider = CLImode || noNetworkMode ? null : new Core.IDSDKManager(),
-                UpdateManager = CLImode ? null : OSHelper.IsWindows() ? InitializeUpdateManager() : null,
                 StartInTestMode = CLImode,
                 PathResolver = CreatePathResolver(CLImode, preloaderLocation, userDataFolder, commonDataFolder),
                 IsServiceMode = isServiceMode,
diff --git a/src/DynamoCore/Configuration/IPathResolver.cs b/src/DynamoCore/Configuration/IPathResolver.cs
index cb0aabaed44..2a28ec40a0d 100644
--- a/src/DynamoCore/Configuration/IPathResolver.cs
+++ b/src/DynamoCore/Configuration/IPathResolver.cs
@@ -58,6 +58,16 @@ public interface IPathResolver
         /// as it will be appended by PathManager.
         /// </summary>
         string CommonDataRootFolder { get; }
+
+        /// <summary>
+        /// Returns a list of user data folders on this system.
+        /// </summary>
+        /// <returns>
+        /// The implementation of this interface method should return a list of user 
+        /// data folders, one for each of Dynamo product installed on the system. When 
+        /// there is no Dynamo product installed, this method returns an empty list.
+        /// </returns>
+        IEnumerable<string> GetDynamoUserDataLocations();
     }
 
     /// <summary>
@@ -189,6 +199,11 @@ public interface IPathManager
         /// </summary>
         int MinorFileVersion { get; }
 
+        /// <summary>
+        /// Integration specific PathResolver
+        /// </summary>
+        IPathResolver PathResolver { get; }
+
         /// <summary>
         /// Call this method to add additional path for consideration when path 
         /// resolution take place.
diff --git a/src/DynamoCore/Configuration/PathManager.cs b/src/DynamoCore/Configuration/PathManager.cs
index 059bc121bd4..a05e97f7f1c 100644
--- a/src/DynamoCore/Configuration/PathManager.cs
+++ b/src/DynamoCore/Configuration/PathManager.cs
@@ -76,6 +76,7 @@ internal static Lazy<PathManager>
 
         private readonly int majorFileVersion;
         private readonly int minorFileVersion;
+        private Updates.BinaryVersion productVersion;
         private readonly string dynamoCoreDir;
         private string hostApplicationDirectory;
         private string userDataDir;
@@ -102,6 +103,14 @@ internal static Lazy<PathManager>
 
         internal IPreferences Preferences { get; set; }
 
+        /// <summary>
+        /// PathResolver is used to resolve paths for custom nodes, packages, and preloaded libraries.
+        /// </summary>
+        public IPathResolver PathResolver
+        {
+            get { return pathResolver; }
+        }
+
         private IEnumerable<string> RootDirectories
         {
             get 
@@ -631,6 +640,18 @@ internal string GetUserDataFolder()
             return GetDynamoDataFolder(Path.Combine(folder, "Dynamo", "Dynamo Core"));
         }
 
+        /// <summary>
+        /// Returns the current Dynamo product version.
+        /// </summary>
+        /// <returns></returns>
+        public Updates.BinaryVersion GetProductVersion()
+        {
+            if (null != productVersion) return productVersion;
+            var executingAssemblyName = Assembly.GetExecutingAssembly().GetName();
+            productVersion = Updates.BinaryVersion.FromString(executingAssemblyName.Version.ToString());
+            return productVersion;
+        }
+
         private string GetCommonDataFolder()
         {
             if (pathResolver != null && !string.IsNullOrEmpty(pathResolver.CommonDataRootFolder))
diff --git a/src/DynamoCore/Core/DynamoMigrator.cs b/src/DynamoCore/Core/DynamoMigrator.cs
index 87b5fb484cd..85f87cf4299 100644
--- a/src/DynamoCore/Core/DynamoMigrator.cs
+++ b/src/DynamoCore/Core/DynamoMigrator.cs
@@ -183,13 +183,12 @@ protected virtual DynamoMigratorBase MigrateFrom(DynamoMigratorBase sourceMigrat
         /// definitions from the last but one version to the currently installed Dynamo version
         /// </summary>
         /// <param name="pathManager"></param>
-        /// <param name="dynamoLookup"></param>
         /// <returns>new migrator instance after migration</returns>
-        public static DynamoMigratorBase MigrateBetweenDynamoVersions(IPathManager pathManager, IDynamoLookUp dynamoLookup = null)
+        public static DynamoMigratorBase MigrateBetweenDynamoVersions(IPathManager pathManager)
         {
             //Get the current version from the current path manager user data directory.
             var currentVersion = GetInstallVersionFromUserDataFolder(pathManager.UserDataDirectory);
-            var previousVersion = GetLatestVersionToMigrate(pathManager, dynamoLookup, currentVersion);
+            var previousVersion = GetLatestVersionToMigrate(pathManager, currentVersion);
             
             if (!previousVersion.HasValue || previousVersion.Value.UserDataRoot == null)
                 return null; //Don't have previous version for migration
@@ -201,12 +200,11 @@ public static DynamoMigratorBase MigrateBetweenDynamoVersions(IPathManager pathM
         /// Returns the most recent version to migrate to the given current version.
         /// </summary>
         /// <param name="pathManager"></param>
-        /// <param name="dynamoLookup"></param>
         /// <param name="currentVersion"></param>
         /// <returns>FileVersion?</returns>
-        public static FileVersion? GetLatestVersionToMigrate(IPathManager pathManager, IDynamoLookUp dynamoLookup, FileVersion currentVersion)
+        public static FileVersion? GetLatestVersionToMigrate(IPathManager pathManager, FileVersion currentVersion)
         {
-            var versions = GetInstalledVersions(pathManager, dynamoLookup);
+            var versions = GetInstalledVersions(pathManager);
 
             if (versions.Count() < 2)
                 return null; // No need for migration
@@ -265,17 +263,14 @@ public static IEnumerable<FileVersion> GetInstalledVersions(string rootFolder)
         }
 
         /// <summary>
-        /// Returns list of FileVersion objects, given the IPathManager and 
-        /// IDynamoLookUp objects. If a valid IDynamoLookUp interface object
-        /// is passed, this method uses the lookup to get Dynamo user data locations.
+        /// Returns list of FileVersion objects, given the IPathManager.
         /// </summary>
         /// <param name="pathManager"></param>
-        /// <param name="dynamoLookup"></param>
         /// <returns></returns>
-        public static IEnumerable<FileVersion> GetInstalledVersions(IPathManager pathManager, IDynamoLookUp dynamoLookup)
+        public static IEnumerable<FileVersion> GetInstalledVersions(IPathManager pathManager)
         {
-            return dynamoLookup != null
-                ? GetInstalledVersionsCore(() => dynamoLookup.GetDynamoUserDataLocations())
+            var installedVersions = GetInstalledVersionsCore(() => pathManager.PathResolver != null? pathManager.PathResolver.GetDynamoUserDataLocations() : Enumerable.Empty<string>());
+            return installedVersions.Any() ? installedVersions
                 : GetInstalledVersions(Path.GetDirectoryName(pathManager.UserDataDirectory));
         }
 
@@ -403,6 +398,32 @@ public string CommonDataRootFolder
         {
             get { return string.Empty; }
         }
+
+        /// <summary>
+        /// Returns the full path of user data location of all version of this
+        /// Dynamo product installed on this system. The default implementation
+        /// returns list of all subfolders in %appdata%\Dynamo as well as 
+        /// %appdata%\Dynamo\Dynamo Core\ folders.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<string> GetDynamoUserDataLocations()
+        {
+            var appDatafolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+            var dynamoFolder = Path.Combine(appDatafolder, "Dynamo");
+            if (!Directory.Exists(dynamoFolder)) return Enumerable.Empty<string>();
+
+            var paths = new List<string>();
+            var coreFolder = new FileInfo(UserDataRootFolder).FullName;
+            //Dynamo Core folder has to be enumerated first to cater migration from
+            //Dynamo 1.0 to Dynamo Core 1.0
+            if (Directory.Exists(coreFolder))
+            {
+                paths.AddRange(Directory.EnumerateDirectories(coreFolder));
+            }
+
+            paths.AddRange(Directory.EnumerateDirectories(dynamoFolder));
+            return paths;
+        }
     }
 
 }
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index 996e074533b..4bca507d88a 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -34,7 +34,6 @@
 using Dynamo.Search;
 using Dynamo.Search.SearchElements;
 using Dynamo.Selection;
-using Dynamo.Updates;
 using Dynamo.Utilities;
 using DynamoServices;
 using Greg;
@@ -46,7 +45,6 @@
 using ProtoCore.Runtime;
 using Compiler = ProtoAssociative.Compiler;
 // Dynamo package manager
-using DefaultUpdateManager = Dynamo.Updates.UpdateManager;
 using FunctionGroup = Dynamo.Engine.FunctionGroup;
 using Symbol = Dynamo.Graph.Nodes.CustomNodes.Symbol;
 using Utils = Dynamo.Graph.Nodes.Utilities;
@@ -98,11 +96,13 @@ public static DynamoPreferencesData Default()
     /// </summary>
     public struct HostAnalyticsInfo
     {
-        /// Dynamo variation identified by host.
+        // Dynamo variation identified by host.
         public string HostName;
-        /// Dynamo host parent id for analytics purpose.
+        // Dynamo variation version specific to host
+        public Version HostVersion;
+        // Dynamo host parent id for analytics purpose.
         public string ParentId;
-        /// Dynamo host session id for analytics purpose.
+        // Dynamo host session id for analytics purpose.
         public string SessionId;
     }
 
@@ -200,7 +200,7 @@ internal LuceneSearchUtility LuceneUtility
         /// </summary>
         public static string Version
         {
-            get { return DefaultUpdateManager.GetProductVersion().ToString(); }
+            get { return Core.PathManager.Instance.GetProductVersion().ToString(); }
         }
 
         /// <summary>
@@ -229,11 +229,6 @@ public static string Version
         /// </summary>
         internal bool NoNetworkMode { get; }
 
-        /// <summary>
-        /// UpdateManager to handle automatic upgrade to higher version.
-        /// </summary>
-        public IUpdateManager UpdateManager { get; private set; }
-
         /// <summary>
         ///     The path manager that configures path information required for
         ///     Dynamo to function properly. See IPathManager interface for more
@@ -292,7 +287,7 @@ internal static string AppVersion
             get
             {
                 return Process.GetCurrentProcess().ProcessName + "-"
-                    + DefaultUpdateManager.GetProductVersion();
+                    + Core.PathManager.Instance.GetProductVersion();
             }
         }
 
@@ -517,7 +512,6 @@ public interface IStartConfiguration
             IPreferences Preferences { get; set; }
             IPathResolver PathResolver { get; set; }
             bool StartInTestMode { get; set; }
-            IUpdateManager UpdateManager { get; set; }
             ISchedulerThread SchedulerThread { get; set; }
             string GeometryFactoryPath { get; set; }
             IAuthProvider AuthProvider { get; set; }
@@ -575,7 +569,6 @@ public struct DefaultStartConfiguration : IStartConfiguration
             public IPreferences Preferences { get; set; }
             public IPathResolver PathResolver { get; set; }
             public bool StartInTestMode { get; set; }
-            public IUpdateManager UpdateManager { get; set; }
             public ISchedulerThread SchedulerThread { get; set; }
             public string GeometryFactoryPath { get; set; }
             public IAuthProvider AuthProvider { get; set; }
@@ -699,14 +692,8 @@ protected DynamoModel(IStartConfiguration config)
                 PreferenceSettings.MessageLogged += LogMessage;
             }
 
-            UpdateManager = config.UpdateManager ?? new DefaultUpdateManager(null);
-
-            if (UpdateManager != null)
-            {
-                // For API compatibility now in Dynamo 2.0, integrators can set HostName in both ways
-                HostName = string.IsNullOrEmpty(UpdateManager.HostName) ? HostAnalyticsInfo.HostName : UpdateManager.HostName;
-                HostVersion = UpdateManager.HostVersion?.ToString();
-            }
+            HostName = HostAnalyticsInfo.HostName;
+            HostVersion = HostAnalyticsInfo.HostVersion?.ToString();
 
             bool areAnalyticsDisabledFromConfig = false;
             if (!IsServiceMode)
@@ -766,10 +753,7 @@ protected DynamoModel(IStartConfiguration config)
 
                 try
                 {
-                    var dynamoLookup = config.UpdateManager != null && config.UpdateManager.Configuration != null
-                        ? config.UpdateManager.Configuration.DynamoLookUp : null;
-
-                    migrator = DynamoMigratorBase.MigrateBetweenDynamoVersions(pathManager, dynamoLookup);
+                    migrator = DynamoMigratorBase.MigrateBetweenDynamoVersions(pathManager);
                 }
                 catch (Exception e)
                 {
@@ -932,12 +916,6 @@ protected DynamoModel(IStartConfiguration config)
                 AuthenticationManager = new AuthenticationManager(config.AuthProvider);
             }
 
-            UpdateManager.Log += UpdateManager_Log;
-            if (!IsTestMode && !IsHeadless && !IsServiceMode && !config.NoNetworkMode)
-            {
-                DefaultUpdateManager.CheckForProductUpdate(UpdateManager);
-            }
-
             Logger.Log(string.Format("Dynamo -- Build {0}",
                                         Assembly.GetExecutingAssembly().GetName().Version));
 
@@ -1410,7 +1388,6 @@ public void Dispose()
 
             EngineController.VMLibrariesReset -= ReloadDummyNodes;
 
-            UpdateManager.Log -= UpdateManager_Log;
             Logger.Dispose();
 
             EngineController.Dispose();
diff --git a/src/DynamoCore/Updates/UpdateManager.cs b/src/DynamoCore/Updates/UpdateManager.cs
deleted file mode 100644
index c78d25e132b..00000000000
--- a/src/DynamoCore/Updates/UpdateManager.cs
+++ /dev/null
@@ -1,1386 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Xml.Linq;
-using System.Xml.Serialization;
-using Autodesk.Analytics.Core;
-using Dynamo.Core;
-using Dynamo.Logging;
-
-namespace Dynamo.Updates
-{
-    /// <summary>
-    /// Represents the method that will handle <see cref="UpdateManager.UpdateDownloaded"/> events.
-    /// </summary>
-    /// <param name="sender">The object where the event handler is attached.</param>
-    /// <param name="e">The event data.</param>
-    public delegate void UpdateDownloadedEventHandler(object sender, UpdateDownloadedEventArgs e);
-	
-    /// <summary>
-    /// A delegate used to handle shutdown request
-    /// </summary>
-    public delegate void ShutdownRequestedEventHandler(IUpdateManager updateManager);
-
-    /// <summary>
-    /// Provides data for <see cref="UpdateManager.UpdateDownloaded"/> events.
-    /// </summary>
-    public class UpdateDownloadedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateDownloadedEventArgs"/> class 
-        /// with the error and the update location
-        /// </summary>
-        /// <param name="error">The exception thrown during downloading update. 
-        /// Null if update is downloaded successfully.</param>
-        /// <param name="fileLocation">Location where the update has been downloaded to.</param>
-        public UpdateDownloadedEventArgs(Exception error, string fileLocation)
-        {
-            Error = error;
-            UpdateFileLocation = fileLocation;
-            UpdateAvailable = !string.IsNullOrEmpty(fileLocation);
-        }
-
-        /// <summary>
-        /// Returns flag which indicates if update has been downloaded.
-        /// </summary>
-        public bool UpdateAvailable { get; private set; }
-
-        /// <summary>
-        /// Returns location where the update has been downloaded to.
-        /// </summary>
-        public string UpdateFileLocation { get; private set; }
-
-        /// <summary>
-        /// Returns exception thrown during downloading update. 
-        /// Null if update is downloaded successfully.
-        /// </summary>
-        public Exception Error { get; private set; }
-    }
-
-    /// <summary>
-    /// An interface which describes properties and methods for
-    /// updating the application.
-    /// </summary>
-    public interface IUpdateManager
-    {
-        /// <summary>
-        /// Returns current product version.
-        /// </summary>
-        BinaryVersion ProductVersion { get; }
-
-        /// <summary>
-        /// Returns available product version.
-        /// </summary>
-        BinaryVersion AvailableVersion { get; }
-
-        /// <summary>
-        /// Returns information, where version can be updated.
-        /// </summary>
-        IAppVersionInfo UpdateInfo { get; set; }
-
-        /// <summary>
-        /// Bool value indicates if new version is available.
-        /// </summary>
-        bool IsUpdateAvailable { get; }
-
-        /// <summary>
-        /// Event is fired when an update is downloaded.
-        /// </summary>
-        event UpdateDownloadedEventHandler UpdateDownloaded;
-
-        /// <summary>
-        /// Event is fired when Dynamo needs to be restarted.
-        /// </summary>
-        event ShutdownRequestedEventHandler ShutdownRequested;
-
-        /// <summary>
-        /// Checks for product updates in background thread.
-        /// </summary>
-        /// <param name="request">Asynchronous web request for update data</param>
-        void CheckForProductUpdate(IAsynchronousRequest request);
-
-        /// <summary>
-        /// Quits and installs new version.
-        /// </summary>
-        void QuitAndInstallUpdate();
-
-        /// <summary>
-        /// This function is called when a Dynamo Model is shutting down.
-        /// </summary>
-        void HostApplicationBeginQuit();
-
-        /// <summary>
-        /// Reads the request's data, and parses for available versions. 
-        /// If a more recent version is available, the UpdateInfo object 
-        /// will be set.
-        /// </summary>
-        /// <param name="request">Asynchronous request</param>
-        void UpdateDataAvailable(IAsynchronousRequest request);
-
-        /// <summary>
-        /// This flag is available via the debug menu to
-        /// allow the update manager to check for newer daily builds.
-        /// </summary>
-        bool CheckNewerDailyBuilds { get; set; }
-
-        /// <summary>
-        /// Specifies whether to force update.
-        /// </summary>
-        bool ForceUpdate { get; set; }
-
-        /// <summary>
-        /// Returns a reference to Update Manager Configuration settings.
-        /// </summary>
-        IUpdateManagerConfiguration Configuration { get; }
-
-        /// <summary>
-        /// Event fires, when something should be logged.
-        /// </summary>
-        event LogEventHandler Log;
-
-        /// <summary>
-        /// This function logs a message.
-        /// </summary>
-        /// <param name="args">LogEventArgs</param>
-        void OnLog(LogEventArgs args);
-
-        /// <summary>
-        /// Sets application process id. It's used for logging.
-        /// </summary>
-        /// <param name="id">int</param>
-        void RegisterExternalApplicationProcessId(int id);
-
-        /// <summary>
-        /// Get the current version of the Host
-        /// </summary>
-        Version HostVersion { get; set; }
-
-        /// <summary>
-        /// Get the current name of the Host
-        /// </summary>
-        String HostName { get; set; }
-    }
-
-    /// <summary>
-    /// Interface provides methods, that get installed Dynamo paths and the last Dynamo version.
-    /// </summary>
-    public interface IDynamoLookUp
-    {
-        /// <summary>
-        /// Returns installation path for all version of this Dynamo Product
-        /// installed on this system.
-        /// </summary>
-        IEnumerable<string> GetDynamoInstallLocations();
-
-        /// <summary>
-        /// Returns a list of user data folders on this system.
-        /// </summary>
-        /// <returns>
-        /// The implementation of this interface method should return a list of user 
-        /// data folders, one for each of Dynamo product installed on the system. When 
-        /// there is no Dynamo product installed, this method returns an empty list.
-        /// </returns>
-        IEnumerable<string> GetDynamoUserDataLocations();
-
-        /// <summary>
-        /// Returns the version of latest installed product
-        /// </summary>
-        BinaryVersion LatestProduct { get; }
-    }
-
-    /// <summary>
-    /// This interface represents configuration properties for Update manager.
-    /// </summary>
-    public interface IUpdateManagerConfiguration
-    {
-        /// <summary>
-        /// Specifies download location for new installer
-        /// </summary>
-        string DownloadSourcePath { get; set; }
-
-        /// <summary>
-        /// Specifies location for signature file to validate the new installer.
-        /// </summary>
-        string SignatureSourcePath { get; set; }
-
-        /// <summary>
-        /// Specifies whether to consider daily builds for update, default is false.
-        /// </summary>
-        bool CheckNewerDailyBuild { get; set; }
-
-        /// <summary>
-        /// Specifies whether to force update, default value is false.
-        /// </summary>
-        bool ForceUpdate { get; set; }
-
-        /// <summary>
-        /// Returns the base name of the installer to be used for upgrade.
-        /// </summary>
-        string InstallerNameBase { get; set; }
-
-        /// <summary>
-        /// Returns IDynamoLookUp interface to search Dynamo installations on the system.
-        /// </summary>
-        IDynamoLookUp DynamoLookUp { get; set; }        
-   }
-    
-    /// <summary>
-    /// This interface represents configuration properties for Disable Update.
-    /// </summary>
-    public interface IDisableUpdateConfig
-    {
-        /// <summary>
-        /// Specifies whether to disable update, default value is false. 
-        /// </summary>
-        Boolean DisableUpdates { get; set; }
-    }
-
-   /// <summary>
-   /// An interface to describe available
-   /// application update info.
-   /// </summary>
-   public interface IAppVersionInfo
-    {
-        BinaryVersion Version { get; set; }
-        string VersionInfoURL { get; set; }
-        string InstallerURL { get; set; }
-        string SignatureURL { get; set; }
-    }
-
-    /// <summary>
-    /// An interface to describe an asynchronous web
-    /// request for updating data.
-    /// </summary>
-    public interface IAsynchronousRequest
-    {
-        /// <summary>
-        /// The data returned from the request.
-        /// </summary>
-        string Data { get; set; }
-
-        /// <summary>
-        /// Any error information returned from the request.
-        /// </summary>
-        string Error { get; set; }
-
-        /// <summary>
-        /// Represents the send request link.
-        /// </summary>
-        Uri Path { get; set; }
-
-        /// <summary>
-        /// An action to be invoked upon completion of the request.
-        /// This action is invoked regardless of the success of the request.
-        /// </summary>
-        Action<IAsynchronousRequest> OnRequestCompleted { get; set; }
-    }
-
-    /// <summary>
-    /// This class returns <see cref="BinaryVersion"/> of Dynamo
-    /// </summary>
-    public class AppVersionInfo : IAppVersionInfo
-    {
-        /// <summary>
-        /// Returns current Dynamo version
-        /// </summary>
-        public BinaryVersion Version { get; set; }
-
-        /// <summary>
-        /// Returns URL where one can get information about 
-        /// current Dynamo version
-        /// </summary>
-        public string VersionInfoURL { get; set; }
-        
-        /// <summary>
-        /// Returns URL where Dynamo installer can be downloaded from
-        /// </summary>
-        public string InstallerURL { get; set; }
-
-        /// <summary>
-        /// Returns URL where signature file to validate the new installer can be downloaded from
-        /// </summary>
-        public string SignatureURL { get; set; }
-    }
-
-    /// <summary>
-    /// The UpdateRequest class encapsulates a request for 
-    /// getting update information from the web.
-    /// </summary>
-    internal class UpdateRequest : IAsynchronousRequest
-    {
-        /// <summary>
-        /// An action to be invoked upon completion of the request.
-        /// This action is invoked regardless of the success of the request.
-        /// </summary>
-        public Action<IAsynchronousRequest> OnRequestCompleted { get; set; }
-
-        /// <summary>
-        /// The data returned from the request.
-        /// </summary>
-        public string Data { get; set; }
-
-        /// <summary>
-        /// Any error information returned from the request.
-        /// </summary>
-        public string Error { get; set; }
-
-        public Uri Path { get; set; }
-
-        /// <summary>
-        /// UpdateManager instance that created this request.
-        /// </summary>
-        private readonly IUpdateManager manager = null;
-
-        /// <summary>
-        /// The constructor.
-        /// </summary>
-        /// <param name="path">Uri that needs to be read to get the update information.</param>
-        /// <param name="manager">The update manager which is making this request.</param>
-        public UpdateRequest(Uri path, IUpdateManager manager)
-        {
-            OnRequestCompleted = manager.UpdateDataAvailable;
-            this.manager = manager;
-
-            Error = string.Empty;
-            Data = string.Empty;
-            Path = path;
-
-            var client = new WebClient();
-            client.OpenReadAsync(path);
-            client.OpenReadCompleted += ReadResult;
-        }
-
-        /// <summary>
-        /// Event handler for the web client's requestion completed event. Reads
-        /// the request result information and subsequently triggers
-        /// the UpdateDataAvailable event.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ReadResult(object sender, OpenReadCompletedEventArgs e)
-        {
-            try
-            {
-                if (null == e || e.Error != null)
-                {
-                    Error = "Unspecified error";
-                    if (null != e && (null != e.Error))
-                        Error = e.Error.Message;
-                }
-
-                using (var sr = new StreamReader(e.Result))
-                {
-                    Data = sr.ReadToEnd();
-                }
-            }
-            catch (Exception ex)
-            {
-                Error = string.Empty;
-                Data = string.Empty;
-
-                manager.OnLog(new LogEventArgs("The update request could not be completed.", LogLevel.File));
-                manager.OnLog(new LogEventArgs(ex, LogLevel.File));
-            }
-
-            //regardless of the success of the above logic
-            //invoke the completion callback
-            OnRequestCompleted.Invoke(this);
-        }
-    }
-
-    /// <summary>
-    /// Specifies Update Manager Configuration settings.
-    /// </summary>
-    public class UpdateManagerConfiguration : IUpdateManagerConfiguration,IDisableUpdateConfig
-    {
-        private const string PRODUCTION_SOURCE_PATH_S = "http://dyn-builds-data.s3.amazonaws.com/";
-        private const string PRODUCTION_SIG_SOURCE_PATH_S = "http://dyn-builds-data-sig.s3.amazonaws.com/";
-        private const string DEFAULT_CONFIG_FILE_S = "UpdateManagerConfig.xml";
-        private const string INSTALL_NAME_BASE = "DynamoInstall";
-
-        /// <summary>
-        /// Specifies download location for new installer
-        /// </summary>
-        public string DownloadSourcePath { get; set; }
-        
-        /// <summary>
-        /// Specifies location for signature file to validate the new installer.
-        /// </summary>
-        public string SignatureSourcePath { get; set; }
-
-        /// <summary>
-        /// Specifies whether to consider daily builds for update, default is false.
-        /// </summary>
-        public bool CheckNewerDailyBuild { get; set; }
-
-        /// <summary>
-        /// Specifies whether to force update, default value is false.
-        /// </summary>
-        public bool ForceUpdate { get; set; }
-
-        /// <summary>
-        /// Returns the base name of the installer to be used for upgrade.
-        /// </summary>
-        public string InstallerNameBase { get; set; }
-
-        /// <summary>
-        /// Return file path for the overriding config file.
-        /// </summary>
-        [XmlIgnore]
-        public string ConfigFilePath { get; set; }
-
-        /// <summary>
-        /// Specifies whether to disable update, default value is false.
-        /// </summary>
-        public Boolean DisableUpdates { get; set; }
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public UpdateManagerConfiguration()
-        {
-            DownloadSourcePath = PRODUCTION_SOURCE_PATH_S;
-            SignatureSourcePath = PRODUCTION_SIG_SOURCE_PATH_S;
-            CheckNewerDailyBuild = false;
-            ForceUpdate = false;
-            InstallerNameBase = INSTALL_NAME_BASE;
-            DisableUpdates = false;
-        }
-
-        /// <summary>
-        /// Loads the configurations from given xml file.
-        /// </summary>
-        /// <param name="filePath">Xml file path that contains configuration details.</param>
-        /// <param name="updateManager">IUpdateManager object which can log errors during loading.</param>
-        /// <returns>Loaded UpdateManagerConfiguration.</returns>
-        public static UpdateManagerConfiguration Load(string filePath, IUpdateManager updateManager)
-        {
-            if(string.IsNullOrEmpty(filePath) || !File.Exists(filePath))
-                return null;
-
-            try
-            {
-                var serializer = new XmlSerializer(typeof(UpdateManagerConfiguration));
-                using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))
-                {
-                    var config = serializer.Deserialize(fs) as UpdateManagerConfiguration;
-                    if(null != config)
-                        config.ConfigFilePath = filePath;
-                    return config;
-                }
-            }
-            catch (Exception ex)
-            {
-                if (null != updateManager)
-                    updateManager.OnLog(
-                        new LogEventArgs(
-                            string.Format(
-                                Properties.Resources.FailedToLoad,
-                                filePath,
-                                ex.Message),
-                            LogLevel.Console));
-                else throw;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Saves this configuration to a given file in xml format.
-        /// </summary>
-        /// <param name="filePath">File path to save this configuration.</param>
-        /// <param name="updateManager">IUpdateManager object which can log errors during saving.</param>
-        public void Save(string filePath, IUpdateManager updateManager)
-        {
-            try
-            {
-                var serializer = new XmlSerializer(typeof(UpdateManagerConfiguration));
-                using (var fs = new FileStream(filePath, FileMode.Create, FileAccess.Write))
-                {
-                    serializer.Serialize(fs, this);
-                }
-            }
-            catch (Exception ex)
-            {
-                if (null != updateManager)
-                    updateManager.OnLog(
-                        new LogEventArgs(
-                            string.Format(
-                                Properties.Resources.FailedToSave,
-                                filePath,
-                                ex.Message),
-                            LogLevel.Console));
-                else throw;
-            }
-        }
-
-        /// <summary>
-        /// Utility method to get the settings
-        /// </summary>
-        /// <param name="lookUp">IDynamoLookUp instance</param>
-        /// <param name="updateManager">IUpdateManager object which can log errors during saving.</param>
-        /// <returns>Update Manager Configuration settings object</returns>
-        public static UpdateManagerConfiguration GetSettings(IDynamoLookUp lookUp, IUpdateManager updateManager = null)
-        {
-            string filePath;
-            var exists = TryGetConfigFilePath(out filePath);
-#if DEBUG
-            //This code is just to create the default config file to
-            //save the default settings, which later on can be modified
-            //to re-direct it to other download target for testing.
-            if (!exists)
-            {
-                var umConfig = new UpdateManagerConfiguration();
-                umConfig.Save(filePath, updateManager);
-            }
-#endif
-            if (!exists) 
-                return new UpdateManagerConfiguration() { DynamoLookUp = lookUp };
-
-            var config = Load(filePath, updateManager);
-            if (null != config)
-                config.DynamoLookUp = lookUp;
-
-            return config;
-        }
-
-        /// <summary>
-        /// Returns the update manager config file path.
-        /// </summary>
-        /// <param name="filePath">Full path for the config file</param>
-        /// <returns>True if file exists.</returns>
-        public static bool TryGetConfigFilePath(out string filePath)
-        {
-            string location = Assembly.GetExecutingAssembly().Location;
-            // ReSharper disable once AssignNullToNotNullAttribute, location is always available
-            filePath = Path.Combine(Path.GetDirectoryName(location), DEFAULT_CONFIG_FILE_S);
-            return File.Exists(filePath);
-        }
-
-        /// <summary>
-        /// IDynamoLookUp object to get installed Dynamo versions
-        /// </summary>
-        [XmlIgnore]
-        public IDynamoLookUp DynamoLookUp { get; set; }
-    }
-
-    /// <summary>
-    /// This class provides services for product update management.
-    /// </summary>
-    [Obsolete("UpdateManager is deprecated and will be removed in a future Dynamo version.")]
-    internal sealed class UpdateManager : NotificationObject, IUpdateManager
-    {
-        #region Private Class Data Members
-
-        private bool versionCheckInProgress;
-        private static BinaryVersion productVersion;
-        private IAppVersionInfo updateInfo;
-        private const string OLD_DAILY_INSTALL_NAME_BASE = "DynamoDailyInstall";
-        // TODO: InstallUpdate tool has been removed. 
-        // Remove UpdateManager and code that's dependent on it: https://jira.autodesk.com/browse/DYN-5873
-        private const string INSTALLUPDATE_EXE = "InstallUpdate.exe";
-        private string updateFileLocation;
-        private int currentDownloadProgress = -1;
-        private IAppVersionInfo downloadedUpdateInfo;
-        private IUpdateManagerConfiguration configuration = null;
-        private int hostApplicationProcessId = -1;
-
-        #endregion
-
-        #region Public Event Handlers
-
-        /// <summary>
-        /// Occurs when RequestUpdateDownload operation completes.
-        /// </summary>
-        public event UpdateDownloadedEventHandler UpdateDownloaded;
-        public event ShutdownRequestedEventHandler ShutdownRequested;
-        public event LogEventHandler Log;
-
-        #endregion
-
-        #region Public Class Properties
-
-        /// <summary>
-        /// Obtains product version string
-        /// </summary>
-        public BinaryVersion ProductVersion
-        {
-            get
-            {
-                return GetProductVersion();
-            }
-        }
-
-        public static BinaryVersion GetProductVersion()
-        {
-            if (null != productVersion) return productVersion;
-
-            var executingAssemblyName = Assembly.GetExecutingAssembly().GetName();
-            productVersion = BinaryVersion.FromString(executingAssemblyName.Version.ToString());
-
-            return productVersion;
-        }
-
-        public Version HostVersion { get; set; }
-
-        public string HostName { get; set; }
-
-        /// <summary>
-        /// BaseVersion is a method which compares the current Dynamo Core Version and the HostVersion
-        /// (DynamoRevit/DynamoStudio etc.) and returns the earlier (lower) Version.
-        /// This allows subsequent methods to do a single check and if there is an updated version (to either Core/Host
-        /// versions), the subsequent methods will poll the server for an update.
-        /// </summary>
-        private BinaryVersion BaseVersion()
-        {
-            if (HostVersion == null) return ProductVersion;
-
-            var binaryHostVersion = BinaryVersion.FromString(HostVersion.ToString());
-
-            if (ProductVersion < binaryHostVersion) return ProductVersion;
-            else return binaryHostVersion;
-        }
-
-        /// <summary>
-        ///     Obtains available update version string 
-        /// </summary>
-        public BinaryVersion AvailableVersion
-        {
-            get
-            {
-                // Dirty patch: A version is available only when the update has been downloaded.
-                // This causes the UI to display the update button only after the download has
-                // completed.
-                return downloadedUpdateInfo == null
-                    ? BaseVersion() : updateInfo.Version;
-            }
-        }
-
-        /// <summary>
-        /// Obtains downloaded update file location.
-        /// </summary>
-        public string UpdateFileLocation
-        {
-            get { return updateFileLocation; }
-            private set
-            {
-                updateFileLocation = value;
-                RaisePropertyChanged("UpdateFileLocation");
-            }
-        }
-
-        public IAppVersionInfo UpdateInfo
-        {
-            get { return updateInfo; }
-            set
-            {
-                if (value != null)
-                {
-                    OnLog(new LogEventArgs(string.Format(Properties.Resources.UpdateAvailable, value.Version), LogLevel.Console));
-                }
-
-                updateInfo = value;
-                RaisePropertyChanged("UpdateInfo");
-            }
-        }
-
-        /// <summary>
-        ///     Dirty patch: Set to the value of UpdateInfo once the new update installer has been
-        ///     downloaded.
-        /// </summary>
-        public IAppVersionInfo DownloadedUpdateInfo
-        {
-            get { return downloadedUpdateInfo; }
-            set
-            {
-                downloadedUpdateInfo = value;
-                RaisePropertyChanged("DownloadedUpdateInfo");
-            }
-        }
-
-        /// <summary>
-        /// Returns true if a new version is available.
-        /// </summary>
-        public bool IsUpdateAvailable
-        {
-            get
-            {
-                //Update is not available until it's downloaded
-                if (DownloadedUpdateInfo == null)
-                    return false;
-
-                return ForceUpdate || AvailableVersion > BaseVersion();
-            }
-        }
-
-        /// <summary>
-        /// This flag is available via the debug menu to
-        /// allow the update manager to check for newer daily 
-        /// builds as well.
-        /// </summary>
-        public bool CheckNewerDailyBuilds
-        {
-            get { return Configuration.CheckNewerDailyBuild; }
-            set
-            {
-                if (!Configuration.CheckNewerDailyBuild && value)
-                {
-                    CheckForProductUpdate(new UpdateRequest(new Uri(Configuration.DownloadSourcePath), this));
-                }
-                Configuration.CheckNewerDailyBuild = value;
-                RaisePropertyChanged("CheckNewerDailyBuilds");
-            }
-        }
-
-        /// <summary>
-        /// Apply the most recent update, regardless
-        /// of whether it is newer than the current version.
-        /// </summary>
-        public bool ForceUpdate
-        {
-            get { return Configuration.ForceUpdate; }
-            set
-            {
-                if (!Configuration.ForceUpdate && value)
-                {
-                    // do a check
-                    CheckForProductUpdate(new UpdateRequest(new Uri(Configuration.DownloadSourcePath), this));
-                }
-                Configuration.ForceUpdate = value;
-                RaisePropertyChanged("ForceUpdate");
-            }
-        }
-
-        /// <summary>
-        /// Returns the configuration settings.
-        /// </summary>
-        public IUpdateManagerConfiguration Configuration
-        {
-            get 
-            {
-                return configuration ?? (configuration = UpdateManagerConfiguration.GetSettings(null, this));
-            }
-        }
-
-        #endregion
-
-        public UpdateManager(IUpdateManagerConfiguration configuration)
-        {
-            this.configuration = configuration;
-            PropertyChanged += UpdateManager_PropertyChanged;
-            HostVersion = null;
-            HostName = string.Empty;
-        }
-
-        void UpdateManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            switch (e.PropertyName)
-            {
-                case "UpdateInfo":
-                    if (updateInfo != null)
-                    {
-                        //When the UpdateInfo property changes, this will be reflected in the UI
-                        //by the vsisibility of the download cloud. The most up to date version will
-                        //be downloaded asynchronously.
-                        OnLog(new LogEventArgs(Properties.Resources.UpdateDownloadStarted, LogLevel.Console));
-
-                        var tempPath = Path.GetTempPath();
-                        DownloadUpdatePackageAsynchronously(updateInfo.InstallerURL, updateInfo.Version, tempPath);
-                        DownloadSignatureFileAsynchronously(updateInfo.SignatureURL, tempPath);
-                    }
-                    break;
-            }
-        }
-
-        #region Public Class Operational Methods
-
-        /// <summary>
-        /// Async call to request the update version info from the web. 
-        /// This call raises UpdateFound event notification, if an update is
-        /// found.
-        /// </summary>
-        public void CheckForProductUpdate(IAsynchronousRequest request)
-        {
-            OnLog(new LogEventArgs("RequestUpdateVersionInfo", LogLevel.File));
-            OnLog(new LogEventArgs(Properties.Resources.RequestingVersionUpdate, LogLevel.Console));
-
-            if (versionCheckInProgress)
-                return;
-
-            versionCheckInProgress = true;
-        }
-
-        /// <summary>
-        /// Callback for the UpdateRequest's UpdateDataAvailable event.
-        /// Reads the request data, and parses for available versions. 
-        /// If a more recent version is available, the UpdateInfo object 
-        /// will be set. 
-        /// </summary>
-        /// <param name="request">An instance of an update request.</param>
-        public void UpdateDataAvailable(IAsynchronousRequest request)
-        {
-            UpdateInfo = null;
-
-            //If there is error data or the request data is empty
-            //bail out.
-            if (!string.IsNullOrEmpty(request.Error) ||
-                string.IsNullOrEmpty(request.Data))
-            {
-                OnLog(new LogEventArgs(String.Format(Properties.Resources.CouldNotGetUpdateData, request.Path), LogLevel.Console));
-                versionCheckInProgress = false;
-                return;
-            }
-
-            var latestBuildFilePath = GetLatestBuildFromS3(request, CheckNewerDailyBuilds);
-            if (string.IsNullOrEmpty(latestBuildFilePath))
-            {
-                OnLog(new LogEventArgs(Properties.Resources.CouldNotGetLatestBuild, LogLevel.Console));
-                versionCheckInProgress = false;
-                return;
-            }
-
-            // Strip the build number from the file name.
-            // DynamoInstall0.7.0 becomes 0.7.0. Build a version
-            // and compare it with the current product version.
-
-            var latestBuildDownloadUrl = Path.Combine(Configuration.DownloadSourcePath, latestBuildFilePath);
-            var latestBuildSignatureUrl = Path.Combine(
-                Configuration.SignatureSourcePath,
-                Path.GetFileNameWithoutExtension(latestBuildFilePath) + ".sig");
-
-            BinaryVersion latestBuildVersion;
-            var latestBuildTime = new DateTime();
-
-            bool useStable = false;
-            if (IsStableBuild(Configuration.InstallerNameBase, latestBuildFilePath))
-            {
-                useStable = true;
-                latestBuildVersion = GetBinaryVersionFromFilePath(Configuration.InstallerNameBase, latestBuildFilePath);
-            }
-            else if (IsDailyBuild(Configuration.InstallerNameBase, latestBuildFilePath) || IsDailyBuild(OLD_DAILY_INSTALL_NAME_BASE, latestBuildFilePath))
-            {
-                latestBuildTime = GetBuildTimeFromFilePath(Configuration.InstallerNameBase, latestBuildFilePath);
-                latestBuildVersion = GetCurrentBinaryVersion();
-            }
-            else
-            {
-                OnLog(new LogEventArgs(Properties.Resources.PathNotRegconizableAsStableOrDailyBuild, LogLevel.Console));
-                versionCheckInProgress = false;
-                return;
-            }
-
-            // Check the last downloaded update. If it's the same or newer as the 
-            // one found on S3, then just set the update information to that one
-            // and bounce.
-
-            //if (ExistingUpdateIsNewer())
-            //{
-            //    logger.Log(string.Format("Using previously updated download {0}", dynamoModel.PreferenceSettings.LastUpdateDownloadPath));
-            //    UpdateDownloaded(this, new UpdateDownloadedEventArgs(null, UpdateFileLocation));
-            //    versionCheckInProgress = false;
-            //    return;
-            //}
-
-            // Install the latest update regardless of whether it
-            // is newer than the current build.
-            if (ForceUpdate)
-            {
-                SetUpdateInfo(latestBuildVersion, latestBuildDownloadUrl, latestBuildSignatureUrl);
-            }
-            else
-            {
-                if (useStable) //Check stables
-                {
-                    if (latestBuildVersion > BaseVersion())
-                    {
-                        SetUpdateInfo(latestBuildVersion, latestBuildDownloadUrl, latestBuildSignatureUrl);
-                    }
-                    else
-                    {
-                        OnLog(new LogEventArgs(Properties.Resources.DynamoUpToDate, LogLevel.Console));
-                    }
-                }
-                else // Check dailies
-                {
-                    if (latestBuildTime > DateTime.Now)
-                    {
-                        SetUpdateInfo(GetCurrentBinaryVersion(), latestBuildDownloadUrl, latestBuildSignatureUrl);
-                    }
-                    else
-                    {
-                        OnLog(new LogEventArgs(Properties.Resources.DynamoUpToDate, LogLevel.Console));
-                    }
-                }
-            }
-
-            versionCheckInProgress = false;
-        }
-
-        public void QuitAndInstallUpdate()
-        {
-            OnLog(new LogEventArgs("UpdateManager.QuitAndInstallUpdate-Invoked", LogLevel.File));
-
-            if (ShutdownRequested != null)
-                ShutdownRequested(this);
-        }
-
-        public void HostApplicationBeginQuit()
-        {
-            // Double check that the updater path is not null and that there
-            // exists a file at that location on disk.
-            // Although this updater is stored in a temp directory,
-            // and the user wouldn't have come across it, there's the
-            // outside chance that it was deleted. Update cannot
-            // continue without this file.
-
-            if (string.IsNullOrEmpty(UpdateFileLocation) || !File.Exists(UpdateFileLocation))
-                return;
-
-            var currDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            var updater = Path.Combine(currDir, INSTALLUPDATE_EXE);
-            
-            // Double check that that the updater program exists.
-            // This program lives in the users' base Dynamo directory. If 
-            // it doesn't exist, we can't run the update.
-
-            if (!File.Exists(updater)) 
-                return;
-
-            var p = new Process
-            {
-                StartInfo =
-                {
-                    FileName = updater,
-                    Arguments = UpdateFileLocation,
-                    UseShellExecute = false,
-                    CreateNoWindow = true
-                }
-            };
-
-            if (hostApplicationProcessId != -1)
-            {
-                p.StartInfo.Arguments += " " + hostApplicationProcessId;
-            }
-            p.Start();
-            Dynamo.Logging.Analytics.TrackEvent(Actions.Installed, Categories.Upgrade, AvailableVersion.ToString());
-        }
-
-        public void RegisterExternalApplicationProcessId(int id)
-        {
-            hostApplicationProcessId = id;
-        }
-
-        #endregion
-
-        #region Private Event Handlers
-
-        private void OnDownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
-        {
-            versionCheckInProgress = false;
-
-            if (e == null)
-                return;
-
-            string errorMessage = ((null == e.Error) ? "Successful" : e.Error.Message);
-            OnLog(new LogEventArgs(Properties.Resources.UpdateDownloadComplete, LogLevel.Console));
-            OnLog(new LogEventArgs(errorMessage, LogLevel.File));
-
-            UpdateFileLocation = string.Empty;
-
-            if (e.Error != null)
-                return;
-
-            // Dirty patch: this ensures that we have a property that reflects the update status 
-            // only after the update has been downloaded.
-            DownloadedUpdateInfo = UpdateInfo;
-
-            UpdateFileLocation = (string)e.UserState;
-            OnLog(new LogEventArgs("Update download complete.", LogLevel.Console));
-            Dynamo.Logging.Analytics.TrackEvent(Actions.Downloaded, Categories.Upgrade, AvailableVersion.ToString());
-
-            if (null != UpdateDownloaded)
-                UpdateDownloaded(this, new UpdateDownloadedEventArgs(e.Error, UpdateFileLocation));
-        }
-
-        public void OnLog(LogEventArgs args)
-        {
-            if (Log != null)
-            {
-                Log(args);
-            }
-        }
-
-        #endregion
-
-        #region Private Class Helper Methods
-
-        /// <summary>
-        /// Returns the file name of the latest build on S3
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="checkDailyBuilds"></param>
-        /// <returns></returns>
-        private string GetLatestBuildFromS3(IAsynchronousRequest request, bool checkDailyBuilds)
-        {
-            XNamespace ns = "http://s3.amazonaws.com/doc/2006-03-01/";
-
-            XDocument doc = null;
-            using (TextReader td = new StringReader(request.Data))
-            {
-                try
-                {
-                    doc = XDocument.Load(td);
-                }
-                catch (Exception e)
-                {
-                    OnLog(new LogEventArgs(e, LogLevel.Console));
-                    return null;
-                }
-            }
-
-            // Reads filenames from S3, and pulls out those which include 
-            // DynamoInstall, and optionally, those that include DynamoDailyInstall.
-            // Order the results according to their LastUpdated field.
-
-            var bucketresult = doc.Element(ns + "ListBucketResult");
-
-            if (bucketresult == null)
-            {
-                return null;
-            }
-
-            var builds = bucketresult.Descendants(ns + "LastModified").
-                OrderByDescending(x => DateTime.Parse(x.Value)).
-                Where(x => x.Parent.Value.Contains(Configuration.InstallerNameBase) || x.Parent.Value.Contains(OLD_DAILY_INSTALL_NAME_BASE)).
-                Select(x => x.Parent);
-
-
-            var xElements = builds as XElement[] ?? builds.ToArray();
-            if (!xElements.Any())
-            {
-                return null;
-            }
-
-            var fileNames = xElements.Select(x => x.Element(ns + "Key").Value);
-
-            string latestBuild = string.Empty;
-            latestBuild = checkDailyBuilds ?
-                fileNames.FirstOrDefault(x => IsDailyBuild(Configuration.InstallerNameBase, x) || IsDailyBuild(OLD_DAILY_INSTALL_NAME_BASE, x)) :
-                fileNames.FirstOrDefault(x => IsStableBuild(Configuration.InstallerNameBase, x));
-
-            return latestBuild;
-        }
-
-        /// <summary>
-        /// Returns a build time from a file path.
-        /// </summary>
-        /// <param name="installNameBase"></param>
-        /// <param name="filePath"></param>
-        /// <returns>A DateTime or the DateTime MinValue.</returns>
-        internal static DateTime GetBuildTimeFromFilePath(string installNameBase, string filePath)
-        {
-            var version = GetVersionString(installNameBase, filePath);
-            var dtStr = version.Split('.').LastOrDefault();
-
-            DateTime dt;
-            return DateTime.TryParseExact(
-                dtStr,
-                "yyyyMMddTHHmm",
-                CultureInfo.InvariantCulture,
-                DateTimeStyles.None,
-                out dt) ? dt : DateTime.MinValue;
-        }
-
-        /// <summary>
-        /// Find the version string within a file name 
-        /// by removing the base install name.
-        /// </summary>
-        /// <param name="installNameBase"></param>
-        /// <param name="filePath"></param>
-        /// <returns>A version string like "x.x.x.x" or null if one cannot be found.</returns>
-        private static string GetVersionString(string installNameBase, string filePath)
-        {
-            if (!filePath.Contains(installNameBase))
-            {
-                return null;
-            }
-
-            var fileName = Path.GetFileNameWithoutExtension(filePath);
-            return fileName.Replace(installNameBase, "");
-        }
-
-        /// <summary>
-        /// Returns a binary version for the executing assembly
-        /// </summary>
-        /// <returns>A BinaryVersion</returns>
-        internal static BinaryVersion GetCurrentBinaryVersion()
-        {
-            // If we're looking at dailies, latest build version will simply be
-            // the current build version without a build or revision, ex. 0.6
-            var v = Assembly.GetExecutingAssembly().GetName().Version;
-            return BinaryVersion.FromString(string.Format("{0}.{1}.{2}", v.Major, v.Minor, v.Build));
-        }
-
-        /// <summary>
-        /// Returns a BinaryVersion from a file path.
-        /// </summary>
-        /// <param name="installNameBase">The base install name.</param>
-        /// <param name="filePath">The path name of the file.</param>
-        /// <returns>A BinaryVersion or null if one can not be parse from the file path.</returns>
-        internal static BinaryVersion GetBinaryVersionFromFilePath(string installNameBase, string filePath)
-        {
-            // Filename format is DynamoInstall0.7.1.YYYYMMDDT0000.exe
-            var index = filePath.IndexOf(installNameBase, StringComparison.Ordinal);
-            if (index < 0)
-                return null;
-
-            // Skip past the 'installNameBase' since we are only interested 
-            // in getting the version numbers that come after the base name.
-            var fileName = Path.GetFileNameWithoutExtension(filePath);
-            var version = fileName.Substring(index + installNameBase.Length);
-
-            var splits = version.Split(new [] { "." }, StringSplitOptions.RemoveEmptyEntries);
-            if (splits.Count() < 3) // This can be 4 if it includes revision number.
-                return null;
-
-            ushort major, minor, build;
-            if (!ushort.TryParse(splits[0], out major))
-                return null;
-            if (!ushort.TryParse(splits[1], out minor))
-                return null;
-            if (!ushort.TryParse(splits[2], out build))
-                return null;
-
-            return BinaryVersion.FromString(string.Format("{0}.{1}.{2}.0", major, minor, build));
-        }
-
-        private void SetUpdateInfo(BinaryVersion latestBuildVersion, string latestBuildDownloadUrl, string signatureUrl)
-        {
-            UpdateInfo = new AppVersionInfo()
-            {
-                Version = latestBuildVersion,
-                VersionInfoURL = Configuration.DownloadSourcePath,
-                InstallerURL = latestBuildDownloadUrl,
-                SignatureURL = signatureUrl
-            };
-        }
-
-        /// <summary>
-        /// Check if a file name is a daily build.
-        /// </summary>
-        /// <param name="installNameBase"></param>
-        /// <param name="fileName"></param>
-        /// <returns>True if this is a daily build, otherwise false.</returns>
-        internal static bool IsDailyBuild(string installNameBase, string fileName)
-        {
-            if (!fileName.Contains(installNameBase))
-            {
-                return false;
-            }
-
-            var versionStr = GetVersionString(installNameBase, fileName);
-            var splits = versionStr.Split('.');
-
-            DateTime dt;
-            return DateTime.TryParseExact(
-                splits.Last(),
-                "yyyyMMddTHHmm",
-                CultureInfo.InvariantCulture,
-                DateTimeStyles.None,
-                out dt);
-        }
-
-        /// <summary>
-        /// Check if a file name is a stable build.
-        /// </summary>
-        /// <param name="installNameBase"></param>
-        /// <param name="fileName"></param>
-        /// <returns>True if this is a stable build, otherwise false.</returns>
-        internal static bool IsStableBuild(string installNameBase, string fileName)
-        {
-            if (!fileName.Contains(installNameBase))
-            {
-                return false;
-            }
-            return !IsDailyBuild(installNameBase, fileName);
-        }
-
-        /// <summary>
-        /// Async call to request downloading a file from web.
-        /// This call raises UpdateDownloaded event notification.
-        /// </summary>
-        /// <param name="url">Web URL for file to download.</param>
-        /// <param name="version">The version of package that is to be downloaded.</param>
-        /// <param name="tempPath">Temp folder path where the update package
-        /// to be downloaded.</param>
-        /// <returns>Request status, it may return false if invalid URL was passed.</returns>
-        private bool DownloadUpdatePackageAsynchronously(string url, BinaryVersion version, string tempPath)
-        {
-            currentDownloadProgress = -1;
-
-            if (string.IsNullOrEmpty(url) || (null == version))
-            {
-                versionCheckInProgress = false;
-                return false;
-            }
-
-            UpdateFileLocation = string.Empty;
-            string downloadedFileName = string.Empty;
-            string downloadedFilePath = string.Empty;
-
-            try
-            {
-                downloadedFileName = Path.GetFileName(url);
-                downloadedFilePath = Path.Combine(tempPath, downloadedFileName);
-
-                if (File.Exists(downloadedFilePath))
-                    File.Delete(downloadedFilePath);
-            }
-            catch (Exception)
-            {
-                versionCheckInProgress = false;
-                return false;
-            }
-
-            var client = new WebClient();
-            client.DownloadProgressChanged += client_DownloadProgressChanged;
-            client.DownloadFileCompleted += new AsyncCompletedEventHandler(OnDownloadFileCompleted);
-            client.DownloadFileAsync(new Uri(url), downloadedFilePath, downloadedFilePath);
-            return true;
-        }
-
-        /// <summary>
-        /// Async call to download the signature file.
-        /// </summary>
-        /// <param name="url">Signature file url for download.</param>
-        /// <param name="tempPath">Temp folder path where the signature file 
-        /// to be downloaded.</param>
-        /// <returns></returns>
-        private bool DownloadSignatureFileAsynchronously(string url, string tempPath)
-        {
-            string downloadedFileName = string.Empty;
-            string downloadedFilePath = string.Empty;
-
-            try
-            {
-                downloadedFileName = Path.GetFileName(url);
-                downloadedFilePath = Path.Combine(tempPath, downloadedFileName);
-
-                if (File.Exists(downloadedFilePath))
-                    File.Delete(downloadedFilePath);
-            }
-            catch (Exception)
-            {
-                versionCheckInProgress = false;
-                return false;
-            }
-
-            var client = new WebClient();
-            client.DownloadFileAsync(new Uri(url), downloadedFilePath, downloadedFilePath);
-            return true;
-        }
-
-        void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
-        {
-            if (e.ProgressPercentage % 10 == 0 &&
-                e.ProgressPercentage > currentDownloadProgress)
-            {
-                OnLog(new LogEventArgs(string.Format(Properties.Resources.UpdateDownloadProgress, e.ProgressPercentage), LogLevel.Console));
-                currentDownloadProgress = e.ProgressPercentage;
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Checks for the product update by requesting for update version info 
-        /// from configured download source path. This method will skip the 
-        /// update check if a newer version of the product is already installed.
-        /// </summary>
-        /// <param name="manager">Update manager instance using which product
-        /// update check needs to be done.</param>
-        internal static void CheckForProductUpdate(IUpdateManager manager)
-        {
-            //If we already have higher version installed, don't look for product update.
-            if(manager.Configuration.DynamoLookUp != null && manager.Configuration.DynamoLookUp.LatestProduct > manager.ProductVersion)
-                return;
-            if((manager.Configuration is IDisableUpdateConfig) && (manager.Configuration as IDisableUpdateConfig).DisableUpdates)
-                return;
-            var downloadUri = new Uri(manager.Configuration.DownloadSourcePath);
-            manager.CheckForProductUpdate(new UpdateRequest(downloadUri, manager));
-        }
-    }
-
-    /// <summary>
-    /// Lookup for installed products
-    /// </summary>
-    internal abstract class DynamoLookUp : IDynamoLookUp
-    {
-        /// <summary>
-        /// Returns the version of latest product
-        /// </summary>
-        public BinaryVersion LatestProduct { get { return GetLatestInstallVersion(); } }
-
-        /// <summary>
-        /// Locates DynamoCore.dll at given install path and gets file version
-        /// </summary>
-        /// <param name="installPath">Dynamo install path</param>
-        /// <returns>Dynamo version if valid Dynamo exists else null</returns>
-        public virtual Version GetDynamoVersion(string installPath)
-        {
-            if(!Directory.Exists(installPath))//null or empty installPath will return false
-                return null;
-
-            var filePath = Directory.GetFiles(installPath, "*DynamoCore.dll").FirstOrDefault();
-            return String.IsNullOrEmpty(filePath) ? null : Version.Parse(FileVersionInfo.GetVersionInfo(filePath).FileVersion);
-        }
-
-        /// <summary>
-        /// Returns all dynamo install path on the system by looking into the Windows registry. 
-        /// </summary>
-        /// <returns>List of Dynamo install path</returns>
-        public abstract IEnumerable<string> GetDynamoInstallLocations();
-
-        /// <summary>
-        /// Returns the full path of user data location of all version of this
-        /// Dynamo product installed on this system. The default implementation
-        /// returns list of all subfolders in %appdata%\Dynamo as well as 
-        /// %appdata%\Dynamo\Dynamo Core\ folders.
-        /// </summary>
-        /// <returns></returns>
-        public virtual IEnumerable<string> GetDynamoUserDataLocations()
-        {
-            var appDatafolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
-            var dynamoFolder = Path.Combine(appDatafolder, "Dynamo");
-            if (!Directory.Exists(dynamoFolder)) return Enumerable.Empty<string>();
-
-            var paths = new List<string>();
-            var coreFolder = Path.Combine(dynamoFolder, "Dynamo Core");
-            //Dynamo Core folder has to be enumerated first to cater migration from
-            //Dynamo 1.0 to Dynamo Core 1.0
-            if (Directory.Exists(coreFolder))
-            {
-                paths.AddRange(Directory.EnumerateDirectories(coreFolder));
-            }
-
-            paths.AddRange(Directory.EnumerateDirectories(dynamoFolder));
-            return paths;
-        }
-        
-        private BinaryVersion GetLatestInstallVersion()
-        {
-            var dynamoInstallations = GetDynamoInstallLocations();
-            if(null == dynamoInstallations)
-                return null;
-
-            var latestVersion =
-                dynamoInstallations.Select(GetDynamoVersion).OrderBy(s => s).LastOrDefault();
-            return latestVersion == null ? null : BinaryVersion.FromString(latestVersion.ToString());
-        }
-    }
-}
diff --git a/src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml b/src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml
deleted file mode 100644
index 18704b951d0..00000000000
--- a/src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<UserControl x:Class="DynamoCore.UI.Controls.GraphUpdateNotificationControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
-             mc:Ignorable="d"
-             d:DesignHeight="30"
-             d:DesignWidth="40">
-    <Control.Resources>
-        <ImageBrush x:Key="ClickBox"
-                    ImageSource="/DynamoCoreWpf;component/UI/Images/Update/clickbox.png" />
-        <Style x:Key="InstallButtonStyle"
-               TargetType="Button">
-            <Setter Property="SnapsToDevicePixels"
-                    Value="true" />
-            <Setter Property="OverridesDefaultStyle"
-                    Value="true" />
-            <Setter Property="Height"
-                    Value="30" />
-            <Setter Property="Width"
-                    Value="40" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border"
-                                Margin="0"
-                                Width="34"
-                                Height="24"
-                                Background="Transparent">
-                            <ContentPresenter Margin="0"
-                                              RecognizesAccessKey="True" />
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsPressed"
-                                     Value="true">
-                                <Setter TargetName="Border"
-                                        Property="Background"
-                                        Value="{StaticResource ClickBox}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Control.Resources>
-    <Grid>
-        <Button x:Name="InstallButton"
-                OverridesDefaultStyle="True"
-                Style="{StaticResource InstallButtonStyle}">
-            <Image Source="/DynamoCoreWpf;component/UI/Images/Update/update_static.png"
-                   Width="40"
-                   Height="30"
-                   Margin="-3,-3,0,0" />
-            <Button.ToolTip>
-                <Label Content="{x:Static p:Resources.DynamoUpdateAvailableToolTip}" />
-            </Button.ToolTip>
-        </Button>
-    </Grid>
-</UserControl>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml.cs b/src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml.cs
deleted file mode 100644
index 48a41467509..00000000000
--- a/src/DynamoCoreWpf/Controls/GraphUpdateNotificationControl.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-
-using Dynamo.Updates;
-using Dynamo.Wpf.Utilities;
-
-namespace DynamoCore.UI.Controls
-{
-    /// <summary>
-    /// Interaction logic for GraphUpdateNotificationControl.xaml
-    /// </summary>
-    public partial class GraphUpdateNotificationControl : UserControl
-    {
-       public GraphUpdateNotificationControl()
-        {
-            InitializeComponent();
-            InstallButton.Click += OnInstallButtonClicked;
-        }
-
-        private void OnInstallButtonClicked(object sender, RoutedEventArgs e)
-        {
-            var um = DataContext as IUpdateManager;
-            if (um == null) return;
-
-            var result = MessageBoxService.Show(Dynamo.Wpf.Properties.Resources.UpdateMessage, 
-                Dynamo.Wpf.Properties.Resources.InstallMessageCaption, 
-                MessageBoxButton.OKCancel,
-                MessageBoxImage.None);
-
-            if (result == MessageBoxResult.OK)
-            {
-                um.QuitAndInstallUpdate();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index a75c9236d12..bb5c06ad00f 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -319,9 +319,6 @@
     <Compile Include="Commands\PortCommands.cs" />
     <Compile Include="Commands\SearchCommands.cs" />
     <Compile Include="Commands\WorkspaceCommands.cs" />
-    <Compile Include="Controls\GraphUpdateNotificationControl.xaml.cs">
-      <DependentUpon>GraphUpdateNotificationControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\ImageBasedControls.cs" />
     <Compile Include="Controls\ShortcutToolbar.xaml.cs">
       <DependentUpon>ShortcutToolbar.xaml</DependentUpon>
@@ -569,10 +566,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\GraphUpdateNotificationControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <None Include="UI\Themes\Modern\InPorts.xaml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
index 56df2b6627b..6028ffb653e 100644
--- a/src/DynamoCoreWpf/UI/Converters.cs
+++ b/src/DynamoCoreWpf/UI/Converters.cs
@@ -2239,48 +2239,6 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
-    public class IsUpdateAvailableToTextConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var um = value as IUpdateManager;
-            if (um == null)
-                return Resources.AboutWindowCannotGetVersion;
-
-            if (!um.IsUpdateAvailable)
-                return Resources.AboutWindowUpToDate;
-
-            var latest = um.AvailableVersion;
-
-            return latest != null ? latest.ToString() : Resources.AboutWindowCannotGetVersion;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-    }
-
-    public class IsUpdateAvailableBrushConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            SolidColorBrush brush;
-
-            brush = (bool)value
-                ? (SolidColorBrush)
-                    SharedDictionaryManager.DynamoColorsAndBrushesDictionary["UpdateManagerUpdateAvailableBrush"]
-                : (SolidColorBrush)SharedDictionaryManager.DynamoColorsAndBrushesDictionary["UpdateManagerUpToDateBrush"];
-
-            return brush;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-    }
-
     public class BinaryRadioButtonCheckedConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter,
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
index 105ccbd5240..18edd8b4296 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
@@ -116,10 +116,6 @@
     <SolidColorBrush x:Key="autocompletionWindow" Color="#535353" />
     <SolidColorBrush x:Key="AutocompletionWindowFontColor" Color="#F5F5F5" />
 
-    <!--  Update Manager  -->
-    <SolidColorBrush x:Key="UpdateManagerUpdateAvailableBrush" Color="#AF1B1B" />
-    <SolidColorBrush x:Key="UpdateManagerUpToDateBrush" Color="#168576" />
-
     <!--  3D  -->
     <Color x:Key="EdgeColor">#000000</Color>
     <Color x:Key="PointColor">#000000</Color>
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
index 9b750dff15b..e244a6dea74 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
@@ -106,8 +106,6 @@
     <controls:TabSizeConverter x:Key="TabSizeConverter" />
     <controls:WarningLevelToColorConverter x:Key="WarningLevelToColorConverter" />
     <controls:BoolToScrollBarVisibilityConverter x:Key="BoolToScrollBarVisibilityConverter" />
-    <controls:IsUpdateAvailableToTextConverter x:Key="IsUpdateAvailableToTextConverter" />
-    <controls:IsUpdateAvailableBrushConverter x:Key="IsUpdateAvailableBrushConverter" />
     <controls:RadioButtonCheckedConverter x:Key="RadioButtonCheckedConverter" />
     <controls:BinaryRadioButtonCheckedConverter x:Key="BinaryRadioButtonCheckedConverter" />
     <controls:NumberFormatConverter x:Key="NumberFormatConverter" />
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index 0583d55b413..5adaa99dbba 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -492,15 +492,6 @@ public string HostName
             get { return model.HostName; }
         }
 
-        public bool IsUpdateAvailable
-        {
-            get
-            {
-                var um = model.UpdateManager;
-                return um.IsUpdateAvailable;
-            }
-        }
-
         public string LicenseFile
         {
             get
@@ -728,7 +719,6 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             SubscribeModelUiEvents();
             SubscribeModelChangedHandlers();
             SubscribeModelBackupFileSaveEvent();
-            SubscribeUpdateManagerHandlers();
 
             InitializeAutomationSettings(startConfiguration.CommandFilePath);
 
@@ -857,7 +847,6 @@ protected virtual void UnsubscribeAllEvents()
             UnsubscribeDispatcherEvents();
             UnsubscribeModelUiEvents();
             UnsubscribeModelChangedEvents();
-            UnsubscribeUpdateManagerEvents();
             UnsubscribeLoggerEvents();
             UnsubscribeModelCleaningUpEvent();
             UnsubscribeModelBackupFileSaveEvent();
@@ -892,16 +881,9 @@ private void UnsubscribeLoggerEvents()
             model.Logger.PropertyChanged -= Instance_PropertyChanged;
         }
 
-        private void SubscribeUpdateManagerHandlers()
-        {
-            model.UpdateManager.UpdateDownloaded += Instance_UpdateDownloaded;
-            model.UpdateManager.ShutdownRequested += UpdateManager_ShutdownRequested;
-        }
-
         private void UnsubscribeUpdateManagerEvents()
         {
-            model.UpdateManager.UpdateDownloaded -= Instance_UpdateDownloaded;
-            model.UpdateManager.ShutdownRequested -= UpdateManager_ShutdownRequested;
+
         }
 
         private void SubscribeModelUiEvents()
@@ -1085,18 +1067,6 @@ internal bool CanClearLog(object parameter)
             return true;
         }
 
-        void Instance_UpdateDownloaded(object sender, UpdateDownloadedEventArgs e)
-        {
-            RaisePropertyChanged("Version");
-            RaisePropertyChanged("IsUpdateAvailable");
-        }
-
-        void UpdateManager_ShutdownRequested(IUpdateManager updateManager)
-        {
-            PerformShutdownSequence(new ShutdownParams(
-                shutdownHost: true, allowCancellation: true));
-        }
-
         void CollectInfoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
@@ -3475,11 +3445,6 @@ public bool PerformShutdownSequence(ShutdownParams shutdownParams)
             MainGuideManager?.CloseRealTimeInfoWindow();
 
             model.ShutDown(shutdownParams.ShutdownHost);
-            if (shutdownParams.ShutdownHost)
-            {
-                model.UpdateManager.HostApplicationBeginQuit();
-            }
-
             UsageReportingManager.DestroyInstance();
             this.model.CommandStarting -= OnModelCommandStarting;
             this.model.CommandCompleted -= OnModelCommandCompleted;
diff --git a/src/DynamoCoreWpf/Views/About/AboutWindow.xaml b/src/DynamoCoreWpf/Views/About/AboutWindow.xaml
index 9ff7236c0cf..008f85fb37e 100644
--- a/src/DynamoCoreWpf/Views/About/AboutWindow.xaml
+++ b/src/DynamoCoreWpf/Views/About/AboutWindow.xaml
@@ -1,4 +1,4 @@
-<Window
+<Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="Dynamo.UI.Views.AboutWindow"
@@ -130,17 +130,6 @@
                                    <Run Text="{Binding HostName, Mode=OneWay}"/>
                                    <Run Foreground="{StaticResource DarkerGreyBrush}" Text= "{Binding HostVersion, Mode=OneWay}"/>
                         </TextBlock>
-                        <TextBlock x:Name ="UpdateInfo"
-                                   HorizontalAlignment="Center"
-                                   FontSize="12" 
-                                   FontFamily="{StaticResource OpenSansRegular}" 
-                                   Foreground="#168576"
-                                   Margin="0"
-                                   PreviewMouseDown="OnPreviewMouseDown">
-                                <Run Foreground="{Binding IsUpdateAvailable, Converter={StaticResource IsUpdateAvailableBrushConverter}}" 
-                                     Text="{Binding Model.UpdateManager, Converter={StaticResource IsUpdateAvailableToTextConverter}, 
-                                     ConverterParameter=DataContext, Mode=OneWay}"/>
-                        </TextBlock>
                     </StackPanel>
 
                     <Button Name="DynamoWebsiteButton" Grid.Row="2" Click="OnClickLink" Style="{StaticResource CtaButtonStyle}"
diff --git a/test/DynamoCoreTests/UpdateManagerTests.cs b/test/DynamoCoreTests/UpdateManagerTests.cs
deleted file mode 100644
index 866d52009ec..00000000000
--- a/test/DynamoCoreTests/UpdateManagerTests.cs
+++ /dev/null
@@ -1,465 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using Dynamo.Updates;
-using Moq;
-using NUnit.Framework;
-using DynUpdateManager = Dynamo.Updates.UpdateManager;
-
-
-namespace Dynamo.Tests
-{
-    /// <summary>
-    /// Test cases to mock return values.
-    /// </summary>
-    public class UpdateManagerTestNotUpToDate
-    {
-        private const string DOWNLOAD_SOURCE_PATH_S = "http://downloadsourcepath/";
-        private const string SIGNATURE_SOURCE_PATH_S = "http://SignatureSourcePath/";
-
-        static UpdateManagerConfiguration NewConfiguration(bool checkNewerDailyBuild =false, bool forceUpdate =false, IDynamoLookUp lookup = null)
-        {
-            return new UpdateManagerConfiguration()
-            {
-                DownloadSourcePath = DOWNLOAD_SOURCE_PATH_S,
-                SignatureSourcePath = SIGNATURE_SOURCE_PATH_S,
-                CheckNewerDailyBuild = checkNewerDailyBuild,
-                ForceUpdate = forceUpdate,
-                DynamoLookUp = lookup,
-            };
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateCheckReturnsInfoWhenNewerVersionAvaialable()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.updateAvailableData);
-
-            var updateManager = new DynUpdateManager(NewConfiguration());
-            updateManager.UpdateDataAvailable(updateRequest.Object);
-            Assert.NotNull(updateManager.UpdateInfo);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateCheckReturnsInfoWhenNewerDailyBuildAvailable()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.dailyBuildAvailableData);
-
-            var updateManager = new DynUpdateManager(NewConfiguration(checkNewerDailyBuild: true));
-            updateManager.UpdateDataAvailable(updateRequest.Object);
-            Assert.NotNull(updateManager.UpdateInfo);
-        }
-
-        [Test, Category("UnitTests")]
-        public void IsUpdateAvailableWhenNewerVersionAvaialable()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.updateAvailableData);
-
-            var updateManager = new DynUpdateManager(NewConfiguration());
-            updateManager.UpdateDataAvailable(updateRequest.Object);
-            updateManager.DownloadedUpdateInfo = updateManager.UpdateInfo;
-
-            Assert.IsTrue(updateManager.IsUpdateAvailable);
-        }
-
-        [Test, Category("UnitTests")]
-        public void IsUpdateAvailableWhenForceUpdateIsTrue()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.noUpdateAvailableData);
-
-            var updateManager = new DynUpdateManager(NewConfiguration(forceUpdate:true));
-            updateManager.UpdateDataAvailable(updateRequest.Object);
-            updateManager.DownloadedUpdateInfo = updateManager.UpdateInfo;
-
-            Assert.IsTrue(updateManager.IsUpdateAvailable);
-        }
-
-        [Test, Category("UnitTests")]
-        public void NoUpdateAvailableWhenUpToDate()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.noUpdateAvailableData);
-
-            var updateManager = new DynUpdateManager(NewConfiguration());
-            updateManager.UpdateDataAvailable(updateRequest.Object);
-            updateManager.DownloadedUpdateInfo = updateManager.UpdateInfo;
-
-            Assert.IsFalse(updateManager.IsUpdateAvailable);
-        }
-
-        [Test, Category("UnitTests")]
-        public void NoUpdateIsAvailableWhenHigherVersionDynamoIsInstalled()
-        {
-            var lookup = new Mock<DynamoLookUp>();
-            lookup.Setup(l => l.GetDynamoInstallLocations()).Returns(new[] { "A" });
-            lookup.Setup(l => l.GetDynamoVersion(It.IsAny<string>()))
-                .Returns<string>(s => Version.Parse("9.9.9.0"));
-
-            var um = new DynUpdateManager(NewConfiguration(false, false, lookup.Object));
-            Assert.IsNotNull(um);
-
-            DynUpdateManager.CheckForProductUpdate(um);
-            um.DownloadedUpdateInfo = um.UpdateInfo;
-
-            Assert.IsNull(um.UpdateInfo);
-            Assert.IsFalse(um.IsUpdateAvailable);
-        }
-
-        [Test, Category("UnitTests")]
-        public void DisableUpdateWhenLowerVersionDynamoIsInstalled()
-        {
-            var lookup = new Mock<DynamoLookUp>();
-            lookup.Setup(l => l.GetDynamoInstallLocations()).Returns(new[] { "A" });
-            lookup.Setup(l => l.GetDynamoVersion(It.IsAny<string>()))
-                .Returns<string>(s => Version.Parse("1.2.0.0"));
-            
-            var um = new DynUpdateManager(NewConfiguration(false,false,lookup.Object));
-            (um.Configuration as IDisableUpdateConfig).DisableUpdates=true;
-            Assert.IsNotNull(um);
-
-            DynUpdateManager.CheckForProductUpdate(um);
-            Assert.IsNull(um.UpdateInfo);
-            Assert.IsFalse(um.IsUpdateAvailable);
-        }
-
-        [Test, Category("UnitTests")]
-        public void NoUpdateAvailableWhenUpdateInfoIsNotYetDownloaded()
-        {
-            var updateManager = new DynUpdateManager(NewConfiguration());
-            
-            Assert.IsFalse(updateManager.IsUpdateAvailable);
-        }
-
-        [Test, Category("UnitTests")]
-        public void UpdateCheckReturnsCorrectVersionWhenAvailable()
-        {
-            var um = new DynUpdateManager(NewConfiguration());
-            Assert.IsNotNull(um);
-
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.updateAvailableData);
-            um.UpdateDataAvailable(updateRequest.Object);
-
-            // Spoof a download completion by setting the downloaded update info to the update info
-            um.DownloadedUpdateInfo = um.UpdateInfo;
-            Assert.NotNull(um.UpdateInfo);
-            Assert.AreEqual(um.AvailableVersion.ToString(), "9.9.9.0");
-        }
-
-        [Test, Category("UnitTests")]
-        public void ConfigurationSerialization()
-        {
-            var config = new UpdateManagerConfiguration()
-            {
-                DownloadSourcePath = DOWNLOAD_SOURCE_PATH_S,
-                SignatureSourcePath = SIGNATURE_SOURCE_PATH_S
-            };
-            
-            //save to a temp file.
-            var tempFile = Path.GetTempFileName();
-            Assert.DoesNotThrow(() => config.Save(tempFile, null));
-            
-            //read from a temp file.
-            UpdateManagerConfiguration savedConfig = null;
-            Assert.DoesNotThrow(() => savedConfig = UpdateManagerConfiguration.Load(tempFile, null));
-            
-            //Compare parameters.
-            Assert.IsNotNull(savedConfig);
-            Assert.AreEqual(config.CheckNewerDailyBuild, savedConfig.CheckNewerDailyBuild);
-            Assert.AreEqual(config.SignatureSourcePath, savedConfig.SignatureSourcePath);
-            Assert.AreEqual(config.DownloadSourcePath, savedConfig.DownloadSourcePath);
-            Assert.AreEqual(config.ForceUpdate, savedConfig.ForceUpdate);
-            Assert.AreEqual(config.DisableUpdates, savedConfig.DisableUpdates);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void ConfigurationRedirection()
-        {
-            //Inject test config to UpdateManager instance, using reflection.
-            var config = new UpdateManagerConfiguration()
-            {
-                DownloadSourcePath = DOWNLOAD_SOURCE_PATH_S,
-                SignatureSourcePath = SIGNATURE_SOURCE_PATH_S
-            };
-
-            var um = new DynUpdateManager(config);
-            Assert.IsNotNull(um);
-        
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data)
-                .Returns(UpdateManagerTestHelpers.updateAvailableData);
-            um.UpdateDataAvailable(updateRequest.Object);
-
-            // Spoof a download completion by setting the downloaded update info to the update info
-            um.DownloadedUpdateInfo = um.UpdateInfo;
-            Assert.NotNull(um.UpdateInfo);
-            Assert.AreEqual("9.9.9.0", um.AvailableVersion.ToString());
-            Assert.AreEqual(DOWNLOAD_SOURCE_PATH_S, um.UpdateInfo.VersionInfoURL);
-            Assert.AreEqual(
-                SIGNATURE_SOURCE_PATH_S + @"DynamoInstall9.9.9.sig",
-                um.UpdateInfo.SignatureURL);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateCheckReturnsNothingWhenNoNewerVersionAvailable()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.noUpdateAvailableData);
-            var um = new DynUpdateManager(NewConfiguration());
-            um.UpdateDataAvailable(updateRequest.Object);
-
-            Assert.Null(um.UpdateInfo);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateCheckReturnsNothingWhenNoVersionsAvailable()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.noData);
-            var um = new DynUpdateManager(NewConfiguration());
-            um.UpdateDataAvailable(updateRequest.Object);
-
-            Assert.Null(um.UpdateInfo);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateCheckReturnsNothingWhenNotConnected()
-        {
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(string.Empty);
-
-            var um = new DynUpdateManager(NewConfiguration());
-            um.UpdateDataAvailable(updateRequest.Object);
-
-            Assert.Null(um.UpdateInfo);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void ShouldRecognizeStableInstallerWithProperName()
-        {
-            var test =
-                Updates.UpdateManager.IsStableBuild("DynamoInstall", "DynamoInstall0.7.1.exe");
-            Assert.True(test);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void ShouldRecognizeOldDailyBuilds()
-        {
-            var test =
-                Updates.UpdateManager.IsDailyBuild("DynamoDailyInstall", "DynamoDailyInstall20140625T0009.exe");
-            Assert.True(test);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void ShouldRecognizeDailyInstallerWithProperName()
-        {
-            var test =
-                Updates.UpdateManager.IsStableBuild("DynamoInstall", "DynamoInstall0.7.1.20140625T0009.exe");
-            Assert.False(test);
-
-            test = Updates.UpdateManager.IsDailyBuild("DynamoInstall", "DynamoInstall0.7.1.20140625T0009.exe");
-            Assert.True(test);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void ShouldGetBinaryVersionFromInstaller()
-        {
-            var version = Updates.UpdateManager.GetBinaryVersionFromFilePath("DynamoInstall", "DynamoInstall0.7.1.exe");
-            Assert.AreEqual("0.7.1.0", version.ToString());
-
-            version = Updates.UpdateManager.GetBinaryVersionFromFilePath("DynamoInstall", "DynamoInstall0.7.1.20140625T0009.exe");
-            Assert.AreEqual("0.7.1.0", version.ToString());
-
-            version = Updates.UpdateManager.GetBinaryVersionFromFilePath("DynamoInstall", "Blah.exe");
-            Assert.IsNull(version);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void ShouldGetDateTimeFromDailyInstaller()
-        {
-            var dateTime = Updates.UpdateManager.GetBuildTimeFromFilePath("DynamoInstall", "DynamoInstall0.7.1.20140625T0009.exe");
-            Assert.AreEqual(dateTime.Year, 2014);
-            Assert.AreEqual(dateTime.Month, 6);
-            Assert.AreEqual(dateTime.Day, 25);
-            Assert.AreEqual(dateTime.Minute, 9);
-            Assert.AreEqual(dateTime.Hour, 0);
-
-            dateTime = Updates.UpdateManager.GetBuildTimeFromFilePath("DynamoInstall", "DynamoInstall0.7.1.exe");
-            Assert.AreEqual(dateTime, DateTime.MinValue);
-        }
-
-        [Test, Category("UnitTests")]
-        public void UpdateCheckReturnsNothingWhenGivenBadData()
-        {
-            // Here we simulate some xml that is returned that is well-formed
-            // but not what we are looking for. This is the case often when you
-            // are logging into a network that requires an additional login, like
-            // hotel wi-fi. In this case, the ListBucketResult element will not 
-            // be found in the xml and we'll get null UpdateInfo.
-
-            var updateRequest = new Mock<IAsynchronousRequest>();
-            updateRequest.Setup(ur => ur.Data).Returns(UpdateManagerTestHelpers.badData);
-
-            var um = new DynUpdateManager(NewConfiguration());
-            um.UpdateDataAvailable(updateRequest.Object);
-
-            Assert.Null(um.UpdateInfo);
-        }
-
-        [Test, Category("UnitTests")]
-        public void GetLatestProductFromGoodData()
-        {
-            var products = new Dictionary<string, Version>
-            {
-                { "A", new Version(0, 1, 2, 3) },
-                { "B", new Version(0, 1, 2, 3) },
-                { "C", new Version(1, 2, 0, 0) },
-                { "D", new Version(0, 1, 3, 3) },
-            };
-
-            var lookup = new Mock<DynamoLookUp>();
-            lookup.Setup(l => l.GetDynamoInstallLocations()).Returns(products.Keys);
-            lookup.Setup(l => l.GetDynamoVersion(It.IsAny<string>()))
-                .Returns<string>(s => products[s]);
-
-            var latest = lookup.Object.LatestProduct;
-            Assert.AreEqual("1.2.0.0", latest.ToString());
-        }
-
-        [Test, Category("UnitTests")]
-        public void NoLatestProductVersion()
-        {
-            var lookup = new Mock<DynamoLookUp>();
-            lookup.Setup(l => l.GetDynamoInstallLocations()).Returns(new[] { "A" });
-            lookup.Setup(l => l.GetDynamoVersion(It.IsAny<string>()))
-                .Returns<string>(null);
-
-            var latest = lookup.Object.LatestProduct;
-            Assert.AreEqual(null, latest);
-        }
-
-        [Test, Category("UnitTests")]
-        public void GetLatestProductVersion()
-        {
-            var products = new Dictionary<string, Version>
-            {
-                { "A", new Version() },
-                { "B", new Version(0, 1, 2, 3) },
-                { "C", new Version(1, 2, 0, 0) },
-                { "D", null },
-            };
-
-            var lookup = new Mock<DynamoLookUp>();
-            lookup.Setup(l => l.GetDynamoInstallLocations()).Returns(products.Keys);
-            lookup.Setup(l => l.GetDynamoVersion(It.IsAny<string>()))
-                .Returns<string>(s => products[s]);
-            var latest = lookup.Object.LatestProduct;
-            Assert.AreEqual("1.2.0.0", latest.ToString());
-        }
-    }
-
-    internal static class UpdateManagerTestHelpers
-    {
-        public const string updateAvailableData =
-            "<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" +
-                "<Name>dyn-builds-data</Name>" +
-                "<Prefix/>" +
-                "<Marker/>" +
-                "<MaxKeys>1000</MaxKeys>" +
-                "<IsTruncated>true</IsTruncated>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.0.exe</Key>" +
-                "<LastModified>2013-11-01T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "<Contents>" +
-                "<Key>DynamoInstall1.0.0.exe</Key>" +
-                "<LastModified>2013-11-02T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "<Contents>" +
-                "<Key>DynamoInstall9.9.9.exe</Key>" +
-                "<LastModified>2013-11-03T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "</ListBucketResult>";
-
-        // Daily build data for the year 2099 :)
-        public const string dailyBuildAvailableData =
-            "<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" +
-                "<Name>dyn-builds-data</Name>" +
-                "<Prefix/>" +
-                "<Marker/>" +
-                "<MaxKeys>1000</MaxKeys>" +
-                "<IsTruncated>true</IsTruncated>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.0.exe</Key>" +
-                "<LastModified>2013-11-01T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.0.20990101T0001.exe</Key>" +
-                "<LastModified>2099-11-02T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.0.20990101T0002.exe</Key>" +
-                "<LastModified>2099-11-03T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "</ListBucketResult>";
-
-        public const string noUpdateAvailableData =
-            "<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" +
-                "<Name>dyn-builds-data</Name>" +
-                "<Prefix/>" +
-                "<Marker/>" +
-                "<MaxKeys>1000</MaxKeys>" +
-                "<IsTruncated>true</IsTruncated>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.0.exe</Key>" +
-                "<LastModified>2013-11-01T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.1.exe</Key>" +
-                "<LastModified>2013-11-02T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "<Contents>" +
-                "<Key>DynamoInstall0.1.2.exe</Key>" +
-                "<LastModified>2013-11-03T17:02:59.000Z</LastModified>" +
-                "</Contents>" +
-                "</ListBucketResult>";
-
-        public const string noData =
-            "<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">" +
-                "<Name>dyn-builds-data</Name>" +
-                "<Prefix/>" +
-                "<Marker/>" +
-                "<MaxKeys>1000</MaxKeys>" +
-                "<IsTruncated>true</IsTruncated>" +
-                "</ListBucketResult>";
-
-        public const string badData =
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-                "<note>" +
-                "<to> Foo</to>" +
-                "<from>Bar</from>" +
-                "<heading>Reminder</heading>" +
-                "<body>This is some bad xml!</body>" +
-                "</note>";
-
-        public static void DoNothing()
-        {
-            Debug.WriteLine("Doing nothing.");
-        }
-    }
-}
diff --git a/test/DynamoCoreTests/Updates/UpdatesTests.cs b/test/DynamoCoreTests/Updates/UpdatesTests.cs
deleted file mode 100644
index ed2581e4fa5..00000000000
--- a/test/DynamoCoreTests/Updates/UpdatesTests.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Dynamo.Logging;
-using Dynamo.Updates;
-using NUnit.Framework;
-
-namespace Dynamo.Tests
-{
-    /// <summary>
-    /// Test class to test the UpdateManager class and its related classes
-    /// </summary>
-    [TestFixture]
-    public class UpdatesTests
-    {
-        private UpdateManager updateManager;
-
-        [SetUp]
-        public void Init()
-        {
-            //Create an instance of the UpdateManager class to be used in the tests.
-            var config = UpdateManagerConfiguration.GetSettings(null);
-            updateManager = new UpdateManager(config);
-        }
-
-        #region UpdateDownloadedEventArgs
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateDownloadedEventArgsConstructorTest()
-        {
-            Exception e = new Exception("Error");
-            string fileLocation = "FileLocation";
-
-            var eventArgs = new UpdateDownloadedEventArgs(e, fileLocation);
-
-            Assert.AreEqual(e, eventArgs.Error);
-            Assert.AreEqual(fileLocation, eventArgs.UpdateFileLocation);
-            
-            //UpdateAvailable depends on FileLocation. If it's null, it will be false, else it is true.
-            Assert.IsTrue(eventArgs.UpdateAvailable);
-            
-            eventArgs = new UpdateDownloadedEventArgs(e, null);
-            Assert.IsFalse(eventArgs.UpdateAvailable);
-        }
-        #endregion
-
-        #region UpdateManagerConfiguration
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateManagerConfigurationLoadTest()
-        {
-            //Testing all the calls for Load that return null
-            Assert.IsNull(UpdateManagerConfiguration.Load(null, updateManager));
-            Assert.IsNull(UpdateManagerConfiguration.Load("", updateManager));
-            Assert.IsNull(UpdateManagerConfiguration.Load("filePath", updateManager));
-            Assert.IsNull(UpdateManagerConfiguration.Load(Path.GetTempFileName(), updateManager));
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateManagerConfigurationSaveTest()
-        {
-            var config = new UpdateManagerConfiguration();
-            var goodPath = Path.GetTempFileName();
-            var badPath = "W:\\PathThatDoesntExist";
-
-            //Happy path
-            Assert.DoesNotThrow(() => config.Save(goodPath, updateManager));
-
-            //if statement in the catch block
-            Assert.DoesNotThrow(() => config.Save(badPath, updateManager));
-            
-            //else statement in the catch block
-            Assert.Throws<DirectoryNotFoundException>(() => config.Save(badPath, null));
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateManagerConfigurationPropertiesTest()
-        {
-            var config = (UpdateManagerConfiguration)updateManager.Configuration;
-
-            //CheckNewerDailyBuild
-            //Set to false and then true to trigger if statement.
-            config.CheckNewerDailyBuild = false;
-            config.CheckNewerDailyBuild = true;
-
-            Assert.AreEqual(true, config.CheckNewerDailyBuild);
-
-            //ForceUpdate
-            //Set to false and then true to trigger if statement.
-            config.ForceUpdate = false;
-            config.ForceUpdate = true;
-
-            Assert.AreEqual(true, config.ForceUpdate);
-        }
-        #endregion
-
-        #region UpdateManager
-        [Test]
-        [Category("UnitTests")]
-        public void QuitAndInstallUpdateTest()
-        {
-            //This handler is used to cover the if statement
-            updateManager.ShutdownRequested += TestShutdownRequestedHandler;
-            Assert.DoesNotThrow(() => updateManager.QuitAndInstallUpdate());
-            updateManager.ShutdownRequested -= TestShutdownRequestedHandler;
-        }
-
-        private void TestShutdownRequestedHandler(IUpdateManager updateManager) { }
-
-        [Test]
-        [Category("UnitTests")]
-        public void BaseVersionTest()
-        {
-            updateManager.DownloadedUpdateInfo = new AppVersionInfo() { Version = BinaryVersion.FromString("5.5.5.5") };
-            updateManager.UpdateInfo = new AppVersionInfo() { Version = BinaryVersion.FromString("5.5.5.5") };
-
-            //These two cases are to cover both routes in the BaseVersion if statement.
-            //ProductVersion < HostVersion
-            updateManager.HostVersion = new Version(9, 9, 9, 9);
-            Assert.IsTrue(updateManager.IsUpdateAvailable);
-
-            //ProductVersion > HostVersion
-            updateManager.HostVersion = new Version(1, 1, 1, 1);
-            Assert.IsTrue(updateManager.IsUpdateAvailable);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateManagerPropertiesTest()
-        {
-            //CheckNewerDailyBuild
-            //Set to false and then true to trigger if statement.
-            updateManager.CheckNewerDailyBuilds = false;
-            updateManager.CheckNewerDailyBuilds = true;
-
-            Assert.AreEqual(true, updateManager.CheckNewerDailyBuilds);
-
-            //ForceUpdate
-            //Set to false and then true to trigger if statement.
-            updateManager.ForceUpdate = false;
-            updateManager.ForceUpdate = true;
-
-            Assert.AreEqual(true, updateManager.ForceUpdate);
-
-            // HostName
-            updateManager.HostName = "Host Name";
-            Assert.AreEqual("Host Name", updateManager.HostName);
-
-            //UpdateFileLocation
-            _ = new UpdateManager(new UpdateManagerConfiguration());
-            //  For a new UpdateManager, the UpdateFileLocation property is not initialized.
-            Assert.That(updateManager.UpdateFileLocation, Is.Null.Or.Empty);
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void IsStableBuildTest()
-        {
-            //If fileName does not contain installNameBase, returns false.
-            Assert.IsFalse(UpdateManager.IsStableBuild("InstallNameBase", "FileName"));
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void IsDailyBuildTest()
-        {
-            //If fileName does not contain installNameBase, returns false.
-            Assert.IsFalse(UpdateManager.IsDailyBuild("InstallNameBase", "FileName"));
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void RegisterExternalApplicationProcessIdTest()
-        {
-            //This is a void method that sets a private attribute. There is no way to validate whether the
-            //value was changed or not, but this covers the code and makes sure no exceptions are thrown.
-            Assert.DoesNotThrow(() => updateManager.RegisterExternalApplicationProcessId(1));
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void OnLogTest()
-        {
-            //Create and validate the LogEventArgs
-            var logEventArgs = new LogEventArgs("Test", LogLevel.Console);
-
-            Assert.AreEqual(LogLevel.Console, logEventArgs.Level);
-            Assert.AreEqual("Test", logEventArgs.Message);
-
-            //Bind the handler and call OnLog
-            updateManager.Log += TestLogHandler;
-            updateManager.OnLog(logEventArgs);
-            updateManager.Log -= TestLogHandler;
-        }
-        
-        private void TestLogHandler(LogEventArgs args) { }
-        #endregion
-
-        #region DynamoLookup
-        private class DynamoLookupChildTest : DynamoLookUp
-        {
-            public override IEnumerable<string> GetDynamoInstallLocations()
-            {
-                return new List<string>();
-            }
-        }
-
-        [Test]
-        [Category("UnitTests")]
-        public void DynamoLookupTests()
-        {
-            var lookup = new DynamoLookupChildTest();
-
-            //LatestProduct will be null in this case because in DynamoLookupChildTest, the implementation of GetDynamoInstallLocations returns an empty list.
-            Assert.IsNull(lookup.LatestProduct);
-            Assert.IsNull(lookup.GetDynamoVersion(Path.GetTempPath()));
-            Assert.IsNotNull(lookup.GetDynamoUserDataLocations());
-        }
-        #endregion
-
-        #region UpdateRequest
-        [Test]
-        [Category("UnitTests")]
-        public void UpdateRequestConstructorTest()
-        {
-            var path = new Uri(Path.GetTempPath());
-            var updateRequest = new UpdateRequest(path, updateManager);
-
-            Assert.IsNotNull(updateRequest.OnRequestCompleted);
-            Assert.IsNotNull(updateRequest.Data);
-            Assert.IsNotNull(updateRequest.Error);
-            Assert.IsNotNull(updateRequest.Path);
-        }
-        #endregion
-    }
-}
diff --git a/test/DynamoCoreTests/UserDataMigrationTests.cs b/test/DynamoCoreTests/UserDataMigrationTests.cs
index e2fadd586f7..9b9ed5776ef 100644
--- a/test/DynamoCoreTests/UserDataMigrationTests.cs
+++ b/test/DynamoCoreTests/UserDataMigrationTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -183,25 +183,15 @@ public void GetSortedInstalledVersions_FromDirectoryInspection()
             {
                 Assert.IsTrue(e.ParamName == "rootFolder");
             }
-            
-            try
-            {
-                DynamoMigratorBase.GetInstalledVersions(null);
-            }
-            catch (ArgumentNullException e)
-            {
-                Assert.IsTrue(e.ParamName == "rootFolder");                
-            }
-            
         }
 
         [Test, Category("UnitTests")]
         public void GetSortedInstallVersion_FromDynamoLookUp()
         {
-            var mockLookup = new Mock<IDynamoLookUp>();
-            mockLookup.Setup(x=>x.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
+            var mockLookup = new Mock<IPathManager>();
+            mockLookup.Setup(x=>x.PathResolver.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
 
-            var versionList = DynamoMigratorBase.GetInstalledVersions(null, mockLookup.Object).ToList();
+            var versionList = DynamoMigratorBase.GetInstalledVersions(mockLookup.Object).ToList();
             VerifySortedOrder(versionList);
             Assert.AreEqual(5, versionList.Count);
             Assert.AreEqual(TempFolder, versionList[0].UserDataRoot);
@@ -212,11 +202,11 @@ public void GetSortedInstallVersion_FromDynamoLookUp()
         [Test, Category("UnitTests")]
         public void GetLatestVersionToMigrate()
         {
-            var mockLookup = new Mock<IDynamoLookUp>();
-            mockLookup.Setup(x => x.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
+            var mockLookup = new Mock<IPathManager>();
+            mockLookup.Setup(x => x.PathResolver.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
 
             var current = new FileVersion(1, 0, Path.Combine(TempFolder, "Test"));
-            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(null, mockLookup.Object, current);
+            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(mockLookup.Object, current);
             Assert.IsTrue(latest.HasValue);
             Assert.AreEqual(1, latest.Value.MajorPart);
             Assert.AreEqual(0, latest.Value.MinorPart);
@@ -226,11 +216,11 @@ public void GetLatestVersionToMigrate()
         [Test, Category("UnitTests")]
         public void GetLatestVersionToMigrate_10()
         {
-            var mockLookup = new Mock<IDynamoLookUp>();
-            mockLookup.Setup(x => x.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
+            var mockLookup = new Mock<IPathManager>();
+            mockLookup.Setup(x => x.PathResolver.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
 
             var current = new FileVersion(1, 0, TempFolder);
-            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(null, mockLookup.Object, current);
+            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(mockLookup.Object, current);
             Assert.IsTrue(latest.HasValue);
             Assert.AreEqual(1, latest.Value.MajorPart);
             Assert.AreEqual(0, latest.Value.MinorPart);
@@ -241,11 +231,11 @@ public void GetLatestVersionToMigrate_10()
         [Test, Category("UnitTests")]
         public void GetLatestVersionToMigrate_PartiallyValidData()
         {
-            var mockLookup = new Mock<IDynamoLookUp>();
-            mockLookup.Setup(x => x.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
+            var mockLookup = new Mock<IPathManager>();
+            mockLookup.Setup(x => x.PathResolver.GetDynamoUserDataLocations()).Returns(MockUserDirectories);
 
             var current = new FileVersion(0, 9, TempFolder);
-            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(null, mockLookup.Object, current);
+            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(mockLookup.Object, current);
             Assert.IsTrue(latest.HasValue);
             Assert.AreEqual(0, latest.Value.MajorPart);
             Assert.AreEqual(8, latest.Value.MinorPart);
@@ -255,11 +245,11 @@ public void GetLatestVersionToMigrate_PartiallyValidData()
         [Test, Category("UnitTests")]
         public void GetLatestVersionToMigrate_AllInvalidData()
         {
-            var mockLookup = new Mock<IDynamoLookUp>();
-            mockLookup.Setup(x => x.GetDynamoUserDataLocations()).Returns(new[] { "x", "y", "z" });
+            var mockLookup = new Mock<IPathManager>();
+            mockLookup.Setup(x => x.PathResolver.GetDynamoUserDataLocations()).Returns(new[] { "x", "y", "z" });
 
             var current = new FileVersion(1, 0, "a");
-            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(null, mockLookup.Object, current);
+            var latest = DynamoMigratorBase.GetLatestVersionToMigrate(mockLookup.Object, current);
             Assert.IsTrue(!latest.HasValue || latest.Value.UserDataRoot == null);
         }
 
diff --git a/test/DynamoCoreWpfTests/UpdateManagerUITests.cs b/test/DynamoCoreWpfTests/UpdateManagerUITests.cs
deleted file mode 100644
index febc9476796..00000000000
--- a/test/DynamoCoreWpfTests/UpdateManagerUITests.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Windows;
-using Dynamo.UI.Controls;
-using Dynamo.Updates;
-using Moq;
-using NUnit.Framework;
-using SystemTestServices;
-using DynamoCoreWpfTests.Utility;
-
-namespace DynamoCoreWpfTests
-{
-    [TestFixture]
-    public class UpdateManagerUITests : SystemTestBase
-    {
-        private const string DOWNLOAD_SOURCE_PATH_S = "http://downloadsourcepath/";
-        private const string SIGNATURE_SOURCE_PATH_S = "http://SignatureSourcePath/";
-
-        private void MockUpdateManager(bool isUpToDate)
-        {
-            var umMock = new Mock<IUpdateManager>();
-            umMock.Setup(um => um.IsUpdateAvailable).Returns(!isUpToDate);
-
-            UpdateManager = umMock.Object;
-        }
-
-        [SetUp]
-        public override void Setup()
-        {
-            //override this to avoid the typical startup behavior
-        }
-    }
-}
diff --git a/test/Libraries/SystemTestServices/SystemTestBase.cs b/test/Libraries/SystemTestServices/SystemTestBase.cs
index 9d7a3be1dea..d7eada732b5 100644
--- a/test/Libraries/SystemTestServices/SystemTestBase.cs
+++ b/test/Libraries/SystemTestServices/SystemTestBase.cs
@@ -46,8 +46,6 @@ public abstract class SystemTestBase
 
         protected DynamoModel Model { get; set; }
 
-        protected IUpdateManager UpdateManager { get; set; }
-
         protected string ExecutingDirectory
         {
             get { return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); }
@@ -193,7 +191,6 @@ protected virtual void StartDynamo(TestSessionConfiguration testConfig)
                     StartInTestMode = true,
                     PathResolver = pathResolver,
                     GeometryFactoryPath = preloader.GeometryFactoryPath,
-                    UpdateManager = this.UpdateManager,
                     ProcessMode = TaskProcessMode.Synchronous
                 });
 
diff --git a/test/Libraries/TestServices/TestPathResolver.cs b/test/Libraries/TestServices/TestPathResolver.cs
index 53703582d5f..ae697deca31 100644
--- a/test/Libraries/TestServices/TestPathResolver.cs
+++ b/test/Libraries/TestServices/TestPathResolver.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 using Dynamo.Interfaces;
 
 namespace TestServices
@@ -81,5 +82,11 @@ public string CommonDataRootFolder
         {
             get { return commonDataRootFolder; }
         }
+
+        public IEnumerable<string> GetDynamoUserDataLocations()
+        {
+            // Do nothing for now.
+            return Enumerable.Empty<string>();
+        }
     }
 }
diff --git a/test/VisualizationTests/HelixWatch3DViewModelTests.cs b/test/VisualizationTests/HelixWatch3DViewModelTests.cs
index b140dd269eb..83dda4484af 100644
--- a/test/VisualizationTests/HelixWatch3DViewModelTests.cs
+++ b/test/VisualizationTests/HelixWatch3DViewModelTests.cs
@@ -99,7 +99,6 @@ protected override void StartDynamo(TestSessionConfiguration testConfig)
                 StartInTestMode = true,
                 PathResolver = pathResolver,
                 GeometryFactoryPath = preloader.GeometryFactoryPath,
-                UpdateManager = this.UpdateManager,
                 ProcessMode = TaskProcessMode.Synchronous,
                 Preferences = PreferenceSettings.Instance
             });

From c640470e41e0593878f6010c65ce7b9247795f51 Mon Sep 17 00:00:00 2001
From: Michael Kirschner <mjk.kirschner@gmail.com>
Date: Mon, 4 Dec 2023 11:07:14 -0500
Subject: [PATCH 04/22] make wrapper more easily mockable (#14672)

* make wrapper more easily mockable

* make test more robust
---
 src/DynamoUtilities/CLIWrapper.cs             |  7 +++--
 .../DynamoUtilitiesTests/CLIWrapperTests.cs   | 30 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/DynamoUtilities/CLIWrapper.cs b/src/DynamoUtilities/CLIWrapper.cs
index 70e71d2f8e0..38938c44960 100644
--- a/src/DynamoUtilities/CLIWrapper.cs
+++ b/src/DynamoUtilities/CLIWrapper.cs
@@ -102,7 +102,7 @@ protected virtual string GetData(int timeoutms, Func<string> mockReadLine = null
         {
             var readStdOutTask = Task.Run(() =>
             {
-                if (process.HasExited)
+                if (CheckIfProcessHasExited())
                 {
                     return string.Empty;
                 }
@@ -180,7 +180,10 @@ protected void RaiseMessageLogged(string message)
         /// <returns>Returns error message</returns>
         protected abstract string GetCantCommunicateErrorMessage();
  
-
+        protected virtual bool CheckIfProcessHasExited()
+        {
+            return process.HasExited;
+        }
 
     }
 }
diff --git a/test/Libraries/DynamoUtilitiesTests/CLIWrapperTests.cs b/test/Libraries/DynamoUtilitiesTests/CLIWrapperTests.cs
index b34a814f198..30ff98d6492 100644
--- a/test/Libraries/DynamoUtilitiesTests/CLIWrapperTests.cs
+++ b/test/Libraries/DynamoUtilitiesTests/CLIWrapperTests.cs
@@ -13,11 +13,10 @@ namespace DynamoUtilitiesTests
     public class CLIWrapperTests
     {
         /// <summary>
-        /// A test class that starts up the DynamoFF CLI and then kills it to cause a deadlock.
+        /// A test class that always responds with startToken... causing a loop.
         /// </summary>
         private class HangingCLIWrapper: Dynamo.Utilities.CLIWrapper
         {
-            private string relativePath = Path.Combine("DynamoFeatureFlags", "DynamoFeatureFlags.exe");
             protected override string GetCantStartErrorMessage()
             {
                 throw new NotImplementedException();
@@ -29,18 +28,22 @@ protected override string GetCantCommunicateErrorMessage()
             }
             internal HangingCLIWrapper()
             {
-                StartProcess(relativePath, null);
             }
 
             internal string GetData()
             {
-                //wait a bit, and then kill the process
-                //this will cause GetData to hang and timeout.
-                Task.Run(() =>
-                {   System.Threading.Thread.Sleep(100);
-                    process.Kill();
-                });
-                return GetData(2000);
+                return GetData(4000, () => { return startofDataToken; });
+            }
+
+            protected override void StartProcess(string relativeEXEPath, string argString)
+            {
+                //don't start anything, we're going to mock data responses.
+                return;
+            }
+
+            protected override bool CheckIfProcessHasExited()
+            {
+                return false;
             }
 
 
@@ -52,7 +55,7 @@ private class SlowCLIWrapper : HangingCLIWrapper
         {
             internal new string GetData()
             {
-                return GetData(2000, () => { Thread.Sleep(4000);return ""; });
+                return GetData(4000, () => { Thread.Sleep(8000);return ""; });
             }
         }
 
@@ -84,7 +87,7 @@ private class MockCLIWraper : HangingCLIWrapper
         }
 
         [Test]
-        public void CLIWrapperDoesNotHangIfProcessDoesNotWriteToStdOut()
+        public void CLIWrapperDoesNotHangIfProcessDoesNotWriteFullSequenceToStdOut()
         {
             var sw = new System.Diagnostics.Stopwatch();
             sw.Start();
@@ -92,6 +95,7 @@ public void CLIWrapperDoesNotHangIfProcessDoesNotWriteToStdOut()
             Assert.AreEqual(string.Empty,wrapper.GetData());
             sw.Stop();
             Assert.GreaterOrEqual(sw.ElapsedMilliseconds,2000);
+            wrapper.Dispose();
 
         }
         [Test]
@@ -103,6 +107,7 @@ public void CLIWrapperTimesOutIfGetDataIsSlow()
             Assert.AreEqual(string.Empty, wrapper.GetData());
             sw.Stop();
             Assert.GreaterOrEqual(sw.ElapsedMilliseconds, 2000);
+            wrapper.Dispose();
 
         }
         [Test]
@@ -114,6 +119,7 @@ public void CLIGetsDataIfDoesNotTimeout()
             Assert.AreEqual("some data", wrapper.GetData().TrimEnd());
             sw.Stop();
             Assert.LessOrEqual(sw.ElapsedMilliseconds, 2000);
+            wrapper.Dispose();
 
         }
     }

From ab27a02193254ef6ee682e4afe0260f3a6a21872 Mon Sep 17 00:00:00 2001
From: Bogdan Zavu <BogdanZavu@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:49:44 -0500
Subject: [PATCH 05/22] DYN-9999 : consolidate host analytics info usage
 (#14664)

* consolidate hostanalyticsinfo usage

* remove appversion

* update comment

* remove appversion

* remove appversion

* init empty version

* remove unused

---------

Co-authored-by: Bogdan Zavu <bogdan.zavu@autodesk.com>
---
 src/DynamoCore/Extensions/ReadyParams.cs             |  6 ------
 src/DynamoCore/Logging/DynamoAnalyticsClient.cs      |  5 +----
 src/DynamoCore/Models/DynamoModel.cs                 | 12 ------------
 .../Views/SplashScreen/SplashScreen.xaml.cs          |  5 +----
 src/DynamoPackages/PackageManagerExtension.cs        |  4 +---
 5 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/DynamoCore/Extensions/ReadyParams.cs b/src/DynamoCore/Extensions/ReadyParams.cs
index 8de32c8fe06..a980d71ce0e 100644
--- a/src/DynamoCore/Extensions/ReadyParams.cs
+++ b/src/DynamoCore/Extensions/ReadyParams.cs
@@ -75,12 +75,6 @@ public virtual ICommandExecutive CommandExecutive
             get { return commandExecutive ?? (commandExecutive = new ExtensionCommandExecutive(dynamoModel)); }
         }
 
-        /// <summary>
-        /// HostInfo object, Useful to determine what host context Dynamo is running in.
-        /// </summary>
-        internal HostAnalyticsInfo HostInfo => DynamoModel.HostAnalyticsInfo;
-
-
         /// <summary>
         /// Event that is raised when the Dynamo Logger logs a notification.
         /// This event passes the notificationMessage to any subscribers
diff --git a/src/DynamoCore/Logging/DynamoAnalyticsClient.cs b/src/DynamoCore/Logging/DynamoAnalyticsClient.cs
index 0e8471136ce..4044f1e257e 100644
--- a/src/DynamoCore/Logging/DynamoAnalyticsClient.cs
+++ b/src/DynamoCore/Logging/DynamoAnalyticsClient.cs
@@ -118,9 +118,6 @@ public DynamoAnalyticsClient(HostAnalyticsInfo hostAnalyticsInfo)
             //Setup Analytics service, and StabilityCookie.
             Session.Start();
 
-            //Dynamo app version.
-            var appversion = DynamoModel.AppVersion;
-
             var hostName = string.IsNullOrEmpty(hostAnalyticsInfo.HostName) ? "Dynamo" : hostAnalyticsInfo.HostName;
 
             hostInfo = new HostContextInfo() { ParentId = hostAnalyticsInfo.ParentId, SessionId = hostAnalyticsInfo.SessionId };
@@ -131,7 +128,7 @@ public DynamoAnalyticsClient(HostAnalyticsInfo hostAnalyticsInfo)
                 buildId = $"{version.Major}.{version.Minor}.{version.Build}"; // BuildId has the following format major.minor.build, ex: 2.5.1
                 releaseId = $"{version.Major}.{version.Minor}.0"; // ReleaseId has the following format: major.minor.0; ex: 2.5.0
             }
-            product = new ProductInfo() { Id = "DYN", Name = hostName, VersionString = appversion, AppVersion = appversion, BuildId = buildId, ReleaseId = releaseId };
+            product = new ProductInfo() { Id = "DYN", Name = hostName, VersionString = "", AppVersion = "", BuildId = buildId, ReleaseId = releaseId };
         }
 
         private void RegisterADPTracker(Service service)
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index 4bca507d88a..a35baf66a50 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -279,18 +279,6 @@ public static string Version
         /// </summary>
         public readonly NodeSearchModel SearchModel;
 
-        /// <summary>
-        ///     The application version string for analytics reporting APIs
-        /// </summary>
-        internal static string AppVersion
-        {
-            get
-            {
-                return Process.GetCurrentProcess().ProcessName + "-"
-                    + Core.PathManager.Instance.GetProductVersion();
-            }
-        }
-
         /// <summary>
         ///     Debugging settings for this instance of Dynamo.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
index 1445a0ed524..51b781759c7 100644
--- a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
+++ b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
@@ -56,8 +56,6 @@ public partial class SplashScreen : Window
         /// </summary>
         internal AuthenticationManager authManager;
 
-        internal HostAnalyticsInfo hostAnalyticsInfo;
-
         /// <summary>
         /// Dynamo View Model reference
         /// </summary>
@@ -84,7 +82,6 @@ public DynamoView DynamoView
                 // When view model is closed, we need to close the splash screen if it is displayed.
                 viewModel.RequestClose += SplashScreenRequestClose;
                 authManager = viewModel.Model.AuthenticationManager;
-                hostAnalyticsInfo = DynamoModel.HostAnalyticsInfo;
             }
         }
 
@@ -518,7 +515,7 @@ internal void CloseWindow()
         {
             CloseWasExplicit = true;
 
-            if (string.IsNullOrEmpty(hostAnalyticsInfo.HostName))
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))
             {
                 Application.Current?.Shutdown();
                 Analytics.TrackEvent(Actions.Close, Categories.SplashScreenOperations);
diff --git a/src/DynamoPackages/PackageManagerExtension.cs b/src/DynamoPackages/PackageManagerExtension.cs
index 4015d0fdb72..6a46bd1f1cf 100644
--- a/src/DynamoPackages/PackageManagerExtension.cs
+++ b/src/DynamoPackages/PackageManagerExtension.cs
@@ -50,10 +50,9 @@ public string UniqueId
         {
             get { return "FCABC211-D56B-4109-AF18-F434DFE48139"; }
         }
-        internal HostAnalyticsInfo HostInfo { get; private set; }
 
         // Current host, empty if sandbox, null when running tests
-        internal virtual string Host => HostInfo.HostName;
+        internal virtual string Host => DynamoModel.HostAnalyticsInfo.HostName;
 
         /// <summary>
         ///     Manages loading of packages (property meant solely for tests)
@@ -177,7 +176,6 @@ public void Ready(ReadyParams sp)
             (sp.CurrentWorkspaceModel as WorkspaceModel).CollectingCustomNodePackageDependencies += GetCustomNodePackageFromID;
             (sp.CurrentWorkspaceModel as WorkspaceModel).CollectingNodePackageDependencies += GetNodePackageFromAssemblyName;
             currentWorkspace = (sp.CurrentWorkspaceModel as WorkspaceModel);
-            HostInfo = ReadyParams.HostInfo;
         }
 
         public void Shutdown()

From d8db34eae83e9aaf82326c77644f99b4a1c86bf6 Mon Sep 17 00:00:00 2001
From: Craig Long <craig.alan.long@gmail.com>
Date: Mon, 4 Dec 2023 14:18:15 -0500
Subject: [PATCH 06/22] DYN-6470 Improve Dynamo PreferenceSettings.Instance
 singleton behavior. (#14658)

* Add passthrough to DynamoModel.PreferenceSettings when available

* remove reference

* Don't need to reset the reference

* Simplify and invert

* update test

---------

Co-authored-by: Craig Long <craig.long@autodesk.com>
---
 .../Configuration/PreferenceSettings.cs           |  2 +-
 src/DynamoCore/Models/DynamoModel.cs              |  8 +++++---
 .../DynamoPythonTests/PythonTestsWithLogging.cs   | 15 +++++++--------
 test/core/python/DynamoPrint.dyn                  |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs
index 74df12158a7..fd6ae88c14c 100644
--- a/src/DynamoCore/Configuration/PreferenceSettings.cs
+++ b/src/DynamoCore/Configuration/PreferenceSettings.cs
@@ -53,7 +53,7 @@ internal readonly static Lazy<PreferenceSettings>
             (() => PreferenceSettings.Load(PathManager.Instance.PreferenceFilePath));
 
         [XmlIgnore]
-        public static PreferenceSettings Instance { get { return lazy.Value; } }
+        public static PreferenceSettings Instance { get; internal set; } = lazy.Value;
 
         private string numberFormat;
         private string lastUpdateDownloadPath;
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index a35baf66a50..3772688526e 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -287,7 +287,8 @@ public static string Version
         /// <summary>
         ///     Preference settings for this instance of Dynamo.
         /// </summary>
-        public readonly PreferenceSettings PreferenceSettings;
+        [Obsolete("this will be removed in 4.0")]
+        public PreferenceSettings PreferenceSettings => PreferenceSettings.Instance;
 
         /// <summary>
         ///     Node Factory, used for creating and intantiating loaded Dynamo nodes.
@@ -672,7 +673,8 @@ protected DynamoModel(IStartConfiguration config)
 
             OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenInitPreferencesSettings, 30));
 
-            PreferenceSettings = (PreferenceSettings)CreateOrLoadPreferences(config.Preferences);
+            PreferenceSettings.Instance = (PreferenceSettings)CreateOrLoadPreferences(config.Preferences);
+
             if (PreferenceSettings != null)
             {
                 SetUICulture(PreferenceSettings.Locale);
@@ -751,7 +753,7 @@ protected DynamoModel(IStartConfiguration config)
                 if (migrator != null)
                 {
                     var isFirstRun = PreferenceSettings.IsFirstRun;
-                    PreferenceSettings = migrator.PreferenceSettings;
+                    PreferenceSettings.Instance = migrator.PreferenceSettings;
 
                     // Preserve the preference settings for IsFirstRun as this needs to be set
                     // only by UsageReportingManager
diff --git a/test/Libraries/DynamoPythonTests/PythonTestsWithLogging.cs b/test/Libraries/DynamoPythonTests/PythonTestsWithLogging.cs
index 16bfac42d6c..245754c80a5 100644
--- a/test/Libraries/DynamoPythonTests/PythonTestsWithLogging.cs
+++ b/test/Libraries/DynamoPythonTests/PythonTestsWithLogging.cs
@@ -33,16 +33,15 @@ protected override DynamoModel.IStartConfiguration CreateStartConfiguration(IPre
         [Test]
         public void DynamoPrintLogsToConsole()
         {
-            var expectedOutput = ".*Greeting CPython node: Hello from Python3!!!" + Environment.NewLine
-                + ".*Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine
-                + ".*Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine
-                + ".*Multiple print parameter node: Hello Dynamo Print !!!" + Environment.NewLine
-                + ".*Print separator parameter node: Hello_Dynamo_Print_!!!" + Environment.NewLine
-                + ".*`!\"£\\$%\\^&\\*\\(\\)_\\+-\\[\\{\\]\\}#~'@;:\\|\\\\,<\\.>/\\? Special character node: Lot's of special characters!!!" + Environment.NewLine
-                + ".*";
+            var expectedOutput = "Greeting CPython node: Hello from Python3!!!" + Environment.NewLine
+                  + "Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine
+                  + "Greeting CPython String node: Hello from Python3!!!" + Environment.NewLine
+                  + "Multiple print parameter node: Hello Dynamo Print !!!" + Environment.NewLine
+                  + "Print separator parameter node: Hello_Dynamo_Print_!!!" + Environment.NewLine
+                  + @"`!£$%^&*()_+-[{]}#~'@;:|\,<.>/? Special character node: Lot's of special characters!!!";
 
             CurrentDynamoModel.OpenFileFromPath(Path.Combine(TestDirectory, "core", "python", "DynamoPrint.dyn"));
-            StringAssert.IsMatch(expectedOutput, CurrentDynamoModel.Logger.LogText);
+            StringAssert.Contains(expectedOutput, CurrentDynamoModel.Logger.LogText);
         }
 
         [Test]
diff --git a/test/core/python/DynamoPrint.dyn b/test/core/python/DynamoPrint.dyn
index 833894e706a..8af349fcb13 100644
--- a/test/core/python/DynamoPrint.dyn
+++ b/test/core/python/DynamoPrint.dyn
@@ -387,8 +387,8 @@
       },
       {
         "ShowGeometry": true,
-        "Name": "`!\"£$%^&*()_+-[{]}#~'@;:|\\,<.>/? Special character node",
         "Id": "da61a0ad7b024ec3bc05c63503a70358",
+        "Name": "`!£$%^&*()_+-[{]}#~'@;:|\\,<.>/? Special character node",
         "IsSetAsInput": false,
         "IsSetAsOutput": false,
         "Excluded": false,

From f1f9b7436153266539903cecb7d298b6f0eb73dc Mon Sep 17 00:00:00 2001
From: Trygve Wastvedt <trygve.wastvedt@autodesk.com>
Date: Mon, 4 Dec 2023 15:15:01 -0600
Subject: [PATCH 07/22] REVIT-215698: Restrict where OnNodeModified is called.
 (#14656)

* Restrict where OnNodeModified is called.

* Clean up.

* Dispose

* No SuppressFinalize
---
 src/Libraries/CoreNodeModels/DropDown.cs      |  9 ++--
 .../NodeViewCustomizations/DSDropDownBase.cs  | 54 +++++++++++--------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/Libraries/CoreNodeModels/DropDown.cs b/src/Libraries/CoreNodeModels/DropDown.cs
index 87fab94c4d2..71ec3ce9758 100644
--- a/src/Libraries/CoreNodeModels/DropDown.cs
+++ b/src/Libraries/CoreNodeModels/DropDown.cs
@@ -59,7 +59,7 @@ public ObservableCollection<DynamoDropDownItem> Items
             set
             {
                 items = value;
-                RaisePropertyChanged("Items");
+                RaisePropertyChanged(nameof(Items));
             }
         }
 
@@ -106,7 +106,6 @@ public int SelectedIndex
                     selectedString = GetSelectedStringFromItem(Items.ElementAt(value));
                 }
 
-                OnNodeModified();
                 RaisePropertyChanged("SelectedIndex");
                 RaisePropertyChanged("SelectedString");
             }
@@ -137,12 +136,12 @@ public string SelectedString
                     if (item != null)
                     {
                         selectedIndex = Items.IndexOf(item);
-                        RaisePropertyChanged("SelectedIndex");
+                        RaisePropertyChanged(nameof(SelectedIndex));
                     }
                 }
 
                 selectedString = value;
-                RaisePropertyChanged("SelectedString");
+                RaisePropertyChanged(nameof(SelectedString));
             }
         }
 
@@ -203,6 +202,8 @@ protected override bool UpdateValueCore(UpdateValueParams updateValueParams)
                     Warning(Dynamo.Properties.Resources.NothingIsSelectedWarning);
                 }
 
+                OnNodeModified();
+
                 return true;
             }
 
diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs
index c54356fda83..e6456345949 100644
--- a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs
+++ b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs
@@ -15,61 +15,69 @@ namespace CoreNodeModelsWpf.Nodes
     public class DropDownNodeViewCustomization : INodeViewCustomization<DSDropDownBase>
     {
         private DSDropDownBase model;
+        private ComboBox comboBox;
 
         public void CustomizeView(DSDropDownBase model, NodeView nodeView)
         {
             this.model = model;
 
-            //add a drop down list to the window
-            var combo = new ComboBox
+            // Add a drop down list to the window
+            comboBox = new ComboBox
             {
-                Width = System.Double.NaN,
-                MinWidth= 150,
+                Width = double.NaN,
+                MinWidth = 150,
                 Height = Configurations.PortHeightInPixels,
                 HorizontalAlignment = HorizontalAlignment.Stretch,
-                VerticalAlignment = VerticalAlignment.Center
+                VerticalAlignment = VerticalAlignment.Center,
+                Style = (Style)SharedDictionaryManager.DynamoModernDictionary["RefreshComboBox"]
             };
 
+            nodeView.inputGrid.Children.Add(comboBox);
+            Grid.SetColumn(comboBox, 0);
+            Grid.SetRow(comboBox, 0);
 
-            combo.Style = (Style)SharedDictionaryManager.DynamoModernDictionary["RefreshComboBox"];
+            comboBox.DropDownOpened += DropDownOpened;
+            comboBox.SelectionChanged += SelectionChanged;
 
-            nodeView.inputGrid.Children.Add(combo);
-            System.Windows.Controls.Grid.SetColumn(combo, 0);
-            System.Windows.Controls.Grid.SetRow(combo, 0);
+            comboBox.DataContext = model;
 
-            combo.DropDownOpened += combo_DropDownOpened;
-
-            combo.DataContext = model;
-
-            // bind this combo box to the selected item hash
-            var bindingVal = new System.Windows.Data.Binding("Items")
+            // Bind this combo box to the selected item hash.
+            var bindingVal = new Binding(nameof(DSDropDownBase.Items))
             {
                 Mode = BindingMode.TwoWay,
                 Source = model
             };
-            combo.SetBinding(ItemsControl.ItemsSourceProperty, bindingVal);
+            comboBox.SetBinding(ItemsControl.ItemsSourceProperty, bindingVal);
             
-            // bind the selected index to the model property SelectedIndex
-            var indexBinding = new Binding("SelectedIndex")
+            // Bind the selected index to the model property SelectedIndex.
+            var indexBinding = new Binding(nameof(DSDropDownBase.SelectedIndex))
             {
                 Mode = BindingMode.TwoWay,
                 Source = model
             };
-            combo.SetBinding(Selector.SelectedIndexProperty, indexBinding);
+            comboBox.SetBinding(Selector.SelectedIndexProperty, indexBinding);
+        }
+
+        private void SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (comboBox.SelectedIndex != -1)
+            {
+                model.OnNodeModified();
+            }
         }
 
         public void Dispose()
         {
+            comboBox.DropDownOpened -= DropDownOpened;
+            comboBox.SelectionChanged -= SelectionChanged;
         }
 
         /// <summary>
         /// When the dropdown is opened, the node's implementation of PopulateItems is called
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void combo_DropDownOpened(object sender, EventArgs e)
+        void DropDownOpened(object sender, EventArgs e)
         {
-            this.model.PopulateItems();
+            model.PopulateItems();
         }
 
     }

From 8735b248e1299add025245c87b3ab48f55272330 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 17:09:21 -0500
Subject: [PATCH 08/22] Bump actions/setup-dotnet from 3 to 4 in
 /.github/workflows (#14681)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build_dynamo_all_net6.0.yml  | 2 +-
 .github/workflows/build_dynamo_all_net8.0.yml  | 2 +-
 .github/workflows/codeql-analysis.yml          | 2 +-
 .github/workflows/dynamoBinDiff.yml            | 4 ++--
 .github/workflows/dynamoNet6.0_build.yml       | 2 +-
 .github/workflows/dynamoNet6.0_linux_build.yml | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_dynamo_all_net6.0.yml b/.github/workflows/build_dynamo_all_net6.0.yml
index a538fc12402..324acbf47c7 100644
--- a/.github/workflows/build_dynamo_all_net6.0.yml
+++ b/.github/workflows/build_dynamo_all_net6.0.yml
@@ -13,7 +13,7 @@ jobs:
         path: Dynamo
         repository: DynamoDS/Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '6.0.x'
     - name: Disable problem matcher
diff --git a/.github/workflows/build_dynamo_all_net8.0.yml b/.github/workflows/build_dynamo_all_net8.0.yml
index 5e6a5bf284c..77762993e73 100644
--- a/.github/workflows/build_dynamo_all_net8.0.yml
+++ b/.github/workflows/build_dynamo_all_net8.0.yml
@@ -13,7 +13,7 @@ jobs:
         path: Dynamo
         repository: DynamoDS/Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0.x'
     - name: Disable problem matcher
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5e90bee85a3..f0dced66f4e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -27,7 +27,7 @@ jobs:
         path: Dynamo
         repository: DynamoDS/Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '6.0.x'    
     # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/dynamoBinDiff.yml b/.github/workflows/dynamoBinDiff.yml
index 440094f431f..0f82bc2a234 100644
--- a/.github/workflows/dynamoBinDiff.yml
+++ b/.github/workflows/dynamoBinDiff.yml
@@ -11,7 +11,7 @@ jobs:
         path: net60_Win_Dynamo
         repository: DynamoDS/Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '6.0.x'
     - name: Disable problem matcher
@@ -46,7 +46,7 @@ jobs:
         path: master_net60_Win_Dynamo
         repository: DynamoDS/Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '6.0.x'
     - name: Disable problem matcher
diff --git a/.github/workflows/dynamoNet6.0_build.yml b/.github/workflows/dynamoNet6.0_build.yml
index f52c91e31fb..40f419d51d9 100644
--- a/.github/workflows/dynamoNet6.0_build.yml
+++ b/.github/workflows/dynamoNet6.0_build.yml
@@ -11,7 +11,7 @@ jobs:
         path: Dynamo
         repository: DynamoDS/Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '6.0.x'
     - name: Disable problem matcher
diff --git a/.github/workflows/dynamoNet6.0_linux_build.yml b/.github/workflows/dynamoNet6.0_linux_build.yml
index b0e9c3bc355..61cba99a7d5 100644
--- a/.github/workflows/dynamoNet6.0_linux_build.yml
+++ b/.github/workflows/dynamoNet6.0_linux_build.yml
@@ -10,7 +10,7 @@ jobs:
       with:
         path: Dynamo
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
     - name: Disable problem matcher
       run: echo "::remove-matcher owner=csc::"
 

From 1a0829f4c984ac097112fe9bf78f5c5d6b5b61f6 Mon Sep 17 00:00:00 2001
From: Michael Kirschner <mjk.kirschner@gmail.com>
Date: Mon, 4 Dec 2023 19:35:22 -0500
Subject: [PATCH 09/22] move from codedom to roslyn for package manager view
 extension tests (#14673)

* update

* fix tests

* Update DynamoCoreWpfTests.csproj
---
 .../DynamoCoreWpfTests.csproj                 | 19 +++++++
 .../PackageManagerViewExtensionTests.cs       | 51 ++++++++++++-------
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
index f25cbd500dd..b00dca1793a 100644
--- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
+++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -24,6 +24,17 @@
     </ItemGroup>
   <ItemGroup>
 	  <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
+
+      <!--roslyn compiler apis direct references so we can copy them to the test_dependencies folder-->
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" GeneratePathProperty="true">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" GeneratePathProperty="true">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      
     <PackageReference Include="Moq" Version="4.18.4" />
 	  <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
 	  <PackageReference Include="Greg" Version="3.0.0.3175">
@@ -203,4 +214,12 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\DocumentationBrowserScriptsTest.html" />
   </ItemGroup>
+
+    <Target Name="CopyRoslynToTestDepsFolder" AfterTargets="Build">
+        <Message Importance="High" Text="copying test dependencies to test dependencies folder" />
+        <!--roslyn compiler api and deps-->
+        <Copy SourceFiles="$(PkgMicrosoft_CodeAnalysis_CSharp)\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll" DestinationFolder="$(TestDependenciesPath)" />
+        <Copy SourceFiles="$(PkgMicrosoft_CodeAnalysis_Common)\lib\netstandard2.0\Microsoft.CodeAnalysis.dll" DestinationFolder="$(TestDependenciesPath)" />
+
+    </Target>
 </Project>
diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs
index 4aca8e5f17f..b86fce54f23 100644
--- a/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs
@@ -1,8 +1,8 @@
 using System;
-using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using Dynamo.Configuration;
 using Dynamo.Core;
 using Dynamo.Interfaces;
@@ -12,13 +12,14 @@
 using Dynamo.PackageManager.UI;
 using Dynamo.Scheduler;
 using Dynamo.Wpf.Extensions;
-using Microsoft.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Moq;
 using NUnit.Framework;
 
 namespace DynamoCoreWpfTests.PackageManager
 {
-    [TestFixture, Category("Failure")]
+    [TestFixture]
     class PackageManagerViewExtensionTests : DynamoTestUIBase
     {
         private string PackagesDirectory { get { return Path.Combine(GetTestDirectory(ExecutingDirectory), "pkgs"); } }
@@ -98,34 +99,26 @@ protected override DynamoModel.IStartConfiguration CreateStartConfiguration(IPat
         /// </summary>
         public virtual void GenerateNewExtension()
         {
-            var provider = new CSharpCodeProvider();
-            var options = new CompilerParameters
-            {
-                GenerateExecutable = false,
-                OutputAssembly = "TestViewExtension.dll",
-            };
-            options.ReferencedAssemblies.Add("DynamoCore.dll");
-            options.ReferencedAssemblies.Add("DynamoCoreWPF.dll");
-            string source = testViewExtensionSource;
+            var options = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
+            var compilation = CSharpCompilation.Create("TestViewExtension", new[] { CSharpSyntaxTree.ParseText(testViewExtensionSource) }, GetGlobalReferences(), options);
 
-            var results = provider.CompileAssemblyFromSource(options, new[] { source });
-            if (results.Errors.Count > 0)
+
+            var results = compilation.Emit("TestViewExtension.dll");
+            if (results.Diagnostics.Count() > 0)
             {
                 Console.WriteLine("Compile ERROR");
-                foreach (CompilerError error in results.Errors)
+                foreach (var error in results.Diagnostics)
                 {
-                    Console.WriteLine(error.ErrorText);
+                    Console.WriteLine(error.GetMessage());
                 }
             }
             else
             {
                 Console.WriteLine("Compile OK");
-                Console.WriteLine("Assembly Path:" + results.PathToAssembly);
-                Console.WriteLine("Assembly Name:" + results.CompiledAssembly.FullName);
 
                 //move the new assembly into the package directory/bin folder.
                 extensionPath = Path.Combine(PackagesDirectory, "subPackageDirectory", "runtimeGeneratedExtension", "bin", "TestViewExtension.dll");
-                File.Copy(results.CompiledAssembly.Location, extensionPath, true);
+                File.Copy("TestViewExtension.dll", extensionPath, true);
 
                 //copy the manifest as well.
                 manifestPath = Path.Combine(PackagesDirectory, "subPackageDirectory", "runtimeGeneratedExtension",
@@ -134,6 +127,26 @@ public virtual void GenerateNewExtension()
             }
         }
 
+        private static PortableExecutableReference[] GetGlobalReferences()
+        {
+            var assemblies = new[]
+            {
+        typeof(object).Assembly,
+        typeof(Console).Assembly
+    };
+            var returnList = assemblies
+                .Select(a => MetadataReference.CreateFromFile(a.Location))
+                .ToList();
+            //The location of the .NET assemblies
+            var assemblyPath = Path.GetDirectoryName(typeof(object).Assembly.Location)!;
+            returnList.Add(MetadataReference.CreateFromFile(Path.Combine(assemblyPath, "System.Runtime.dll")));
+
+            returnList.Add(MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DynamoCore.dll")));
+            returnList.Add(MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DynamoCoreWpf.dll")));
+
+            return returnList.ToArray();
+        }
+
         [Test]
         public void PackageManagerLoadsRuntimeGeneratedExtension()
         {

From 3f564ec8b1664671555fff04ae80ee0e3a63ef30 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Tue, 5 Dec 2023 04:50:44 +0000
Subject: [PATCH 10/22] Pm mypackages - update package version (#14655)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* colors in config.js

- now all colors are controlled by the COLORS object in confing.js

* folder structure

- correctly creates minimum depth folder structure for the files added

* getting somewhere with browser

- updated browser to only show root items

* added pages

- added pages for the wizard-like experience when publishing a package

* connected packagecontents and rootcontents

* misc changes

* tree visual update fix

- using Dispatcher fixes the async tree creation

* wip

* tests added

- tests added to assert correct functionality of collecting files and folders

* visual style tweaks

- updated files and folders icons
- now only allows LibraryNode checkboxes for Assembly dll files

* previewbuild started

- started the structure for preview build

* testing preview functionality

- added tests for the core methods of PreviewPackageBuild

* delete folders working

- changed `RemoveItem` method to account for folder items being removed
- fixed a bug where removing an Assembly file would generate an error. Assembly files can also be added to 'additional items'

* item selection and deletion

- UI added to allow users to add/remove items from current Package selection

* remove inactive selection border background

- ui tweaks

* preview contents, bugfix

- preview contents now correctly display based on user choice (retain folder or not)
- fixed a bug where CustomDefinitions would read as root item
- Pages are disabled when not displayed, in order to stop handling of tasks that affect other Pages

* browser sorting

- now sorts browser alphabetically
- fixed disabled behavior

* assemblies show as files

- assemblies now will show up with their file path, but still get picked up from their assembly resource on disk

* customnode preview item added

- we need the ability to display custom nodes as file with file paths during package creation. CustomDefinition does not have the attributes to address that, so we are adding a new 'preview' item type to server the purpose

* delete item tests added

- added tests for delete item
- fixed an issue where removing all items would not result in cleaning the RootContent items
- added detailed description for the customTreeView_SelectedItemChanged method

* consistent select all behavior

- fixed checkbox behavior to be consistent when interacting with the rest of the controls

* clear data and ui

- clearing data and ui after publishing
- clearing data and ui with Cancel button

* main flow finished

- finished the main flow between the pages

* retain folder structure

- publish local retaining folder structure

* navigation way, cancel prompts

- now warns the user of losing changes if using cancel or navigating away

* clear custom filepaths when clearing package controls

- also clear custom definition filepaths

* removing items more tests added

- added more tests around removing items

* tests preview items structure to created package

- tests added to assert preview package structure is identical to the created package structure

* test remove multiple

- added test to assert correct removal of multiple root items
- publish package clears on window close without prompt
- added ellipsis for package name
- center message prompts to main view

* fixed custombrowsercontrol visuals

- multiple ui fixes to the custom browser control

* ui styling fixes

- rework on the custom browser user control to correctly display dotted lines
- no longer treats every assembly as NodeLibrary

* rework of retain folder structure

- change the logic of how to collect files under multiple root folders when using retain folder structure
- keywords fix, added tests

* minor refactor

* resources

* hover and tooltips

- adding hover states
- adding tooltips
- removing old resources

* resources

* adding packagebuilder tests

- adding tests for BuildRetainDirectory

* submit package retaining folder structure

- created the second path to submitting packages online retaining folder structure
- tests added

* publish retain folder done

- finished workflow for publishing package reatining folder
- changed UI finish screen to work differently depending on which workflow was taken - publish locally or online
- tests added

* exclude unmanaged dlls

- unmanaged dll files cannot be Node Library
- fixed Node Library preview

* description removed, name validation adorner added

- removed description from package validation rules
- added name error validation and adorner

* tooltips

- fixed tooltips and styles

* remove PublishPackageReadyToPublishPage

- PublishPackageReadyToPublishPage was not used, removed

* keywords tags

 - added keywords tags
- TODO: should we replace Kewords with KewordsCollection when submitting a package?

* host control updated

- updated the host control visuals
- tooltips update

* build version error message

- added build version error message

* rework markdown path locator

- added new control when no markdown path is selected

* numeric up/down fix and tests

- added tests for numeric up/down
- space is now handled and should not be allowed
- new validation rule for package Name field

* starting space rule

- no longer able to start with a space for all input fields
- allows user to skip adding minor and build values will be replaced with default ones

* new validation rules

- updated validation rules as per Figma

* remove empty tooltips

- remove unnecessary tooltip to the content presenter
- added 1 missing tooltip to line items

* fix

* comment to PublishRetainFolderStructure

- added a detailed comment describing the new PublishRetainFolderStructure method

* remove duplicate icon.png from test folders

- removed duplicate icon.png files / replaced with empty text files instead
- updated tests that were failing since last changes

* comments to public properties added

* restored deleted namespaces

- not sure how the namespaces got wiped with the previous commit

* remove unused icons

* failing tests fix

- the tests were failing because another test folder was starting with a preceding alphabet letter

* remove commented out code

* update mypackages ui and functionality

- starting the work around MyPackages tab

* replaced bullet menu icon

- now uses vector path rather than png icon (scalable)

* refresh datacontext on change

- now correctly refreshes the PublishPackageViewModel datacontext when publishing new package version

* memory leak

* PublishNewVersionCommand inside PackageManagerViewModel

- the design dictates that we trigger a `publish version` command from inside a packageManagerSearchElementViewModel, which is separated from the PackageViewModel that has all the necessary methods for that
- we are using the PackageManagerViewModel as the highest order VM that to create a bridge between the search element and the installed package

* wire the command

* unsubscribe from event handlers

- unsunbscribing from a few unattended event handlers
- removed EntryDictionary, it wasn't used anywhere but was taking resources
- unsubsribing from ele.RequestShowFileDialog -= OnRequestShowFileDialog; for each searchelementVM this time!

* clear breadcrumbs

* publish tab no memory leak

- publish tab is not leaking

* BrowserItemViewModel  dispose

- implement dispose method inside the BrowserItemViewModel  to unsubscribe from the ItemsOnCollectionChanged event

* disabled PublishingACustomNodeSetsPackageInfoCorrectly_ test

- disabled this test for the moment, it contaminates the packages folder by creating a package and leading to numerous failure tests consequently

* fixed minor bugs

- fixed a bug where the install to folder would not show the required dialog
- fixed a bug where after locking the name for edit (after submitting a new package version) clearing the results would not remove the block from typing the name

* Squashed commit of the following:

commit f5d55636f77605bc6e1f818f08fb367c43a87da5
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Tue Nov 28 12:12:19 2023 +0000

    dispose methods null checks

    - trying to prevent null exceptions in case resources have been cleared before dispose event has been called

commit e43ad538f0a6c6416d3a9204a81311a99bbb23f0
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Tue Nov 28 11:05:20 2023 +0000

    remove begin invoke from mainFrame_Navigated

    - this was done to try and fix a failing test but it should not be needed

commit 42bf04c0df4d52925cdecefc93a42a7565f909de
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Mon Nov 27 21:04:19 2023 +0000

    null check to mainFrame_Navigated

    - added a null check

commit 9dde030c5d565baf203f25794724dfa8eb51d91b
Merge: a77a11a877 3f765b51ad
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Mon Nov 27 18:07:39 2023 +0000

    Merge branch 'pm-publishpackage-cherrypick-resources' into pm-publishpackage-cherrypick-mypackage

commit a77a11a8774c8c1f98f26e679905b492c691620f
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Mon Nov 27 17:47:17 2023 +0000

    main changes

    - this cherry-pick contains all main changes minus resources and tests.
    - will need to merge resources to work correctly
    - if this breaks the test run, we will need to further split it up, or introduce the changes one by one somehow

commit 3f765b51ad31c80e9c1f77d457310b32717ff4d0
Merge: 95d502a95b 36fb8d31b3
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Mon Nov 27 17:38:11 2023 +0000

    Merge remote-tracking branch 'upstream/master' into pm-publishpackage-cherrypick-resources

commit 95d502a95b5437e809865b7170495c8007703055
Author: Deyan Nenov <dnenov@archilizer.com>
Date:   Mon Nov 27 17:38:02 2023 +0000

    resource cherry-pick

    - picked up all resource changes

commit 36fb8d31b3fc60fcea57354d81d8a9ce070d6149
Author: Jorgen Dahl <sm6srw@users.noreply.github.com>
Date:   Mon Nov 27 11:51:35 2023 -0500

    Test net8 (#14635)

    * Test net8

    * Also add DotNet to the build properties

    * Update CS_SDK.props

    * Update CS_SDK.props

    * update

    * update

    * update

    * Go back to net6

    ---------

    Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com>

commit cbba6d073ded1a4cfaf8a323401f5b80eae1b585
Author: Michael Kirschner <mjk.kirschner@gmail.com>
Date:   Mon Nov 27 11:26:04 2023 -0500

    DYN-6412 fix performance issue with feature flags, and deadlock with CLI wrapper. (#14637)

    * fix for null data being shown over and over

    * fix issues with cli wrapper get data

    * revert

    * add test

    * review comments add tests

    * comments

    * review comments

commit c5df6f9ab3ef5ad73a55cea82d422b8c1941ca9a
Author: Ashish Aggarwal <ashish.aggarwal@autodesk.com>
Date:   Mon Nov 27 11:22:32 2023 -0500

    Replace Application.Current with HostAnalyticsInfo.HostName check (#14574)

    * Fix PostDiff job

    * replace application.current

    * tests

    * refactor after Bogdans PR

    ---------

    Co-authored-by: Aaron (Qilong) <173288704@qq.com>

commit 11b1f7c30546308e273a027c11a84936a005dd2d
Author: jesusalvino <96534278+jesusalvino@users.noreply.github.com>
Date:   Mon Nov 27 08:55:32 2023 -0500

    DYN-6313 Add ML Node AutoComplete TOU (#14625)

    * Updating the Agreement and Term of Use

    * Adding the MLNodeAuntocomplete rtf file

    * Persists the AgreeToMLAutocompleteTOU as preference settings

    * rename property

    * resources and control names

    * Clean up

    * Update

    * update

    ---------

    Co-authored-by: Jesus Alfredo Alviño <jesus.alfredo.alvino@autodesk.com>
    Co-authored-by: Aaron (Qilong) <aaron.tang@autodesk.com>

commit 3e97cbdc8a5e6e47a7c480febd17ed1e4d047ad1
Author: Aabishkar KC <aabishkar@gmail.com>
Date:   Wed Nov 22 12:56:04 2023 -0500

    Update smoke tests workflow (#14638)

* update selected known host value on clear

- fixed a small issue where the selected known hosts were not being cleared on reset

* changes to publish package name validation

- moved small fixes to publish package name validation to this branch

* font size alignment

* font size change

* font weight change

* remove redundant test files

* added missing resource

* rename ThisDataContextChanged to PackageManagerPublishControl_DataContextChanged

---------

Co-authored-by: Craig Long <craig.alan.long@gmail.com>
---
 .../Controls/InstalledPackagesControl.xaml    |  24 +--
 .../Properties/Resources.Designer.cs          |   9 ++
 .../Properties/Resources.en-US.resx           |   3 +
 src/DynamoCoreWpf/Properties/Resources.resx   |   5 +-
 .../UI/Themes/Modern/DynamoModern.xaml        |  19 ++-
 .../PackageManagerSearchElementViewModel.cs   |  18 +++
 .../PackageManagerSearchViewModel.cs          |   7 +-
 .../PackageManager/PackageManagerViewModel.cs |  34 +++-
 .../PackageManager/PublishPackageViewModel.cs |  21 ++-
 .../Views/Core/DynamoView.xaml.cs             |   4 +
 .../PackageManagerPackagesControl.xaml        | 153 ++++++++++++------
 .../PackageManagerPublishControl.xaml.cs      |  30 +++-
 .../PackageManager/PackageManagerView.xaml    |  10 +-
 .../Pages/PublishPackagePublishPage.xaml      |   2 +-
 .../Pages/PublishPackagePublishPage.xaml.cs   |  35 +++-
 15 files changed, 299 insertions(+), 75 deletions(-)

diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
index 6bf51a5ad9e..969911653eb 100644
--- a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
@@ -52,10 +52,12 @@
                                  GroupName="PackageFilters"
                                  IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
                                  Style="{StaticResource {x:Type ToggleButton}}"
-                                 FontSize="10"
+                                 FontSize="11"
                                  FontFamily="Artifakt Element"
                                  FontWeight="Medium"
                                  HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"
+                                 VerticalContentAlignment="Center"
                                  BorderThickness="1"
                                  BorderBrush="Transparent"
                                  UseLayoutRounding="True"
@@ -121,7 +123,7 @@
                                                 </TextBlock>
                                                 <TextBlock Text="{Binding Path=Model.VersionName}"
                                                                MinWidth="70"
-                                                               FontSize="11"
+                                                               FontSize="12"
                                                                VerticalAlignment="Center"
                                                                Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>
                                                
@@ -255,7 +257,8 @@
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
+                                                                           FontSize="11"
+                                                                           FontWeight="Regular"
                                                                            TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
@@ -279,7 +282,8 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
+                                                                           FontSize="11"
+                                                                           FontWeight="Regular"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -312,7 +316,8 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
+                                                                           FontSize="11"
+                                                                           FontWeight="Regular"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -334,7 +339,7 @@
                                                         Margin="0,0,0,5">
 
                                                 <Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalFileLabel}"
-                                                           FontSize="11"
+                                                           FontSize="12"
                                                        Padding="0,5,5,5"
                                                            Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
                                                 <ItemsControl Name="AdditionalFiles"
@@ -344,9 +349,10 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=RelativePath}"
-                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
-                                                                           TextTrimming="CharacterEllipsis" />
+                                                                       Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                       FontSize="12"
+                                                                       FontWeight="Regular"
+                                                                       TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
 
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index e63e6df6817..61b0f44e341 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -5744,6 +5744,15 @@ public static string PackageManagerMyPackagesControlName {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Publish Version.
+        /// </summary>
+        public static string PackageManagerMyPackagesPublishVersion {
+            get {
+                return ResourceManager.GetString("PackageManagerMyPackagesPublishVersion", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to My Packages.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index f6c0fe0f6ab..1d4540cf9a1 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3612,6 +3612,9 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
+  <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
+    <value>Publish Version</value>
+  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 7565ef61128..4fc62fdc39a 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3599,6 +3599,9 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
+ <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
+    <value>Publish Version</value>
+  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
@@ -3842,4 +3845,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
     <value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index 26ca6add1dd..c3cc6e2c43e 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -53,6 +53,7 @@
     <Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
     <Color x:Key="GenericMouseOverBackgroundColor">#808080</Color>
 
+    <SolidColorBrush x:Key="BorderPressedColorBrush" Color="{DynamicResource BorderPressedColor}"/>
     <SolidColorBrush x:Key="GenericBorderBackgroundColorBrush" Color="#3c3c3c"/>    
     <SolidColorBrush x:Key="GenericMouseOverBackgroundColorBrush" Color="{DynamicResource GenericMouseOverBackgroundColor}"/>    
 
@@ -1022,7 +1023,7 @@
         <Setter Property="CaretBrush" Value="{StaticResource PrimaryCharcoal200Brush}" />
         <Setter Property="Padding" Value="10,12,10,8"/>
         <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}"/>
-        <Setter Property="FontSize" Value="12px" />
+        <Setter Property="FontSize" Value="14px" />
         <Setter Property="Foreground" Value="{StaticResource PrimaryCharcoal200Brush}"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
 
@@ -3421,11 +3422,19 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Grid>
-                        <Image Name="menuIcon"  Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu_16_16.png"/>
+                        <Border Width="16" Height="16" Background="Transparent" BorderThickness="0">
+                            <Path Name="menuIcon"
+                                  Width="16"
+                                  Height="16"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Fill="{DynamicResource MidGreyBrush}"
+                                  Data="M7.5 3C8.32843 3 9 2.32843 9 1.5C9 0.671573 8.32843 0 7.5 0C6.67157 0 6 0.671573 6 1.5C6 2.32843 6.67157 3 7.5 3ZM7.5 9C8.32843 9 9 8.32843 9 7.5C9 6.67157 8.32843 6 7.5 6C6.67157 6 6 6.67157 6 7.5C6 8.32843 6.67157 9 7.5 9ZM9 13.5C9 14.3284 8.32843 15 7.5 15C6.67157 15 6 14.3284 6 13.5C6 12.6716 6.67157 12 7.5 12C8.32843 12 9 12.6716 9 13.5Z"/>
+                        </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="menuIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu-hover-16px.png" />
+                            <Setter TargetName="menuIcon" Property="Fill" Value="{DynamicResource BorderPressedColorBrush}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value=".5" />
@@ -3434,7 +3443,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </Style>
+    </Style>    
 
     <Style x:Key="CtaButtonStyle" TargetType="Button">
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -4242,7 +4251,7 @@
 
     <Style x:Key="PackageManagerTab" TargetType="{x:Type TabItem}">
         <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="FontSize" Value="15" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
index 783035dfe4b..f04c2d5692f 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
@@ -113,6 +113,24 @@ public PackageManagerSearchElementViewModel(PackageManagerSearchElement element,
         public PackageManagerSearchElementViewModel(PackageManagerSearchElement element, bool canLogin) : this(element, canLogin, true)
         {}
 
+        /// <summary>
+        /// A property showing if the currently logged-in user owns the package
+        /// </summary>
+        private bool isOwner = false;
+        public bool IsOnwer
+        {
+            get
+            {
+                return isOwner;
+            }
+
+            internal set
+            {   
+                isOwner = value;
+                RaisePropertyChanged(nameof(IsOnwer));
+            }
+        }
+
         private bool canInstall;
         /// <summary>
         /// A Boolean flag reporting whether or not the user can install this SearchElement's package.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index 36cb8d1bd11..fd57ae6fd81 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -651,8 +651,12 @@ private void PopulateMyPackages()
             var pkgs = PackageManagerClientViewModel.CachedPackageList.Where(x => x.Maintainers != null && x.Maintainers.Contains(name)).ToList();
             foreach(var pkg in pkgs)
             {
-                var p = new PackageManagerSearchElementViewModel(pkg, false);
+                var p = new PackageManagerSearchElementViewModel(pkg,
+                                                                 PackageManagerClientViewModel.AuthenticationManager.HasAuthProvider,
+                                                                 CanInstallPackage(pkg.Name));
                 p.RequestDownload += this.PackageOnExecuted;
+                p.RequestShowFileDialog += this.OnRequestShowFileDialog;
+                p.IsOnwer = true;
 
                 myPackages.Add(p);
             }
@@ -666,6 +670,7 @@ private void ClearMySearchResults()
             foreach (var ele in this.SearchMyResults)
             {
                 ele.RequestDownload -= PackageOnExecuted;
+                ele.RequestShowFileDialog -= OnRequestShowFileDialog;
             }
 
             this.SearchMyResults = null;
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
index 8474cf4e3ce..84897abc499 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Linq;
+using Dynamo.PackageManager.ViewModels;
+using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using NotificationObject = Dynamo.Core.NotificationObject;
 
@@ -25,7 +28,20 @@ public class PackageManagerViewModel : NotificationObject, IDisposable
         /// <summary>
         /// PublishPackageViewModel containing information about all the published packages
         /// </summary>
-        public PublishPackageViewModel PublishPackageViewModel { get; set; }
+        ///
+        private PublishPackageViewModel publishPackageViewModel;
+        public PublishPackageViewModel PublishPackageViewModel
+        {
+            get { return publishPackageViewModel; }
+            set
+            {
+                if (publishPackageViewModel != value)
+                {
+                    publishPackageViewModel = value;
+                    RaisePropertyChanged(nameof(PublishPackageViewModel));
+                }
+            }
+        }
 
         /// <summary>
         /// Returns all installed packages
@@ -37,6 +53,7 @@ public class PackageManagerViewModel : NotificationObject, IDisposable
         /// </summary>
         public ObservableCollection<PackageFilter> Filters => installedPackagesViewModel.Filters;
 
+        public DelegateCommand PublishNewVersionCommand { get; set; }
 
         //Width of the PackageManagerView the default value is 1076
         public double Width
@@ -90,6 +107,21 @@ public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSe
             {
                 PreferencesViewModel.SelectedPackagePathForInstall = dynamoViewModel.PreferenceSettings.SelectedPackagePathForInstall;
             }
+
+            PublishNewVersionCommand = new DelegateCommand(PublishNewPackageVersionRelayCommand);
+        }
+
+
+        private void PublishNewPackageVersionRelayCommand(object obj)
+        {
+            var searchElement = obj as PackageManagerSearchElementViewModel;
+            if(searchElement != null)
+            {
+                var localPackage = LocalPackages.First(x => x.Model.Name.Equals(searchElement.Name));
+
+                if (localPackage == null) { return; }
+                localPackage.PublishNewPackageVersionCommand.Execute();
+            }
         }
 
         private void LocalPackages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
index f1aeab43e50..b6b78271acf 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -92,7 +93,7 @@ public DynamoViewModel DynamoViewModel
         /// <summary>
         /// Package Publish entry, binded to the host multi-selection option
         /// </summary>
-        public class HostComboboxEntry
+        public class HostComboboxEntry : NotificationObject 
         {
             /// <summary>
             /// Name of the host
@@ -102,7 +103,19 @@ public class HostComboboxEntry
             /// <summary>
             /// Boolean indicates if the host entry is selected
             /// </summary>
-            public bool IsSelected { get; set; }
+            private bool _isSelected;
+            public bool IsSelected
+            {
+                get { return _isSelected; }
+                set
+                {
+                    if (_isSelected != value)
+                    {
+                        _isSelected = value;
+                        RaisePropertyChanged(nameof(IsSelected));
+                    }
+                }
+            }
 
             /// <summary>
             /// Constructor
@@ -190,6 +203,7 @@ public bool IsNewVersion
                 {
                     _isNewVersion = value;
                     RaisePropertyChanged("IsNewVersion");
+                    RaisePropertyChanged("CanEditName");
                 }
             }
         }
@@ -1108,8 +1122,9 @@ private void ClearAllEntries()
             this.AdditionalFiles = new ObservableCollection<string>();
             this.Dependencies = new ObservableCollection<PackageDependency>();
             this.Assemblies = new List<PackageAssembly>();
-            this.SelectedHosts = new List<String>();
+            this.KnownHosts.ForEach(host => { host.IsSelected = false; });
             this.SelectedHostsString = string.Empty;
+            this.SelectedHosts = new List<String>();
             this.copyrightHolder = string.Empty;
             this.copyrightYear = string.Empty;
             this.RootFolder = string.Empty;
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 58be0f74b2d..7e792419834 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1493,6 +1493,10 @@ private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)
 
                 if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;
             }
+            if (_pkgVM != null)
+            {
+                _pkgVM.PublishPackageViewModel = model;
+            }
 
             packageManagerWindow.Focus();
             packageManagerWindow.Navigate(Wpf.Properties.Resources.PackageManagerPublishTab);
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
index 998499ef4d2..6fa2e9d1291 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
@@ -259,6 +259,7 @@
                                     IsEnabled="{Binding IsEnabledForInstall}">
                                 <Button.Style>
                                     <Style TargetType="Button">
+                                        <Setter Property="Visibility" Value="Visible"/>
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type Button}">
@@ -329,12 +330,9 @@
                                                                                 </DataTrigger>
                                                                                 <MultiDataTrigger>
                                                                                     <MultiDataTrigger.Conditions>
-                                                                                        <Condition Binding="{Binding Path=IsDeprecated}"
-                                                                                                   Value="False" />
-                                                                                        <Condition Binding="{Binding Path=CanInstall}"
-                                                                                                   Value="True" />
-                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}"
-                                                                                                   Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
+                                                                                        <Condition Binding="{Binding Path=CanInstall}" Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
                                                                                     </MultiDataTrigger.Conditions>
                                                                                     <Setter Property="Fill">
                                                                                         <Setter.Value>
@@ -350,54 +348,117 @@
                                                         </Grid>
                                                     </Border>
                                                     <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsMouseOver"
-                                                                 Value="True">
-                                                            <Setter TargetName="ButtonBorder"
-                                                                    Property="BorderBrush"
-                                                                    Value="#4A4A4A" />
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
                                                         </Trigger>
-                                                        <Trigger Property="IsPressed"
-                                                                 Value="True">
-                                                            <Setter TargetName="ButtonBorder"
-                                                                    Property="BorderBrush"
-                                                                    Value="#5F5F5F" />
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
                                                         </Trigger>
-                                                        <DataTrigger Binding="{Binding IsDeprecated}"
-                                                                     Value="True">
-                                                            <Setter Property="TextBlock.Opacity"
-                                                                    Value="0.5" />
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#84D7CE" />
-                                                            <Setter Property="ToolTip"
-                                                                    Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
+                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
+                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding CanInstall}"
-                                                                     Value="False">
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#999999" />
-                                                            <Setter Property="Opacity"
-                                                                    Value="1" />
+                                                        <DataTrigger Binding="{Binding CanInstall}" Value="False">
+                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
+                                                            <Setter Property="Opacity" Value="1" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}"
-                                                                     Value="False">
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#999999" />
-                                                            <Setter Property="TextBlock.Opacity"
-                                                                    Value="1" />
+                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}" Value="False">
+                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
+                                                            <Setter Property="TextBlock.Opacity" Value="1" />
+                                                        </DataTrigger>
+                                                        <MultiDataTrigger>
+                                                            <MultiDataTrigger.Conditions>
+                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
+                                                                <Condition Binding="{Binding Path=CanInstall}" Value="True" />
+                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
+                                                            </MultiDataTrigger.Conditions>
+                                                            <Setter Property="TextBlock.Opacity" Value="1" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                        </MultiDataTrigger>
+                                                        <MultiDataTrigger>
+                                                            <MultiDataTrigger.Conditions>
+                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
+                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
+                                                            </MultiDataTrigger.Conditions>
+                                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                                        </MultiDataTrigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Button.Style>
+                            </Button>
+
+
+                            <!--  Publish Version Button  -->
+                            <Button Name="publishButton"
+                                    Content="{x:Static p:Resources.PackageManagerMyPackagesPublishVersion}"
+                                    Command="{Binding Path=PackageManagerViewModel.PublishNewVersionCommand,
+                                                      RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                    CommandParameter="{Binding}"
+                                    DockPanel.Dock="Right"
+                                    ToolTipService.ShowOnDisabled="True"
+                                    IsEnabled="{Binding IsEnabledForInstall}">
+                                <Button.Style>
+                                    <Style TargetType="Button">
+                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="{x:Type Button}">
+                                                    <Border Name="ButtonBorder"
+                                                            Height="25"
+                                                            Padding="5,0"
+                                                            BorderThickness="2"
+                                                            CornerRadius="2">
+                                                        <Grid x:Name="publishPackageGrid">
+
+                                                            <DockPanel LastChildFill="False">
+                                                                <TextBlock Name="textBlock"
+                                                                           Padding="4,4,4,3"
+                                                                           VerticalAlignment="Center"
+                                                                           Cursor="Hand"
+                                                                           DockPanel.Dock="Right"
+                                                                           FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                                           FontSize="11"
+                                                                           Text="{TemplateBinding Content}" />
+                                                                <Rectangle Width="10"
+                                                                           Height="10"
+                                                                           VerticalAlignment="Center"
+                                                                           DockPanel.Dock="Left">
+                                                                    <Rectangle.Fill>
+                                                                        <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - default.png" />
+                                                                    </Rectangle.Fill>
+                                                                </Rectangle>
+                                                            </DockPanel>
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
+                                                        </Trigger>
+                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
+                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                         </DataTrigger>
                                                         <MultiDataTrigger>
                                                             <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=IsDeprecated}"
-                                                                           Value="False" />
-                                                                <Condition Binding="{Binding Path=CanInstall}"
-                                                                           Value="True" />
-                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}"
-                                                                           Value="True" />
+                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
+                                                            </MultiDataTrigger.Conditions>
+                                                            <Setter Property="TextBlock.Opacity" Value="1" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                        </MultiDataTrigger>
+                                                        <MultiDataTrigger>
+                                                            <MultiDataTrigger.Conditions>
+                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
+                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
                                                             </MultiDataTrigger.Conditions>
-                                                            <Setter Property="TextBlock.Opacity"
-                                                                    Value="1" />
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#84D7CE" />
+                                                            <Setter Property="Visibility" Value="Visible"/>
                                                         </MultiDataTrigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
index 54a82e58d1b..ce278dff7cb 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
@@ -32,9 +32,35 @@ public PackageManagerPublishControl()
             InitializeComponent();
 
             this.Loaded += InitializeContext;
+            this.DataContextChanged += PackageManagerPublishControl_DataContextChanged;
+        }
+
+        private void PackageManagerPublishControl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(this.DataContext is PublishPackageViewModel)) return;
+
+            ResetDataContext();
+            SetDataContext();
         }
 
         private void InitializeContext(object sender, RoutedEventArgs e)
+        {
+            SetDataContext();
+
+            this.Loaded -= InitializeContext;
+        }
+
+        private void ResetDataContext()
+        {
+            if (PublishPackageViewModel != null)
+            {
+                PublishPackageViewModel.PublishSuccess -= PackageViewModelOnPublishSuccess;
+                PublishPackageViewModel.RequestShowFolderBrowserDialog -= OnRequestShowFolderBrowserDialog;
+            }
+
+            PublishPackageViewModel = null; 
+        }
+        private void SetDataContext()
         {
             // Set the owner of this user control
             this.Owner = Window.GetWindow(this);
@@ -42,7 +68,7 @@ private void InitializeContext(object sender, RoutedEventArgs e)
             PublishPackageViewModel = this.DataContext as PublishPackageViewModel;
             PublishPackageViewModel.Owner = this.Owner;
 
-            if(PublishPackageViewModel != null )
+            if (PublishPackageViewModel != null)
             {
                 PublishPackageViewModel.PublishSuccess += PackageViewModelOnPublishSuccess;
                 PublishPackageViewModel.RequestShowFolderBrowserDialog += OnRequestShowFolderBrowserDialog;
@@ -78,6 +104,8 @@ public void Dispose()
             NavButtonStacks = null;
 
             Breadcrumbs?.Clear();
+            
+            this.DataContextChanged -= PackageManagerPublishControl_DataContextChanged;
         }
 
         private void InitializePages()
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
index b8eb4d9aa1b..771ec05f97e 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
@@ -32,7 +32,7 @@
             <controls:ListHasMoreThanNItemsToVisibilityConverter x:Key="ListHasMoreThanNItemsToVisibilityConverter" />
             <controls:EmptyListToVisibilityConverter x:Key="EmptyListToVisibilityConverter" />
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
+            
             <Style x:Key="PkgMngTextBlockStyle" TargetType="TextBlock">
                 <Setter Property="Width" Value="Auto" />
                 <Setter Property="Margin" Value="0 5" />
@@ -111,7 +111,7 @@
                            Grid.Column="0"
                            Margin="14,16,0,0"
                            TextAlignment="Left"
-                           FontSize="18"
+                           FontSize="20"
                            FontFamily="Helvetica"
                            HorizontalAlignment="Left"
                            Width="459" />
@@ -509,7 +509,7 @@
                                                 HorizontalAlignment="Stretch">
                                         <TextBlock FontFamily="{StaticResource ArtifaktElementRegular}"
                                                    Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                   FontSize="13"
+                                                   FontSize="14"
                                                    Margin="0 5 0 20">
                                             <Run Text="{x:Static p:Resources.PackageManagerSettingsRunPrefix}" />
                                             <Hyperlink Click="OnPackageManagerSettingsHyperlinkClicked"
@@ -521,7 +521,7 @@
                                         </TextBlock>
                                         <Label Content="{x:Static p:Resources.PreferencesViewPackageDownloadDirectory}"
                                                Padding="5,5,5,5"
-                                               FontSize="13"
+                                               FontSize="14"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
@@ -541,7 +541,7 @@
 
                                         <Label Content="{x:Static p:Resources.PackagePathPreferencesTitle}"
                                                Padding="5,5,5,5"
-                                               FontSize="13"
+                                               FontSize="14"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
index 3fa2101b100..e3f6cb36e8a 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
@@ -539,7 +539,7 @@
                                     <CheckBox Name="HostEntry"
                                               Checked="HostEntry_CheckStateChanged"
                                               Content="{Binding HostName}"
-                                              IsChecked="{Binding IsSelected, Mode=TwoWay}"
+                                              IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                               Style="{StaticResource ComboBoxCheckBoxStyle}"
                                               Tag="{RelativeSource FindAncestor,
                                                             AncestorType={x:Type ComboBox}}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
index 84e1a796522..72004e438f8 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Navigation;
 
@@ -11,7 +12,7 @@ public class PackageNameLengthValidationRule : ValidationRule
     {
         public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         {
-            if (value is string name && name.TrimEnd().Length > 2)
+            if (IsValidName((string)value))
             {
                 // Validation succeeded
                 return ValidationResult.ValidResult;
@@ -20,6 +21,11 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             // Validation failed
             return new ValidationResult(false, Wpf.Properties.Resources.NameNeedMoreCharacters);
         }
+        public static bool IsValidName(string value)
+        {
+            return (value is string name && name.TrimEnd().Length > 2);
+        }
+
     }
 
 
@@ -136,11 +142,36 @@ private void textBoxInput_PreviewKeyDown(object sender, System.Windows.Input.Key
         {
             var textBox = sender as TextBox;
             if (textBox == null) return;
+            if (e.Key == Key.System) return;
+
+            int caretIndex = textBox.CaretIndex; // Store the caret index
 
             // Prevents text starting with a space
             if (e.Key == System.Windows.Input.Key.Space && string.IsNullOrWhiteSpace(textBox.Text))
             {
-                e.Handled = true; 
+                e.Handled = true;
+                return;
+            }
+
+            if (string.IsNullOrEmpty(textBox.Text)) { return; }
+
+            // In case we are using the Backspace to remove characters, the validation error will stop the Name property from being updated 
+            if (textBox.Name.Equals("packageNameInput") && e.Key == Key.Back && !PackageNameLengthValidationRule.IsValidName(textBox.Text.Substring(0, textBox.Text.Length - 1)))
+            {
+                e.Handled = true;
+
+                if (!string.IsNullOrEmpty(PublishPackageViewModel.Name))
+                {
+                    // Manually remove the last character from the Name property, as the validation error will not update the Name property
+                    PublishPackageViewModel.Name = PublishPackageViewModel.Name.Substring(0, PublishPackageViewModel.Name.Length - 1);
+
+                    // Trigger re-validation explicitly
+                    var expression = textBox.GetBindingExpression(TextBox.TextProperty);
+                    expression?.UpdateSource();
+
+                    textBox.CaretIndex = caretIndex - 1 >= 0 ? caretIndex - 1 : 0;
+                    return;
+                }
             }
         }
     }

From 628604a1200fefca1447a2cedc6aeef9ea557cca Mon Sep 17 00:00:00 2001
From: Jorgen Dahl <sm6srw@users.noreply.github.com>
Date: Tue, 5 Dec 2023 08:02:21 -0500
Subject: [PATCH 11/22] Switch to net8.0 (#14683)

---
 src/Config/CS_SDK.props | 4 ++--
 src/build.xml           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props
index 09ae2fd3263..6d0ccd98f42 100644
--- a/src/Config/CS_SDK.props
+++ b/src/Config/CS_SDK.props
@@ -6,7 +6,7 @@
     <PlatformTarget >x64</PlatformTarget>
     <!--Use the property DotNet to set TargetFramework from commandline without forcing it on all projects-->
     <!--Ex. DynamoServices uses TargetFramework netstandard2.0 -->
-    <DotNet>net6.0</DotNet>
+    <DotNet>net8.0</DotNet>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
     <TargetFramework>$(DotNet)</TargetFramework>
     <FileAlignment>512</FileAlignment>
@@ -146,4 +146,4 @@
           </PropertyGroup>
       </Otherwise>
   </Choose>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/build.xml b/src/build.xml
index b2df74100c7..44c8a7e92a0 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -5,7 +5,7 @@
 <PropertyGroup>
     <Solution>Dynamo.All.sln</Solution>
     <Platform>Any CPU</Platform>
-    <DotNet>net6.0</DotNet>
+    <DotNet>net8.0</DotNet>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <NuGetPath>$(MSBuildProjectDirectory)\..\tools\Nuget\NuGet.exe</NuGetPath>
  </PropertyGroup>

From 02cd5a4b4e6778656e1aaea11ebe1dfc0786e304 Mon Sep 17 00:00:00 2001
From: aparajit-pratap <aparajit.pratap@autodesk.com>
Date: Tue, 5 Dec 2023 10:37:34 -0500
Subject: [PATCH 12/22] Do not raise event to show legacy trace UI in headless
 mode (#14686)

* remove coreclr-ncalc references

* do not raise event to show legacy trace UI in headless mode
---
 src/DynamoCore/Models/DynamoModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index 3772688526e..ea736e2935e 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -2309,7 +2309,7 @@ private bool OpenJsonFile(
             workspace.FromJsonGraphId = string.IsNullOrEmpty(filePath) ? WorkspaceModel.ComputeGraphIdFromJson(fileContents) : "";
             workspace.ScaleFactor = dynamoPreferences.ScaleFactor;
             
-            if (!IsTestMode)
+            if (!IsTestMode || !IsHeadless)
             {
                 if (workspace.ContainsLegacyTraceData)
                 {
@@ -2442,7 +2442,7 @@ private bool OpenXmlHomeWorkspace(
             Guid deterministicId = GuidUtility.Create(GuidUtility.UrlNamespace, workspaceInfo.Name);
 
             var loadedTraceData = Utils.LoadTraceDataFromXmlDocument(xmlDoc, out var containsLegacyTraceData);
-            if (!IsTestMode)
+            if (!IsTestMode || !IsHeadless)
             {
                 if (containsLegacyTraceData) OnRequestNotification(Resources.LegacyTraceDataWarning, true);
             }

From 3ffbb3839383bdc0e21b102c3728a96fdefa8a0d Mon Sep 17 00:00:00 2001
From: Enzo Batista <111511512+Enzo707@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:08:14 -0300
Subject: [PATCH 13/22] Feature [DYN-5197] dismiss NotificationsPanel by
 clicking outside the panel (#14680)

* feat(NotificationCenterController): add PreviewMouseDown to dismiss notifications panel by clicking outside the panel

* unsuscribe DynamoView_PreviewMouseDown event handler
---
 src/Notifications/NotificationCenterController.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Notifications/NotificationCenterController.cs b/src/Notifications/NotificationCenterController.cs
index 7a8a1dd687c..ec5d2740cd1 100644
--- a/src/Notifications/NotificationCenterController.cs
+++ b/src/Notifications/NotificationCenterController.cs
@@ -83,6 +83,7 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
             dynamoView.LocationChanged += DynamoView_LocationChanged;
             notificationsButton.Click += NotificationsButton_Click;
             dynamoView.Closing += View_Closing;
+            dynamoView.PreviewMouseDown += DynamoView_PreviewMouseDown;
 
             notificationUIPopup = new NotificationUI
             {
@@ -106,6 +107,7 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
         private void View_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             dynamoView.Closing -= View_Closing;
+            dynamoView.PreviewMouseDown -= DynamoView_PreviewMouseDown;
             SuspendCoreWebviewAsync();
         }
 
@@ -276,6 +278,17 @@ private void DynamoView_SizeChanged(object sender, SizeChangedEventArgs e)
             notificationUIPopup.UpdatePopupLocation();
         }
 
+        /// <summary>
+        /// Dismiss notifications panel by clicking outside the panel
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DynamoView_PreviewMouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (!notificationUIPopup.IsOpen) return;
+            notificationUIPopup.IsOpen = false;
+        }
+
         /// <summary>
         /// Notification Center button click handler
         /// </summary>

From a23a197d70568f7446ff89c52a4111edf98ff4a1 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Tue, 5 Dec 2023 18:04:28 +0000
Subject: [PATCH 14/22] Revert "Pm mypackages - update package version
 (#14655)" (#14689)

This reverts commit 3f564ec8b1664671555fff04ae80ee0e3a63ef30.
---
 .../Controls/InstalledPackagesControl.xaml    |  24 ++-
 .../Properties/Resources.Designer.cs          |   9 --
 .../Properties/Resources.en-US.resx           |   3 -
 src/DynamoCoreWpf/Properties/Resources.resx   |   5 +-
 .../UI/Themes/Modern/DynamoModern.xaml        |  19 +--
 .../PackageManagerSearchElementViewModel.cs   |  18 ---
 .../PackageManagerSearchViewModel.cs          |   7 +-
 .../PackageManager/PackageManagerViewModel.cs |  34 +---
 .../PackageManager/PublishPackageViewModel.cs |  21 +--
 .../Views/Core/DynamoView.xaml.cs             |   4 -
 .../PackageManagerPackagesControl.xaml        | 153 ++++++------------
 .../PackageManagerPublishControl.xaml.cs      |  30 +---
 .../PackageManager/PackageManagerView.xaml    |  10 +-
 .../Pages/PublishPackagePublishPage.xaml      |   2 +-
 .../Pages/PublishPackagePublishPage.xaml.cs   |  35 +---
 15 files changed, 75 insertions(+), 299 deletions(-)

diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
index 969911653eb..6bf51a5ad9e 100644
--- a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
@@ -52,12 +52,10 @@
                                  GroupName="PackageFilters"
                                  IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
                                  Style="{StaticResource {x:Type ToggleButton}}"
-                                 FontSize="11"
+                                 FontSize="10"
                                  FontFamily="Artifakt Element"
                                  FontWeight="Medium"
                                  HorizontalAlignment="Center"
-                                 VerticalAlignment="Center"
-                                 VerticalContentAlignment="Center"
                                  BorderThickness="1"
                                  BorderBrush="Transparent"
                                  UseLayoutRounding="True"
@@ -123,7 +121,7 @@
                                                 </TextBlock>
                                                 <TextBlock Text="{Binding Path=Model.VersionName}"
                                                                MinWidth="70"
-                                                               FontSize="12"
+                                                               FontSize="11"
                                                                VerticalAlignment="Center"
                                                                Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>
                                                
@@ -257,8 +255,7 @@
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="11"
-                                                                           FontWeight="Regular"
+                                                                           FontSize="9"
                                                                            TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
@@ -282,8 +279,7 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="11"
-                                                                           FontWeight="Regular"
+                                                                           FontSize="9"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -316,8 +312,7 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="11"
-                                                                           FontWeight="Regular"
+                                                                           FontSize="9"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -339,7 +334,7 @@
                                                         Margin="0,0,0,5">
 
                                                 <Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalFileLabel}"
-                                                           FontSize="12"
+                                                           FontSize="11"
                                                        Padding="0,5,5,5"
                                                            Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
                                                 <ItemsControl Name="AdditionalFiles"
@@ -349,10 +344,9 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=RelativePath}"
-                                                                       Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                       FontSize="12"
-                                                                       FontWeight="Regular"
-                                                                       TextTrimming="CharacterEllipsis" />
+                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                           FontSize="9"
+                                                                           TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
 
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 61b0f44e341..e63e6df6817 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -5744,15 +5744,6 @@ public static string PackageManagerMyPackagesControlName {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Publish Version.
-        /// </summary>
-        public static string PackageManagerMyPackagesPublishVersion {
-            get {
-                return ResourceManager.GetString("PackageManagerMyPackagesPublishVersion", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to My Packages.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 1d4540cf9a1..f6c0fe0f6ab 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3612,9 +3612,6 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
-  <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
-    <value>Publish Version</value>
-  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 4fc62fdc39a..7565ef61128 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3599,9 +3599,6 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
- <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
-    <value>Publish Version</value>
-  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
@@ -3845,4 +3842,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
     <value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index c3cc6e2c43e..26ca6add1dd 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -53,7 +53,6 @@
     <Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
     <Color x:Key="GenericMouseOverBackgroundColor">#808080</Color>
 
-    <SolidColorBrush x:Key="BorderPressedColorBrush" Color="{DynamicResource BorderPressedColor}"/>
     <SolidColorBrush x:Key="GenericBorderBackgroundColorBrush" Color="#3c3c3c"/>    
     <SolidColorBrush x:Key="GenericMouseOverBackgroundColorBrush" Color="{DynamicResource GenericMouseOverBackgroundColor}"/>    
 
@@ -1023,7 +1022,7 @@
         <Setter Property="CaretBrush" Value="{StaticResource PrimaryCharcoal200Brush}" />
         <Setter Property="Padding" Value="10,12,10,8"/>
         <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}"/>
-        <Setter Property="FontSize" Value="14px" />
+        <Setter Property="FontSize" Value="12px" />
         <Setter Property="Foreground" Value="{StaticResource PrimaryCharcoal200Brush}"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
 
@@ -3422,19 +3421,11 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Grid>
-                        <Border Width="16" Height="16" Background="Transparent" BorderThickness="0">
-                            <Path Name="menuIcon"
-                                  Width="16"
-                                  Height="16"
-                                  HorizontalAlignment="Center"
-                                  VerticalAlignment="Center"
-                                  Fill="{DynamicResource MidGreyBrush}"
-                                  Data="M7.5 3C8.32843 3 9 2.32843 9 1.5C9 0.671573 8.32843 0 7.5 0C6.67157 0 6 0.671573 6 1.5C6 2.32843 6.67157 3 7.5 3ZM7.5 9C8.32843 9 9 8.32843 9 7.5C9 6.67157 8.32843 6 7.5 6C6.67157 6 6 6.67157 6 7.5C6 8.32843 6.67157 9 7.5 9ZM9 13.5C9 14.3284 8.32843 15 7.5 15C6.67157 15 6 14.3284 6 13.5C6 12.6716 6.67157 12 7.5 12C8.32843 12 9 12.6716 9 13.5Z"/>
-                        </Border>
+                        <Image Name="menuIcon"  Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu_16_16.png"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="menuIcon" Property="Fill" Value="{DynamicResource BorderPressedColorBrush}" />
+                            <Setter TargetName="menuIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu-hover-16px.png" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value=".5" />
@@ -3443,7 +3434,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </Style>    
+    </Style>
 
     <Style x:Key="CtaButtonStyle" TargetType="Button">
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -4251,7 +4242,7 @@
 
     <Style x:Key="PackageManagerTab" TargetType="{x:Type TabItem}">
         <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontSize" Value="15" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
index f04c2d5692f..783035dfe4b 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
@@ -113,24 +113,6 @@ public PackageManagerSearchElementViewModel(PackageManagerSearchElement element,
         public PackageManagerSearchElementViewModel(PackageManagerSearchElement element, bool canLogin) : this(element, canLogin, true)
         {}
 
-        /// <summary>
-        /// A property showing if the currently logged-in user owns the package
-        /// </summary>
-        private bool isOwner = false;
-        public bool IsOnwer
-        {
-            get
-            {
-                return isOwner;
-            }
-
-            internal set
-            {   
-                isOwner = value;
-                RaisePropertyChanged(nameof(IsOnwer));
-            }
-        }
-
         private bool canInstall;
         /// <summary>
         /// A Boolean flag reporting whether or not the user can install this SearchElement's package.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index fd57ae6fd81..36cb8d1bd11 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -651,12 +651,8 @@ private void PopulateMyPackages()
             var pkgs = PackageManagerClientViewModel.CachedPackageList.Where(x => x.Maintainers != null && x.Maintainers.Contains(name)).ToList();
             foreach(var pkg in pkgs)
             {
-                var p = new PackageManagerSearchElementViewModel(pkg,
-                                                                 PackageManagerClientViewModel.AuthenticationManager.HasAuthProvider,
-                                                                 CanInstallPackage(pkg.Name));
+                var p = new PackageManagerSearchElementViewModel(pkg, false);
                 p.RequestDownload += this.PackageOnExecuted;
-                p.RequestShowFileDialog += this.OnRequestShowFileDialog;
-                p.IsOnwer = true;
 
                 myPackages.Add(p);
             }
@@ -670,7 +666,6 @@ private void ClearMySearchResults()
             foreach (var ele in this.SearchMyResults)
             {
                 ele.RequestDownload -= PackageOnExecuted;
-                ele.RequestShowFileDialog -= OnRequestShowFileDialog;
             }
 
             this.SearchMyResults = null;
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
index 84897abc499..8474cf4e3ce 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Linq;
-using Dynamo.PackageManager.ViewModels;
-using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using NotificationObject = Dynamo.Core.NotificationObject;
 
@@ -28,20 +25,7 @@ public class PackageManagerViewModel : NotificationObject, IDisposable
         /// <summary>
         /// PublishPackageViewModel containing information about all the published packages
         /// </summary>
-        ///
-        private PublishPackageViewModel publishPackageViewModel;
-        public PublishPackageViewModel PublishPackageViewModel
-        {
-            get { return publishPackageViewModel; }
-            set
-            {
-                if (publishPackageViewModel != value)
-                {
-                    publishPackageViewModel = value;
-                    RaisePropertyChanged(nameof(PublishPackageViewModel));
-                }
-            }
-        }
+        public PublishPackageViewModel PublishPackageViewModel { get; set; }
 
         /// <summary>
         /// Returns all installed packages
@@ -53,7 +37,6 @@ public PublishPackageViewModel PublishPackageViewModel
         /// </summary>
         public ObservableCollection<PackageFilter> Filters => installedPackagesViewModel.Filters;
 
-        public DelegateCommand PublishNewVersionCommand { get; set; }
 
         //Width of the PackageManagerView the default value is 1076
         public double Width
@@ -107,21 +90,6 @@ public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSe
             {
                 PreferencesViewModel.SelectedPackagePathForInstall = dynamoViewModel.PreferenceSettings.SelectedPackagePathForInstall;
             }
-
-            PublishNewVersionCommand = new DelegateCommand(PublishNewPackageVersionRelayCommand);
-        }
-
-
-        private void PublishNewPackageVersionRelayCommand(object obj)
-        {
-            var searchElement = obj as PackageManagerSearchElementViewModel;
-            if(searchElement != null)
-            {
-                var localPackage = LocalPackages.First(x => x.Model.Name.Equals(searchElement.Name));
-
-                if (localPackage == null) { return; }
-                localPackage.PublishNewPackageVersionCommand.Execute();
-            }
         }
 
         private void LocalPackages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
index b6b78271acf..f1aeab43e50 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -93,7 +92,7 @@ public DynamoViewModel DynamoViewModel
         /// <summary>
         /// Package Publish entry, binded to the host multi-selection option
         /// </summary>
-        public class HostComboboxEntry : NotificationObject 
+        public class HostComboboxEntry
         {
             /// <summary>
             /// Name of the host
@@ -103,19 +102,7 @@ public class HostComboboxEntry : NotificationObject
             /// <summary>
             /// Boolean indicates if the host entry is selected
             /// </summary>
-            private bool _isSelected;
-            public bool IsSelected
-            {
-                get { return _isSelected; }
-                set
-                {
-                    if (_isSelected != value)
-                    {
-                        _isSelected = value;
-                        RaisePropertyChanged(nameof(IsSelected));
-                    }
-                }
-            }
+            public bool IsSelected { get; set; }
 
             /// <summary>
             /// Constructor
@@ -203,7 +190,6 @@ public bool IsNewVersion
                 {
                     _isNewVersion = value;
                     RaisePropertyChanged("IsNewVersion");
-                    RaisePropertyChanged("CanEditName");
                 }
             }
         }
@@ -1122,9 +1108,8 @@ private void ClearAllEntries()
             this.AdditionalFiles = new ObservableCollection<string>();
             this.Dependencies = new ObservableCollection<PackageDependency>();
             this.Assemblies = new List<PackageAssembly>();
-            this.KnownHosts.ForEach(host => { host.IsSelected = false; });
-            this.SelectedHostsString = string.Empty;
             this.SelectedHosts = new List<String>();
+            this.SelectedHostsString = string.Empty;
             this.copyrightHolder = string.Empty;
             this.copyrightYear = string.Empty;
             this.RootFolder = string.Empty;
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 7e792419834..58be0f74b2d 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1493,10 +1493,6 @@ private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)
 
                 if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;
             }
-            if (_pkgVM != null)
-            {
-                _pkgVM.PublishPackageViewModel = model;
-            }
 
             packageManagerWindow.Focus();
             packageManagerWindow.Navigate(Wpf.Properties.Resources.PackageManagerPublishTab);
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
index 6fa2e9d1291..998499ef4d2 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
@@ -259,7 +259,6 @@
                                     IsEnabled="{Binding IsEnabledForInstall}">
                                 <Button.Style>
                                     <Style TargetType="Button">
-                                        <Setter Property="Visibility" Value="Visible"/>
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type Button}">
@@ -330,9 +329,12 @@
                                                                                 </DataTrigger>
                                                                                 <MultiDataTrigger>
                                                                                     <MultiDataTrigger.Conditions>
-                                                                                        <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
-                                                                                        <Condition Binding="{Binding Path=CanInstall}" Value="True" />
-                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsDeprecated}"
+                                                                                                   Value="False" />
+                                                                                        <Condition Binding="{Binding Path=CanInstall}"
+                                                                                                   Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}"
+                                                                                                   Value="True" />
                                                                                     </MultiDataTrigger.Conditions>
                                                                                     <Setter Property="Fill">
                                                                                         <Setter.Value>
@@ -348,117 +350,54 @@
                                                         </Grid>
                                                     </Border>
                                                     <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
+                                                        <Trigger Property="IsMouseOver"
+                                                                 Value="True">
+                                                            <Setter TargetName="ButtonBorder"
+                                                                    Property="BorderBrush"
+                                                                    Value="#4A4A4A" />
                                                         </Trigger>
-                                                        <Trigger Property="IsPressed" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
+                                                        <Trigger Property="IsPressed"
+                                                                 Value="True">
+                                                            <Setter TargetName="ButtonBorder"
+                                                                    Property="BorderBrush"
+                                                                    Value="#5F5F5F" />
                                                         </Trigger>
-                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
-                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
+                                                        <DataTrigger Binding="{Binding IsDeprecated}"
+                                                                     Value="True">
+                                                            <Setter Property="TextBlock.Opacity"
+                                                                    Value="0.5" />
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#84D7CE" />
+                                                            <Setter Property="ToolTip"
+                                                                    Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding CanInstall}" Value="False">
-                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
-                                                            <Setter Property="Opacity" Value="1" />
+                                                        <DataTrigger Binding="{Binding CanInstall}"
+                                                                     Value="False">
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#999999" />
+                                                            <Setter Property="Opacity"
+                                                                    Value="1" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}" Value="False">
-                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
-                                                            <Setter Property="TextBlock.Opacity" Value="1" />
-                                                        </DataTrigger>
-                                                        <MultiDataTrigger>
-                                                            <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
-                                                                <Condition Binding="{Binding Path=CanInstall}" Value="True" />
-                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
-                                                            </MultiDataTrigger.Conditions>
-                                                            <Setter Property="TextBlock.Opacity" Value="1" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                        </MultiDataTrigger>
-                                                        <MultiDataTrigger>
-                                                            <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
-                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
-                                                            </MultiDataTrigger.Conditions>
-                                                            <Setter Property="Visibility" Value="Collapsed"/>
-                                                        </MultiDataTrigger>
-                                                    </ControlTemplate.Triggers>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </Button.Style>
-                            </Button>
-
-
-                            <!--  Publish Version Button  -->
-                            <Button Name="publishButton"
-                                    Content="{x:Static p:Resources.PackageManagerMyPackagesPublishVersion}"
-                                    Command="{Binding Path=PackageManagerViewModel.PublishNewVersionCommand,
-                                                      RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                                    CommandParameter="{Binding}"
-                                    DockPanel.Dock="Right"
-                                    ToolTipService.ShowOnDisabled="True"
-                                    IsEnabled="{Binding IsEnabledForInstall}">
-                                <Button.Style>
-                                    <Style TargetType="Button">
-                                        <Setter Property="Visibility" Value="Collapsed"/>
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate TargetType="{x:Type Button}">
-                                                    <Border Name="ButtonBorder"
-                                                            Height="25"
-                                                            Padding="5,0"
-                                                            BorderThickness="2"
-                                                            CornerRadius="2">
-                                                        <Grid x:Name="publishPackageGrid">
-
-                                                            <DockPanel LastChildFill="False">
-                                                                <TextBlock Name="textBlock"
-                                                                           Padding="4,4,4,3"
-                                                                           VerticalAlignment="Center"
-                                                                           Cursor="Hand"
-                                                                           DockPanel.Dock="Right"
-                                                                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                                                                           FontSize="11"
-                                                                           Text="{TemplateBinding Content}" />
-                                                                <Rectangle Width="10"
-                                                                           Height="10"
-                                                                           VerticalAlignment="Center"
-                                                                           DockPanel.Dock="Left">
-                                                                    <Rectangle.Fill>
-                                                                        <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - default.png" />
-                                                                    </Rectangle.Fill>
-                                                                </Rectangle>
-                                                            </DockPanel>
-                                                        </Grid>
-                                                    </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
-                                                        </Trigger>
-                                                        <Trigger Property="IsPressed" Value="True">
-                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
-                                                        </Trigger>
-                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
-                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
+                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}"
+                                                                     Value="False">
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#999999" />
+                                                            <Setter Property="TextBlock.Opacity"
+                                                                    Value="1" />
                                                         </DataTrigger>
                                                         <MultiDataTrigger>
                                                             <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
-                                                            </MultiDataTrigger.Conditions>
-                                                            <Setter Property="TextBlock.Opacity" Value="1" />
-                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
-                                                        </MultiDataTrigger>
-                                                        <MultiDataTrigger>
-                                                            <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
-                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
+                                                                <Condition Binding="{Binding Path=IsDeprecated}"
+                                                                           Value="False" />
+                                                                <Condition Binding="{Binding Path=CanInstall}"
+                                                                           Value="True" />
+                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}"
+                                                                           Value="True" />
                                                             </MultiDataTrigger.Conditions>
-                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                            <Setter Property="TextBlock.Opacity"
+                                                                    Value="1" />
+                                                            <Setter Property="TextBlock.Foreground"
+                                                                    Value="#84D7CE" />
                                                         </MultiDataTrigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
index ce278dff7cb..54a82e58d1b 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
@@ -32,35 +32,9 @@ public PackageManagerPublishControl()
             InitializeComponent();
 
             this.Loaded += InitializeContext;
-            this.DataContextChanged += PackageManagerPublishControl_DataContextChanged;
-        }
-
-        private void PackageManagerPublishControl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (!(this.DataContext is PublishPackageViewModel)) return;
-
-            ResetDataContext();
-            SetDataContext();
         }
 
         private void InitializeContext(object sender, RoutedEventArgs e)
-        {
-            SetDataContext();
-
-            this.Loaded -= InitializeContext;
-        }
-
-        private void ResetDataContext()
-        {
-            if (PublishPackageViewModel != null)
-            {
-                PublishPackageViewModel.PublishSuccess -= PackageViewModelOnPublishSuccess;
-                PublishPackageViewModel.RequestShowFolderBrowserDialog -= OnRequestShowFolderBrowserDialog;
-            }
-
-            PublishPackageViewModel = null; 
-        }
-        private void SetDataContext()
         {
             // Set the owner of this user control
             this.Owner = Window.GetWindow(this);
@@ -68,7 +42,7 @@ private void SetDataContext()
             PublishPackageViewModel = this.DataContext as PublishPackageViewModel;
             PublishPackageViewModel.Owner = this.Owner;
 
-            if (PublishPackageViewModel != null)
+            if(PublishPackageViewModel != null )
             {
                 PublishPackageViewModel.PublishSuccess += PackageViewModelOnPublishSuccess;
                 PublishPackageViewModel.RequestShowFolderBrowserDialog += OnRequestShowFolderBrowserDialog;
@@ -104,8 +78,6 @@ public void Dispose()
             NavButtonStacks = null;
 
             Breadcrumbs?.Clear();
-            
-            this.DataContextChanged -= PackageManagerPublishControl_DataContextChanged;
         }
 
         private void InitializePages()
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
index 771ec05f97e..b8eb4d9aa1b 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
@@ -32,7 +32,7 @@
             <controls:ListHasMoreThanNItemsToVisibilityConverter x:Key="ListHasMoreThanNItemsToVisibilityConverter" />
             <controls:EmptyListToVisibilityConverter x:Key="EmptyListToVisibilityConverter" />
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            
+
             <Style x:Key="PkgMngTextBlockStyle" TargetType="TextBlock">
                 <Setter Property="Width" Value="Auto" />
                 <Setter Property="Margin" Value="0 5" />
@@ -111,7 +111,7 @@
                            Grid.Column="0"
                            Margin="14,16,0,0"
                            TextAlignment="Left"
-                           FontSize="20"
+                           FontSize="18"
                            FontFamily="Helvetica"
                            HorizontalAlignment="Left"
                            Width="459" />
@@ -509,7 +509,7 @@
                                                 HorizontalAlignment="Stretch">
                                         <TextBlock FontFamily="{StaticResource ArtifaktElementRegular}"
                                                    Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                   FontSize="14"
+                                                   FontSize="13"
                                                    Margin="0 5 0 20">
                                             <Run Text="{x:Static p:Resources.PackageManagerSettingsRunPrefix}" />
                                             <Hyperlink Click="OnPackageManagerSettingsHyperlinkClicked"
@@ -521,7 +521,7 @@
                                         </TextBlock>
                                         <Label Content="{x:Static p:Resources.PreferencesViewPackageDownloadDirectory}"
                                                Padding="5,5,5,5"
-                                               FontSize="14"
+                                               FontSize="13"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
@@ -541,7 +541,7 @@
 
                                         <Label Content="{x:Static p:Resources.PackagePathPreferencesTitle}"
                                                Padding="5,5,5,5"
-                                               FontSize="14"
+                                               FontSize="13"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
index e3f6cb36e8a..3fa2101b100 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
@@ -539,7 +539,7 @@
                                     <CheckBox Name="HostEntry"
                                               Checked="HostEntry_CheckStateChanged"
                                               Content="{Binding HostName}"
-                                              IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                              IsChecked="{Binding IsSelected, Mode=TwoWay}"
                                               Style="{StaticResource ComboBoxCheckBoxStyle}"
                                               Tag="{RelativeSource FindAncestor,
                                                             AncestorType={x:Type ComboBox}}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
index 72004e438f8..84e1a796522 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Navigation;
 
@@ -12,7 +11,7 @@ public class PackageNameLengthValidationRule : ValidationRule
     {
         public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         {
-            if (IsValidName((string)value))
+            if (value is string name && name.TrimEnd().Length > 2)
             {
                 // Validation succeeded
                 return ValidationResult.ValidResult;
@@ -21,11 +20,6 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
             // Validation failed
             return new ValidationResult(false, Wpf.Properties.Resources.NameNeedMoreCharacters);
         }
-        public static bool IsValidName(string value)
-        {
-            return (value is string name && name.TrimEnd().Length > 2);
-        }
-
     }
 
 
@@ -142,36 +136,11 @@ private void textBoxInput_PreviewKeyDown(object sender, System.Windows.Input.Key
         {
             var textBox = sender as TextBox;
             if (textBox == null) return;
-            if (e.Key == Key.System) return;
-
-            int caretIndex = textBox.CaretIndex; // Store the caret index
 
             // Prevents text starting with a space
             if (e.Key == System.Windows.Input.Key.Space && string.IsNullOrWhiteSpace(textBox.Text))
             {
-                e.Handled = true;
-                return;
-            }
-
-            if (string.IsNullOrEmpty(textBox.Text)) { return; }
-
-            // In case we are using the Backspace to remove characters, the validation error will stop the Name property from being updated 
-            if (textBox.Name.Equals("packageNameInput") && e.Key == Key.Back && !PackageNameLengthValidationRule.IsValidName(textBox.Text.Substring(0, textBox.Text.Length - 1)))
-            {
-                e.Handled = true;
-
-                if (!string.IsNullOrEmpty(PublishPackageViewModel.Name))
-                {
-                    // Manually remove the last character from the Name property, as the validation error will not update the Name property
-                    PublishPackageViewModel.Name = PublishPackageViewModel.Name.Substring(0, PublishPackageViewModel.Name.Length - 1);
-
-                    // Trigger re-validation explicitly
-                    var expression = textBox.GetBindingExpression(TextBox.TextProperty);
-                    expression?.UpdateSource();
-
-                    textBox.CaretIndex = caretIndex - 1 >= 0 ? caretIndex - 1 : 0;
-                    return;
-                }
+                e.Handled = true; 
             }
         }
     }

From 34dcf084f8b9de6ac1ecbb66f0410d1de83147bf Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Wed, 6 Dec 2023 00:03:44 +0000
Subject: [PATCH 15/22] Outdated error message for upload package version field
 (#14691)

---
 src/DynamoCoreWpf/Properties/Resources.Designer.cs | 2 +-
 src/DynamoCoreWpf/Properties/Resources.en-US.resx  | 4 ++--
 src/DynamoCoreWpf/Properties/Resources.resx        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index e63e6df6817..fb340ccce0b 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -4083,7 +4083,7 @@ public static string LogoutMenuItemText {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You must provide a Major version as a non-negative integer..
+        ///   Looks up a localized string similar to Provide major, minor, and build version number..
         /// </summary>
         public static string MajorVersionNonNegative {
             get {
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index f6c0fe0f6ab..588081c3467 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1229,7 +1229,7 @@ Failed to publish file(s):
     <value>Library</value>
   </data>
   <data name="MajorVersionNonNegative" xml:space="preserve">
-    <value>You must provide a Major version as a non-negative integer.</value>
+    <value>Provide major, minor, and build version number.</value>
     <comment>ErrorString</comment>
   </data>
   <data name="Manual" xml:space="preserve">
@@ -3855,4 +3855,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
     <value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 7565ef61128..61b2c74b5f7 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -1776,7 +1776,7 @@ Note: Incorrect folder structure may affect the functionality of packages that r
     <comment>ErrorString</comment>
   </data>
   <data name="MajorVersionNonNegative" xml:space="preserve">
-    <value>You must provide a Major version as a non-negative integer.</value>
+    <value>Provide major, minor, and build version number.</value>
     <comment>ErrorString</comment>
   </data>
   <data name="MinorVersionNonNegative" xml:space="preserve">

From af792ae445c473468c2596ad4f840e8c2bde1bda Mon Sep 17 00:00:00 2001
From: Michael Kirschner <mjk.kirschner@gmail.com>
Date: Tue, 5 Dec 2023 19:31:08 -0500
Subject: [PATCH 16/22] fix test (#14697)

passed here:
https://master-15.jenkins.autodesk.com/view/DYN/job/DYN-DevCI_Self_Service/1327/
merging
---
 src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index 5adaa99dbba..cfbc44b532d 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -22,6 +22,7 @@
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Interfaces;
+using Dynamo.Logging;
 using Dynamo.Models;
 using Dynamo.PackageManager;
 using Dynamo.PackageManager.UI;
@@ -1879,7 +1880,8 @@ private void model_ComputeModelDeserialized()
         /// <param name="notification"></param>
         private void model_RequestNotification(string notification, bool stayOpen = false)
         {
-            this.MainGuideManager.CreateRealTimeInfoWindow(notification, stayOpen);
+            this.MainGuideManager?.CreateRealTimeInfoWindow(notification, stayOpen);
+            model?.Logger?.Log(notification);
         }
 
         /// <summary>

From 1eee20ef7af012b4e2fd41592e31ec9de27679ad Mon Sep 17 00:00:00 2001
From: aparajit-pratap <aparajit.pratap@autodesk.com>
Date: Tue, 5 Dec 2023 20:24:09 -0500
Subject: [PATCH 17/22] Update DynamoModel.cs

---
 src/DynamoCore/Models/DynamoModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index ea736e2935e..185f094259d 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -2309,7 +2309,7 @@ private bool OpenJsonFile(
             workspace.FromJsonGraphId = string.IsNullOrEmpty(filePath) ? WorkspaceModel.ComputeGraphIdFromJson(fileContents) : "";
             workspace.ScaleFactor = dynamoPreferences.ScaleFactor;
             
-            if (!IsTestMode || !IsHeadless)
+            if (!IsTestMode && !IsHeadless)
             {
                 if (workspace.ContainsLegacyTraceData)
                 {
@@ -2442,7 +2442,7 @@ private bool OpenXmlHomeWorkspace(
             Guid deterministicId = GuidUtility.Create(GuidUtility.UrlNamespace, workspaceInfo.Name);
 
             var loadedTraceData = Utils.LoadTraceDataFromXmlDocument(xmlDoc, out var containsLegacyTraceData);
-            if (!IsTestMode || !IsHeadless)
+            if (!IsTestMode && !IsHeadless)
             {
                 if (containsLegacyTraceData) OnRequestNotification(Resources.LegacyTraceDataWarning, true);
             }

From 3dbe2e1ac0a78aca994ac6d6fdf165296272e834 Mon Sep 17 00:00:00 2001
From: "Aaron (Qilong)" <173288704@qq.com>
Date: Wed, 6 Dec 2023 02:14:27 -0500
Subject: [PATCH 18/22] Update Dropdown node population method (#14687)

---
 src/Libraries/CoreNodeModels/DropDown.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Libraries/CoreNodeModels/DropDown.cs b/src/Libraries/CoreNodeModels/DropDown.cs
index 71ec3ce9758..50586afaec0 100644
--- a/src/Libraries/CoreNodeModels/DropDown.cs
+++ b/src/Libraries/CoreNodeModels/DropDown.cs
@@ -303,7 +303,6 @@ public void PopulateItems()
             // Restore the selection when selectedIndex is valid
             if (selectionState == SelectionState.Restore && !string.IsNullOrEmpty(currentSelection))
             {
-                SelectedIndex = -1;
                 for (int i = 0; i < items.Count; i++)
                 {
                     if (GetSelectedStringFromItem(items.ElementAt(i)).Equals(currentSelection))

From 0450cc03ec2ded38f3ef5ed31534dd3309f716df Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Wed, 6 Dec 2023 16:42:13 +0000
Subject: [PATCH 19/22] DYN-6493: reset page order when discarding publish
 package form (#14695)

* reset page order

- goes back to the first page when navigating away from the tab (on cancel only)

* revert namespaces

* revert namespaces
---
 .../PackageManagerPublishControl.xaml.cs         | 16 ++++++++++++++++
 .../PackageManager/PackageManagerView.xaml.cs    |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
index 54a82e58d1b..84bc4d07653 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
@@ -329,5 +329,21 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
                 PublishPackageViewModel.CancelCommand.Execute();
             }
         }
+
+        /// <summary>
+        /// Navigates back to the starting page 
+        /// </summary>
+        internal void ResetPageOrder()
+        {
+            currentPage = 0;
+            int stepIndex = Breadcrumbs.IndexOf((string)PublishPages[0].Tag);
+            for (int i = Breadcrumbs.Count - 1; i > stepIndex; i--)
+            {
+                Breadcrumbs.RemoveAt(i);
+            }
+            this.mainFrame.NavigationService.Navigate(PublishPages[currentPage]);
+            this.breadcrumbsNavigation.Visibility = Visibility.Collapsed;
+            ToggleButtonRowVisibility(0);
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs
index 5a576e2878e..9b6a751e27e 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs
@@ -228,6 +228,11 @@ private void tab_PreviewMouseDown(object sender, MouseButtonEventArgs e)
                 {
                     PackageManagerViewModel.PublishPackageViewModel.CancelCommand.Execute();
                     selectedTab.IsSelected = true;
+                    var pmPublishControl = this.packageManagerPublish as PackageManagerPublishControl;
+                    if (pmPublishControl != null)
+                    {
+                        pmPublishControl.ResetPageOrder();
+                    }
                 }
                 else
                 {

From 6b64aee04fda8bc8f9e9427a32c3fe67be4ee62a Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Wed, 6 Dec 2023 17:58:46 +0000
Subject: [PATCH 20/22] DYN-6500: disable cancel button if no changes (#14692)

* disable cancel button of no changes

- if there are no changes, disable the cancel button

* revert namespaces

* revert namespaces

* rename button cancel to reset
---
 .../Properties/Resources.Designer.cs          |  9 +++++++
 .../Properties/Resources.en-US.resx           |  3 +++
 src/DynamoCoreWpf/Properties/Resources.resx   |  3 +++
 .../PackageManager/PublishPackageViewModel.cs | 26 +++++++++++++++++++
 .../PackageManagerPublishControl.xaml         |  3 ++-
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index fb340ccce0b..8a80997f08b 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -8109,6 +8109,15 @@ public static string PublishPackageRemoveFromPacakgeTooltip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Reset.
+        /// </summary>
+        public static string PublishPackageResetButton {
+            get {
+                return ResourceManager.GetString("PublishPackageResetButton", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to When this setting is enabled, the folder structure of uploaded files will be retained. Otherwise, files will be placed into predefined folders.
         ///
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 588081c3467..5de8faf77fb 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1843,6 +1843,9 @@ Next assemblies were loaded several times:
   <data name="PublishPackageLocally" xml:space="preserve">
     <value>Publish Locally</value>
   </data>
+  <data name="PublishPackageResetButton" xml:space="preserve">
+    <value>Reset</value>
+  </data>
   <data name="PublishPackageMessage" xml:space="preserve">
     <value>Package published successfully. 
 Want to publish a different package?</value>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 61b2c74b5f7..ce311e01cb3 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2322,6 +2322,9 @@ Do you want to install the latest Dynamo update?</value>
   <data name="PublishPackageLocally" xml:space="preserve">
     <value>Publish Locally</value>
   </data>
+  <data name="PublishPackageResetButton" xml:space="preserve">
+    <value>Reset</value>
+  </data>
   <data name="PublishPackageSelectPackageContentsMessage" xml:space="preserve">
     <value>Select package contents</value>
   </data>
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
index f1aeab43e50..c70728c89ed 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -255,6 +255,7 @@ public string Group
                 {
                     _group = value;
                     RaisePropertyChanged("Group");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -273,6 +274,7 @@ public string Description
                 {
                     _Description = value;
                     RaisePropertyChanged("Description");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -301,6 +303,7 @@ public string Keywords
 
                     _Keywords = value;
                     RaisePropertyChanged("Keywords");
+                    RaisePropertyChanged(nameof(HasChanges));
                     KeywordList = value.Split(' ').Where(x => x.Length > 0).ToList();
                 }
             }
@@ -354,6 +357,7 @@ public string MinorVersion
                     if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
                     _MinorVersion = value;
                     RaisePropertyChanged("MinorVersion");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -380,6 +384,7 @@ public string BuildVersion
                     if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
                     _BuildVersion = value;
                     RaisePropertyChanged("BuildVersion");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -406,6 +411,7 @@ public string MajorVersion
                     if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
                     _MajorVersion = value;
                     RaisePropertyChanged("MajorVersion");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -429,6 +435,7 @@ public string License
                 {
                     _license = value;
                     RaisePropertyChanged(nameof(License));
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -444,6 +451,7 @@ public string CopyrightHolder
             {
                 copyrightHolder = value;
                 RaisePropertyChanged(nameof(CopyrightHolder));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
@@ -458,6 +466,7 @@ public string CopyrightYear
             {
                 copyrightYear = value;
                 RaisePropertyChanged(nameof(CopyrightYear));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
@@ -475,6 +484,7 @@ public string SiteUrl
                 {
                     _siteUrl = value;
                     RaisePropertyChanged("SiteUrl");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -493,6 +503,7 @@ public string RepositoryUrl
                 {
                     _repositoryUrl = value;
                     RaisePropertyChanged("RepositoryUrl");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -516,6 +527,8 @@ public string Name
                         SubmitCommand.RaiseCanExecuteChanged();
                         PublishLocallyCommand.RaiseCanExecuteChanged();
                     });
+
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -581,6 +594,7 @@ public List<string> SelectedHosts
                     SelectedHostsString = SelectedHostsString.Trim().TrimEnd(',');
                     RaisePropertyChanged( nameof(SelectedHosts));
                     RaisePropertyChanged( nameof(SelectedHostsString));
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -598,6 +612,7 @@ public string SelectedHostsString
                 {
                     selectedHostsString = value;
                     RaisePropertyChanged(nameof(SelectedHostsString));
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -759,6 +774,7 @@ public ObservableCollection<string> AdditionalFiles
                 {
                     _additionalFiles = value;
                     RaisePropertyChanged("AdditionalFiles");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -784,6 +800,7 @@ public string DependencyNames
             {
                 dependencyNames = value; 
                 RaisePropertyChanged(nameof(DependencyNames));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
@@ -892,9 +909,18 @@ public string RootFolder
             {
                 _rootFolder = value;
                 RaisePropertyChanged(nameof(RootFolder));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
+        /// <summary>
+        /// Indicates if the user has made any changes to the current publish package form
+        /// </summary>
+        public bool HasChanges
+        {
+            get { return AnyUserChanges(); }
+        }
+
         #endregion
                 
         internal PublishPackageViewModel()
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
index 7e11de8dca6..e6487e6d839 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
@@ -364,7 +364,8 @@
 
                     <!--  Cancel  -->
                     <Button Click="CancelButton_Click"
-                            Content="{x:Static p:Resources.CancelButton}"
+                            Content="{x:Static p:Resources.PublishPackageResetButton}"
+                            IsEnabled="{Binding HasChanges}"
                             DockPanel.Dock="Right"
                             Background="Transparent"
                             Foreground="White"

From 97761cddf7e27d08c3eac8791185f9edbe7ed5c2 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Wed, 6 Dec 2023 17:59:36 +0000
Subject: [PATCH 21/22] ui cherrypicks (#14704)

- only UI related cherrypick which should not trigger any test issues
---
 .../Controls/InstalledPackagesControl.xaml    |  24 +--
 .../Properties/Resources.Designer.cs          |   9 ++
 .../Properties/Resources.en-US.resx           |   3 +
 src/DynamoCoreWpf/Properties/Resources.resx   |   5 +-
 .../UI/Themes/Modern/DynamoModern.xaml        |  19 ++-
 .../PackageManagerPackagesControl.xaml        | 153 ++++++++++++------
 .../PackageManager/PackageManagerView.xaml    |  10 +-
 .../Pages/PublishPackagePublishPage.xaml      |   2 +-
 8 files changed, 158 insertions(+), 67 deletions(-)

diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
index 6bf51a5ad9e..969911653eb 100644
--- a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
@@ -52,10 +52,12 @@
                                  GroupName="PackageFilters"
                                  IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
                                  Style="{StaticResource {x:Type ToggleButton}}"
-                                 FontSize="10"
+                                 FontSize="11"
                                  FontFamily="Artifakt Element"
                                  FontWeight="Medium"
                                  HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"
+                                 VerticalContentAlignment="Center"
                                  BorderThickness="1"
                                  BorderBrush="Transparent"
                                  UseLayoutRounding="True"
@@ -121,7 +123,7 @@
                                                 </TextBlock>
                                                 <TextBlock Text="{Binding Path=Model.VersionName}"
                                                                MinWidth="70"
-                                                               FontSize="11"
+                                                               FontSize="12"
                                                                VerticalAlignment="Center"
                                                                Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>
                                                
@@ -255,7 +257,8 @@
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
+                                                                           FontSize="11"
+                                                                           FontWeight="Regular"
                                                                            TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
@@ -279,7 +282,8 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
+                                                                           FontSize="11"
+                                                                           FontWeight="Regular"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -312,7 +316,8 @@
                                                             <TextBlock Name="Label"
                                                                            Text="{Binding Path=Name}"
                                                                            Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
+                                                                           FontSize="11"
+                                                                           FontWeight="Regular"
                                                                            TextTrimming="CharacterEllipsis" />
 
                                                             <DataTemplate.Triggers>
@@ -334,7 +339,7 @@
                                                         Margin="0,0,0,5">
 
                                                 <Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalFileLabel}"
-                                                           FontSize="11"
+                                                           FontSize="12"
                                                        Padding="0,5,5,5"
                                                            Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
                                                 <ItemsControl Name="AdditionalFiles"
@@ -344,9 +349,10 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <TextBlock Text="{Binding Path=RelativePath}"
-                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                                           FontSize="9"
-                                                                           TextTrimming="CharacterEllipsis" />
+                                                                       Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                       FontSize="12"
+                                                                       FontWeight="Regular"
+                                                                       TextTrimming="CharacterEllipsis" />
                                                         </DataTemplate>
                                                     </ItemsControl.ItemTemplate>
 
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 8a80997f08b..2ce5d62be52 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -5744,6 +5744,15 @@ public static string PackageManagerMyPackagesControlName {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Publish Version.
+        /// </summary>
+        public static string PackageManagerMyPackagesPublishVersion {
+            get {
+                return ResourceManager.GetString("PackageManagerMyPackagesPublishVersion", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to My Packages.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 5de8faf77fb..9936d518cb8 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3615,6 +3615,9 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
+  <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
+    <value>Publish Version</value>
+  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index ce311e01cb3..19a284d4064 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3602,6 +3602,9 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PackageDeprecatedTooltip" xml:space="preserve">
     <value>This package is outdated and cannot be installed.</value>
   </data>
+ <data name="PackageManagerMyPackagesPublishVersion" xml:space="preserve">
+    <value>Publish Version</value>
+  </data>
   <data name="SplashScreenViewExtensions" xml:space="preserve">
     <value>Loading View Extensions...</value>
   </data>
@@ -3845,4 +3848,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
     <value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index 26ca6add1dd..c3cc6e2c43e 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -53,6 +53,7 @@
     <Color x:Key="DefaultBorderBrushDarkColor">Black</Color>
     <Color x:Key="GenericMouseOverBackgroundColor">#808080</Color>
 
+    <SolidColorBrush x:Key="BorderPressedColorBrush" Color="{DynamicResource BorderPressedColor}"/>
     <SolidColorBrush x:Key="GenericBorderBackgroundColorBrush" Color="#3c3c3c"/>    
     <SolidColorBrush x:Key="GenericMouseOverBackgroundColorBrush" Color="{DynamicResource GenericMouseOverBackgroundColor}"/>    
 
@@ -1022,7 +1023,7 @@
         <Setter Property="CaretBrush" Value="{StaticResource PrimaryCharcoal200Brush}" />
         <Setter Property="Padding" Value="10,12,10,8"/>
         <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}"/>
-        <Setter Property="FontSize" Value="12px" />
+        <Setter Property="FontSize" Value="14px" />
         <Setter Property="Foreground" Value="{StaticResource PrimaryCharcoal200Brush}"/>
         <Setter Property="TextWrapping" Value="Wrap"/>
 
@@ -3421,11 +3422,19 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Grid>
-                        <Image Name="menuIcon"  Width="16" Height="16" Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu_16_16.png"/>
+                        <Border Width="16" Height="16" Background="Transparent" BorderThickness="0">
+                            <Path Name="menuIcon"
+                                  Width="16"
+                                  Height="16"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Fill="{DynamicResource MidGreyBrush}"
+                                  Data="M7.5 3C8.32843 3 9 2.32843 9 1.5C9 0.671573 8.32843 0 7.5 0C6.67157 0 6 0.671573 6 1.5C6 2.32843 6.67157 3 7.5 3ZM7.5 9C8.32843 9 9 8.32843 9 7.5C9 6.67157 8.32843 6 7.5 6C6.67157 6 6 6.67157 6 7.5C6 8.32843 6.67157 9 7.5 9ZM9 13.5C9 14.3284 8.32843 15 7.5 15C6.67157 15 6 14.3284 6 13.5C6 12.6716 6.67157 12 7.5 12C8.32843 12 9 12.6716 9 13.5Z"/>
+                        </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="menuIcon" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/menu-hover-16px.png" />
+                            <Setter TargetName="menuIcon" Property="Fill" Value="{DynamicResource BorderPressedColorBrush}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value=".5" />
@@ -3434,7 +3443,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-    </Style>
+    </Style>    
 
     <Style x:Key="CtaButtonStyle" TargetType="Button">
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -4242,7 +4251,7 @@
 
     <Style x:Key="PackageManagerTab" TargetType="{x:Type TabItem}">
         <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="FontSize" Value="15" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
index 998499ef4d2..6fa2e9d1291 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
@@ -259,6 +259,7 @@
                                     IsEnabled="{Binding IsEnabledForInstall}">
                                 <Button.Style>
                                     <Style TargetType="Button">
+                                        <Setter Property="Visibility" Value="Visible"/>
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type Button}">
@@ -329,12 +330,9 @@
                                                                                 </DataTrigger>
                                                                                 <MultiDataTrigger>
                                                                                     <MultiDataTrigger.Conditions>
-                                                                                        <Condition Binding="{Binding Path=IsDeprecated}"
-                                                                                                   Value="False" />
-                                                                                        <Condition Binding="{Binding Path=CanInstall}"
-                                                                                                   Value="True" />
-                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}"
-                                                                                                   Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
+                                                                                        <Condition Binding="{Binding Path=CanInstall}" Value="True" />
+                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
                                                                                     </MultiDataTrigger.Conditions>
                                                                                     <Setter Property="Fill">
                                                                                         <Setter.Value>
@@ -350,54 +348,117 @@
                                                         </Grid>
                                                     </Border>
                                                     <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsMouseOver"
-                                                                 Value="True">
-                                                            <Setter TargetName="ButtonBorder"
-                                                                    Property="BorderBrush"
-                                                                    Value="#4A4A4A" />
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
                                                         </Trigger>
-                                                        <Trigger Property="IsPressed"
-                                                                 Value="True">
-                                                            <Setter TargetName="ButtonBorder"
-                                                                    Property="BorderBrush"
-                                                                    Value="#5F5F5F" />
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
                                                         </Trigger>
-                                                        <DataTrigger Binding="{Binding IsDeprecated}"
-                                                                     Value="True">
-                                                            <Setter Property="TextBlock.Opacity"
-                                                                    Value="0.5" />
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#84D7CE" />
-                                                            <Setter Property="ToolTip"
-                                                                    Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
+                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
+                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding CanInstall}"
-                                                                     Value="False">
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#999999" />
-                                                            <Setter Property="Opacity"
-                                                                    Value="1" />
+                                                        <DataTrigger Binding="{Binding CanInstall}" Value="False">
+                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
+                                                            <Setter Property="Opacity" Value="1" />
                                                         </DataTrigger>
-                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}"
-                                                                     Value="False">
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#999999" />
-                                                            <Setter Property="TextBlock.Opacity"
-                                                                    Value="1" />
+                                                        <DataTrigger Binding="{Binding IsEnabledForInstall}" Value="False">
+                                                            <Setter Property="TextBlock.Foreground" Value="#999999" />
+                                                            <Setter Property="TextBlock.Opacity" Value="1" />
+                                                        </DataTrigger>
+                                                        <MultiDataTrigger>
+                                                            <MultiDataTrigger.Conditions>
+                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
+                                                                <Condition Binding="{Binding Path=CanInstall}" Value="True" />
+                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
+                                                            </MultiDataTrigger.Conditions>
+                                                            <Setter Property="TextBlock.Opacity" Value="1" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                        </MultiDataTrigger>
+                                                        <MultiDataTrigger>
+                                                            <MultiDataTrigger.Conditions>
+                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
+                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
+                                                            </MultiDataTrigger.Conditions>
+                                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                                        </MultiDataTrigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Button.Style>
+                            </Button>
+
+
+                            <!--  Publish Version Button  -->
+                            <Button Name="publishButton"
+                                    Content="{x:Static p:Resources.PackageManagerMyPackagesPublishVersion}"
+                                    Command="{Binding Path=PackageManagerViewModel.PublishNewVersionCommand,
+                                                      RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                    CommandParameter="{Binding}"
+                                    DockPanel.Dock="Right"
+                                    ToolTipService.ShowOnDisabled="True"
+                                    IsEnabled="{Binding IsEnabledForInstall}">
+                                <Button.Style>
+                                    <Style TargetType="Button">
+                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="{x:Type Button}">
+                                                    <Border Name="ButtonBorder"
+                                                            Height="25"
+                                                            Padding="5,0"
+                                                            BorderThickness="2"
+                                                            CornerRadius="2">
+                                                        <Grid x:Name="publishPackageGrid">
+
+                                                            <DockPanel LastChildFill="False">
+                                                                <TextBlock Name="textBlock"
+                                                                           Padding="4,4,4,3"
+                                                                           VerticalAlignment="Center"
+                                                                           Cursor="Hand"
+                                                                           DockPanel.Dock="Right"
+                                                                           FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                                           FontSize="11"
+                                                                           Text="{TemplateBinding Content}" />
+                                                                <Rectangle Width="10"
+                                                                           Height="10"
+                                                                           VerticalAlignment="Center"
+                                                                           DockPanel.Dock="Left">
+                                                                    <Rectangle.Fill>
+                                                                        <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - default.png" />
+                                                                    </Rectangle.Fill>
+                                                                </Rectangle>
+                                                            </DockPanel>
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#4A4A4A" />
+                                                        </Trigger>
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="ButtonBorder" Property="BorderBrush" Value="#5F5F5F" />
+                                                        </Trigger>
+                                                        <DataTrigger Binding="{Binding IsDeprecated}" Value="True">
+                                                            <Setter Property="TextBlock.Opacity" Value="0.5" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                            <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                         </DataTrigger>
                                                         <MultiDataTrigger>
                                                             <MultiDataTrigger.Conditions>
-                                                                <Condition Binding="{Binding Path=IsDeprecated}"
-                                                                           Value="False" />
-                                                                <Condition Binding="{Binding Path=CanInstall}"
-                                                                           Value="True" />
-                                                                <Condition Binding="{Binding Path=IsEnabledForInstall}"
-                                                                           Value="True" />
+                                                                <Condition Binding="{Binding Path=IsDeprecated}" Value="False" />
+                                                            </MultiDataTrigger.Conditions>
+                                                            <Setter Property="TextBlock.Opacity" Value="1" />
+                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                        </MultiDataTrigger>
+                                                        <MultiDataTrigger>
+                                                            <MultiDataTrigger.Conditions>
+                                                                <Condition Binding="{Binding Path=CanInstall}" Value="False"/>
+                                                                <Condition Binding="{Binding Path=IsOnwer}" Value="True"/>
                                                             </MultiDataTrigger.Conditions>
-                                                            <Setter Property="TextBlock.Opacity"
-                                                                    Value="1" />
-                                                            <Setter Property="TextBlock.Foreground"
-                                                                    Value="#84D7CE" />
+                                                            <Setter Property="Visibility" Value="Visible"/>
                                                         </MultiDataTrigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
index b8eb4d9aa1b..771ec05f97e 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
@@ -32,7 +32,7 @@
             <controls:ListHasMoreThanNItemsToVisibilityConverter x:Key="ListHasMoreThanNItemsToVisibilityConverter" />
             <controls:EmptyListToVisibilityConverter x:Key="EmptyListToVisibilityConverter" />
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
+            
             <Style x:Key="PkgMngTextBlockStyle" TargetType="TextBlock">
                 <Setter Property="Width" Value="Auto" />
                 <Setter Property="Margin" Value="0 5" />
@@ -111,7 +111,7 @@
                            Grid.Column="0"
                            Margin="14,16,0,0"
                            TextAlignment="Left"
-                           FontSize="18"
+                           FontSize="20"
                            FontFamily="Helvetica"
                            HorizontalAlignment="Left"
                            Width="459" />
@@ -509,7 +509,7 @@
                                                 HorizontalAlignment="Stretch">
                                         <TextBlock FontFamily="{StaticResource ArtifaktElementRegular}"
                                                    Foreground="{StaticResource PreferencesWindowFontColor}"
-                                                   FontSize="13"
+                                                   FontSize="14"
                                                    Margin="0 5 0 20">
                                             <Run Text="{x:Static p:Resources.PackageManagerSettingsRunPrefix}" />
                                             <Hyperlink Click="OnPackageManagerSettingsHyperlinkClicked"
@@ -521,7 +521,7 @@
                                         </TextBlock>
                                         <Label Content="{x:Static p:Resources.PreferencesViewPackageDownloadDirectory}"
                                                Padding="5,5,5,5"
-                                               FontSize="13"
+                                               FontSize="14"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
@@ -541,7 +541,7 @@
 
                                         <Label Content="{x:Static p:Resources.PackagePathPreferencesTitle}"
                                                Padding="5,5,5,5"
-                                               FontSize="13"
+                                               FontSize="14"
                                                Foreground="{StaticResource PreferencesWindowFontColor}">
                                             <Label.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.PreferencesPackageDownloadDirectoryTooltip}"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
index 3fa2101b100..e3f6cb36e8a 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
@@ -539,7 +539,7 @@
                                     <CheckBox Name="HostEntry"
                                               Checked="HostEntry_CheckStateChanged"
                                               Content="{Binding HostName}"
-                                              IsChecked="{Binding IsSelected, Mode=TwoWay}"
+                                              IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                               Style="{StaticResource ComboBoxCheckBoxStyle}"
                                               Tag="{RelativeSource FindAncestor,
                                                             AncestorType={x:Type ComboBox}}"

From c599f9f3a6e8c38200e72a244bc9525f158832f0 Mon Sep 17 00:00:00 2001
From: pinzart90 <46732933+pinzart90@users.noreply.github.com>
Date: Wed, 6 Dec 2023 13:33:38 -0500
Subject: [PATCH 22/22] Webview2 initialization (#14671)

* upate

* Update ViewExtension.cs

* Update DocumentationBrowserView.xaml.cs

* Update NotificationsViewExtension.cs

* update

* update

* Update NotificationCenterController.cs

* Test webview2 (#14670)

* update

* update

* Update DocumentationBrowserView.xaml.cs

* update

* Update DocumentationBrowserView.xaml.cs

* update

* update

---------

Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com>

* Update NotificationCenterController.cs

* Update DispatcherUtil.cs

* Update CS_SDK.props

* Revert "Update CS_SDK.props"

This reverts commit cfaceb2ee3e5be6500b08ff065642e7248cc69d0.

---------

Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com>
---
 .../DocumentationBrowserView.xaml.cs          |  40 +++---
 .../DocumentationBrowserViewExtension.cs      |   2 +-
 .../Views/GuidedTour/PopupWindow.xaml.cs      |   4 +-
 .../Views/SplashScreen/SplashScreen.xaml.cs   |   2 +
 src/DynamoUtilities/AsyncMethodState.cs       |  14 ++
 .../Properties/AssemblyInfo.cs                |   2 +-
 .../LibraryViewController.cs                  |  42 +++---
 .../ViewExtension.cs                          |   3 +-
 .../NotificationCenterController.cs           |  90 ++++++++-----
 .../NotificationsViewExtension.cs             |  10 +-
 src/Notifications/Properties/AssemblyInfo.cs  |   4 +-
 test/DynamoCoreTests/UnitTestBase.cs          |   2 +
 test/DynamoCoreWpfTests/DynamoTestUIBase.cs   |   4 +-
 .../DynamoViewModelUnitTest.cs                |   4 +-
 .../PackageManager/PackageManagerUITests.cs   |   8 +-
 .../PythonNodeCustomizationTests.cs           |  24 +++-
 .../Utility/DispatcherUtil.cs                 |  40 +++++-
 .../DocumentationBrowserViewExtensionTests.cs | 123 +++++++++++-------
 .../NotificationsExtensionTests.cs            |  10 ++
 .../SystemTestServices/SystemTestBase.cs      |   5 +-
 .../HelixWatch3DViewModelTests.cs             |   3 +-
 21 files changed, 283 insertions(+), 153 deletions(-)
 create mode 100644 src/DynamoUtilities/AsyncMethodState.cs

diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs
index 766261cab34..b3990d9d288 100644
--- a/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs
+++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserView.xaml.cs
@@ -7,6 +7,7 @@
 using System.Windows.Controls;
 using Dynamo.Logging;
 using Dynamo.Utilities;
+using DynamoUtilities;
 using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.Wpf;
 
@@ -21,7 +22,7 @@ public partial class DocumentationBrowserView : UserControl, IDisposable
         private readonly DocumentationBrowserViewModel viewModel;
         private const string VIRTUAL_FOLDER_MAPPING = "appassets";
         static readonly string HTML_IMAGE_PATH_PREFIX = @"http://";
-        private bool hasBeenInitialized;
+        internal AsyncMethodState initState = AsyncMethodState.NotStarted;
         private ScriptingObject comScriptingObject;
         private string fontStylePath = "Dynamo.Wpf.Views.GuidedTour.HtmlPages.Resources.ArtifaktElement-Regular.woff";
 
@@ -104,26 +105,22 @@ private void ShouldAllowNavigation(object sender, CoreWebView2NavigationStarting
         /// <param name="link"></param>
         public void NavigateToPage(Uri link)
         {
-            InitializeAsync();
+            Dispatcher.Invoke(InitializeAsync);
         }
 
         protected virtual void Dispose(bool disposing)
         {
             // Cleanup
             this.viewModel.LinkChanged -= NavigateToPage;
-            this.documentationBrowser.NavigationStarting -= ShouldAllowNavigation;
-            this.documentationBrowser.DpiChanged -= DocumentationBrowser_DpiChanged;
-
-            if (this.documentationBrowser.CoreWebView2 != null)
+            if (this.documentationBrowser != null)
             {
-                this.documentationBrowser.CoreWebView2.WebMessageReceived -= CoreWebView2OnWebMessageReceived;
-            }
+                this.documentationBrowser.NavigationStarting -= ShouldAllowNavigation;
+                this.documentationBrowser.DpiChanged -= DocumentationBrowser_DpiChanged;
+                if (this.documentationBrowser.CoreWebView2 != null)
+                {
+                    this.documentationBrowser.CoreWebView2.WebMessageReceived -= CoreWebView2OnWebMessageReceived;
+                }
 
-            // Note to test writers
-            // Disposing the document browser will cause future tests
-            // that uses the Browser component to crash
-            if (!Models.DynamoModel.IsTestMode)
-            {
                 this.documentationBrowser.Dispose();
             }
         }
@@ -159,8 +156,9 @@ async void InitializeAsync()
             }
 
             // Only initialize once 
-            if (!hasBeenInitialized)
+            if (initState == AsyncMethodState.NotStarted)
             {
+                initState = AsyncMethodState.Started;
                 if (!string.IsNullOrEmpty(WebBrowserUserDataFolder))
                 {
                     //This indicates in which location will be created the WebView2 cache folder
@@ -169,9 +167,9 @@ async void InitializeAsync()
                         UserDataFolder = WebBrowserUserDataFolder
                     };
                 }
+
                 //Initialize the CoreWebView2 component otherwise we can't navigate to a web page
                 await documentationBrowser.EnsureCoreWebView2Async();
-                
            
                 this.documentationBrowser.CoreWebView2.WebMessageReceived += CoreWebView2OnWebMessageReceived;
                 comScriptingObject = new ScriptingObject(this.viewModel);
@@ -181,7 +179,7 @@ async void InitializeAsync()
                 this.documentationBrowser.CoreWebView2.Settings.IsZoomControlEnabled = true;
                 this.documentationBrowser.CoreWebView2.Settings.AreDevToolsEnabled = true;
 
-                hasBeenInitialized = true;
+                initState = AsyncMethodState.Done;
             }
 
             if(Directory.Exists(VirtualFolderPath))
@@ -192,10 +190,7 @@ async void InitializeAsync()
 
             htmlContent = ResourceUtilities.LoadResourceAndReplaceByKey(htmlContent, "#fontStyle", fontStylePath);
 
-            Dispatcher.BeginInvoke(new Action(() =>
-            {
-                this.documentationBrowser.NavigateToString(htmlContent);
-            }));
+            this.documentationBrowser.NavigateToString(htmlContent);
         }
 
         private void CoreWebView2OnWebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e)
@@ -209,6 +204,11 @@ private void CoreWebView2OnWebMessageReceived(object sender, CoreWebView2WebMess
         /// </summary>
         public void Dispose()
         {
+            if (initState == AsyncMethodState.Started)
+            {
+                Log("DocumentationBrowserView is being disposed but async initialization is still not done");
+            }
+
             Dispose(true);
             GC.SuppressFinalize(this);
         }
diff --git a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs
index b56498864e5..3934a1c6377 100644
--- a/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs
+++ b/src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.cs
@@ -178,7 +178,7 @@ public override void Loaded(ViewLoadedParams viewLoadedParams)
 
         public override void Shutdown()
         {
-            Dispose();
+            // Do nothing for now
         }
 
         private void OnInsertFile(object sender, InsertDocumentationLinkEventArgs e)
diff --git a/src/DynamoCoreWpf/Views/GuidedTour/PopupWindow.xaml.cs b/src/DynamoCoreWpf/Views/GuidedTour/PopupWindow.xaml.cs
index c007b7d3014..fe5f47fe0f3 100644
--- a/src/DynamoCoreWpf/Views/GuidedTour/PopupWindow.xaml.cs
+++ b/src/DynamoCoreWpf/Views/GuidedTour/PopupWindow.xaml.cs
@@ -105,7 +105,9 @@ private void PopupWindow_Opened(object sender, EventArgs e)
         {
             if (hostControlInfo.HtmlPage != null && !string.IsNullOrEmpty(hostControlInfo.HtmlPage.FileName))
             {
-                ContentRichTextBox.Visibility = Visibility.Hidden;            
+                ContentRichTextBox.Visibility = Visibility.Hidden;
+
+                // Opened event ensures the webview2 will be visible when added to the popup layout tree.
                 InitWebView2Component();
             }
         }
diff --git a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
index 51b781759c7..44918de435b 100644
--- a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
+++ b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
@@ -304,6 +304,8 @@ protected override async void OnContentRendered(EventArgs e)
             {
                 UserDataFolder = webBrowserUserDataFolder.FullName
             };
+
+            //ContentRendered ensures that the webview2 component is visible.
             await webView.EnsureCoreWebView2Async();
             // Context menu disabled
             webView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
diff --git a/src/DynamoUtilities/AsyncMethodState.cs b/src/DynamoUtilities/AsyncMethodState.cs
new file mode 100644
index 00000000000..9385dbe40bf
--- /dev/null
+++ b/src/DynamoUtilities/AsyncMethodState.cs
@@ -0,0 +1,14 @@
+
+namespace DynamoUtilities
+{
+    /// <summary>
+    /// Simple representation of the states of an async method
+    /// Used for identifying issues like Dispose called before async method is finished. 
+    /// </summary>
+    internal enum AsyncMethodState
+    {
+        NotStarted = 0,// Async method not called yet
+        Started,// Async method called but not finished execution (usually set before any awaits)
+        Done// Async method has finished execution (all awaits have finished)
+    }
+}
diff --git a/src/DynamoUtilities/Properties/AssemblyInfo.cs b/src/DynamoUtilities/Properties/AssemblyInfo.cs
index 67a7633b408..208a7fe482b 100644
--- a/src/DynamoUtilities/Properties/AssemblyInfo.cs
+++ b/src/DynamoUtilities/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@
 [assembly: InternalsVisibleTo("DynamoCLI")]
 [assembly: InternalsVisibleTo("NodeDocumentationMarkdownGenerator")]
 [assembly: InternalsVisibleTo("DynamoUtilitiesTests")]
-
+[assembly: InternalsVisibleTo("Notifications")]
diff --git a/src/LibraryViewExtensionWebView2/LibraryViewController.cs b/src/LibraryViewExtensionWebView2/LibraryViewController.cs
index 6c4499fd368..749598a66c8 100644
--- a/src/LibraryViewExtensionWebView2/LibraryViewController.cs
+++ b/src/LibraryViewExtensionWebView2/LibraryViewController.cs
@@ -120,6 +120,22 @@ internal LibraryViewController(Window dynamoView, ICommandExecutive commandExecu
             {
                 WebBrowserUserDataFolder = webBrowserUserDataFolder.FullName;
             }
+
+            /// Create and add the library view to the WPF visual tree.
+            /// Also load the library.html and js files.
+            LibraryViewModel model = new LibraryViewModel();
+            LibraryView view = new LibraryView(model);
+
+            //Adding the LibraryView to the sidebar ensures that the webview2 component is visible.
+            var sidebarGrid = dynamoWindow.FindName("sidebarGrid") as Grid;
+            sidebarGrid.Children.Add(view);
+
+            browser = view.mainGrid.Children.OfType<WebView2>().FirstOrDefault();
+            browser.Loaded += Browser_Loaded;
+            browser.SizeChanged += Browser_SizeChanged;
+
+            LibraryViewController.SetupSearchModelEventsObserver(browser, dynamoViewModel.Model.SearchModel,
+                    this, this.customization);
         }
 
         private void DynamoViewModel_PreferencesWindowChanged(object sender, EventArgs e)
@@ -302,30 +318,6 @@ private string ReplaceUrlWithBase64Image(string html, string minifiedURL, bool m
            Tuple.Create("/resources/search-icon-clear.svg",true)
         };
 
-        /// <summary>
-        /// Creates and adds the library view to the WPF visual tree.
-        /// Also loads the library.html and js files.
-        /// </summary>
-        /// <returns>LibraryView control</returns>
-        internal void AddLibraryView()
-        {
-            LibraryViewModel model = new LibraryViewModel();
-            LibraryView view = new LibraryView(model);
-
-            var sidebarGrid = dynamoWindow.FindName("sidebarGrid") as Grid;
-            sidebarGrid.Children.Add(view);
-
-            browser = view.mainGrid.Children.OfType<WebView2>().FirstOrDefault();
-            browser.Loaded += Browser_Loaded;
-            browser.SizeChanged += Browser_SizeChanged;
-
-            this.browser = view.mainGrid.Children.OfType<WebView2>().FirstOrDefault();
-            InitializeAsync();
-
-            LibraryViewController.SetupSearchModelEventsObserver(browser, dynamoViewModel.Model.SearchModel,
-                    this, this.customization);
-        }
-
         async void InitializeAsync()
         {
             try
@@ -422,6 +414,8 @@ private void Browser_Loaded(object sender, RoutedEventArgs e)
         {
             string msg = "Browser Loaded";
             LogToDynamoConsole(msg);
+
+            InitializeAsync();
         }
 
         // This enum is for matching the modifier keys between C# and javaScript
diff --git a/src/LibraryViewExtensionWebView2/ViewExtension.cs b/src/LibraryViewExtensionWebView2/ViewExtension.cs
index 999e02b596d..69d679dfd27 100644
--- a/src/LibraryViewExtensionWebView2/ViewExtension.cs
+++ b/src/LibraryViewExtensionWebView2/ViewExtension.cs
@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
 using Dynamo.Models;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Extensions;
@@ -35,7 +35,6 @@ public void Loaded(ViewLoadedParams viewLoadedParams)
             {
                 viewParams = viewLoadedParams;
                 controller = new LibraryViewController(viewLoadedParams.DynamoWindow, viewLoadedParams.CommandExecutive, customization);
-                controller.AddLibraryView();
                 (viewLoadedParams.DynamoWindow.DataContext as DynamoViewModel).PropertyChanged += handleDynamoViewPropertyChanges;
             }
             
diff --git a/src/Notifications/NotificationCenterController.cs b/src/Notifications/NotificationCenterController.cs
index ec5d2740cd1..c66e7cd415e 100644
--- a/src/Notifications/NotificationCenterController.cs
+++ b/src/Notifications/NotificationCenterController.cs
@@ -12,6 +12,7 @@
 using Dynamo.Controls;
 using Dynamo.Logging;
 using Dynamo.Notifications.View;
+using DynamoUtilities;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.ViewModels.Core;
 using Newtonsoft.Json;
@@ -48,7 +49,7 @@ public void UpdateNotificationWindowSize(int height)
         }
     }
 
-    public class NotificationCenterController
+    public class NotificationCenterController : IDisposable
     {
         private readonly NotificationUI notificationUIPopup;
         private readonly DynamoView dynamoView;
@@ -64,6 +65,8 @@ public class NotificationCenterController
         private static readonly string NotificationCenterButtonName = "notificationsButton";
         internal DirectoryInfo webBrowserUserDataFolder;
 
+        internal AsyncMethodState initState = AsyncMethodState.NotStarted;
+
         private readonly DynamoLogger logger;
         private string jsonStringFile;
         private NotificationsModel notificationsModel;
@@ -82,7 +85,6 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
             dynamoView.SizeChanged += DynamoView_SizeChanged;
             dynamoView.LocationChanged += DynamoView_LocationChanged;
             notificationsButton.Click += NotificationsButton_Click;
-            dynamoView.Closing += View_Closing;
             dynamoView.PreviewMouseDown += DynamoView_PreviewMouseDown;
 
             notificationUIPopup = new NotificationUI
@@ -97,41 +99,14 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
 
             // If user turns on the feature, they will need to restart Dynamo to see the count
             // This ensures no network traffic when Notification center feature is turned off
-            if (dynamoViewModel.PreferenceSettings.EnableNotificationCenter && !dynamoViewModel.Model.NoNetworkMode ) 
-            {               
-                InitializeBrowserAsync();
+            if (dynamoViewModel.PreferenceSettings.EnableNotificationCenter && !dynamoViewModel.Model.NoNetworkMode )
+            {
+                notificationUIPopup.webView.Loaded += InitializeBrowserAsync;
                 RequestNotifications();
             }   
         }
 
-        private void View_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            dynamoView.Closing -= View_Closing;
-            dynamoView.PreviewMouseDown -= DynamoView_PreviewMouseDown;
-            SuspendCoreWebviewAsync();
-        }
-
-        async void SuspendCoreWebviewAsync()
-        {
-            if (notificationUIPopup == null) return;
-
-            notificationUIPopup.IsOpen = false;
-            notificationUIPopup.webView.Visibility = Visibility.Hidden;
-
-            if (notificationUIPopup.webView.CoreWebView2 != null)
-            {
-                notificationUIPopup.webView.CoreWebView2.Stop();
-                notificationUIPopup.webView.CoreWebView2InitializationCompleted -= WebView_CoreWebView2InitializationCompleted;
-                notificationUIPopup.webView.CoreWebView2.NewWindowRequested -= WebView_NewWindowRequested;
-
-                dynamoView.SizeChanged -= DynamoView_SizeChanged;
-                dynamoView.LocationChanged -= DynamoView_LocationChanged;
-                notificationsButton.Click -= NotificationsButton_Click;
-                notificationUIPopup.webView.NavigationCompleted -= WebView_NavigationCompleted;
-            }
-        }
-
-        private void InitializeBrowserAsync()
+        private async void InitializeBrowserAsync(object sender, RoutedEventArgs e)
         {
             if (webBrowserUserDataFolder != null)
             {
@@ -142,7 +117,10 @@ private void InitializeBrowserAsync()
                 };
             }               
             notificationUIPopup.webView.CoreWebView2InitializationCompleted += WebView_CoreWebView2InitializationCompleted;
-            notificationUIPopup.webView.EnsureCoreWebView2Async();        
+
+            initState = AsyncMethodState.Started;
+            await notificationUIPopup.webView.EnsureCoreWebView2Async();
+            initState = AsyncMethodState.Done;
         }
 
         private void WebView_NavigationCompleted(object sender, Microsoft.Web.WebView2.Core.CoreWebView2NavigationCompletedEventArgs e)
@@ -328,5 +306,49 @@ public void RefreshNotifications(string url="") {
                 InvokeJS(@"window.RequestNotifications('" + DynamoUtilities.PathHelper.GetServiceBackendAddress(this, "notificationAddress") + "');");
             }
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (dynamoView != null)
+            {
+                dynamoView.SizeChanged -= DynamoView_SizeChanged;
+                dynamoView.LocationChanged -= DynamoView_LocationChanged;
+                dynamoView.PreviewMouseDown -= DynamoView_PreviewMouseDown;
+            }
+
+            if (notificationUIPopup != null)
+            {
+                notificationUIPopup.IsOpen = false;
+                notificationsButton.Click -= NotificationsButton_Click;
+
+                if (notificationUIPopup.webView != null)
+                {
+                    notificationUIPopup.webView.Visibility = Visibility.Hidden;
+                    notificationUIPopup.webView.Loaded -= InitializeBrowserAsync;
+                    notificationUIPopup.webView.NavigationCompleted -= WebView_NavigationCompleted;
+                    notificationUIPopup.webView.CoreWebView2InitializationCompleted -= WebView_CoreWebView2InitializationCompleted;
+
+                    if (notificationUIPopup.webView.CoreWebView2 != null)
+                    {
+                        notificationUIPopup.webView.CoreWebView2.Stop();
+                        notificationUIPopup.webView.CoreWebView2.NewWindowRequested -= WebView_NewWindowRequested;
+                    }
+                    notificationUIPopup.webView.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Dispose function for DocumentationBrowser
+        /// </summary>
+        public void Dispose()
+        {
+            if (initState == AsyncMethodState.Started)
+            {
+                logger?.Log("NotificationCenterController is being disposed but async initialization is still not done");
+            }
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
     }
 }
diff --git a/src/Notifications/NotificationsViewExtension.cs b/src/Notifications/NotificationsViewExtension.cs
index 2840e073f23..d3e19b5b0ce 100644
--- a/src/Notifications/NotificationsViewExtension.cs
+++ b/src/Notifications/NotificationsViewExtension.cs
@@ -18,7 +18,7 @@ public class NotificationsViewExtension : IViewExtension, INotifyPropertyChanged
         private Action<Logging.NotificationMessage> notificationHandler;
         private ObservableCollection<Logging.NotificationMessage> notifications;
         private bool disposed;
-        private NotificationCenterController notificationCenterController;
+        internal NotificationCenterController notificationCenterController;
         /// <summary>
         /// Notifications data collection. PropertyChanged event is raised to help dealing WPF bind dispose.
         /// </summary>
@@ -67,6 +67,8 @@ public void Dispose()
                 {
                     BindingOperations.ClearAllBindings(notificationsMenuItem.CountLabel);
                 }
+                notificationCenterController?.Dispose();
+                notificationCenterController = null;
                 notificationsMenuItem = null;
                 disposed = true;
             }
@@ -115,6 +117,12 @@ public void Loaded(ViewLoadedParams viewStartupParams)
         private void LoadNotificationCenter()
         {
             var dynamoView = viewLoadedParams.DynamoWindow as DynamoView;
+
+            if (notificationCenterController != null)
+            {
+                notificationCenterController.Dispose();
+                notificationCenterController = null;
+            }
             notificationCenterController = new NotificationCenterController(dynamoView, logger);
         }
 
diff --git a/src/Notifications/Properties/AssemblyInfo.cs b/src/Notifications/Properties/AssemblyInfo.cs
index f5edea27fe7..32c77894c8c 100644
--- a/src/Notifications/Properties/AssemblyInfo.cs
+++ b/src/Notifications/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -9,3 +10,4 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("0acedbf9-81ab-45ee-b5e5-0d036bce0a31")]
+[assembly:InternalsVisibleTo("DynamoCoreWpfTests")]
diff --git a/test/DynamoCoreTests/UnitTestBase.cs b/test/DynamoCoreTests/UnitTestBase.cs
index 425ddc00bfc..3b846660b00 100644
--- a/test/DynamoCoreTests/UnitTestBase.cs
+++ b/test/DynamoCoreTests/UnitTestBase.cs
@@ -64,6 +64,7 @@ public static string TestDirectory
         [SetUp]
         public virtual void Setup()
         {
+            System.Console.WriteLine("Start test: " + TestContext.CurrentContext.Test.Name);
             SetupDirectories();
 
             if (assemblyHelper == null)
@@ -97,6 +98,7 @@ public virtual void Cleanup()
             {
                 AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
             }
+            System.Console.WriteLine("Finished test: " + TestContext.CurrentContext.Test.Name);
         }
 
         public string GetNewFileNameOnTempPath(string fileExtension = "dyn")
diff --git a/test/DynamoCoreWpfTests/DynamoTestUIBase.cs b/test/DynamoCoreWpfTests/DynamoTestUIBase.cs
index 2f7cd01bfb6..dab89d012a1 100644
--- a/test/DynamoCoreWpfTests/DynamoTestUIBase.cs
+++ b/test/DynamoCoreWpfTests/DynamoTestUIBase.cs
@@ -40,6 +40,7 @@ protected string ExecutingDirectory
         [SetUp]
         public virtual void Start()
         {
+            System.Console.WriteLine("Start test: " + TestContext.CurrentContext.Test.Name);
             var assemblyPath = Assembly.GetExecutingAssembly().Location;
             preloader = new Preloader(Path.GetDirectoryName(assemblyPath));
             preloader.Preload();
@@ -78,7 +79,7 @@ public virtual void Start()
             View = new DynamoView(ViewModel);
             View.Show();
 
-            SynchronizationContext.SetSynchronizationContext(new SynchronizationContext());
+            SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
         }
 
         protected static void RaiseLoadedEvent(FrameworkElement element)
@@ -138,6 +139,7 @@ public void Exit()
             {
                 Console.WriteLine(ex.StackTrace);
             }
+            System.Console.WriteLine("Finished test: " + TestContext.CurrentContext.Test.Name);
         }
 
         protected virtual void GetLibrariesToPreload(List<string> libraries)
diff --git a/test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs b/test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs
index fe782319b6a..8705685c2ef 100644
--- a/test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs
+++ b/test/DynamoCoreWpfTests/DynamoViewModelUnitTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -185,4 +185,4 @@ protected void RunCurrentModel() // Run currently loaded model.
             Assert.DoesNotThrow(() => ViewModel.HomeSpace.Run());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs
index b24af6612a0..563f0f50a65 100644
--- a/test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs
+++ b/test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs
@@ -1262,8 +1262,12 @@ public void PackageManagerDownloadsBeforeInstalling()
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
 
-            //actually perform the download & install operations
-            pmVmMock.Object.ExecutePackageDownload(id, pkgVer, "");
+            Task.Run(() => {
+                // This test runs on a single thread (using DispatcherSyncronizationContext)
+                // We need to run the async ExecutePackageDownload function in a separate thread so that the Thread.Sleep does not mess up the other awaiting tasks.
+                //actually perform the download & install operations
+                pmVmMock.Object.ExecutePackageDownload(id, pkgVer, "");
+            }).Wait();
 
             //wait a bit.
             Thread.Sleep(500);
diff --git a/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs b/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
index 6a739b33db4..cc825e1e8da 100644
--- a/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
+++ b/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
@@ -12,6 +12,7 @@
 using Dynamo.PythonServices;
 using Dynamo.Tests;
 using Dynamo.Utilities;
+using Dynamo.ViewModels;
 using DynamoCoreWpfTests.Utility;
 using ICSharpCode.AvalonEdit.Document;
 using NUnit.Framework;
@@ -20,7 +21,7 @@
 
 namespace DynamoCoreWpfTests
 {
-    [TestFixture, Category("Failure")]
+    [TestFixture]
     public class PythonNodeCustomizationTests : DynamoTestUIBase
     {
         bool bTextEnteringEventRaised = false;
@@ -49,6 +50,19 @@ private static DependencyObject GetInfoBubble(DependencyObject parent)
             return null;
         }
 
+        private void WaitForDocumentationBrowserInitialization()
+        {
+            var docBrowserviewExtension = this.View.viewExtensionManager.ViewExtensions.OfType<DocumentationBrowserViewExtension>().FirstOrDefault();
+
+            // Wait for the DocumentationBrowserView webview2 control to finish initialization
+            DispatcherUtil.DoEventsLoop(() =>
+            {
+                return docBrowserviewExtension.BrowserView.initState == DynamoUtilities.AsyncMethodState.Done;
+            });
+
+            Assert.IsTrue(docBrowserviewExtension.BrowserView.initState == DynamoUtilities.AsyncMethodState.Done);
+        }
+
         public override void Open(string path)
         {
             base.Open(path);
@@ -276,7 +290,7 @@ public void OnMoreInfoEventTest()
 
             //Pressing the MoreInfo button, here the OnMoreInfoEvent is raised 
             moreInfoButton.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent));
-            DispatcherUtil.DoEvents();
+            WaitForDocumentationBrowserInitialization();
 
             //Check that now we are showing a extension tab (DocumentationBrowser)
             Assert.That(this.ViewModel.SideBarTabItems.Count, Is.EqualTo(1));
@@ -315,8 +329,7 @@ public void OpenPythonLearningMaterialValidationTest()
 
             //Click the button and internally the  OpenPythonLearningMaterial method is executed
             learnMoreMenuItem.RaiseEvent(new RoutedEventArgs(MenuItem.ClickEvent));
-
-            DispatcherUtil.DoEvents();
+            WaitForDocumentationBrowserInitialization();
 
             var learnMoreTab = this.ViewModel.SideBarTabItems
                                 .Where(x => x.Content.GetType().Equals(typeof(DocumentationBrowserView)))
@@ -349,8 +362,7 @@ public void OpenPythonLearningMaterial_PythonNodeFromStringValidationTest()
 
             //Click the button and internally the  OpenPythonLearningMaterial method is executed
             learnMoreMenuItem.RaiseEvent(new RoutedEventArgs(MenuItem.ClickEvent));
-
-            DispatcherUtil.DoEvents();
+            WaitForDocumentationBrowserInitialization();
 
             var learnMoreTab = this.ViewModel.SideBarTabItems
                                 .Where(x => x.Content.GetType().Equals(typeof(DocumentationBrowserView)))
diff --git a/test/DynamoCoreWpfTests/Utility/DispatcherUtil.cs b/test/DynamoCoreWpfTests/Utility/DispatcherUtil.cs
index 9f12de81776..b7e21cddb75 100644
--- a/test/DynamoCoreWpfTests/Utility/DispatcherUtil.cs
+++ b/test/DynamoCoreWpfTests/Utility/DispatcherUtil.cs
@@ -1,9 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Security.Permissions;
 using System.Windows.Threading;
+using System.Threading;
+using NUnit.Framework;
 
 namespace DynamoCoreWpfTests.Utility
 {
@@ -22,11 +24,39 @@ public static void DoEvents()
         }
 
         /// <summary>
-        ///     Helper method for DispatcherUtil
+        /// Force the Dispatcher to empty it's queue every 100 ms for a maximum 4 seconds or until
+        /// the check function returns true.
         /// </summary>
-        /// <param name="frame"></param>
-        /// <returns></returns>
-        private static object ExitFrame(object frame)
+        /// <param name="check">When check returns true, the even loop is stopped.</param>
+        [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        public static void DoEventsLoop(Func<bool> check = null)
+        {
+            const int max_count = 40;
+
+            int count = 0;
+            while (true)
+            {
+                if (check != null && check())
+                {
+                    return;
+                }
+                if (count >= max_count)
+                {
+                    return;
+                }
+
+                DispatcherUtil.DoEvents();
+                Thread.Sleep(100);
+                count++;
+            }
+        }
+
+    /// <summary>
+    ///     Helper method for DispatcherUtil
+    /// </summary>
+    /// <param name="frame"></param>
+    /// <returns></returns>
+    private static object ExitFrame(object frame)
         {
             ((DispatcherFrame)frame).Continue = false;
             return null;
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs
index 6d3e73e72d8..e3abc8f4ee7 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/DocumentationBrowserViewExtensionTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -7,7 +6,6 @@
 using System.Reflection;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using Dynamo;
@@ -20,6 +18,7 @@
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Extensions;
 using DynamoCoreWpfTests.Utility;
+using DynamoUtilities;
 using NUnit.Framework;
 
 namespace DynamoCoreWpfTests
@@ -80,6 +79,8 @@ public void ClickingMenuItemLaunchesSidebarWithIndexContent()
             // simulate clicking the Show docs browser menu item
             ShowDocsBrowser();
 
+            WaitForWebView2Initialization();
+
             // confirm the extension loads a view into the sidebar
             // and get the html content inside
             var docsTab = GetDocsTabItem();
@@ -96,6 +97,9 @@ public void ShowingStartPageHidesBrowser()
         {
             // Arrange
             ShowDocsBrowser();
+
+            WaitForWebView2Initialization();
+
             var docsView = GetDocsTabItem().Content as DocumentationBrowserView;
             this.ViewModel.NewHomeWorkspaceCommand.Execute(null);
             var visibilityBeforeShowStartPageEvent = docsView.documentationBrowser.Visibility;
@@ -136,11 +140,10 @@ public void CanCreatePackageNodeDocumentationAndLoadImages()
                  );
 
             var node = this.ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault();
-            node.Name = nodeRename; // Forces original name header to appear 
-            var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this.ViewModel);
+            node.Name = nodeRename;// Forces original name header to appear
+
+            var htmlContent = RequestNodeDocs(node);
 
-            docBrowserviewExtension.HandleRequestOpenDocumentationLink(nodeAnnotationEventArgs);
-            var htmlContent = GetSidebarDocsBrowserContents();
             //There are times in which the URL contain characters like backslash (%5C) then they need to be replaced by the normal slash "/"
             htmlContent = htmlContent.Replace(@"%5C", "/");
 
@@ -162,6 +165,9 @@ public void ViewExtensionIgnoresExternalEvents()
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
                 viewExtension.HandleRequestOpenDocumentationLink(externalEvent);
+                DispatcherUtil.DoEventsLoop();
+
+                Assert.AreEqual(AsyncMethodState.NotStarted, viewExtension.BrowserView.initState);
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
 
                 // Assert
@@ -180,9 +186,8 @@ public void CanHandleDocsEventWithValidLink()
             {
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
                 Assert.IsFalse(docsEvent.IsRemoteResource);
@@ -220,9 +225,8 @@ public void Displays404PageOnMissingDocFile()
             {
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
                 Assert.IsFalse(docsEvent.IsRemoteResource);
@@ -246,9 +250,9 @@ public void DisplaysHtmlEmbeddedInLoadedAssemblies()
 
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                var htmlContent = GetSidebarDocsBrowserContents();
+                
 
                 // Assert
                 Assert.IsFalse(docsEvent.IsRemoteResource);
@@ -273,9 +277,9 @@ public void Displays404PageWhenLinkPointsToAssemblyThatCannotBeFound()
 
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                var htmlContent = GetSidebarDocsBrowserContents();
+                
 
                 // Assert
                 Assert.IsFalse(docsEvent.IsRemoteResource);
@@ -306,9 +310,7 @@ public void DisplaysLocalizedContentWhenAvailable()
                 var uri = $"{assemblyName};{fileName}";
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
-                // Act
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var htmlContent = GetSidebarDocsBrowserContents();
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
 
                 // Assert
                 StringAssert.Contains("<h3>Division by zero - en-us</h3>", htmlContent);
@@ -340,9 +342,7 @@ public void DisplayNeutralCultureContentWhenSpecificCultureContentIsNotAvailable
                 var uri = $"{assemblyName};{fileName}";
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
-                // Act
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var htmlContent = GetSidebarDocsBrowserContents();
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
 
                 // Assert
                 StringAssert.Contains("<h3>Division entre cero - es</h3>", htmlContent);
@@ -374,9 +374,7 @@ public void DisplaySpecificCultureContentWhenNeutralCultureContentIsNotAvailable
                 var uri = $"{assemblyName};{fileName}";
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
-                // Act
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var htmlContent = GetSidebarDocsBrowserContents();
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
 
                 // Assert
                 StringAssert.Contains("<h3>Division by zero - en-us</h3>", htmlContent);
@@ -409,9 +407,7 @@ public void DisplaysInvariantContentWhenNoCompatibleLocalizedContentIsAvailable(
                 var uri = $"{assemblyName};{fileName}";
                 var docsEvent = new OpenDocumentationLinkEventArgs(new Uri(uri, UriKind.Relative));
 
-                // Act
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
-                var htmlContent = GetSidebarDocsBrowserContents();
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
 
                 // Assert
                 StringAssert.Contains("<h3>Division by zero - invariant</h3>", htmlContent);
@@ -437,9 +433,9 @@ public void RemovesScriptTagsFromLoadedHtml()
 
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
+
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
                 Assert.IsFalse(docsEvent.IsRemoteResource);
@@ -464,9 +460,8 @@ public void DPIScriptExists()
 
                 // Act
                 var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+                var htmlContent = RequestDocLink(viewExtension, docsEvent);
                 var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-                var htmlContent = GetSidebarDocsBrowserContents();
 
                 // Assert
                 Assert.IsFalse(docsEvent.IsRemoteResource);
@@ -511,21 +506,21 @@ public void CanCreateNodeDocumenationHtmlFromNodeAnnotationEventArgsWithOOTBNode
             var nodeRename = "New node name";
             var expectedNodeDocumentationTitle = $"<h1>{nodeRename}</h1>";
             var expectedNodeDocumentationNamespace = $"<p><i>{nodeName}</i></p>";
-       
+
             // Act
             this.ViewModel.ExecuteCommand(
                 new DynamoModel.CreateNodeCommand(
                     Guid.NewGuid().ToString(), nodeName, 0, 0, false, false)
                 );
 
+            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
+
             var node = this.ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault();
-            node.Name = nodeRename; // Forces original name header to appear 
-            var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this.ViewModel);
+            node.Name = nodeRename; // Forces original name header to appear
+
+            var htmlContent = RequestNodeDocs(node);
 
-            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-            docBrowserviewExtension.HandleRequestOpenDocumentationLink(nodeAnnotationEventArgs);
             var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-            var htmlContent = GetSidebarDocsBrowserContents();
 
             // Assert
             Assert.AreEqual(0, tabsBeforeExternalEventTrigger);
@@ -565,14 +560,16 @@ public void CanCreateNodeDocumenationHtmlFromNodeAnnotationEventArgsWithPackageN
                      Guid.NewGuid().ToString(), nodeName, 0, 0, false, false)
                  );
 
+            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
+
             var node = this.ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault();
+
             node.Name = nodeRename; // Forces original name header to appear 
-            var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this.ViewModel);
 
-            var tabsBeforeExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-            docBrowserviewExtension.HandleRequestOpenDocumentationLink(nodeAnnotationEventArgs);
+            var htmlContent = RequestNodeDocs(node);
+
             var tabsAfterExternalEventTrigger = this.ViewModel.SideBarTabItems.Count;
-            var htmlContent = GetSidebarDocsBrowserContents();
+
             htmlContent = htmlContent.Replace(@"%5C", "/");
 
             // Assert
@@ -630,8 +627,8 @@ public void DocsCanBeLoadedForDSNonPackageNodesFrom_FallBackPath()
             new DynamoModel.CreateNodeCommand(
               Guid.NewGuid().ToString(), nodeName, 0, 0, false, false)
           );
-             node = this.ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault();
-             htmlContent = RequestNodeDocs(node);
+            node = this.ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault();
+            htmlContent = RequestNodeDocs(node);
 
             Assert.IsTrue(htmlContent.Contains("loopwhile sample docs"));
         }
@@ -657,7 +654,7 @@ public void DocsAreLoadedFromHostPathBeforeCorePath()
             var htmlContent = RequestNodeDocs(node);
 
             Assert.IsTrue(htmlContent.Contains("list.rank sample docs from host path"));
-        } 
+        }
 
         [Test]
         public void DocsCanBeLoadedForCoreNodeModelNodesFrom_FallBackPath()
@@ -711,10 +708,22 @@ private string RequestNodeDocs(Dynamo.Graph.Nodes.NodeModel node)
             var docBrowserviewExtension = this.View.viewExtensionManager.ViewExtensions.OfType<DocumentationBrowserViewExtension>().FirstOrDefault();
             var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this.ViewModel);
             docBrowserviewExtension.HandleRequestOpenDocumentationLink(nodeAnnotationEventArgs);
+
+            WaitForWebView2Initialization(docBrowserviewExtension.BrowserView);
+
+            return GetSidebarDocsBrowserContents();
+        }
+
+        private string RequestDocLink(DocumentationBrowserViewExtension viewExtension, OpenDocumentationLinkEventArgs docsEvent)
+        {
+            viewExtension.HandleRequestOpenDocumentationLink(docsEvent);
+
+            WaitForWebView2Initialization(viewExtension.BrowserView);
+
             return GetSidebarDocsBrowserContents();
         }
 
-        [Test,Category("Failure")]
+        [Test]
         public void AddGraphInSpecificLocationToWorkspace()
         {
             //TODO see this issue:
@@ -752,7 +761,7 @@ public void AddGraphInSpecificLocationToWorkspace()
                 Assert.AreEqual(ViewModel.Model.CurrentWorkspace.Nodes.Count(), 1);
 
                 var node = ViewModel.Model.CurrentWorkspace.Nodes.FirstOrDefault();
-               
+
                 RequestNodeDocs(node);
                 var docsView = GetDocsTabItem().Content as DocumentationBrowserView;
                 var docsViewModel = docsView.DataContext as DocumentationBrowserViewModel;
@@ -784,8 +793,6 @@ public void Validate_GetGraphLinkFromMDLocation()
             //In this call the GetGraphLinkFromMDLocation() method is executed internally
             RequestNodeDocs(node);
 
-            // Show the DocumentationBrowser so we can get the DocumentationBrowserViewModel
-            ShowDocsBrowser();
             var docsView = GetDocsTabItem().Content as DocumentationBrowserView;
             var docsViewModel = docsView.DataContext as DocumentationBrowserViewModel;
 
@@ -821,8 +828,6 @@ public void Validate_GetGraphLinkFromPackage()
             //In this call the GetGraphLinkFromMDLocation() method is executed internally
             RequestNodeDocs(node);
 
-            // Show the DocumentationBrowser so we can get the DocumentationBrowserViewModel
-            ShowDocsBrowser();
             var docsView = GetDocsTabItem().Content as DocumentationBrowserView;
             var docsViewModel = docsView.DataContext as DocumentationBrowserViewModel;
 
@@ -834,7 +839,7 @@ public void Validate_GetGraphLinkFromPackage()
             Assert.IsTrue(!string.IsNullOrEmpty(graphPathValue));
 
             //check that the path contains "packageWithDocumentation"
-            Assert.That(graphPathValue.Contains(Path.Combine("PackageWithNodeDocumentation","doc",dynFileName)));
+            Assert.That(graphPathValue.Contains(Path.Combine("PackageWithNodeDocumentation", "doc", dynFileName)));
         }
 
         #region Helpers
@@ -865,10 +870,28 @@ private List<MenuItem> GetDocsMenuItems()
                 .ToList();
         }
 
+        private void WaitForWebView2Initialization(DocumentationBrowserView docView = null)
+        {
+            if (docView == null)
+            {
+                var docsTab = GetDocsTabItem();
+                docView = docsTab.Content as DocumentationBrowserView;
+            }
+            
+            // Wait for the DocumentationBrowserView webview2 control to finish initialization
+            DispatcherUtil.DoEventsLoop(() =>
+            {
+                return docView.initState == AsyncMethodState.Done;
+            });
+
+            Assert.AreEqual(AsyncMethodState.Done, docView.initState);
+        }
+
         private string GetSidebarDocsBrowserContents()
         {
             var docsTab = GetDocsTabItem();
             var docsView = docsTab.Content as DocumentationBrowserView;
+     
             var docsViewModel = docsView.DataContext as DocumentationBrowserViewModel;
             return docsViewModel.GetContent();
         }
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs
index db893d69222..8b14fa9e6bd 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/NotificationsExtensionTests.cs
@@ -8,6 +8,8 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using Dynamo.Notifications;
+using Dynamo.DocumentationBrowser;
+using DynamoCoreWpfTests.Utility;
 
 namespace DynamoCoreWpfTests.ViewExtensions
 {
@@ -20,6 +22,14 @@ public void PressNotificationButtonAndShowPopup()
             var notificationsButton = (Button)shortcutBar.FindName("notificationsButton");
             notificationsButton.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent));
 
+            var notificationExtension = this.View.viewExtensionManager.ViewExtensions.OfType<NotificationsViewExtension>().FirstOrDefault();
+            // Wait for the NotificationCenterController webview2 control to finish initialization
+            DispatcherUtil.DoEventsLoop(() =>
+            {
+                return notificationExtension.notificationCenterController.initState == DynamoUtilities.AsyncMethodState.Done;
+            });
+            Assert.AreEqual(DynamoUtilities.AsyncMethodState.Done, notificationExtension.notificationCenterController.initState);
+
             NotificationUI notificationUI = PresentationSource.CurrentSources.OfType<System.Windows.Interop.HwndSource>()
                                         .Select(h => h.RootVisual)
                                         .OfType<FrameworkElement>()
diff --git a/test/Libraries/SystemTestServices/SystemTestBase.cs b/test/Libraries/SystemTestServices/SystemTestBase.cs
index d7eada732b5..774a09abb68 100644
--- a/test/Libraries/SystemTestServices/SystemTestBase.cs
+++ b/test/Libraries/SystemTestServices/SystemTestBase.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using System.Windows.Threading;
 using Dynamo.Configuration;
 using Dynamo.Controls;
 using Dynamo.Core;
@@ -60,6 +61,7 @@ protected string ExecutingDirectory
         [SetUp]
         public virtual void Setup()
         {
+            System.Console.WriteLine("Start test: " + TestContext.CurrentContext.Test.Name);
             var testConfig = GetTestSessionConfiguration();
 
             if (assemblyResolver == null)
@@ -137,6 +139,7 @@ public virtual void TearDown()
             {
                 Console.WriteLine(ex.StackTrace);
             }
+            System.Console.WriteLine("Finished test: " + TestContext.CurrentContext.Test.Name);
         }
 
         [OneTimeTearDown]
@@ -204,7 +207,7 @@ protected virtual void StartDynamo(TestSessionConfiguration testConfig)
             View = new DynamoView(ViewModel);
             View.Show();
 
-            SynchronizationContext.SetSynchronizationContext(new SynchronizationContext());
+            SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
         }
 
         /// <summary>
diff --git a/test/VisualizationTests/HelixWatch3DViewModelTests.cs b/test/VisualizationTests/HelixWatch3DViewModelTests.cs
index 83dda4484af..832eb83113a 100644
--- a/test/VisualizationTests/HelixWatch3DViewModelTests.cs
+++ b/test/VisualizationTests/HelixWatch3DViewModelTests.cs
@@ -8,6 +8,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Media3D;
+using System.Windows.Threading;
 using System.Xml;
 using CoreNodeModels;
 using CoreNodeModels.Input;
@@ -118,7 +119,7 @@ protected override void StartDynamo(TestSessionConfiguration testConfig)
             View = new DynamoView(ViewModel);
             View.Show();
 
-            SynchronizationContext.SetSynchronizationContext(new SynchronizationContext());
+            SynchronizationContext.SetSynchronizationContext(new DispatcherSynchronizationContext());
         }
 
         /// <summary>