DynamoDS
diff --git a/‎LICENSE.txt
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion b/‎LICENSE.txt
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎doc/distrib/License.rtf
Copy file name to clipboard
+506-119Lines changed: 506 additions & 119 deletions b/‎doc/distrib/License.rtf
Copy file name to clipboard
+506-119Lines changed: 506 additions & 119 deletions
diff --git a/‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+58Lines changed: 58 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+58Lines changed: 58 additions & 0 deletions
diff --git a/‎src/Libraries/PythonNodeModels/Properties/AssemblyInfo.cs
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/‎src/Libraries/PythonNodeModels/Properties/AssemblyInfo.cs
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Libraries/PythonNodeModels/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/Libraries/PythonNodeModels/Properties/Resources.Designer.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
@@ -30,6 +30,10 @@ https://github.com/cyotek/Cyotek.Drawing.BitmapFont
 https://github.com/cyotek/Cyotek.Drawing.BitmapFont/blob/master/LICENSE.txt 
   (MIT license)
 
+### DiffPlex
+https://github.com/mmanela/diffplex/blob/master/License.txt
+  (Apache License)
+
 ### DirectX
 https://github.com/DynamoDS/Dynamo/tree/master/tools/install/Extra/DirectX/License Agreements/DirectX SDK EULA.txt
 https://github.com/DynamoDS/Dynamo/tree/master/tools/install/Extra/DirectX/License Agreements/directx redist.txt
@@ -134,4 +138,3 @@ https://github.com/DesignEngrLab/StarMath/blob/master/LICENSE
 https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
   (Microsoft Public License)
 
-
 
@@ -8,7 +8,7 @@
 // associated with an assembly.
 [assembly: AssemblyCompany("Autodesk, Inc")]
 [assembly: AssemblyProduct("Dynamo")]
-[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2017")]
+[assembly: AssemblyCopyright("Copyright © Autodesk, Inc 2020")]
 [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("2.8.0.1665")]
+[assembly: AssemblyVersion("2.8.0.2015")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("2.8.0.1665")]
+[assembly: AssemblyFileVersion("2.8.0.2015")]
@@ -758,6 +758,64 @@
         </Setter>
     </Style>
 
+    <Style x:Key="SButtonWithShapeIcon"
+           TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+
+                    <Border x:Name="container"
+                            Background="Transparent"
+                            BorderBrush="#3c3c3c"
+                            BorderThickness="1">
+                        <Grid x:Name="inner"
+                              Background="#373737">
+
+                            <StackPanel Orientation="Horizontal">
+                                <ContentControl Content="{DynamicResource ResourceKey=Shape}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+
+                        <Trigger Property="Button.IsMouseOver"
+                                 Value="true">
+                            <Setter TargetName="container"
+                                    Property="BorderBrush"
+                                    Value="#656565" />
+                            <Setter TargetName="inner"
+                                    Property="Background"
+                                    Value="#373737" />
+                        </Trigger>
+
+                        <Trigger Property="Button.IsPressed"
+                                 Value="true">
+                            <Setter TargetName="container"
+                                    Property="BorderBrush"
+                                    Value="#656565" />
+                            <Setter TargetName="inner"
+                                    Property="Background"
+                                    Value="#272727" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled"
+                                 Value="false">
+                            <Setter TargetName="container"
+                                    Property="BorderBrush"
+                                    Value="Transparent" />
+                            <Setter TargetName="inner"
+                                    Property="Background"
+                                    Value="#373737" />
+                        </Trigger>
+
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 
     <Style x:Key="STextButtonDefault"
            TargetType="{x:Type Button}">
 
@@ -10,8 +10,14 @@
 [assembly: AssemblyCulture("")]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("a0debf47-0cf2-46e8-90b9-0c3d9b808fd7")]
+
 // Remove this when PythonEngineSelector become public
 [assembly: InternalsVisibleTo("DynamoPythonTests")]
 [assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
 [assembly: InternalsVisibleTo("IronPythonExtension")]
-[assembly: InternalsVisibleTo("PythonMigrationViewExtension")]
+
+// Needed to use internal MigrationAssistantRequested event 
+[assembly: InternalsVisibleTo("PythonNodeModelsWpf")]
+[assembly: InternalsVisibleTo("PythonMigrationViewExtension")]
+
+