From 4913db804a28067e23a1992600e6d821cc314509 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Thu, 7 Sep 2023 17:16:31 +0100
Subject: [PATCH 1/9] votes cherry pick

- adding changes connected to the 'votes' behavior
---
 .../PackageDetailsView.xaml                   | 101 ++++++++++++++----
 .../PackageDetailsViewExtension.cs            |   2 +
 .../PackageDetailsViewModel.cs                |  47 +++++++-
 3 files changed, 130 insertions(+), 20 deletions(-)

diff --git a/src/PackageDetailsViewExtension/PackageDetailsView.xaml b/src/PackageDetailsViewExtension/PackageDetailsView.xaml
index 0fccf453351..09a9fefb14f 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsView.xaml
+++ b/src/PackageDetailsViewExtension/PackageDetailsView.xaml
@@ -24,12 +24,16 @@
             <controls:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <controls:PrettyDateConverter x:Key="PrettyDateConverter" />
             <controls:EmptyStringToHiddenConverter x:Key="EmptyStringToHiddenConverter" />
+            <SolidColorBrush x:Key="ForegroundGrayBrush" Color="#D8D8D8" />
+            <SolidColorBrush x:Key="HoverBorderGrayBrush" Color="#6d6d6d" />
+            <SolidColorBrush x:Key="PressedBorderGrayBrush" Color="#7e7e7e" />
+            <SolidColorBrush x:Key="HasVotedBlueBrush" Color="#84D7CE" />     
             <Style x:Key="LabelStyle" TargetType="TextBlock">
                 <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementBold}" />
                 <Setter Property="FontWeight" Value="Bold" />
                 <Setter Property="FontSize" Value="14px" />
                 <Setter Property="MinWidth" Value="200px" />
-                <Setter Property="Foreground" Value="#D8D8D8" />
+                <Setter Property="Foreground" Value="{StaticResource ForegroundGrayBrush}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="Margin" Value="0,0,0,5" />
                 <Setter Property="TextWrapping" Value="Wrap" />
@@ -58,6 +62,76 @@
                 <Setter Property="Padding" Value="8,0" />
                 <Setter Property="Height" Value="22px" />
             </Style>
+            <Style TargetType="{x:Type Hyperlink}">
+                <Setter Property="Foreground"
+                        Value="{StaticResource Blue300Brush}" />
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver"
+                             Value="True">
+                        <Setter Property="Foreground"
+                                Value="{StaticResource Blue400Brush}" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+
+            <Style x:Key="ImageButton" TargetType="{x:Type Button}">
+                <Setter Property="UseLayoutRounding" Value="True" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border Style="{StaticResource BorderStyle}"
+                                    x:Name="buttonBorder"
+                                    BorderBrush="{StaticResource ExtensionButtonBackgroundColor}"
+                                    BorderThickness="2">
+                                <Grid x:Name="container">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Viewbox Width="12"
+                                                 Height="12"
+                                                 VerticalAlignment="Center">    
+                                            <Path x:Name="heartIcon"
+                                                  Data="M13.91,6.75c-1.17,2.25-4.3,5.31-6.07,6.94c-0.1903,0.1718-0.4797,0.1718-0.67,0C5.39,12.06,2.26,9,1.09,6.75&#xA;&#x9;C-1.48,1.8,5-1.5,7.5,3.45C10-1.5,16.48,1.8,13.91,6.75z"
+                                                  Stroke="{StaticResource ForegroundGrayBrush}"
+                                                  StrokeThickness="1"
+                                                  VerticalAlignment="Center"/>
+                                        </Viewbox>
+                                        <TextBlock Name="VotesLabel"
+                                                   Margin="5,2,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Style="{StaticResource BodyTextStyle}"
+                                                   Text="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </StackPanel>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="heartIcon"
+                                            Property="Stroke"
+                                            Value="{StaticResource HasVotedBlueBrush}" />
+                                    <Setter TargetName="buttonBorder"
+                                            Property="BorderBrush"
+                                            Value="{StaticResource HoverBorderGrayBrush}" />
+                                </Trigger>
+                                <Trigger Property="Button.IsPressed" Value="true">
+                                    <Setter TargetName="heartIcon"
+                                            Property="Stroke"
+                                            Value="{StaticResource ForegroundGrayBrush}" />
+                                    <Setter TargetName="buttonBorder"
+                                            Property="BorderBrush"
+                                            Value="{StaticResource PressedBorderGrayBrush}" />
+                                </Trigger>
+                                <DataTrigger Binding="{Binding Path=HasVoted}" Value="True">
+                                    <Setter TargetName="heartIcon"
+                                            Property="Fill"
+                                            Value="{StaticResource HasVotedBlueBrush}" />
+                                    <Setter TargetName="heartIcon"
+                                            Property="Stroke"
+                                            Value="{StaticResource HasVotedBlueBrush}" />
+                                </DataTrigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
 
             <!--  DataGrid  -->
             <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
@@ -75,7 +149,7 @@
                                            FontFamily="{StaticResource ArtifaktElementRegular}"
                                            FontSize="14px"
                                            FontWeight="Regular"
-                                           Foreground="#D8D8D8"
+                                           Foreground="{StaticResource ForegroundGrayBrush}"
                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.Text}"
                                            TextWrapping="Wrap"
                                            ToolTipService.ShowDuration="30000">
