Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Rename Add Package Reference dialog to Manage Packages.

  • Loading branch information...
commit 17dc0e77712b9701b326dc87a037917055f8f19b 1 parent 0052ecf
@mrward mrward authored
Showing with 65 additions and 65 deletions.
  1. +15 −15 src/AddIns/Misc/PackageManagement/Project/PackageManagement.addin
  2. +6 −6 src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
  3. +1 −1  src/AddIns/Misc/PackageManagement/Project/Src/{IAddPackageReferenceView.cs → IManagePackagesView.cs}
  4. +6 −6 src/AddIns/Misc/PackageManagement/Project/Src/{AddPackageReferenceCommand.cs → ManagePackagesCommand.cs}
  5. +3 −3 src/AddIns/Misc/PackageManagement/Project/Src/{AddPackageReferenceView.xaml.cs → ManagePackagesView.cs}
  6. +3 −3 src/AddIns/Misc/PackageManagement/Project/Src/{AddPackageReferenceView.xaml → ManagePackagesView.xaml}
  7. +2 −2 ...dIns/Misc/PackageManagement/Project/Src/{AddPackageReferenceViewModel.cs → ManagePackagesViewModel.cs}
  8. +7 −7 src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementViewModels.cs
  9. +4 −4 src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
  10. +1 −1  ...s/Misc/PackageManagement/Test/Src/Helpers/{FakeAddPackageReferenceView.cs → FakeManagePackagesView.cs}
  11. +6 −6 ...Management/Test/Src/Helpers/{TestableAddPackageReferenceCommand.cs → TestableManagePackagesCommand.cs}
  12. +7 −7 ...s/Misc/PackageManagement/Test/Src/{AddPackageReferenceCommandTests.cs → ManagePackagesCommandTests.cs}
  13. +4 −4 ...sc/PackageManagement/Test/Src/{AddPackageReferenceViewModelTests.cs → ManagePackagesViewModelTests.cs}
