DynamoDS
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/Docs/PublishPackageDocumentation.html
Copy file name to clipboard
+11-1Lines changed: 11 additions & 1 deletion b/‎src/DynamoCoreWpf/ViewModels/PackageManager/Docs/PublishPackageDocumentation.html
Copy file name to clipboard
+11-1Lines changed: 11 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
Copy file name to clipboard
+44-10Lines changed: 44 additions & 10 deletions b/‎src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
Copy file name to clipboard
+44-10Lines changed: 44 additions & 10 deletions
@@ -3284,4 +3284,10 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="NotificationCenterButtonTooltip" xml:space="preserve">
     <value>Click to view latest news from Dynamo Team.</value>
   </data>
+  <data name="InfectedPackageMessageString" xml:space="preserve">
+    <value>This is an infected package. Please upload a clean version.</value>
+  </data>
+  <data name="InfectedPackageErrorString" xml:space="preserve">
+    <value>Upload Error</value>
+  </data>
 </root>
@@ -3271,4 +3271,10 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="NotificationCenterButtonTooltip" xml:space="preserve">
     <value>Click to view latest news from Dynamo Team.</value>
   </data>
+  <data name="InfectedPackageMessageString" xml:space="preserve">
+    <value>This is an infected package. Please upload a clean version.</value>
+  </data>
+  <data name="InfectedPackageErrorString" xml:space="preserve">
+    <value>Upload Error</value>
+  </data>
 </root>
@@ -206,7 +206,7 @@ <h4>Package Name:</h4>
     <p>
         <b>Add File:</b><br />
         Select and add all the files that are related to your package; generally the bin folder, binaries and dependencies are added.
-        <p>
+    <p>
         <b>Select Node Libraries:</b><br />
     <p>
         Specify which of the files you added to the package are the node libraries. Node libraries contain the types and methods that Dynamo will import as nodes. In general you should mark any assembly as a node library which contains types you wish to import into Dynamo. ZeroTouch, NodeModel, or NodeViewCustomization assemblies should be marked as node library.
@@ -223,4 +223,14 @@ <h4>Package Name:</h4>
         When publishing locally the package will be published in the local root directory,
         whereas while publishing online the package will be uploaded to the package manager.
     </p>
+    <hr />
+    <h3>Anti-virus Scans</h3>
+    <p>
+        To provide a secure environment to all Dynamo Package users, we have introduced anti-virus scans for new packages.
+        When a user uploads a package, it will be scanned for viruses and will only be available publicly once it has been flagged as safe.
+        The scan will happen during the package upload process and will not add to the usual duration of 10-15 minutes for the new package to be available online.
+        If your package is flagged as infected, the Package Manager search window will display a notification stating that the uploaded package has
+        been found to be infected and won't be published online. To make the package publicly available, check the files included with the package
+        and upload a new version through the Package Manager.
+    </p>
 </body>
@@ -200,6 +200,7 @@ public class PackageManagerClientViewModel : NotificationObject, IPackageInstall
 
         #region Properties/Fields
 
+        private readonly string QUARANTINED = "quarantined";
         public PackageManagerSearchView Owner { get; set; }
 
         ObservableCollection<PackageUploadHandle> _uploads = new ObservableCollection<PackageUploadHandle>();
@@ -224,6 +225,7 @@ internal virtual PackageManagerExtension PackageManagerExtension
         }
 
         public List<PackageManagerSearchElement> CachedPackageList { get; private set; }
+        public List<PackageManagerSearchElement> InfectedPackageList { get; private set; }
 
         public readonly DynamoViewModel DynamoViewModel;
         public AuthenticationManager AuthenticationManager { get; set; }
@@ -471,6 +473,28 @@ public List<PackageManagerSearchElement> ListAll()
             return CachedPackageList;
         }
 
+        /// <summary>
+        /// Returns a dictionary of infected package(s) with name and version, if the last published version of package uploaded by the current user was flagged as infected.
+        /// </summary>
+        /// <returns></returns>
+        public List<PackageManagerSearchElement> GetInfectedPackages()
+        {
+            InfectedPackageList = new List<PackageManagerSearchElement>();
+            var latestPkgs = Model.GetUsersLatestPackages();
+            if (latestPkgs != null && latestPkgs.maintains.Count > 0)
+            {
+                foreach (var infectedVer in latestPkgs.maintains)
+                {
+                    if (infectedVer.scan_status == QUARANTINED)
+                    {
+                        var ele = new PackageManagerSearchElement(infectedVer);
+                        InfectedPackageList.Add(ele);
+                    }
+                }
+            }
+            return InfectedPackageList;
+        }
+
         /// <summary>
         /// Download and install a specific package from the package manager
         /// </summary>
 
@@ -138,6 +138,11 @@ private void SetFilterHosts(object obj)
         // The results of the last synchronization with the package manager server
         public List<PackageManagerSearchElement> LastSync { get; set; }
 