@@ -228,20 +302,9 @@
                             Orientation="Horizontal">
 
                     <!--  Votes  -->
-                    <Border Style="{StaticResource BorderStyle}">
-                        <StackPanel Orientation="Horizontal">
-                            <Rectangle Width="10" Height="10">
-                                <Rectangle.Fill>
-                                    <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Favorite.png" />
-                                </Rectangle.Fill>
-                            </Rectangle>
-                            <TextBlock Name="VotesLabel"
-                                       Margin="5,2,0,0"
-                                       VerticalAlignment="Center"
-                                       Style="{StaticResource BodyTextStyle}"
-                                       Text="{Binding NumberVotes, Converter={StaticResource NegativeIntToZeroConverter}}" />
-                        </StackPanel>
-                    </Border>
+                    <Button Style="{StaticResource ImageButton}"
+                            Content="{Binding NumberVotes, Converter={StaticResource NegativeIntToZeroConverter}}"
+                            Command="{Binding UpvoteCommand}" />
 
                     <!--  Downloads  -->
                     <Border Style="{StaticResource BorderStyle}">
@@ -333,7 +396,7 @@
                                                 <Grid Background="{StaticResource ExtensionBackgroundColor}" IsHitTestVisible="True">
                                                     <StackPanel Margin="12,8,10,5">
                                                         <TextBlock HorizontalAlignment="Left"
-                                                                   Foreground="#D8D8D8"
+                                                                   Foreground="{StaticResource ForegroundGrayBrush}"
                                                                    Text="{Binding PackageVersionNumber}" />
                                                         <Button Name="installButton"
                                                                 Command="{Binding ElementName=PackageDetailsWindow, Path=DataContext.TryInstallPackageVersionCommand}"
@@ -417,7 +480,7 @@
                                                                         </Trigger>
                                                                         <DataTrigger Binding="{Binding ElementName=PackageDetailsWindow, Path=DataContext.IsPackageDeprecated}" Value="True">
                                                                             <Setter Property="TextBlock.Opacity" Value="0.5" />
-                                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                                            <Setter Property="TextBlock.Foreground" Value="{StaticResource HasVotedBlueBrush}"  />
                                                                             <Setter Property="ToolTip" Value="{x:Static p:Resources.PackageDeprecatedTooltip}" />
                                                                         </DataTrigger>
                                                                         <DataTrigger Binding="{Binding Path=CanInstall, UpdateSourceTrigger=PropertyChanged}" Value="False">
@@ -435,7 +498,7 @@
                                                                                 <Condition Binding="{Binding ElementName=PackageDetailsWindow, Path=DataContext.IsEnabledForInstall}" Value="True" />
                                                                             </MultiDataTrigger.Conditions>
                                                                             <Setter Property="TextBlock.Opacity" Value="1" />
-                                                                            <Setter Property="TextBlock.Foreground" Value="#84D7CE" />
+                                                                            <Setter Property="TextBlock.Foreground" Value="{StaticResource HasVotedBlueBrush}" />
                                                                         </MultiDataTrigger>
                                                                     </ControlTemplate.Triggers>
                                                                 </ControlTemplate>
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.cs b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.cs
index e803714a40a..4a0d87ed279 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.cs
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.cs
@@ -55,6 +55,7 @@ internal void OnViewExtensionOpenWithParameterRequest(string extensionIdentifica
         
         internal void OpenPackageDetails(PackageManagerSearchElement packageManagerSearchElement)
         {
+            PackageDetailsViewModel?.Dispose();
             PackageDetailsViewModel = new PackageDetailsViewModel(this, packageManagerSearchElement);
 
             if (PackageDetailsView == null)
@@ -151,6 +152,7 @@ public override void Dispose()
 
         public override void Closed()
         {
+            PackageDetailsViewModel?.Dispose();
             PackageDetailsViewModel = null;
             PackageDetailsView = null;
             Grid = null;
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
index 9555cf53bcc..f140b34198a 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Input;
 using Dynamo.Core;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Interfaces;
@@ -29,6 +30,8 @@ private IPreferences Preferences
             }
         }
 
+        private int numberVotes;
+        private bool hasVoted;
         #endregion
 
         #region Public Properties
@@ -77,7 +80,15 @@ public string License
         /// <summary>
         /// How many votes this package has received.
         /// </summary>
-        public int NumberVotes { get; }
+        public int NumberVotes
+        {
+            get => numberVotes;
+            set
+            {
+                if (value != numberVotes) { numberVotes = value; }
+                RaisePropertyChanged(nameof(NumberVotes));
+            }
+        }
 
         /// <summary>
         /// How many times this package has been downloaded.
@@ -109,6 +120,15 @@ public string License
         /// False if custom package paths are disabled.
         /// </summary>
         public bool IsEnabledForInstall { get; private set; }
+        public bool HasVoted
+        {
+            get => hasVoted;
+            set
+            {
+                if (value != hasVoted) { hasVoted = value; }
+                RaisePropertyChanged(nameof(HasVoted));
+            }
+        }
 
         #endregion
 
@@ -116,6 +136,7 @@ public string License
 
         public DelegateCommand OpenDependencyDetailsCommand { get; set; }
         public DelegateCommand TryInstallPackageVersionCommand { get; set; }
+        public ICommand UpvoteCommand { get; set; }
 
         /// <summary>
         /// Retrieves a package by name and display its details in the PackageDetailsView.
@@ -146,6 +167,24 @@ internal void TryInstallPackageVersion(object obj)
             this.PackageDetailsViewExtension.PackageManagerClientViewModel.DownloadAndInstallPackage(packageInfo);
         }
 
