Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DYN-5709: Pm publish version patch request #15395

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/master' into pm-publish-versio…
…n-patch-request
  • Loading branch information
dnenov committed Jul 25, 2024
commit 9fef12d4d028193018185833e0d96db85547143e
Original file line number Diff line number Diff line change
@@ -219,8 +219,8 @@
private bool _isPackageInstalled = false;
public bool IsPackageInstalled
{
get { return _isPackageInstalled; }

Check failure on line 222 in src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs

GitHub Actions / analyze

Symbol 'IsPackageInstalled.get' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)
set

Check failure on line 223 in src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs

GitHub Actions / analyze

Symbol 'IsPackageInstalled.set' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md)
{
if (_isPackageInstalled != value)
{
@@ -1108,7 +1108,7 @@
if (!rootItems.Any()) return rootItems;

var roots = new List<PackageItemRootViewModel>();

var commonPaths = GetCommonPaths(items.Keys.ToArray());
if (commonPaths == null) return null;

@@ -1382,9 +1382,9 @@
{
if (e.PropertyName == "PackageContents")
{
CanSubmit();
SubmitCommand.RaiseCanExecuteChanged();
PublishLocallyCommand.RaiseCanExecuteChanged();
CanSubmit();
SubmitCommand.RaiseCanExecuteChanged();
PublishLocallyCommand.RaiseCanExecuteChanged();
}
}

@@ -2794,12 +2794,13 @@
internal PackageItemRootViewModel GetExistingRootItemViewModel(string publishPath, string packageName)
{
if (!PackageContents.Any()) return null;
if (PackageContents.Count(x => x.DependencyType.Equals(DependencyType.Folder)) == 1) {
if (PackageContents.Count(x => x.DependencyType.Equals(DependencyType.Folder)) == 1)
{
// If there is only one root item, this root item becomes the new folder
var item = PackageContents.First(x => x.DependencyType.Equals(DependencyType.Folder));

item = new PackageItemRootViewModel(Path.Combine(publishPath, packageName));
item.AddChildren( PackageContents.First().ChildItems.ToList() );
item.AddChildren(PackageContents.First().ChildItems.ToList());

return item;
}
@@ -2809,7 +2810,7 @@
foreach (var item in PackageContents)
{
// Skip 'bare' custom nodes, they will be represented by their CustomNodePreview counterparts
if(item.DependencyType.Equals(DependencyType.CustomNode)) { continue; }
if (item.DependencyType.Equals(DependencyType.CustomNode)) { continue; }

item.isChild = true;
rootItem.AddChildren(item);
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.