+        /// <summary>
+        /// Stores a list of latest infected package versions published by the current user, if any.
+        /// </summary>
+        public ObservableCollection<PackageManagerSearchElement> InfectedPackages { get; set; }
+
         /// <summary>
         ///     SortingKey property
         /// </summary>
@@ -387,7 +392,7 @@ public PackageSearchState SearchState
         /// appears at the base of the window. This command fires when the user clicks to dismiss
         /// one of these toast notifications.
         /// </summary>
-        public DelegateCommand<object> ClearDownloadToastNotificationCommand { get; set; }
+        public DelegateCommand<object> ClearToastNotificationCommand { get; set; }
 
 
         /// <summary>
@@ -408,6 +413,7 @@ public IPreferences Preferences
         internal PackageManagerSearchViewModel()
         {
             SearchResults = new ObservableCollection<PackageManagerSearchElementViewModel>();
+            InfectedPackages = new ObservableCollection<PackageManagerSearchElement>();
             MaxNumSearchResults = 35;
             SearchDictionary = new SearchDictionary<PackageManagerSearchElement>();
             ClearCompletedCommand = new DelegateCommand(ClearCompleted, CanClearCompleted);
@@ -416,7 +422,7 @@ internal PackageManagerSearchViewModel()
             SetSortingDirectionCommand = new DelegateCommand<object>(SetSortingDirection, CanSetSortingDirection);
             ViewPackageDetailsCommand = new DelegateCommand<object>(ViewPackageDetails);
             ClearSearchTextBoxCommand = new DelegateCommand<object>(ClearSearchTextBox);
-            ClearDownloadToastNotificationCommand = new DelegateCommand<object>(ClearDownloadToastNotification);
+            ClearToastNotificationCommand = new DelegateCommand<object>(ClearToastNotification);
             SearchText = string.Empty;
             SortingKey = PackageSortingKey.LastUpdate;
             SortingDirection = PackageSortingDirection.Descending;
@@ -543,17 +549,28 @@ public void ClearSearchTextBox(object obj)
         /// one of these toast notifications.
         /// </summary>
         /// <param name="obj"></param>
-        public void ClearDownloadToastNotification(object obj)
+        public void ClearToastNotification(object obj)
         {
-            if (!(obj is PackageDownloadHandle packageDownloadHandle)) return;
+            if (obj is PackageDownloadHandle packageDownloadHandle)
+            {
 
-            PackageDownloadHandle packageDownloadHandleToRemove = PackageManagerClientViewModel.Downloads
-                .FirstOrDefault(x => x.Id == packageDownloadHandle.Id);
+                PackageDownloadHandle packageDownloadHandleToRemove = PackageManagerClientViewModel.Downloads
+                    .FirstOrDefault(x => x.Id == packageDownloadHandle.Id);
 
-            if (packageDownloadHandleToRemove == null) return;
+                if (packageDownloadHandleToRemove == null) return;
 
-            PackageManagerClientViewModel.Downloads.Remove(packageDownloadHandleToRemove);
-            RaisePropertyChanged(nameof(Downloads));
+                PackageManagerClientViewModel.Downloads.Remove(packageDownloadHandleToRemove);
+                RaisePropertyChanged(nameof(Downloads));
+            }
+            else if (obj is PackageManagerSearchElement packageSearchElement)
+            {
+                PackageManagerSearchElement packageInfectedToRemove = this.InfectedPackages
+                    .FirstOrDefault(x => x.InfectedPackageName == packageSearchElement.InfectedPackageName);
+
+                this.InfectedPackages.Remove(packageInfectedToRemove);
+                RaisePropertyChanged(nameof(InfectedPackages));
+            }
+            return;
         }
 
         /// <summary>
@@ -671,9 +688,26 @@ public void RefreshAndSearchAsync()
                     }
                     this.SearchState = HasNoResults ? PackageSearchState.NoResults : PackageSearchState.Results;
                 }
+                RefreshInfectedPackages();
             }
             , TaskScheduler.FromCurrentSynchronizationContext()); // run continuation in ui thread
-            
+        }
+
+        internal void RefreshInfectedPackages()
+        {
+            var infectedPkgs = PackageManagerClientViewModel.GetInfectedPackages();
+            infectedPkgs.Sort((e1, e2) => e1.InfectedPackageCreationDate.CompareTo(e2.InfectedPackageCreationDate));
+
+            this.InfectedPackages.Clear();
+            foreach (var pkg in infectedPkgs) {
+                this.InfectedPackages.Add(pkg);
+
+                // Limiting the infected packages list to 3. As the packages are resolved other unresolved packages will be displayed.
+                if (this.InfectedPackages.Count() == 3) 
+                { 
+                    break; 
+                }
+            }
         }
 
         internal void AddToSearchResults(PackageManagerSearchElementViewModel element)