+        /// <summary>
+        /// Upvote a packge - only keep track if a packge is due an upvote, 
+        /// but do not commit to it until dispose - if it still needs upvoting, then propagate further
+        /// </summary>
+        /// <param name="obj"></param>
+        private void UpvotePackage(object obj)
+        {
+            HasVoted = !HasVoted;
+            NumberVotes = HasVoted ? ++NumberVotes : --NumberVotes;
+        }
+
+        private bool CanUpvotePackage(object obj)
+        {
+            // If any version of the package has been installed locally, then we allow voting
+            return PackageDetailItems.Any(x => !x.CanInstall);
+        }
+
+
         /// <summary>
         /// After installing a package version, this method sets the CanInstall flag to false for
         /// that specific version only. A dynamic check would be better, but the package has not been
@@ -234,6 +273,7 @@ PackageManagerSearchElement packageManagerSearchElement
 
             OpenDependencyDetailsCommand = new DelegateCommand(OpenDependencyDetails);
             TryInstallPackageVersionCommand = new DelegateCommand(TryInstallPackageVersion);
+            UpvoteCommand = new DelegateCommand(UpvotePackage, CanUpvotePackage);
         }
 
         private void PackageLoaderOnPackageAdded(Package obj)
@@ -277,6 +317,11 @@ private bool DetectWhetherCanInstall(PackageLoader packageLoader, string package
         internal void Dispose()
         {
             PackageDetailsViewExtension.PackageManagerExtension.PackageLoader.PackageAdded -= PackageLoaderOnPackageAdded;
+            if (HasVoted)
+            {
+                PackageManagerSearchElement packageManagerSearchElement = GetPackageByName(this.PackageName);
+                packageManagerSearchElement?.Upvote();
+            }
         }
     }
 }

From 9cc476918b25d97a8583524cdb8d77f549033e77 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Thu, 7 Sep 2023 17:31:12 +0100
Subject: [PATCH 2/9] Greg update

- still not showing the new 'GetUserVotes' request that was added with this PR https://github.com/DynamoDS/PackageManagerClient/pull/84
---
 src/DynamoCoreWpf/DynamoCoreWpf.csproj             |  2 +-
 src/DynamoPackages/PackageManagerClient.cs         | 14 +++++++++++++-
 .../PackageDetailsViewExtension.csproj             |  2 +-
 test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj  |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 58dcb2a6e5b..4d4051dace8 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -129,7 +129,7 @@
       <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.2416" />
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
+    <PackageReference Include="Greg" Version="2.5.0.6084" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="106.12.0" />
diff --git a/src/DynamoPackages/PackageManagerClient.cs b/src/DynamoPackages/PackageManagerClient.cs
index 3417622b5ba..9427e2337b8 100644
--- a/src/DynamoPackages/PackageManagerClient.cs
+++ b/src/DynamoPackages/PackageManagerClient.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Dynamo.Graph.Workspaces;
 using Greg;
 using Greg.Requests;
 using Greg.Responses;
-using System.Linq;
 
 namespace Dynamo.PackageManager
 {
@@ -65,6 +65,18 @@ internal bool Upvote(string packageId)
             }, false);
         }
 
