From f1f9b7436153266539903cecb7d298b6f0eb73dc Mon Sep 17 00:00:00 2001 From: Trygve Wastvedt Date: Mon, 4 Dec 2023 15:15:01 -0600 Subject: [PATCH 1/8] REVIT-215698: Restrict where OnNodeModified is called. (#14656) * Restrict where OnNodeModified is called. * Clean up. * Dispose * No SuppressFinalize --- src/Libraries/CoreNodeModels/DropDown.cs | 9 ++-- .../NodeViewCustomizations/DSDropDownBase.cs | 54 +++++++++++-------- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/Libraries/CoreNodeModels/DropDown.cs b/src/Libraries/CoreNodeModels/DropDown.cs index 87fab94c4d2..71ec3ce9758 100644 --- a/src/Libraries/CoreNodeModels/DropDown.cs +++ b/src/Libraries/CoreNodeModels/DropDown.cs @@ -59,7 +59,7 @@ public ObservableCollection Items set { items = value; - RaisePropertyChanged("Items"); + RaisePropertyChanged(nameof(Items)); } } @@ -106,7 +106,6 @@ public int SelectedIndex selectedString = GetSelectedStringFromItem(Items.ElementAt(value)); } - OnNodeModified(); RaisePropertyChanged("SelectedIndex"); RaisePropertyChanged("SelectedString"); } @@ -137,12 +136,12 @@ public string SelectedString if (item != null) { selectedIndex = Items.IndexOf(item); - RaisePropertyChanged("SelectedIndex"); + RaisePropertyChanged(nameof(SelectedIndex)); } } selectedString = value; - RaisePropertyChanged("SelectedString"); + RaisePropertyChanged(nameof(SelectedString)); } } @@ -203,6 +202,8 @@ protected override bool UpdateValueCore(UpdateValueParams updateValueParams) Warning(Dynamo.Properties.Resources.NothingIsSelectedWarning); } + OnNodeModified(); + return true; } diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs index c54356fda83..e6456345949 100644 --- a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs +++ b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/DSDropDownBase.cs @@ -15,61 +15,69 @@ namespace CoreNodeModelsWpf.Nodes public class DropDownNodeViewCustomization : INodeViewCustomization { private DSDropDownBase model; + private ComboBox comboBox; public void CustomizeView(DSDropDownBase model, NodeView nodeView) { this.model = model; - //add a drop down list to the window - var combo = new ComboBox + // Add a drop down list to the window + comboBox = new ComboBox { - Width = System.Double.NaN, - MinWidth= 150, + Width = double.NaN, + MinWidth = 150, Height = Configurations.PortHeightInPixels, HorizontalAlignment = HorizontalAlignment.Stretch, - VerticalAlignment = VerticalAlignment.Center + VerticalAlignment = VerticalAlignment.Center, + Style = (Style)SharedDictionaryManager.DynamoModernDictionary["RefreshComboBox"] }; + nodeView.inputGrid.Children.Add(comboBox); + Grid.SetColumn(comboBox, 0); + Grid.SetRow(comboBox, 0); - combo.Style = (Style)SharedDictionaryManager.DynamoModernDictionary["RefreshComboBox"]; + comboBox.DropDownOpened += DropDownOpened; + comboBox.SelectionChanged += SelectionChanged; - nodeView.inputGrid.Children.Add(combo); - System.Windows.Controls.Grid.SetColumn(combo, 0); - System.Windows.Controls.Grid.SetRow(combo, 0); + comboBox.DataContext = model; - combo.DropDownOpened += combo_DropDownOpened; - - combo.DataContext = model; - - // bind this combo box to the selected item hash - var bindingVal = new System.Windows.Data.Binding("Items") + // Bind this combo box to the selected item hash. + var bindingVal = new Binding(nameof(DSDropDownBase.Items)) { Mode = BindingMode.TwoWay, Source = model }; - combo.SetBinding(ItemsControl.ItemsSourceProperty, bindingVal); + comboBox.SetBinding(ItemsControl.ItemsSourceProperty, bindingVal); - // bind the selected index to the model property SelectedIndex - var indexBinding = new Binding("SelectedIndex") + // Bind the selected index to the model property SelectedIndex. + var indexBinding = new Binding(nameof(DSDropDownBase.SelectedIndex)) { Mode = BindingMode.TwoWay, Source = model }; - combo.SetBinding(Selector.SelectedIndexProperty, indexBinding); + comboBox.SetBinding(Selector.SelectedIndexProperty, indexBinding); + } + + private void SelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (comboBox.SelectedIndex != -1) + { + model.OnNodeModified(); + } } public void Dispose() { + comboBox.DropDownOpened -= DropDownOpened; + comboBox.SelectionChanged -= SelectionChanged; } /// /// When the dropdown is opened, the node's implementation of PopulateItems is called /// - /// - /// - void combo_DropDownOpened(object sender, EventArgs e) + void DropDownOpened(object sender, EventArgs e) { - this.model.PopulateItems(); + model.PopulateItems(); } } From 8735b248e1299add025245c87b3ab48f55272330 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:09:21 -0500 Subject: [PATCH 2/8] Bump actions/setup-dotnet from 3 to 4 in /.github/workflows (#14681) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_dynamo_all_net6.0.yml | 2 +- .github/workflows/build_dynamo_all_net8.0.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dynamoBinDiff.yml | 4 ++-- .github/workflows/dynamoNet6.0_build.yml | 2 +- .github/workflows/dynamoNet6.0_linux_build.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_dynamo_all_net6.0.yml b/.github/workflows/build_dynamo_all_net6.0.yml index a538fc12402..324acbf47c7 100644 --- a/.github/workflows/build_dynamo_all_net6.0.yml +++ b/.github/workflows/build_dynamo_all_net6.0.yml @@ -13,7 +13,7 @@ jobs: path: Dynamo repository: DynamoDS/Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' - name: Disable problem matcher diff --git a/.github/workflows/build_dynamo_all_net8.0.yml b/.github/workflows/build_dynamo_all_net8.0.yml index 5e6a5bf284c..77762993e73 100644 --- a/.github/workflows/build_dynamo_all_net8.0.yml +++ b/.github/workflows/build_dynamo_all_net8.0.yml @@ -13,7 +13,7 @@ jobs: path: Dynamo repository: DynamoDS/Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Disable problem matcher diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5e90bee85a3..f0dced66f4e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,7 +27,7 @@ jobs: path: Dynamo repository: DynamoDS/Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/dynamoBinDiff.yml b/.github/workflows/dynamoBinDiff.yml index 440094f431f..0f82bc2a234 100644 --- a/.github/workflows/dynamoBinDiff.yml +++ b/.github/workflows/dynamoBinDiff.yml @@ -11,7 +11,7 @@ jobs: path: net60_Win_Dynamo repository: DynamoDS/Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' - name: Disable problem matcher @@ -46,7 +46,7 @@ jobs: path: master_net60_Win_Dynamo repository: DynamoDS/Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' - name: Disable problem matcher diff --git a/.github/workflows/dynamoNet6.0_build.yml b/.github/workflows/dynamoNet6.0_build.yml index f52c91e31fb..40f419d51d9 100644 --- a/.github/workflows/dynamoNet6.0_build.yml +++ b/.github/workflows/dynamoNet6.0_build.yml @@ -11,7 +11,7 @@ jobs: path: Dynamo repository: DynamoDS/Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' - name: Disable problem matcher diff --git a/.github/workflows/dynamoNet6.0_linux_build.yml b/.github/workflows/dynamoNet6.0_linux_build.yml index b0e9c3bc355..61cba99a7d5 100644 --- a/.github/workflows/dynamoNet6.0_linux_build.yml +++ b/.github/workflows/dynamoNet6.0_linux_build.yml @@ -10,7 +10,7 @@ jobs: with: path: Dynamo - name: Setup dotnet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 - name: Disable problem matcher run: echo "::remove-matcher owner=csc::" From 1a0829f4c984ac097112fe9bf78f5c5d6b5b61f6 Mon Sep 17 00:00:00 2001 From: Michael Kirschner Date: Mon, 4 Dec 2023 19:35:22 -0500 Subject: [PATCH 3/8] move from codedom to roslyn for package manager view extension tests (#14673) * update * fix tests * Update DynamoCoreWpfTests.csproj --- .../DynamoCoreWpfTests.csproj | 19 +++++++ .../PackageManagerViewExtensionTests.cs | 51 ++++++++++++------- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj index f25cbd500dd..b00dca1793a 100644 --- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj +++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj @@ -24,6 +24,17 @@ + + + + all + compile; build; native; contentfiles; analyzers; buildtransitive + + + all + compile; build; native; contentfiles; analyzers; buildtransitive + + @@ -203,4 +214,12 @@ + + + + + + + + diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs index 4aca8e5f17f..b86fce54f23 100644 --- a/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs +++ b/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs @@ -1,8 +1,8 @@ using System; -using System.CodeDom.Compiler; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using Dynamo.Configuration; using Dynamo.Core; using Dynamo.Interfaces; @@ -12,13 +12,14 @@ using Dynamo.PackageManager.UI; using Dynamo.Scheduler; using Dynamo.Wpf.Extensions; -using Microsoft.CSharp; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; using Moq; using NUnit.Framework; namespace DynamoCoreWpfTests.PackageManager { - [TestFixture, Category("Failure")] + [TestFixture] class PackageManagerViewExtensionTests : DynamoTestUIBase { private string PackagesDirectory { get { return Path.Combine(GetTestDirectory(ExecutingDirectory), "pkgs"); } } @@ -98,34 +99,26 @@ protected override DynamoModel.IStartConfiguration CreateStartConfiguration(IPat /// public virtual void GenerateNewExtension() { - var provider = new CSharpCodeProvider(); - var options = new CompilerParameters - { - GenerateExecutable = false, - OutputAssembly = "TestViewExtension.dll", - }; - options.ReferencedAssemblies.Add("DynamoCore.dll"); - options.ReferencedAssemblies.Add("DynamoCoreWPF.dll"); - string source = testViewExtensionSource; + var options = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary); + var compilation = CSharpCompilation.Create("TestViewExtension", new[] { CSharpSyntaxTree.ParseText(testViewExtensionSource) }, GetGlobalReferences(), options); - var results = provider.CompileAssemblyFromSource(options, new[] { source }); - if (results.Errors.Count > 0) + + var results = compilation.Emit("TestViewExtension.dll"); + if (results.Diagnostics.Count() > 0) { Console.WriteLine("Compile ERROR"); - foreach (CompilerError error in results.Errors) + foreach (var error in results.Diagnostics) { - Console.WriteLine(error.ErrorText); + Console.WriteLine(error.GetMessage()); } } else { Console.WriteLine("Compile OK"); - Console.WriteLine("Assembly Path:" + results.PathToAssembly); - Console.WriteLine("Assembly Name:" + results.CompiledAssembly.FullName); //move the new assembly into the package directory/bin folder. extensionPath = Path.Combine(PackagesDirectory, "subPackageDirectory", "runtimeGeneratedExtension", "bin", "TestViewExtension.dll"); - File.Copy(results.CompiledAssembly.Location, extensionPath, true); + File.Copy("TestViewExtension.dll", extensionPath, true); //copy the manifest as well. manifestPath = Path.Combine(PackagesDirectory, "subPackageDirectory", "runtimeGeneratedExtension", @@ -134,6 +127,26 @@ public virtual void GenerateNewExtension() } } + private static PortableExecutableReference[] GetGlobalReferences() + { + var assemblies = new[] + { + typeof(object).Assembly, + typeof(Console).Assembly + }; + var returnList = assemblies + .Select(a => MetadataReference.CreateFromFile(a.Location)) + .ToList(); + //The location of the .NET assemblies + var assemblyPath = Path.GetDirectoryName(typeof(object).Assembly.Location)!; + returnList.Add(MetadataReference.CreateFromFile(Path.Combine(assemblyPath, "System.Runtime.dll"))); + + returnList.Add(MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DynamoCore.dll"))); + returnList.Add(MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DynamoCoreWpf.dll"))); + + return returnList.ToArray(); + } + [Test] public void PackageManagerLoadsRuntimeGeneratedExtension() { From 3f564ec8b1664671555fff04ae80ee0e3a63ef30 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Tue, 5 Dec 2023 04:50:44 +0000 Subject: [PATCH 4/8] Pm mypackages - update package version (#14655) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * colors in config.js - now all colors are controlled by the COLORS object in confing.js * folder structure - correctly creates minimum depth folder structure for the files added * getting somewhere with browser - updated browser to only show root items * added pages - added pages for the wizard-like experience when publishing a package * connected packagecontents and rootcontents * misc changes * tree visual update fix - using Dispatcher fixes the async tree creation * wip * tests added - tests added to assert correct functionality of collecting files and folders * visual style tweaks - updated files and folders icons - now only allows LibraryNode checkboxes for Assembly dll files * previewbuild started - started the structure for preview build * testing preview functionality - added tests for the core methods of PreviewPackageBuild * delete folders working - changed `RemoveItem` method to account for folder items being removed - fixed a bug where removing an Assembly file would generate an error. Assembly files can also be added to 'additional items' * item selection and deletion - UI added to allow users to add/remove items from current Package selection * remove inactive selection border background - ui tweaks * preview contents, bugfix - preview contents now correctly display based on user choice (retain folder or not) - fixed a bug where CustomDefinitions would read as root item - Pages are disabled when not displayed, in order to stop handling of tasks that affect other Pages * browser sorting - now sorts browser alphabetically - fixed disabled behavior * assemblies show as files - assemblies now will show up with their file path, but still get picked up from their assembly resource on disk * customnode preview item added - we need the ability to display custom nodes as file with file paths during package creation. CustomDefinition does not have the attributes to address that, so we are adding a new 'preview' item type to server the purpose * delete item tests added - added tests for delete item - fixed an issue where removing all items would not result in cleaning the RootContent items - added detailed description for the customTreeView_SelectedItemChanged method * consistent select all behavior - fixed checkbox behavior to be consistent when interacting with the rest of the controls * clear data and ui - clearing data and ui after publishing - clearing data and ui with Cancel button * main flow finished - finished the main flow between the pages * retain folder structure - publish local retaining folder structure * navigation way, cancel prompts - now warns the user of losing changes if using cancel or navigating away * clear custom filepaths when clearing package controls - also clear custom definition filepaths * removing items more tests added - added more tests around removing items * tests preview items structure to created package - tests added to assert preview package structure is identical to the created package structure * test remove multiple - added test to assert correct removal of multiple root items - publish package clears on window close without prompt - added ellipsis for package name - center message prompts to main view * fixed custombrowsercontrol visuals - multiple ui fixes to the custom browser control * ui styling fixes - rework on the custom browser user control to correctly display dotted lines - no longer treats every assembly as NodeLibrary * rework of retain folder structure - change the logic of how to collect files under multiple root folders when using retain folder structure - keywords fix, added tests * minor refactor * resources * hover and tooltips - adding hover states - adding tooltips - removing old resources * resources * adding packagebuilder tests - adding tests for BuildRetainDirectory * submit package retaining folder structure - created the second path to submitting packages online retaining folder structure - tests added * publish retain folder done - finished workflow for publishing package reatining folder - changed UI finish screen to work differently depending on which workflow was taken - publish locally or online - tests added * exclude unmanaged dlls - unmanaged dll files cannot be Node Library - fixed Node Library preview * description removed, name validation adorner added - removed description from package validation rules - added name error validation and adorner * tooltips - fixed tooltips and styles * remove PublishPackageReadyToPublishPage - PublishPackageReadyToPublishPage was not used, removed * keywords tags - added keywords tags - TODO: should we replace Kewords with KewordsCollection when submitting a package? * host control updated - updated the host control visuals - tooltips update * build version error message - added build version error message * rework markdown path locator - added new control when no markdown path is selected * numeric up/down fix and tests - added tests for numeric up/down - space is now handled and should not be allowed - new validation rule for package Name field * starting space rule - no longer able to start with a space for all input fields - allows user to skip adding minor and build values will be replaced with default ones * new validation rules - updated validation rules as per Figma * remove empty tooltips - remove unnecessary tooltip to the content presenter - added 1 missing tooltip to line items * fix * comment to PublishRetainFolderStructure - added a detailed comment describing the new PublishRetainFolderStructure method * remove duplicate icon.png from test folders - removed duplicate icon.png files / replaced with empty text files instead - updated tests that were failing since last changes * comments to public properties added * restored deleted namespaces - not sure how the namespaces got wiped with the previous commit * remove unused icons * failing tests fix - the tests were failing because another test folder was starting with a preceding alphabet letter * remove commented out code * update mypackages ui and functionality - starting the work around MyPackages tab * replaced bullet menu icon - now uses vector path rather than png icon (scalable) * refresh datacontext on change - now correctly refreshes the PublishPackageViewModel datacontext when publishing new package version * memory leak * PublishNewVersionCommand inside PackageManagerViewModel - the design dictates that we trigger a `publish version` command from inside a packageManagerSearchElementViewModel, which is separated from the PackageViewModel that has all the necessary methods for that - we are using the PackageManagerViewModel as the highest order VM that to create a bridge between the search element and the installed package * wire the command * unsubscribe from event handlers - unsunbscribing from a few unattended event handlers - removed EntryDictionary, it wasn't used anywhere but was taking resources - unsubsribing from ele.RequestShowFileDialog -= OnRequestShowFileDialog; for each searchelementVM this time! * clear breadcrumbs * publish tab no memory leak - publish tab is not leaking * BrowserItemViewModel dispose - implement dispose method inside the BrowserItemViewModel to unsubscribe from the ItemsOnCollectionChanged event * disabled PublishingACustomNodeSetsPackageInfoCorrectly_ test - disabled this test for the moment, it contaminates the packages folder by creating a package and leading to numerous failure tests consequently * fixed minor bugs - fixed a bug where the install to folder would not show the required dialog - fixed a bug where after locking the name for edit (after submitting a new package version) clearing the results would not remove the block from typing the name * Squashed commit of the following: commit f5d55636f77605bc6e1f818f08fb367c43a87da5 Author: Deyan Nenov Date: Tue Nov 28 12:12:19 2023 +0000 dispose methods null checks - trying to prevent null exceptions in case resources have been cleared before dispose event has been called commit e43ad538f0a6c6416d3a9204a81311a99bbb23f0 Author: Deyan Nenov Date: Tue Nov 28 11:05:20 2023 +0000 remove begin invoke from mainFrame_Navigated - this was done to try and fix a failing test but it should not be needed commit 42bf04c0df4d52925cdecefc93a42a7565f909de Author: Deyan Nenov Date: Mon Nov 27 21:04:19 2023 +0000 null check to mainFrame_Navigated - added a null check commit 9dde030c5d565baf203f25794724dfa8eb51d91b Merge: a77a11a877 3f765b51ad Author: Deyan Nenov Date: Mon Nov 27 18:07:39 2023 +0000 Merge branch 'pm-publishpackage-cherrypick-resources' into pm-publishpackage-cherrypick-mypackage commit a77a11a8774c8c1f98f26e679905b492c691620f Author: Deyan Nenov Date: Mon Nov 27 17:47:17 2023 +0000 main changes - this cherry-pick contains all main changes minus resources and tests. - will need to merge resources to work correctly - if this breaks the test run, we will need to further split it up, or introduce the changes one by one somehow commit 3f765b51ad31c80e9c1f77d457310b32717ff4d0 Merge: 95d502a95b 36fb8d31b3 Author: Deyan Nenov Date: Mon Nov 27 17:38:11 2023 +0000 Merge remote-tracking branch 'upstream/master' into pm-publishpackage-cherrypick-resources commit 95d502a95b5437e809865b7170495c8007703055 Author: Deyan Nenov Date: Mon Nov 27 17:38:02 2023 +0000 resource cherry-pick - picked up all resource changes commit 36fb8d31b3fc60fcea57354d81d8a9ce070d6149 Author: Jorgen Dahl Date: Mon Nov 27 11:51:35 2023 -0500 Test net8 (#14635) * Test net8 * Also add DotNet to the build properties * Update CS_SDK.props * Update CS_SDK.props * update * update * update * Go back to net6 --------- Co-authored-by: pinzart commit cbba6d073ded1a4cfaf8a323401f5b80eae1b585 Author: Michael Kirschner Date: Mon Nov 27 11:26:04 2023 -0500 DYN-6412 fix performance issue with feature flags, and deadlock with CLI wrapper. (#14637) * fix for null data being shown over and over * fix issues with cli wrapper get data * revert * add test * review comments add tests * comments * review comments commit c5df6f9ab3ef5ad73a55cea82d422b8c1941ca9a Author: Ashish Aggarwal Date: Mon Nov 27 11:22:32 2023 -0500 Replace Application.Current with HostAnalyticsInfo.HostName check (#14574) * Fix PostDiff job * replace application.current * tests * refactor after Bogdans PR --------- Co-authored-by: Aaron (Qilong) <173288704@qq.com> commit 11b1f7c30546308e273a027c11a84936a005dd2d Author: jesusalvino <96534278+jesusalvino@users.noreply.github.com> Date: Mon Nov 27 08:55:32 2023 -0500 DYN-6313 Add ML Node AutoComplete TOU (#14625) * Updating the Agreement and Term of Use * Adding the MLNodeAuntocomplete rtf file * Persists the AgreeToMLAutocompleteTOU as preference settings * rename property * resources and control names * Clean up * Update * update --------- Co-authored-by: Jesus Alfredo Alviño Co-authored-by: Aaron (Qilong) commit 3e97cbdc8a5e6e47a7c480febd17ed1e4d047ad1 Author: Aabishkar KC Date: Wed Nov 22 12:56:04 2023 -0500 Update smoke tests workflow (#14638) * update selected known host value on clear - fixed a small issue where the selected known hosts were not being cleared on reset * changes to publish package name validation - moved small fixes to publish package name validation to this branch * font size alignment * font size change * font weight change * remove redundant test files * added missing resource * rename ThisDataContextChanged to PackageManagerPublishControl_DataContextChanged --------- Co-authored-by: Craig Long --- .../Controls/InstalledPackagesControl.xaml | 24 +-- .../Properties/Resources.Designer.cs | 9 ++ .../Properties/Resources.en-US.resx | 3 + src/DynamoCoreWpf/Properties/Resources.resx | 5 +- .../UI/Themes/Modern/DynamoModern.xaml | 19 ++- .../PackageManagerSearchElementViewModel.cs | 18 +++ .../PackageManagerSearchViewModel.cs | 7 +- .../PackageManager/PackageManagerViewModel.cs | 34 +++- .../PackageManager/PublishPackageViewModel.cs | 21 ++- .../Views/Core/DynamoView.xaml.cs | 4 + .../PackageManagerPackagesControl.xaml | 153 ++++++++++++------ .../PackageManagerPublishControl.xaml.cs | 30 +++- .../PackageManager/PackageManagerView.xaml | 10 +- .../Pages/PublishPackagePublishPage.xaml | 2 +- .../Pages/PublishPackagePublishPage.xaml.cs | 35 +++- 15 files changed, 299 insertions(+), 75 deletions(-) diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml index 6bf51a5ad9e..969911653eb 100644 --- a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml +++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml @@ -52,10 +52,12 @@ GroupName="PackageFilters" IsChecked="{Binding Path=IsChecked, Mode=TwoWay}" Style="{StaticResource {x:Type ToggleButton}}" - FontSize="10" + FontSize="11" FontFamily="Artifakt Element" FontWeight="Medium" HorizontalAlignment="Center" + VerticalAlignment="Center" + VerticalContentAlignment="Center" BorderThickness="1" BorderBrush="Transparent" UseLayoutRounding="True" @@ -121,7 +123,7 @@ @@ -255,7 +257,8 @@ @@ -279,7 +282,8 @@ @@ -312,7 +316,8 @@ @@ -334,7 +339,7 @@ Margin="0,0,0,5"> + Foreground="{StaticResource PreferencesWindowFontColor}" + FontSize="12" + FontWeight="Regular" + TextTrimming="CharacterEllipsis" /> diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index e63e6df6817..61b0f44e341 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -5744,6 +5744,15 @@ public static string PackageManagerMyPackagesControlName { } } + /// + /// Looks up a localized string similar to Publish Version. + /// + public static string PackageManagerMyPackagesPublishVersion { + get { + return ResourceManager.GetString("PackageManagerMyPackagesPublishVersion", resourceCulture); + } + } + /// /// Looks up a localized string similar to My Packages. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index f6c0fe0f6ab..1d4540cf9a1 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -3612,6 +3612,9 @@ You can manage this in Preferences -> Security. This package is outdated and cannot be installed. + + Publish Version + Loading View Extensions... diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index 7565ef61128..4fc62fdc39a 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -3599,6 +3599,9 @@ You can manage this in Preferences -> Security. This package is outdated and cannot be installed. + + Publish Version + Loading View Extensions... @@ -3842,4 +3845,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in To access the Recommended Nodes feature, please read and accept Dynamo > Agreement and Terms of Use. - \ No newline at end of file + diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml index 26ca6add1dd..c3cc6e2c43e 100644 --- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml +++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml @@ -53,6 +53,7 @@ Black #808080 + @@ -1022,7 +1023,7 @@ - + @@ -3421,11 +3422,19 @@ - + + + - + @@ -3434,7 +3443,7 @@ - + + + + + + + - - - -