DynamoDS
diff --git a/‎src/DynamoCore/Extensions/ReadyParams.cs
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/‎src/DynamoCore/Extensions/ReadyParams.cs
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/DynamoCore/Logging/ILogger.cs
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎src/DynamoCore/Logging/ILogger.cs
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎src/DynamoCore/Properties/AssemblyInfo.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/DynamoCore/Properties/AssemblyInfo.cs
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+28-1Lines changed: 28 additions & 1 deletion b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+28-1Lines changed: 28 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+12-35Lines changed: 12 additions & 35 deletions b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+12-35Lines changed: 12 additions & 35 deletions
diff --git a/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Copy file name to clipboard
+22-2Lines changed: 22 additions & 2 deletions b/‎src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Copy file name to clipboard
+22-2Lines changed: 22 additions & 2 deletions
diff --git a/‎src/DynamoPackages/PackageManagerExtension.cs
Copy file name to clipboard
+37-1Lines changed: 37 additions & 1 deletion b/‎src/DynamoPackages/PackageManagerExtension.cs
Copy file name to clipboard
+37-1Lines changed: 37 additions & 1 deletion
@@ -76,7 +76,13 @@ 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
 
@@ -61,4 +61,11 @@ public interface ILogSource
         /// </summary>
         event Action<ILogMessage> MessageLogged;
     }
+    internal interface INotificationSource
+    {
+        /// <summary>
+        ///     Emits Notifications.
+        /// </summary>
+        event Action<NotificationMessage> NotificationLogged;
+    }
 }
@@ -47,4 +47,6 @@
 [assembly: InternalsVisibleTo("SystemTestServices")]
 [assembly: InternalsVisibleTo("DynamoManipulation")]
 [assembly: InternalsVisibleTo("IronPythonTests")]
+[assembly: InternalsVisibleTo("DynamoPackagesWPF")]
+
 [assembly: TypeForwardedTo(typeof(Dynamo.Scheduler.Disposable))]
@@ -3236,4 +3236,13 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="TrustLocationSkippedNotification" xml:space="preserve">
     <value>No trusted location has been added.</value>
   </data>
+  <data name="MessagePackageTargetOtherHosts2" xml:space="preserve">
+    <value>The package or one of its dependencies targets a different environment, such as Revit, Civil 3D, Advance Steel, Alias or FormIt. This can cause instability and unexpected problems.</value>
+  </data>
+  <data name="MessagePackageTargetOtherHostShort" xml:space="preserve">
+    <value>Package targets a different host than current host application.</value>
+  </data>
+  <data name="TitlePackageTargetOtherHost" xml:space="preserve">
+    <value>Package Host Error</value>
+  </data>
 </root>
@@ -3223,4 +3223,13 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="TrustLocationSkippedNotification" xml:space="preserve">
     <value>No trusted location has been added.</value>
   </data>
+  <data name="MessagePackageTargetOtherHosts2" xml:space="preserve">
+    <value>The package or one of its dependencies targets a different environment, such as Revit, Civil 3D, Advance Steel, Alias or FormIt. This can cause instability and unexpected problems.</value>
+  </data>
+  <data name="MessagePackageTargetOtherHostShort" xml:space="preserve">
+    <value>Package targets a different host than current host application.</value>
+  </data>
+  <data name="TitlePackageTargetOtherHost" xml:space="preserve">
+    <value>Package Host Error</value>
+  </data>
 </root>
@@ -218,7 +218,7 @@ public ObservableCollection<PackageDownloadHandle> Downloads
 
         private PackageManagerExtension pmExtension;
 
-        internal PackageManagerExtension PackageManagerExtension
+        internal virtual PackageManagerExtension PackageManagerExtension
         {
             get { return pmExtension ?? (pmExtension = DynamoViewModel.Model.GetPackageManagerExtension()); }
         }
@@ -685,9 +685,6 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
             return true;
         }
 