+        internal IEnumerable<string> UserVotes(string packageId)
+        {
+            var votes = FailFunc.TryExecute(() =>
+            {
+                var nv = new GetUserVotes();
+                var pkgResponse = this.client.ExecuteAndDeserializeWithContent<List<String>>(nv);
+                return pkgResponse.content;
+            }, new List<string>());
+
+            return votes;
+        }
+
         internal PackageManagerResult DownloadPackage(string packageId, string version, out string pathToPackage)
         {
             try
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
index 773fd78bf20..33c41f8ab7e 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
@@ -14,7 +14,7 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Greg" Version="2.5.0.5076" />
+	<PackageReference Include="Greg" Version="2.5.0.6084" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="106.12.0" />
   </ItemGroup>
diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
index 70c2f4dd8b1..285011cbb14 100644
--- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
+++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -26,7 +26,7 @@
 	  <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Moq" Version="4.18.4" />
 	  <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
-	  <PackageReference Include="Greg" Version="2.5.0.5076">
+	  <PackageReference Include="Greg" Version="2.5.0.6084">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>

From 274f4a825f83bf64f816caa4b9bcae3ad0d0c347 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Thu, 28 Sep 2023 18:37:59 +0100
Subject: [PATCH 3/9] votes cherry pick

- voting for packages functionality reinstated
- checking for user votes on loading
- if the user has already voted for a package prevents from voting again
- ui updates
---
 src/DynamoCore/DynamoCore.csproj              | 10 ++--
 src/DynamoCoreWpf/DynamoCoreWpf.csproj        |  2 +-
 .../PackageManagerClientViewModel.cs          | 16 ++++++
 .../PackageManagerPackagesControl.xaml        | 49 ++++++++++++-------
 src/DynamoPackages/DynamoPackages.csproj      |  2 +-
 src/DynamoPackages/PackageManagerClient.cs    |  8 +--
 .../PackageManagerSearchElement.cs            |  5 ++
 .../PackageDetailsViewExtension.csproj        |  2 +-
 .../PackageDetailsViewModel.cs                | 27 +++++-----
 .../NodeDocumentationMarkdownGenerator.csproj |  2 +-
 test/DynamoCoreTests/DynamoCoreTests.csproj   |  2 +-
 .../DynamoCoreWpfTests.csproj                 |  2 +-
 .../PackageManagerClientTests.cs              | 15 ++++++
 .../PackageManagerTests.csproj                |  2 +-
 14 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
index 6cd56de2e89..43d727b841c 100644
--- a/src/DynamoCore/DynamoCore.csproj
+++ b/src/DynamoCore/DynamoCore.csproj
@@ -30,6 +30,8 @@
     <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.2485" GeneratePathProperty="true" />
     <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2685" GeneratePathProperty="true" />
     <PackageReference Include="Greg" Version="2.5.0.5076" />
+    <PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.18.0.2486" GeneratePathProperty="true" />
+    <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
 	  <PackageReference Include="RestSharp" Version="106.12.0" CopyXML="true" />
 	<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
@@ -122,10 +124,10 @@
           <LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
           <ExternSimplexNoise Include="$(SolutionDir)..\extern\SimplexNoise\*" />
           <SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
-          <NodeHelpMDFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.md"/>
-		  <NodeHelpDYNFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.dyn"/>
-		  <NodeHelpTXTFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.txt"/>
-		  <NodeHelpSATFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.sat"/>
+          <NodeHelpMDFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.md" />
+		  <NodeHelpDYNFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.dyn" />
+		  <NodeHelpTXTFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.txt" />
+		  <NodeHelpSATFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.sat" />
           <NodeHelpJpgImageFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.jpg" />
 		  <NodeHelpPngImageFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.png" />
 		  <NodeHelpGifImageFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.gif" />
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 645898caeaf..333c2e3f91a 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -132,7 +132,7 @@
       <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.2485" />
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
-    <PackageReference Include="Greg" Version="2.5.0.6084" />
+    <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="106.12.0" />
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
index efe3950cf68..5d3ae3294ca 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -263,6 +263,12 @@ public string Username
 
         public ICommand ToggleLoginStateCommand { get; private set; }
 
+        /// <summary>
+        /// Contains all votes the user has been submitted.
+        /// Will allow the user to vote for a package they have not upvoted before
+        /// </summary>
+        private List<string> Uservotes { get; set; }
+
         internal PackageManagerClientViewModel(DynamoViewModel dynamoViewModel, PackageManagerClient model )
         {
             this.DynamoViewModel = dynamoViewModel;
@@ -280,6 +286,11 @@ internal PackageManagerClientViewModel(DynamoViewModel dynamoViewModel, PackageM
                     RaisePropertyChanged("Username");
                 };
             }
+
+            if (AuthenticationManager.LoginState.Equals(LoginState.LoggedIn))
+            {
+                this.Uservotes = this.Model.UserVotes();
+            }
         }
 
         private void ToggleLoginState()
@@ -489,6 +500,11 @@ public List<PackageManagerSearchElement> ListAll()
                 var ele = new PackageManagerSearchElement(header);
 
                 ele.UpvoteRequested += this.Model.Upvote;
+                if (Uservotes != null)
+                {
+                    ele.HasUpvote = Uservotes.Contains(header._id);
+                }
+
                 CachedPackageList.Add( ele );
             }
 
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
index a96a6eb21a3..ce4ab1dfeac 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
@@ -106,18 +106,16 @@
                  SelectedIndex="{Binding Path=SelectedIndex}"
                  VirtualizingPanel.ScrollUnit="Pixel">
 
-            <ListBox.Resources>
+            <ListBox.Resources>                
+                <SolidColorBrush x:Key="ForegroundGrayBrush" Color="#D8D8D8" />
+                <SolidColorBrush x:Key="HasVotedBlueBrush" Color="#84D7CE" />   
                 <!--  Local style used for labels on result, e.g. Number of Installs  -->
                 <Style x:Key="resultLabelStyle"
                        TargetType="TextBlock">
-                    <Setter Property="FontFamily"
-                            Value="{StaticResource ArtifaktElementRegular}" />
-                    <Setter Property="FontSize"
-                            Value="10" />
-                    <Setter Property="Foreground"
-                            Value="#C7C7C7" />
-                    <Setter Property="VerticalAlignment"
-                            Value="Center" />
+                    <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}" />
+                    <Setter Property="FontSize" Value="10" />
+                    <Setter Property="Foreground" Value="#C7C7C7" />
+                    <Setter Property="VerticalAlignment" Value="Center" />
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding Model.IsDeprecated}"
                                      Value="True">
@@ -516,15 +514,19 @@
                                        DockPanel.Dock="Right"
                                        Style="{StaticResource resultLabelStyle}"
                                        Text="{Binding Path=Model.Votes, Converter={StaticResource NegativeIntToZeroConverter}}" />