View
30 src/AddIns/Misc/PackageManagement/Project/PackageManagement.addin
@@ -19,11 +19,11 @@
<Path path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode">
<Condition name="WriteableProject" action="Disable">
<MenuItem
- id="AddPackageReference"
- label="Add Package Reference"
- insertafter="AddReference"
- insertbefore="AddWebReference"
- class = "ICSharpCode.PackageManagement.AddPackageReferenceCommand"/>
+ id="ManagePackages"
+ label="Manage Packages"
+ insertafter="AddWebReference"
+ insertbefore="AddSeparator"
+ class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
</Condition>
</Path>
@@ -31,11 +31,11 @@
<Path name="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ReferenceFolderNode">
<Condition name="WriteableProject" action="Disable">
<MenuItem
- id="AddPackageReference"
- label="Add Package Reference"
- insertafter="AddReference"
- insertbefore="AddWebReference"
- class="ICSharpCode.PackageManagement.AddPackageReferenceCommand"/>
+ id="ManagePackages"
+ label="Manage Packages"
+ insertafter="AddWebReference"
+ insertbefore="AddSeparator"
+ class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
</Condition>
</Path>
@@ -43,11 +43,11 @@
<Path name="/SharpDevelop/Workbench/MainMenu/Project">
<Condition name="WriteableProject" action="Disable">
<MenuItem
- id="AddPackageReference"
- label="Add Package Reference"
- insertafter="AddReference"
- insertbefore="AddWebReference"
- class="ICSharpCode.PackageManagement.AddPackageReferenceCommand"/>
+ id="ManagePackages"
+ label="Manage Packages"
+ insertafter="AddWebReference"
+ insertbefore="AddSeparator"
+ class="ICSharpCode.PackageManagement.ManagePackagesCommand"/>
</Condition>
</Path>
View
12 src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
@@ -70,7 +70,7 @@
</Compile>
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\AcceptLicensesEventArgs.cs" />
- <Compile Include="Src\AddPackageReferenceCommand.cs" />
+ <Compile Include="Src\ManagePackagesCommand.cs" />
<Compile Include="Src\AggregateExceptionErrorMessage.cs" />
<Compile Include="Src\ConsolePackageActionRunner.cs" />
<Compile Include="Src\DefaultProjectTemplatePackageSource.cs" />
@@ -107,7 +107,7 @@
<Compile Include="Src\EnvDTE\TextEditorFontSizeProperty.cs" />
<Compile Include="Src\EnvDTE\TextEditorOptions.cs" />
<Compile Include="Src\FileExistsException.cs" />
- <Compile Include="Src\IAddPackageReferenceView.cs" />
+ <Compile Include="Src\IManagePackagesView.cs" />
<Compile Include="Src\InstallProjectTemplatePackagesCommand.cs" />
<Compile Include="Src\IPackageActionRunner.cs" />
<Compile Include="Src\IPackageFromRepository.cs" />
@@ -151,11 +151,11 @@
<Compile Include="Src\ProjectTemplatePackageRepositoryCache.cs" />
<Compile Include="Src\ProjectTemplatePackagesSettingsFileName.cs" />
<Compile Include="Src\RegisteredPackageRepositories.cs" />
- <Compile Include="Src\AddPackageReferenceView.xaml.cs">
- <DependentUpon>AddPackageReferenceView.xaml</DependentUpon>
+ <Compile Include="Src\ManagePackagesView.cs">
+ <DependentUpon>ManagePackagesView.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
- <Compile Include="Src\AddPackageReferenceViewModel.cs" />
+ <Compile Include="Src\ManagePackagesViewModel.cs" />
<Compile Include="Src\AvailablePackagesViewModel.cs" />
<Compile Include="Src\BooleanToFontWeightConverter.cs" />
<Compile Include="Src\DelegateCommand.cs" />
@@ -339,7 +339,7 @@
<Compile Include="Src\VisualStudio\SVsExtensionManager.cs" />
</ItemGroup>
<ItemGroup>
- <Page Include="Src\AddPackageReferenceView.xaml" />
+ <Page Include="Src\ManagePackagesView.xaml" />
<Page Include="Src\LicenseAcceptanceView.xaml" />
<Page Include="Src\PackageManagementOptionsView.xaml" />
<Page Include="Src\RegisteredPackageSourcesUserControl.xaml" />
View
2  ...t/Project/Src/IAddPackageReferenceView.cs → ...gement/Project/Src/IManagePackagesView.cs
@@ -5,7 +5,7 @@
namespace ICSharpCode.PackageManagement
{
- public interface IAddPackageReferenceView : IDisposable
+ public interface IManagePackagesView : IDisposable
{
bool? ShowDialog();
}
View
12 ...Project/Src/AddPackageReferenceCommand.cs → ...ment/Project/Src/ManagePackagesCommand.cs
@@ -8,16 +8,16 @@
namespace ICSharpCode.PackageManagement
{
- public class AddPackageReferenceCommand : AbstractMenuCommand
+ public class ManagePackagesCommand : AbstractMenuCommand
{
IPackageManagementOutputMessagesView outputMessagesView;
- public AddPackageReferenceCommand()
+ public ManagePackagesCommand()
: this(PackageManagementServices.OutputMessagesView)
{
}
- public AddPackageReferenceCommand(IPackageManagementOutputMessagesView outputMessagesView)
+ public ManagePackagesCommand(IPackageManagementOutputMessagesView outputMessagesView)
{
this.outputMessagesView = outputMessagesView;
}
@@ -26,14 +26,14 @@ public override void Run()
{
outputMessagesView.Clear();
- using (IAddPackageReferenceView view = CreateAddPackageReferenceView()) {
+ using (IManagePackagesView view = CreateManagePackagesView()) {
view.ShowDialog();
}
}
- protected virtual IAddPackageReferenceView CreateAddPackageReferenceView()
+ protected virtual IManagePackagesView CreateManagePackagesView()
{
- return new AddPackageReferenceView() {
+ return new ManagePackagesView() {
Owner = WorkbenchSingleton.MainWindow
};
}
View
6 ...oject/Src/AddPackageReferenceView.xaml.cs → ...agement/Project/Src/ManagePackagesView.cs
@@ -6,16 +6,16 @@
namespace ICSharpCode.PackageManagement
{
- public partial class AddPackageReferenceView : Window, IAddPackageReferenceView
+ public partial class ManagePackagesView : Window, IManagePackagesView
{
- public AddPackageReferenceView()
+ public ManagePackagesView()
{
InitializeComponent();
}
public void Dispose()
{
- var viewModel = MainPanel.DataContext as AddPackageReferenceViewModel;
+ var viewModel = MainPanel.DataContext as ManagePackagesViewModel;
viewModel.Dispose();
}
}
View
6 .../Project/Src/AddPackageReferenceView.xaml → ...ement/Project/Src/ManagePackagesView.xaml
@@ -1,5 +1,5 @@
<Window
- x:Class="ICSharpCode.PackageManagement.AddPackageReferenceView"
+ x:Class="ICSharpCode.PackageManagement.ManagePackagesView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
xmlns:pm="clr-namespace:ICSharpCode.PackageManagement"
@@ -9,7 +9,7 @@
MinHeight="380"
MinWidth="440"
Style="{x:Static core:GlobalStyles.DialogWindowStyle}"
- Title="Add Package Reference"
+ Title="Manage Packages"
WindowStartupLocation="CenterOwner">
<Window.Resources>
@@ -25,7 +25,7 @@
<!-- Use DockPanel.DataContext instead of Window.DataContext otherwise Visual Studio does not show
design time data -->
<DockPanel.DataContext>
- <Binding Source="{StaticResource ViewModels}" Path="AddPackageReferenceViewModel"/>
+ <Binding Source="{StaticResource ViewModels}" Path="ManagePackagesViewModel"/>
</DockPanel.DataContext>
<Grid
DockPanel.Dock="Bottom"
View
4 ...oject/Src/AddPackageReferenceViewModel.cs → ...nt/Project/Src/ManagePackagesViewModel.cs
@@ -10,7 +10,7 @@
namespace ICSharpCode.PackageManagement
{
- public class AddPackageReferenceViewModel : ViewModelBase<AddPackageReferenceViewModel>, IDisposable
+ public class ManagePackagesViewModel : ViewModelBase<ManagePackagesViewModel>, IDisposable
{
IPackageManagementSolution solution;
IThreadSafePackageManagementEvents packageManagementEvents;
@@ -18,7 +18,7 @@ public class AddPackageReferenceViewModel : ViewModelBase<AddPackageReferenceVie
string message;
bool hasError;
- public AddPackageReferenceViewModel(
+ public ManagePackagesViewModel(
IPackageManagementSolution solution,
IRegisteredPackageRepositories registeredPackageRepositories,
IThreadSafePackageManagementEvents packageManagementEvents,
View
14 src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementViewModels.cs
@@ -10,7 +10,7 @@ namespace ICSharpCode.PackageManagement
{
public class PackageManagementViewModels
{
- AddPackageReferenceViewModel addPackageReferenceViewModel;
+ ManagePackagesViewModel managePackagesViewModel;
RegisteredPackageSourcesViewModel registeredPackageSourcesViewModel;
RegisteredPackageSourcesViewModel registeredProjectTemplatePackageSourcesViewModel;
PackageManagementOptionsViewModel packageManagementOptionsViewModel;
@@ -18,20 +18,20 @@ public class PackageManagementViewModels
IPackageManagementSolution solution;
IRegisteredPackageRepositories registeredPackageRepositories;
- public AddPackageReferenceViewModel AddPackageReferenceViewModel {
+ public ManagePackagesViewModel ManagePackagesViewModel {
get {
- CreateAddPackageReferenceViewModel();
- return addPackageReferenceViewModel;
+ CreateManagePackagesViewModel();
+ return managePackagesViewModel;
}
}
- void CreateAddPackageReferenceViewModel()
+ void CreateManagePackagesViewModel()
{
CreateRegisteredPackageRepositories();
CreateSolution();
var packageManagementEvents = new ThreadSafePackageManagementEvents(PackageManagementServices.PackageManagementEvents);
- addPackageReferenceViewModel =
- new AddPackageReferenceViewModel(
+ managePackagesViewModel =
+ new ManagePackagesViewModel(
solution,
registeredPackageRepositories,
packageManagementEvents,
View
8 src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
@@ -69,7 +69,7 @@
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
- <Compile Include="Src\AddPackageReferenceCommandTests.cs" />
+ <Compile Include="Src\ManagePackagesCommandTests.cs" />
<Compile Include="Src\ConsolePackageActionRunnerTests.cs" />
<Compile Include="Src\DefaultProjectTemplatePackageSourceTests.cs" />
<Compile Include="Src\EnvDTE\ColorableItemsTests.cs" />
@@ -91,7 +91,7 @@
<Compile Include="Src\Helpers\ExceptionThrowingPackageManagementProject.cs" />
<Compile Include="Src\Helpers\ExceptionThrowingPackageReferencesForProject.cs" />
<Compile Include="Src\Helpers\ExceptionThrowingRegisteredPackageRepositories.cs" />
- <Compile Include="Src\Helpers\FakeAddPackageReferenceView.cs" />
+ <Compile Include="Src\Helpers\FakeManagePackagesView.cs" />
<Compile Include="Src\Helpers\FakeLogger.cs" />
<Compile Include="Src\Helpers\FakeLoggingService.cs" />
<Compile Include="Src\Helpers\FakeMessageService.cs" />
@@ -119,7 +119,7 @@
<Compile Include="Src\Helpers\FakeSolutionPackageRepository.cs" />
<Compile Include="Src\Helpers\FakeTextEditorOptions.cs" />
<Compile Include="Src\Helpers\ProjectItemCollectionAssert.cs" />
- <Compile Include="Src\Helpers\TestableAddPackageReferenceCommand.cs" />
+ <Compile Include="Src\Helpers\TestableManagePackagesCommand.cs" />
<Compile Include="Src\Helpers\TestableDTEProject.cs" />
<Compile Include="Src\Helpers\TestableInstallProjectTemplatePackagesCommand.cs" />
<Compile Include="Src\Helpers\TestablePowerShellMissingConsoleHost.cs" />
@@ -192,7 +192,7 @@
<Compile Include="Src\Helpers\TestableViewModelBase.cs" />
<Compile Include="Src\Helpers\Tests\PackageReferenceRepositoryTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Src\AddPackageReferenceViewModelTests.cs" />
+ <Compile Include="Src\ManagePackagesViewModelTests.cs" />
<Compile Include="Src\AvailablePackagesViewModelTests.cs" />
<Compile Include="Src\BooleanToFontWeightConverterTests.cs" />
<Compile Include="Src\DelegateCommandTests.cs" />
View
2  ...rc/Helpers/FakeAddPackageReferenceView.cs → ...est/Src/Helpers/FakeManagePackagesView.cs
@@ -6,7 +6,7 @@
namespace PackageManagement.Tests.Helpers
{
- public class FakeAddPackageReferenceView : IAddPackageReferenceView
+ public class FakeManagePackagesView : IManagePackagesView
{
public bool IsShowDialogCalled;
View
12 ...ers/TestableAddPackageReferenceCommand.cs → .../Helpers/TestableManagePackagesCommand.cs
@@ -8,25 +8,25 @@
namespace PackageManagement.Tests.Helpers
{
- public class TestableAddPackageReferenceCommand : AddPackageReferenceCommand
+ public class TestableManagePackagesCommand : ManagePackagesCommand
{
public FakePackageManagementOutputMessagesView FakeOutputMessagesView;
- public FakeAddPackageReferenceView FakeAddPackageReferenceView = new FakeAddPackageReferenceView();
+ public FakeManagePackagesView FakeManagePackagesView = new FakeManagePackagesView();
- public TestableAddPackageReferenceCommand()
+ public TestableManagePackagesCommand()
: this(new FakePackageManagementOutputMessagesView())
{
}
- public TestableAddPackageReferenceCommand(FakePackageManagementOutputMessagesView view)
+ public TestableManagePackagesCommand(FakePackageManagementOutputMessagesView view)
: base(view)
{
this.FakeOutputMessagesView = view;
}
- protected override IAddPackageReferenceView CreateAddPackageReferenceView()
+ protected override IManagePackagesView CreateManagePackagesView()
{
- return FakeAddPackageReferenceView;
+ return FakeManagePackagesView;
}
}
}
View
14 ...st/Src/AddPackageReferenceCommandTests.cs → ...nt/Test/Src/ManagePackagesCommandTests.cs
@@ -8,19 +8,19 @@
namespace PackageManagement.Tests
{
[TestFixture]
- public class AddPackageReferenceCommandTests
+ public class ManagePackagesCommandTests
{
- TestableAddPackageReferenceCommand command;
- FakeAddPackageReferenceView view;
+ TestableManagePackagesCommand command;
+ FakeManagePackagesView view;
void CreateCommand()
{
- command = new TestableAddPackageReferenceCommand();
- view = command.FakeAddPackageReferenceView;
+ command = new TestableManagePackagesCommand();
+ view = command.FakeManagePackagesView;
}
[Test]
- public void Run_CommandExecuted_AddPackageReferenceViewIsDisplayed()
+ public void Run_CommandExecuted_ManagePackagesViewIsDisplayed()
{
CreateCommand();
command.Run();
@@ -29,7 +29,7 @@ public void Run_CommandExecuted_AddPackageReferenceViewIsDisplayed()
}
[Test]
- public void Run_CommandExecuted_AddPackageReferenceViewIsDisposed()
+ public void Run_CommandExecuted_ManagePackagesViewIsDisposed()
{
CreateCommand();
command.Run();
View
8 .../Src/AddPackageReferenceViewModelTests.cs → .../Test/Src/ManagePackagesViewModelTests.cs
@@ -13,9 +13,9 @@
namespace PackageManagement.Tests
{
[TestFixture]
- public class AddPackageReferenceViewModelTests
+ public class ManagePackagesViewModelTests
{
- AddPackageReferenceViewModel viewModel;
+ ManagePackagesViewModel viewModel;
PackageManagementEvents packageManagementEvents;
FakeLicenseAcceptanceService fakeLicenseAcceptanceSevice;
FakePackageManagementSolution fakeSolution;
@@ -49,7 +49,7 @@ void CreateViewModel(FakePackageManagementSolution solution, IThreadSafePackageM
taskFactory = new FakeTaskFactory();
fakeLicenseAcceptanceSevice = new FakeLicenseAcceptanceService();
fakeActionRunner = new FakePackageActionRunner();
- viewModel = new AddPackageReferenceViewModel(
+ viewModel = new ManagePackagesViewModel(
solution,
fakeRegisteredPackageRepositories,
packageManagementEvents,
@@ -265,7 +265,7 @@ public void Dispose_ContainedViewModelsAreDisposed_AvailablePackagesViewModelIsD
}
[Test]
- public void Dispose_ContainedViewModelsAreDisposed_InstaledPackagesViewModelIsDisposed()
+ public void Dispose_ContainedViewModelsAreDisposed_InstalledPackagesViewModelIsDisposed()
{
CreateViewModel();
viewModel.Dispose();
Please sign in to comment.
Something went wrong with that request. Please try again.