-        // Current host, empty if sandbox, null when running tests
-        internal virtual string Host => DynamoViewModel.Model.HostAnalyticsInfo.HostName;
-
         internal async void ExecutePackageDownload(string name, PackageVersion package, string installPath)
         {
             string msg = String.IsNullOrEmpty(installPath) ?
@@ -711,7 +708,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // we reverse these arrays because the package manager returns dependencies in topological order starting at 
                 // the current package - and we want to install the dependencies first!.
                 var reversedVersions = package.full_dependency_versions.Select(x => x).Reverse().ToList();
-                var dependencyVersionHeaders = package.full_dependency_ids.Select(x=>x).Reverse().Select((dep, i) =>
+                var dependencyVersionHeaders = package.full_dependency_ids.Select(x => x).Reverse().Select((dep, i) =>
                 {
                     var depVersion = reversedVersions[i];
                     try
@@ -734,12 +731,12 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 {
                     return;
                 }
-                
+
                 if (!dependencyVersionHeaders.Any(x => x.name == name))
                 {// Add the main package if it does not exist
                     dependencyVersionHeaders.Add(package);
                 }
-                
+
                 var localPkgs = pmExt.PackageLoader.LocalPackages;
                 // if the new package has one or more dependencies that are already installed
                 // we need to either first uninstall them, or allow the user to forcibly install the package,
@@ -753,7 +750,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 var localPkgsConflictingWithPkgDeps = new List<Package>();
                 var newPackageHeaders = new List<PackageVersion>();
 
-                foreach(var dependencyHeader in dependencyVersionHeaders)
+                foreach (var dependencyHeader in dependencyVersionHeaders)
                 {
                     var localPkgWithSameName = localPkgs.FirstOrDefault(x =>
                         (x.LoadState.State == PackageLoadState.StateTypes.Loaded ||
@@ -813,37 +810,15 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // if any do, notify user and allow cancellation
                 if (containsBinariesOrPythonScripts)
                 {
-                    var res = MessageBoxService.Show(Owner, 
+                    var res = MessageBoxService.Show(Owner,
                         Resources.MessagePackageContainPythonScript,
                         Resources.PackageDownloadMessageBoxTitle,
                         MessageBoxButton.OKCancel, MessageBoxImage.Exclamation);
 
                     if (res == MessageBoxResult.Cancel || res == MessageBoxResult.None) return;
                 }
 
-                // determinate if any of the packages are targeting other hosts
-                var containsPackagesThatTargetOtherHosts = false;
-
-                // Known hosts
-                var knownHosts = Model.GetKnownHosts();
-
-                // Sandbox, special case: Warn if any package targets only one known host
-                if (String.IsNullOrEmpty(Host))
-                {
-                    containsPackagesThatTargetOtherHosts =
-                        newPackageHeaders.Any(y => y.host_dependencies != null && y.host_dependencies.Intersect(knownHosts).Count() == 1);
-                }
-                else
-                {
-                    // Warn if there are packages targeting other hosts but not our host
-                    var otherHosts = knownHosts.Except(new List<string>() {Host});
-                    containsPackagesThatTargetOtherHosts = newPackageHeaders.Any(x =>
-                    {
-                        // Is our host in the list?
-                        // If not, is any other host in the list?
-                        return x.host_dependencies != null && !x.host_dependencies.Contains(Host) && otherHosts.Any(y => x.host_dependencies != null && x.host_dependencies.Contains(y));
-                    });
-                }
+                var containsPackagesThatTargetOtherHosts = PackageManagerExtension.CheckIfPackagesTargetOtherHosts(newPackageHeaders);
 
                 // if any do, notify user and allow cancellation
                 if (containsPackagesThatTargetOtherHosts)
@@ -875,7 +850,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                         return;
                     }
                 }
-                
+
                 // add custom path to custom package folder list
                 if (!String.IsNullOrEmpty(installPath))
                 {
@@ -888,7 +863,8 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
 
                 // form header version pairs and download and install all packages
                 var downloadTasks = newPackageHeaders
-                    .Select((dep) => {
+                    .Select((dep) =>
+                    {
                         return new PackageDownloadHandle()
                         {
                             Id = dep.id,
@@ -903,7 +879,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // When above downloads complete, start installing packages in dependency order.
                 // The downloads have completed in a random order, but the dependencyVersionHeaders list is in correct topological
                 // install order.
-                foreach(var dep in newPackageHeaders)
+                foreach (var dep in newPackageHeaders)
                 {
                     var matchingDownload = downloadTasks.Where(x => x.Result.handle.Id == dep.id).FirstOrDefault();
                     if (matchingDownload != null)
@@ -913,6 +889,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 }
             }
         }
+       
 
         /// <summary>
         ///     Returns a newline delimited string representing the package name and version of the argument
 
@@ -173,9 +173,15 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             {
                 try
                 {
-                    var logSource = ext as ILogSource;
-                    if (logSource != null)
+                    if (ext is ILogSource logSource)
+                    {
                         logSource.MessageLogged += Log;
+                    }
+
+                    if(ext is INotificationSource notificationSource)
+                    {
+                        notificationSource.NotificationLogged += LogNotification;
+                    }
 
                     ext.Startup(startupParams);
                     // if we are starting ViewExtension (A) which is a source of other extensions (like packageManager)
@@ -1610,6 +1616,16 @@ private void WindowClosed(object sender, EventArgs e)
             //when this view is finally disposed, dispose will be called on them.
             foreach (var ext in viewExtensionManager.ViewExtensions)
             {
+                if (ext is ILogSource logSource)
+                {
+                    logSource.MessageLogged -= Log;
+                }
+
+                if (ext is INotificationSource notificationSource)
+                {
+                    notificationSource.NotificationLogged -= LogNotification;
+                }
+
                 try
                 {
                     ext.Shutdown();
@@ -2418,6 +2434,10 @@ private void Log(string message)
         {
             Log(LogMessage.Info(message));
         }
+        private void LogNotification(NotificationMessage notification)
+        {
+            dynamoViewModel.Model.Logger.LogNotification(notification.Sender, notification.Title,notification.ShortMessage, notification.DetailedMessage);
+        }
 
         private void Window_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
 
@@ -10,6 +10,7 @@
 using Dynamo.Logging;
 using Dynamo.Models;
 using Greg;
+using Greg.Responses;
 
 namespace Dynamo.PackageManager
 {
@@ -49,6 +50,10 @@ 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;
 
         /// <summary>
         ///     Manages loading of packages (property meant solely for tests)
@@ -60,7 +65,7 @@ public string UniqueId
         /// <summary>
         ///     Dynamo Package Manager Instance.
         /// </summary>
-        public PackageManagerClient PackageManagerClient { get; private set; }
+        public virtual PackageManagerClient PackageManagerClient { get; private set; }
 
 
         #endregion
@@ -183,6 +188,7 @@ 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()
@@ -341,6 +347,36 @@ private void OnPackageRemoved(Package package)
         }
 
         #endregion
+        internal bool CheckIfPackagesTargetOtherHosts(IEnumerable<PackageVersion> newPackageHeaders)
+        {
+            // determine if any of the packages are targeting other hosts
+            var containsPackagesThatTargetOtherHosts = false;
+
+            // Known hosts
+            var knownHosts = PackageManagerClient.GetKnownHosts();
+
+            // Sandbox, special case: Warn if any package targets only one known host
+            if (String.IsNullOrEmpty(Host))
+            {
+                containsPackagesThatTargetOtherHosts =
+                    newPackageHeaders.Any(y => y.host_dependencies != null && y.host_dependencies.Intersect(knownHosts).Count() == 1);
+            }
+            else
+            {
+                // Warn if there are packages targeting other hosts but not our host
+                var otherHosts = knownHosts.Except(new List<string>() { Host });
+                containsPackagesThatTargetOtherHosts = newPackageHeaders.Any(x =>
+                {
+                    // Is our host in the list?
+                    // If not, is any other host in the list?
+                    return x.host_dependencies != null && !x.host_dependencies.Contains(Host) && otherHosts.Any(y => x.host_dependencies.Contains(y));
+                });
+            }
+
+            return containsPackagesThatTargetOtherHosts;
+        }
+
+
     }
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,11 @@ public interface ILogSource`
`61`	`61`	`/// </summary>`
`62`	`62`	`event Action<ILogMessage> MessageLogged;`
`63`	`63`	`}`
	`64`	`+ internal interface INotificationSource`
	`65`	`+ {`
	`66`	`+ /// <summary>`
	`67`	`+ /// Emits Notifications.`
	`68`	`+ /// </summary>`
	`69`	`+ event Action<NotificationMessage> NotificationLogged;`
	`70`	`+ }`
`64`	`71`	`}`