-                            <Rectangle Width="12"
-                                       Height="11"
-                                       Margin="5,0,0,2"
-                                       VerticalAlignment="Center"
-                                       DockPanel.Dock="Right">
-                                <Rectangle.Fill>
-                                    <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Favorite.png" />
-                                </Rectangle.Fill>
-                            </Rectangle>
+                          
+
+                            <Viewbox Width="12"
+                                     Height="12"
+                                     Margin="5,0,0,2"
+                                     VerticalAlignment="Center"
+                                     DockPanel.Dock="Right">
+                                <Path x:Name="heartIcon"
+                                      Data="M13.91,6.75c-1.17,2.25-4.3,5.31-6.07,6.94c-0.1903,0.1718-0.4797,0.1718-0.67,0C5.39,12.06,2.26,9,1.09,6.75&#xA;&#x9;C-1.48,1.8,5-1.5,7.5,3.45C10-1.5,16.48,1.8,13.91,6.75z"
+                                      Stroke="{StaticResource ForegroundGrayBrush}"
+                                      StrokeThickness="1"
+                                      VerticalAlignment="Center" />
+                            </Viewbox>
 
                             <!-- The version combobox -->
                             <StackPanel Margin="5,0,5,0"
@@ -578,6 +580,17 @@
                                    Fill="{StaticResource DarkMidGreyBrush}" />
 
                     </Grid>
+                    <DataTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Path=Model.HasUpvote}"
+                                     Value="True">
+                            <Setter TargetName="heartIcon"
+                                    Property="Fill"
+                                    Value="{StaticResource HasVotedBlueBrush}" />
+                            <Setter TargetName="heartIcon"
+                                    Property="Stroke"
+                                    Value="{StaticResource HasVotedBlueBrush}" />
+                        </DataTrigger>
+                    </DataTemplate.Triggers>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj
index e4368d83afe..e97c50e3d82 100644
--- a/src/DynamoPackages/DynamoPackages.csproj
+++ b/src/DynamoPackages/DynamoPackages.csproj
@@ -33,7 +33,7 @@
     <Content Include="PackageManagerExtension_ExtensionDefinition.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
+    <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="RestSharp" Version="106.12.0" />
   </ItemGroup>
diff --git a/src/DynamoPackages/PackageManagerClient.cs b/src/DynamoPackages/PackageManagerClient.cs
index 9427e2337b8..e793b06f993 100644
--- a/src/DynamoPackages/PackageManagerClient.cs
+++ b/src/DynamoPackages/PackageManagerClient.cs
@@ -65,16 +65,16 @@ internal bool Upvote(string packageId)
             }, false);
         }
 
-        internal IEnumerable<string> UserVotes(string packageId)
+        internal List<string> UserVotes()
         {
             var votes = FailFunc.TryExecute(() =>
             {
                 var nv = new GetUserVotes();
-                var pkgResponse = this.client.ExecuteAndDeserializeWithContent<List<String>>(nv);
+                var pkgResponse = this.client.ExecuteAndDeserializeWithContent<UserVotes>(nv);
                 return pkgResponse.content;
-            }, new List<string>());
+            }, null);
 
-            return votes;
+            return votes.has_upvoted;
         }
 
         internal PackageManagerResult DownloadPackage(string packageId, string version, out string pathToPackage)
diff --git a/src/DynamoPackages/PackageManagerSearchElement.cs b/src/DynamoPackages/PackageManagerSearchElement.cs
index 1eefe6ce658..99111c75b18 100644
--- a/src/DynamoPackages/PackageManagerSearchElement.cs
+++ b/src/DynamoPackages/PackageManagerSearchElement.cs
@@ -124,6 +124,11 @@ public string HostsString
         public string InfectedPackageVersion { get; set; }
         public string InfectedPackageCreationDate { get; set; }
 
+        /// <summary>
+        ///     Shows if the current user has upvoted this package
+        /// </summary>
+        public bool HasUpvote { get; internal set; }
+
         #endregion
 
         /// <summary>
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
index 33c41f8ab7e..6a6b2742fbb 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
@@ -14,7 +14,7 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Greg" Version="2.5.0.6084" />
+	<PackageReference Include="Greg" Version="2.5.0.6325" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="106.12.0" />
   </ItemGroup>
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
index f140b34198a..071e2dcdd46 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
@@ -120,6 +120,10 @@ public int NumberVotes
         /// False if custom package paths are disabled.
         /// </summary>
         public bool IsEnabledForInstall { get; private set; }
+
+        /// <summary>
+        /// Shows if the current user has voted for this package
+        /// </summary>
         public bool HasVoted
         {
             get => hasVoted;
@@ -168,20 +172,25 @@ internal void TryInstallPackageVersion(object obj)
         }
 
         /// <summary>
-        /// Upvote a packge - only keep track if a packge is due an upvote, 
-        /// but do not commit to it until dispose - if it still needs upvoting, then propagate further
+        /// Upvotes a packge
         /// </summary>
         /// <param name="obj"></param>
         private void UpvotePackage(object obj)
         {
-            HasVoted = !HasVoted;
-            NumberVotes = HasVoted ? ++NumberVotes : --NumberVotes;
+            PackageManagerSearchElement packageManagerSearchElement = GetPackageByName(this.PackageName);
+            packageManagerSearchElement?.Upvote();
+
+            HasVoted = true;
+            NumberVotes = ++NumberVotes;
         }
 
