feat: support different distributor names for a package, this can hap…

…pen if the owner decides to switch the name of the company
Zeugwerk · Jan 21, 2024 · 72da9ee · 72da9ee
1 parent ce7b965
commit 72da9ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/TwinpackShared/TwinpackUtils.cs b/TwinpackShared/TwinpackUtils.cs
@@ -299,10 +299,9 @@ public static void RemoveReference(ITcPlcLibraryManager libManager, string place
                     itemDistributorName = plcLibrary.Distributor;
                 }
 
-                if (string.Equals(itemPlaceholderName, placeholderName, StringComparison.InvariantCultureIgnoreCase) &&
-                    string.Equals(itemDistributorName, distributorName, StringComparison.InvariantCultureIgnoreCase))
+                if (string.Equals(itemPlaceholderName, placeholderName, StringComparison.InvariantCultureIgnoreCase))
                 {
-                    _logger.Info($"Remove reference to {placeholderName} (version: {itemVersion}, distributor: {itemDistributorName})");
+                    _logger.Info($"Remove reference {placeholderName} (version: {itemVersion}, distributor: {itemDistributorName})");
                     libManager.RemoveReference(placeholderName);
                 }
             }

diff --git a/TwinpackVsixShared/Dialogs/PackageVersionWindow.xaml.cs b/TwinpackVsixShared/Dialogs/PackageVersionWindow.xaml.cs
@@ -275,7 +275,7 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
                 TargetsView.SelectedIndex = target != null ? UserInfo.Targets.IndexOf(target) : 0;
                 FileTypeView.SelectedIndex = _packageVersion?.Compiled == 1 ? 1 : 0;
 
-                IsConfigured = _plcConfig != null && (_package?.PackageId == null || _plcConfig.Name == _package.Name && _plcConfig.DistributorName == _package.DistributorName && _package.Repository == _twinpackServer.Username);
+                IsConfigured = _plcConfig != null && (_package?.PackageId == null || _plcConfig.Name == _package.Name && _package.Repository == _twinpackServer.Username);
                 IsNewPackage = _package.PackageId == null;
                 if (IsNewPackage)
                     License = (cmbLicense.Items[2] as ComboBoxItem).Content.ToString();