diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs index eee39b74c03..aae54d6e8bf 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs @@ -188,9 +188,6 @@ public PackageViewModel(DynamoViewModel dynamoViewModel, Package model) PublishNewPackageVersionCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackageVersion), IsOwner); PublishNewPackageCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackage), () => CanPublish); - PublishNewPackageVersionRetainCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackageVersionRetainFolderStructure), IsOwner); - PublishNewPackageRetainCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackageRetainFolderStructure), () => CanPublish); - UninstallCommand = new DelegateCommand(Uninstall, CanUninstall); UnmarkForUninstallationCommand = new DelegateCommand(UnmarkForUninstallation, CanUnmarkForUninstallation); LoadCommand = new DelegateCommand(Load, CanLoad); @@ -454,24 +451,6 @@ private void PublishNewPackage() dynamoViewModel.OnRequestPackagePublishDialog(vm); } - private void PublishNewPackageVersionRetainFolderStructure() - { - Model.RefreshCustomNodesFromDirectory(dynamoModel.CustomNodeManager, DynamoModel.IsTestMode); - var vm = PublishPackageViewModel.FromLocalPackageRetainFolderStructure(dynamoViewModel, Model); - vm.IsNewVersion = true; - - dynamoViewModel.OnRequestPackagePublishDialog(vm); - } - - private void PublishNewPackageRetainFolderStructure() - { - Model.RefreshCustomNodesFromDirectory(dynamoModel.CustomNodeManager, DynamoModel.IsTestMode); - var vm = PublishPackageViewModel.FromLocalPackageRetainFolderStructure(dynamoViewModel, Model); - vm.IsNewVersion = false; - - dynamoViewModel.OnRequestPackagePublishDialog(vm); - } - private void ExecuteWithTou(Action acceptanceCallback) { // create TermsOfUseHelper object to check asynchronously whether the Terms of Use has diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs index da3d99e6d5e..13a54063586 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs @@ -1381,106 +1381,6 @@ public static PublishPackageViewModel FromLocalPackage(DynamoViewModel dynamoVie } - - /// - /// An alternative path to publishing package version experience - /// In this method, we keep duplicate assemblies, adding them as files and not raising an error - /// - /// - /// - /// - public static PublishPackageViewModel FromLocalPackageRetainFolderStructure(DynamoViewModel dynamoViewModel, Package pkg) - { - var defs = new List(); - - foreach (var x in pkg.LoadedCustomNodes) - { - CustomNodeDefinition def; - if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionDefinition( - x.FunctionId, - DynamoModel.IsTestMode, - out def)) - { - defs.Add(def); - } - } - - var pkgViewModel = new PublishPackageViewModel(dynamoViewModel) - { - Group = pkg.Group, - Description = pkg.Description, - Keywords = pkg.Keywords != null ? String.Join(" ", pkg.Keywords) : "", - CustomNodeDefinitions = defs, - Name = pkg.Name, - RepositoryUrl = pkg.RepositoryUrl ?? "", - SiteUrl = pkg.SiteUrl ?? "", - Package = pkg, - License = pkg.License, - SelectedHosts = pkg.HostDependencies as List, - CopyrightHolder = pkg.CopyrightHolder, - CopyrightYear = pkg.CopyrightYear, - IsPublishFromLocalPackage = true, - RetainFolderStructureOverride = true - }; - - // add additional files - pkg.EnumerateAdditionalFiles(); - foreach (var file in pkg.AdditionalFiles) - { - pkgViewModel.AdditionalFiles.Add(file.Model.FullName); - } - - var nodeLibraryNames = pkg.Header.node_libraries; - - var assembliesLoadedTwice = new List(); - foreach (var file in pkg.EnumerateAssemblyFilesInPackage()) - { - Assembly assem; - var result = PackageLoader.TryMetaDataContextLoad(file, SharedPublishLoadContext, out assem); - - switch (result) - { - case AssemblyLoadingState.Success: - { - var isNodeLibrary = nodeLibraryNames == null || nodeLibraryNames.Contains(assem.FullName); - pkgViewModel.Assemblies.Add(new PackageAssembly() - { - IsNodeLibrary = isNodeLibrary, - Assembly = assem - }); - break; - } - case AssemblyLoadingState.NotManagedAssembly: - { - // if it's not a .NET assembly, we load it as an additional file - pkgViewModel.AdditionalFiles.Add(file); - break; - } - case AssemblyLoadingState.AlreadyLoaded: - { - // When retaining the folder structure, we bypass this check (for now!) - pkgViewModel.AdditionalFiles.Add(file); - break; - } - } - } - - //after dependencies are loaded refresh package contents - pkgViewModel.RefreshPackageContents(); - pkgViewModel.UpdateDependencies(); - - if (pkg.VersionName == null) return pkgViewModel; - - var parts = pkg.VersionName.Split('.'); - if (parts.Count() != 3) return pkgViewModel; - - pkgViewModel.MajorVersion = parts[0]; - pkgViewModel.MinorVersion = parts[1]; - pkgViewModel.BuildVersion = parts[2]; - return pkgViewModel; - - } - public void OnPublishSuccess() { if (PublishSuccess != null)