+
         private bool CanUpvotePackage(object obj)
         {
-            // If any version of the package has been installed locally, then we allow voting
-            return PackageDetailItems.Any(x => !x.CanInstall);
+            // If any version of the package has been installed locally, 
+            // and if the user has not voted for this package before
+            // then we allow voting
+            return PackageDetailItems.Any(x => !x.CanInstall) && !this.HasVoted;
         }
 
 
@@ -265,6 +274,7 @@ PackageManagerSearchElement packageManagerSearchElement
             License = packageManagerSearchElement.Header.license;
             PackageSiteURL = packageManagerSearchElement.SiteUrl;
             PackageRepositoryURL = packageManagerSearchElement.RepositoryUrl;
+            HasVoted = packageManagerSearchElement.HasUpvote;
 
             if (!Models.DynamoModel.IsTestMode)
             {
@@ -317,11 +327,6 @@ private bool DetectWhetherCanInstall(PackageLoader packageLoader, string package
         internal void Dispose()
         {
             PackageDetailsViewExtension.PackageManagerExtension.PackageLoader.PackageAdded -= PackageLoaderOnPackageAdded;
-            if (HasVoted)
-            {
-                PackageManagerSearchElement packageManagerSearchElement = GetPackageByName(this.PackageName);
-                packageManagerSearchElement?.Upvote();
-            }
         }
     }
 }
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
index b90d9534828..5720cc7ce0f 100644
--- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
+++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
         <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.2485" />
-        <PackageReference Include="Greg" Version="2.5.0.5076" />
+        <PackageReference Include="Greg" Version="2.5.0.6325" />
         <PackageReference Include="Magick.NET.Core" Version="7.0.1" />
         <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj
index 02fe36efa41..7281e0d9840 100644
--- a/test/DynamoCoreTests/DynamoCoreTests.csproj
+++ b/test/DynamoCoreTests/DynamoCoreTests.csproj
@@ -31,7 +31,7 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Greg" Version="2.5.0.5076">
+        <PackageReference Include="Greg" Version="2.5.0.6325">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
index 285011cbb14..6da630414b2 100644
--- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
+++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -26,7 +26,7 @@
 	  <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Moq" Version="4.18.4" />
 	  <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
-	  <PackageReference Include="Greg" Version="2.5.0.6084">
+	  <PackageReference Include="Greg" Version="2.5.0.6325">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
diff --git a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
index bb70fe0b4cc..e2391e78045 100644
--- a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
+++ b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
@@ -261,6 +261,21 @@ public void Upvote_ReturnsFalseWhenRequestThrowsException()
             Assert.IsFalse(res);
         }
 
+        //[Test]
+        //public void UserVotes_ReturnType()
+        //{
+        //    var c = new Mock<IGregClient>();
+        //    c.Setup(x =>
+        //        x.ExecuteAndDeserializeWithContent<List<PackageHeader>>(It.IsAny<GetUserVotes>()))
+        //        .Throws(new Exception("Fail!"));
+
+        //    var m = new PackageManagerClient(c.Object, MockMaker.Empty<IPackageUploadBuilder>(), "");
+
+        //    var pl = m.UserVotes();
+
+        //    Assert.IsNotNull(pl);
+        //}
+
         #endregion
 
         #region GetTermsOfUseAcceptanceStatus
diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
index 3aba4da863f..0e0fec4fe4e 100644
--- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
+++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
@@ -17,7 +17,7 @@
         <PackageReference Include="RestSharp" Version="106.12.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="Greg" Version="2.5.0.5076">
+        <PackageReference Include="Greg" Version="2.5.0.6325">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

From 0b13c6e3e5a74db381c3e68d5b1743ef1cba0c5a Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Sun, 1 Oct 2023 15:50:39 +0100
Subject: [PATCH 4/9] minor fixes

- now correctly updates the SeachElement item inside the PackageManagerPackagesControl 'votes' icon when user has voted for a package
- now allows to vote for a package right after a package has been installed
---
 .../PackageManagerSearchElement.cs             | 18 +++++++++++++++++-
 .../PackageDetailsViewModel.cs                 |  3 +++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/DynamoPackages/PackageManagerSearchElement.cs b/src/DynamoPackages/PackageManagerSearchElement.cs
index 99111c75b18..4fd2d6dd602 100644
--- a/src/DynamoPackages/PackageManagerSearchElement.cs
+++ b/src/DynamoPackages/PackageManagerSearchElement.cs
@@ -124,10 +124,24 @@ public string HostsString
         public string InfectedPackageVersion { get; set; }
         public string InfectedPackageCreationDate { get; set; }
 
+        private bool hasUpvote;
         /// <summary>
         ///     Shows if the current user has upvoted this package
         /// </summary>
-        public bool HasUpvote { get; internal set; }
+        public bool HasUpvote
+        {
+            get
+            {
+                return hasUpvote;
+            }
+
+            internal set
+            {
+                hasUpvote = value;
+                RaisePropertyChanged(nameof(HasUpvote));
+            }
+        }
+
 
         #endregion
 
@@ -172,6 +186,8 @@ public void Upvote()
                     }
                 }
                 , TaskScheduler.FromCurrentSynchronizationContext());
+
+            HasUpvote = true;
         }
 
         [Obsolete("This API will no longer decrease package votes and will be removed in Dynamo 3.0")]
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
index 071e2dcdd46..5441b9c222f 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
@@ -206,6 +206,9 @@ private void RefreshPackageDetailItemInstalledStatus(string versionName)
                 if (packageDetailItem.PackageVersion.version != versionName) continue;
                 packageDetailItem.CanInstall = false;
                 RaisePropertyChanged(nameof(packageDetailItem.CanInstall));
+
+                // Also update the 'CanExecute' condition for 'UpvoteCommand' which relies on a package being installed
+                ((DelegateCommand)UpvoteCommand).RaiseCanExecuteChanged();  
             }
         }
 

From 0d346426aca859c526ece33e61ba67ebb234bfb7 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Sun, 22 Oct 2023 11:39:31 +0100
Subject: [PATCH 5/9] Greg - Duplicate 'PackageReference' items found

- removed duplicate package references
---
 src/DynamoCore/DynamoCore.csproj                               | 1 -
 src/DynamoCoreWpf/DynamoCoreWpf.csproj                         | 1 -
 .../NodeDocumentationMarkdownGenerator.csproj                  | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
index 2f7060b3421..de64a8aba01 100644
--- a/src/DynamoCore/DynamoCore.csproj
+++ b/src/DynamoCore/DynamoCore.csproj
@@ -29,7 +29,6 @@
     <PackageReference Include="Autodesk.IDSDK" Version="1.1.6" />
     <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" GeneratePathProperty="true" />
     <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2880" GeneratePathProperty="true" />
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
     <PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.18.0.2486" GeneratePathProperty="true" />
     <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index d0306eb78f3..a94b383d39d 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -134,7 +134,6 @@
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
     <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="106.12.0" />
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
index 614824e05fb..e095ffd03c1 100644
--- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
+++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
@@ -15,7 +15,6 @@
         <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.2485" />
         <PackageReference Include="Greg" Version="2.5.0.6325" />
         <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
-        <PackageReference Include="Greg" Version="2.5.0.5076" />
         <PackageReference Include="Magick.NET.Core" Version="7.0.1" />
         <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -69,4 +68,4 @@
       <LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 25d73b54ef2b407add08e223854c4a8b67085d09 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Wed, 25 Oct 2023 10:06:14 +0100
Subject: [PATCH 6/9] references reconciliation

- reconciled meshed up references
- comments
---
 .../AssemblySharedInfo.cs                         |  6 +++---
 src/DynamoCore/DynamoCore.csproj                  |  2 --
 src/DynamoCoreWpf/DynamoCoreWpf.csproj            |  2 --
 src/DynamoPackages/DynamoPackages.csproj          |  3 +--
 .../PackageDetailsViewExtension.csproj            |  1 -
 .../PackageDetailsViewModel.cs                    |  5 ++---
 .../NodeDocumentationMarkdownGenerator.csproj     |  2 --
 test/DynamoCoreTests/DynamoCoreTests.csproj       |  1 -
 test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj |  1 -
 .../PackageManagerClientTests.cs                  | 15 ---------------
 10 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
index 00502a86eac..e6d25cd2b21 100644
--- a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
+++ b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
@@ -8,7 +8,7 @@
 // associated with an assembly.
 [assembly: AssemblyCompany("Autodesk, Inc")]
 [assembly: AssemblyProduct("Dynamo")]
-[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2023")]
+[assembly: AssemblyCopyright("Copyright � Autodesk, Inc 2023")]
 [assembly: AssemblyTrademark("")]
 
 //In order to begin building localizable applications, set
@@ -45,7 +45,7 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("3.0.0.5795")]
+[assembly: AssemblyVersion("3.0.0.6622")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("3.0.0.5795")]
+[assembly: AssemblyFileVersion("3.0.0.6622")]
diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
index d46ed46f149..bda6173ac6a 100644
--- a/src/DynamoCore/DynamoCore.csproj
+++ b/src/DynamoCore/DynamoCore.csproj
@@ -30,8 +30,6 @@
     <PackageReference Include="Greg" Version="3.0.0.2955" />
     <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" GeneratePathProperty="true" />
     <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2880" GeneratePathProperty="true" />
-    <PackageReference Include="DynamoVisualProgramming.LibG_228_0_0" Version="2.18.0.2486" GeneratePathProperty="true" />
-    <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
 	  <PackageReference Include="RestSharp" Version="109.0.1" CopyXML="true" />
 	<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 4558fa4236d..b260e126a29 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -132,8 +132,6 @@
       <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
-    <PackageReference Include="Greg" Version="2.5.0.6325" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
     <PackageReference Include="Greg" Version="3.0.0.2955" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj
index e1570aad473..ef52d420fb4 100644
--- a/src/DynamoPackages/DynamoPackages.csproj
+++ b/src/DynamoPackages/DynamoPackages.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -30,7 +30,6 @@
     <Content Include="PackageManagerExtension_ExtensionDefinition.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Greg" Version="2.5.0.6325" />
     <PackageReference Include="Greg" Version="3.0.0.2955" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="RestSharp" Version="109.0.1" />
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
index 947a2eb02ca..e28629ad5f1 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
@@ -14,7 +14,6 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Greg" Version="2.5.0.6325" />
 	<PackageReference Include="Greg" Version="3.0.0.2955" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Include="RestSharp" Version="109.0.1" />
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
index 5441b9c222f..e27af1bd8fd 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Input;
 using Dynamo.Core;
 using Dynamo.Graph.Workspaces;
 using Dynamo.Interfaces;
@@ -140,7 +139,7 @@ public bool HasVoted
 
         public DelegateCommand OpenDependencyDetailsCommand { get; set; }
         public DelegateCommand TryInstallPackageVersionCommand { get; set; }
-        public ICommand UpvoteCommand { get; set; }
+        public DelegateCommand UpvoteCommand { get; set; }
 
         /// <summary>
         /// Retrieves a package by name and display its details in the PackageDetailsView.
@@ -208,7 +207,7 @@ private void RefreshPackageDetailItemInstalledStatus(string versionName)
                 RaisePropertyChanged(nameof(packageDetailItem.CanInstall));
 
                 // Also update the 'CanExecute' condition for 'UpvoteCommand' which relies on a package being installed
-                ((DelegateCommand)UpvoteCommand).RaiseCanExecuteChanged();  
+                UpvoteCommand.RaiseCanExecuteChanged();  
             }
         }
 
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
index 7390b6f03ea..b3e3a9f3490 100644
--- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
+++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
@@ -12,8 +12,6 @@
   </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.18.0.2485" />
-        <PackageReference Include="Greg" Version="2.5.0.6325" />
         <PackageReference Include="Greg" Version="3.0.0.2955" />
         <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
         <PackageReference Include="Magick.NET.Core" Version="7.0.1" />
diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj
index b606be5b388..219eed1e37c 100644
--- a/test/DynamoCoreTests/DynamoCoreTests.csproj
+++ b/test/DynamoCoreTests/DynamoCoreTests.csproj
@@ -31,7 +31,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Greg" Version="2.5.0.6325">
         <PackageReference Include="Greg" Version="3.0.0.2955">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
index 1e57a4e0333..beb3024c022 100644
--- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
+++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -26,7 +26,6 @@
 	  <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Moq" Version="4.18.4" />
 	  <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
-	  <PackageReference Include="Greg" Version="2.5.0.6325">
 	  <PackageReference Include="Greg" Version="3.0.0.2955">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
index e2391e78045..bb70fe0b4cc 100644
--- a/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
+++ b/test/Libraries/PackageManagerTests/PackageManagerClientTests.cs
@@ -261,21 +261,6 @@ public void Upvote_ReturnsFalseWhenRequestThrowsException()
             Assert.IsFalse(res);
         }
 
-        //[Test]
-        //public void UserVotes_ReturnType()
-        //{
-        //    var c = new Mock<IGregClient>();
-        //    c.Setup(x =>
-        //        x.ExecuteAndDeserializeWithContent<List<PackageHeader>>(It.IsAny<GetUserVotes>()))
-        //        .Throws(new Exception("Fail!"));
-
-        //    var m = new PackageManagerClient(c.Object, MockMaker.Empty<IPackageUploadBuilder>(), "");
-
-        //    var pl = m.UserVotes();
-
-        //    Assert.IsNotNull(pl);
-        //}
-
         #endregion
 
         #region GetTermsOfUseAcceptanceStatus

From dffb0cfd702fe289c6eeba25136faa887834273f Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Wed, 25 Oct 2023 10:13:15 +0100
Subject: [PATCH 7/9] reference fix

- last reference?
---
 test/Libraries/PackageManagerTests/PackageManagerTests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
index b75a1a0ce61..6d9824b3af3 100644
--- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
+++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
@@ -20,7 +20,6 @@
         </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="Greg" Version="2.5.0.6325">
         <PackageReference Include="Greg" Version="3.0.0.2955">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From e70eaafde38701cc2377d305792d440e512d5509 Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Thu, 26 Oct 2023 09:55:08 +0100
Subject: [PATCH 8/9] revert assemblyinfo changes

- revert changes made by mistake
---
 src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
index e6d25cd2b21..00502a86eac 100644
--- a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
+++ b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
@@ -8,7 +8,7 @@
 // associated with an assembly.
 [assembly: AssemblyCompany("Autodesk, Inc")]
 [assembly: AssemblyProduct("Dynamo")]
-[assembly: AssemblyCopyright("Copyright � Autodesk, Inc 2023")]
+[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2023")]
 [assembly: AssemblyTrademark("")]
 
 //In order to begin building localizable applications, set
@@ -45,7 +45,7 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("3.0.0.6622")]
+[assembly: AssemblyVersion("3.0.0.5795")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("3.0.0.6622")]
+[assembly: AssemblyFileVersion("3.0.0.5795")]

From 656a1df5df3a45c5365b266441c39404222d7a2e Mon Sep 17 00:00:00 2001
From: Deyan Nenov <dnenov@archilizer.com>
Date: Thu, 26 Oct 2023 10:56:43 +0100
Subject: [PATCH 9/9] failing tests fix

---
 src/PackageDetailsViewExtension/PackageDetailsViewModel.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
index e27af1bd8fd..038977f98d7 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewModel.cs
@@ -328,6 +328,7 @@ private bool DetectWhetherCanInstall(PackageLoader packageLoader, string package
         /// </summary>
         internal void Dispose()
         {
+            if (PackageDetailsViewExtension.PackageManagerExtension.PackageLoader == null) return;
             PackageDetailsViewExtension.PackageManagerExtension.PackageLoader.PackageAdded -= PackageLoaderOnPackageAdded;
         }
     }