diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs index ae4167a5a1..941884aa32 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs @@ -189,7 +189,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets PackageReference CreatePackageReference() { - return new PackageReference(Id, Version, null, null); + return new PackageReference(Id, Version, null, null, false, false); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs index 80dd78f3ec..eb1d0f02a7 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs @@ -183,12 +183,12 @@ namespace ICSharpCode.PackageManagement.Design } } - public event EventHandler PackageReferenceRemoved; + public event EventHandler PackageReferenceRemoving; - public void FirePackageReferenceRemovedEvent(PackageOperationEventArgs e) + public void FirePackageReferenceRemovingEvent(PackageOperationEventArgs e) { - if (PackageReferenceRemoved != null) { - PackageReferenceRemoved(this, e); + if (PackageReferenceRemoving != null) { + PackageReferenceRemoving(this, e); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs index e4e688853e..36b323c0f6 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs @@ -193,5 +193,10 @@ namespace ICSharpCode.PackageManagement.Design PackagePassedToUpdatePackageReference = package; SettingsPassedToUpdatePackageReference = settings; } + + public void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions, bool ignoreWalkInfo) + { + throw new NotImplementedException(); + } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs index b35be1821d..000c94a762 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs @@ -35,18 +35,18 @@ namespace ICSharpCode.PackageManagement.Design } } - public event EventHandler PackageReferenceRemoved; + public event EventHandler PackageReferenceRemoving; - protected virtual void OnPackageReferenceRemoved(IPackage package) + protected virtual void OnPackageReferenceRemoving(IPackage package) { - if (PackageReferenceRemoved != null) { - PackageReferenceRemoved(this, new PackageOperationEventArgs(package, null, String.Empty)); + if (PackageReferenceRemoving != null) { + PackageReferenceRemoving(this, new PackageOperationEventArgs(package, null, String.Empty)); } } #pragma warning disable 67 public event EventHandler PackageReferenceAdding; - public event EventHandler PackageReferenceRemoving; + public event EventHandler PackageReferenceRemoved; #pragma warning restore 67 public IPackageRepository LocalRepository { get; set; } @@ -87,9 +87,9 @@ namespace ICSharpCode.PackageManagement.Design OnPackageReferenceAdded(package); } - public void FirePackageReferenceRemoved(IPackage package) + public void FirePackageReferenceRemoving(IPackage package) { - OnPackageReferenceRemoved(package); + OnPackageReferenceRemoving(package); } public void AddPackageReference(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs index 4450c7e528..e7afb6d74d 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.PackageManagement event EventHandler PackageInstalled; event EventHandler PackageUninstalled; event EventHandler PackageReferenceAdded; - event EventHandler PackageReferenceRemoved; + event EventHandler PackageReferenceRemoving; string Name { get; } ILogger Logger { get; set; } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs index 01fa702369..a4f266e25a 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs @@ -64,9 +64,9 @@ namespace ICSharpCode.PackageManagement remove { projectManager.PackageReferenceAdded -= value; } } - public event EventHandler PackageReferenceRemoved { - add { projectManager.PackageReferenceRemoved += value; } - remove { projectManager.PackageReferenceRemoved -= value; } + public event EventHandler PackageReferenceRemoving { + add { projectManager.PackageReferenceRemoving += value; } + remove { projectManager.PackageReferenceRemoving -= value; } } public bool IsPackageInstalled(IPackage package) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSources.cs b/src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSources.cs index dabec52ea3..bf41dd8e8e 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSources.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/RegisteredPackageSources.cs @@ -11,8 +11,8 @@ namespace ICSharpCode.PackageManagement { public class RegisteredPackageSources : ObservableCollection { - public static readonly string DefaultPackageSourceUrl = "https://nuget.org/api/v2/"; - public static readonly string DefaultPackageSourceName = "NuGet Official Package Source"; + public static readonly string DefaultPackageSourceUrl = "https://www.nuget.org/api/v2/"; + public static readonly string DefaultPackageSourceName = "nuget.org"; public static readonly PackageSource DefaultPackageSource = new PackageSource(DefaultPackageSourceUrl, DefaultPackageSourceName); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunAllProjectPackageScriptsAction.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunAllProjectPackageScriptsAction.cs index 8c47518c29..7ba100a699 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunAllProjectPackageScriptsAction.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunAllProjectPackageScriptsAction.cs @@ -22,7 +22,7 @@ namespace ICSharpCode.PackageManagement.Scripting List> packageReferenceAddedHandlers = new List>(); - List> packageReferenceRemovedHandlers = + List> packageReferenceRemovingHandlers = new List>(); public RunAllProjectPackageScriptsAction( @@ -68,7 +68,7 @@ namespace ICSharpCode.PackageManagement.Scripting foreach (IPackageManagementProject project in projects) { RegisterPackageInstalledEvent(project); RegisterPackageReferenceAddedEvent(project); - RegisterPackageReferenceRemovedEvent(project); + RegisterPackageReferenceRemovingEvent(project); } } @@ -88,12 +88,12 @@ namespace ICSharpCode.PackageManagement.Scripting project.PackageReferenceAdded += referenceAddedHandler; } - void RegisterPackageReferenceRemovedEvent(IPackageManagementProject project) + void RegisterPackageReferenceRemovingEvent(IPackageManagementProject project) { - EventHandler referenceRemovedHandler = - (_, e) => PackageReferenceRemoved(project, e); - packageReferenceRemovedHandlers.Add(referenceRemovedHandler); - project.PackageReferenceRemoved += referenceRemovedHandler; + EventHandler referenceRemovingHandler = + (_, e) => PackageReferenceRemoving(project, e); + packageReferenceRemovingHandlers.Add(referenceRemovingHandler); + project.PackageReferenceRemoving += referenceRemovingHandler; } void UnregisterEvents() @@ -101,7 +101,7 @@ namespace ICSharpCode.PackageManagement.Scripting foreach (IPackageManagementProject project in projects) { UnregisterPackageInstalledEvent(project); UnregisterPackageReferenceAddedEvent(project); - UnregisterPackageReferenceRemovedEvent(project); + UnregisterPackageReferenceRemovingEvent(project); } } @@ -119,11 +119,11 @@ namespace ICSharpCode.PackageManagement.Scripting project.PackageReferenceAdded -= handler; } - void UnregisterPackageReferenceRemovedEvent(IPackageManagementProject project) + void UnregisterPackageReferenceRemovingEvent(IPackageManagementProject project) { - EventHandler handler = packageReferenceRemovedHandlers.First(); - packageReferenceRemovedHandlers.Remove(handler); - project.PackageReferenceRemoved -= handler; + EventHandler handler = packageReferenceRemovingHandlers.First(); + packageReferenceRemovingHandlers.Remove(handler); + project.PackageReferenceRemoving -= handler; } void PackageInstalled(IPackageManagementProject project, PackageOperationEventArgs e) @@ -136,7 +136,7 @@ namespace ICSharpCode.PackageManagement.Scripting RunInstallScript(project, e); } - void PackageReferenceRemoved(IPackageManagementProject project, PackageOperationEventArgs e) + void PackageReferenceRemoving(IPackageManagementProject project, PackageOperationEventArgs e) { RunUninstallScript(project, e); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunPackageScriptsAction.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunPackageScriptsAction.cs index 7d3e1a8265..9dec7ede3a 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunPackageScriptsAction.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/RunPackageScriptsAction.cs @@ -39,14 +39,14 @@ namespace ICSharpCode.PackageManagement.Scripting { project.PackageInstalled += PackageInstalled; project.PackageReferenceAdded += PackageReferenceAdded; - project.PackageReferenceRemoved += PackageReferenceRemoved; + project.PackageReferenceRemoving += PackageReferenceRemoving; } void UnregisterEvents() { project.PackageInstalled -= PackageInstalled; project.PackageReferenceAdded -= PackageReferenceAdded; - project.PackageReferenceRemoved -= PackageReferenceRemoved; + project.PackageReferenceRemoving -= PackageReferenceRemoving; } void PackageInstalled(object sender, PackageOperationEventArgs e) @@ -54,7 +54,7 @@ namespace ICSharpCode.PackageManagement.Scripting RunInitScript(e); } - void PackageReferenceRemoved(object sender, PackageOperationEventArgs e) + void PackageReferenceRemoving(object sender, PackageOperationEventArgs e) { RunUninstallScript(e); } diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll b/src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll index 29cc96bad8..c2f8e2ec44 100644 Binary files a/src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll and b/src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll differ diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml index 9d93859f20..5b85044935 100644 --- a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml +++ b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml @@ -702,7 +702,7 @@ Description ------------------------------------------------------------------ Updates every package in the project, MvcApplication1, to the latest "safe" version. For example, - For example, if version 1.0.0 of a package is installed, and versions 1.0.1, 1.0.2, and 1.1 are + if version 1.0.0 of a package is installed, and versions 1.0.1, 1.0.2, and 1.1 are available in the feed, the -Safe flag updates the package to 1.0.2. diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll index 12b82b9b6f..6af49f2159 100644 Binary files a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll and b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll differ diff --git a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll index 5f79f99f85..42f78f234b 100644 Binary files a/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll and b/src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll differ diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs index 9eecb6a019..a9d13c4792 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs @@ -14,7 +14,7 @@ namespace PackageManagement.Tests.Helpers public void AddFakePackageReference(string packageId, string version) { - var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null); + var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false); FakePackageReferences.Add(packageReference); } @@ -27,7 +27,7 @@ namespace PackageManagement.Tests.Helpers public void DeleteEntry(string id, SemanticVersion version) { - var packageReference = new PackageReference(id, version, null, null); + var packageReference = new PackageReference(id, version, null, null, false, false); EntriesDeleted.Add(packageReference); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs index 1042404fa4..c7018bc3a7 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs @@ -100,7 +100,7 @@ namespace PackageManagement.Tests } [Test] - public void PackageViewModels_PackageReferenceIsRemoved_PackageViewModelsIsUpdated() + public void PackageViewModels_PackageReferenceIsBeingRemoved_PackageViewModelsIsUpdated() { CreateViewModel(); FakePackage package = AddPackageToProjectLocalRepository(); @@ -159,7 +159,7 @@ namespace PackageManagement.Tests } [Test] - public void PackageViewModels_PackageReferenceIsRemovedAfterViewModelIsDisposed_PackageViewModelsIsNotUpdated() + public void PackageViewModels_PackageReferenceIsBeingRemovedAfterViewModelIsDisposed_PackageViewModelsIsNotUpdated() { CreateViewModel(); FakePackage package = AddPackageToProjectLocalRepository(); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs index 5320fdcffa..6553b06e6f 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs @@ -407,13 +407,13 @@ namespace PackageManagement.Tests } [Test] - public void IsPackageRestoreEnabled_PackageRestoreNotInSettings_ReturnsFalse() + public void IsPackageRestoreEnabled_PackageRestoreNotInSettings_ReturnsTrue() { CreateOptions(); bool enabled = options.IsPackageRestoreEnabled; - Assert.IsFalse(enabled); + Assert.IsTrue(enabled); } [Test] @@ -430,7 +430,7 @@ namespace PackageManagement.Tests } [Test] - public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionDeletedFromSettings() + public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreSectionIsNotDeletedFromSettings() { CreateSettings(); EnablePackageRestoreInSettings(); @@ -439,7 +439,20 @@ namespace PackageManagement.Tests options.IsPackageRestoreEnabled = false; bool deleted = fakeSettings.IsPackageRestoreSectionDeleted; - Assert.IsTrue(deleted); + Assert.IsFalse(deleted); + } + + [Test] + public void IsPackageRestoreEnabled_OriginallyEnabledInSettingsButSetToTrue_PackageRestoreIsFalseInSettings() + { + CreateSettings(); + EnablePackageRestoreInSettings(); + CreateOptions(fakeSettings); + + options.IsPackageRestoreEnabled = false; + + KeyValuePair keyValuePair = fakeSettings.GetValuePassedToSetValueForPackageRestoreSection(); + Assert.AreEqual("False", keyValuePair.Value); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs index a5e789ddae..521df654c1 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsViewModelTests.cs @@ -24,7 +24,7 @@ namespace PackageManagement.Tests void CreateRecentRepository() { - fakeRecentRepository = new FakeRecentPackageRepository(); + fakeRecentRepository = new FakeRecentPackageRepository(); } void CreateMachineCache() @@ -44,6 +44,11 @@ namespace PackageManagement.Tests fakeSettings.SetPackageRestoreSetting(true); } + void DisablePackageRestoreInOptions() + { + fakeSettings.SetPackageRestoreSetting(false); + } + void CreateViewModelUsingCreatedMachineCache() { CreateRecentRepository(); @@ -312,10 +317,22 @@ namespace PackageManagement.Tests Assert.IsTrue(result); } + [Test] + public void IsPackageRestoreEnabled_NotSet_ReturnsTrue() + { + CreateOptions(); + CreateViewModel(options); + + bool result = viewModel.IsPackageRestoreEnabled; + + Assert.IsTrue(result); + } + [Test] public void IsPackageRestoreEnabled_FalseInOptions_ReturnsFalse() { CreateOptions(); + DisablePackageRestoreInOptions(); CreateViewModel(options); bool result = viewModel.IsPackageRestoreEnabled; diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs index 8a71281566..b2068f05e0 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs @@ -486,14 +486,14 @@ namespace PackageManagement.Tests } [Test] - public void PackageReferenceRemoved_ProjectManagerPackageReferenceRemovedEventFired_EventFiresWithPackage() + public void PackageReferenceRemoving_ProjectManagerPackageReferenceRemovingEventFired_EventFiresWithPackage() { CreateProject(); PackageOperationEventArgs eventArgs = null; - project.PackageReferenceRemoved += (sender, e) => eventArgs = e; + project.PackageReferenceRemoving += (sender, e) => eventArgs = e; var expectedPackage = new FakePackage(); - fakeProjectManager.FirePackageReferenceRemoved(expectedPackage); + fakeProjectManager.FirePackageReferenceRemoving(expectedPackage); Assert.AreEqual(expectedPackage, eventArgs.Package); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs index 3d8626a8e5..37e565c89a 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs @@ -38,7 +38,7 @@ namespace PackageManagement.Tests void AddPackageReference(string packageId, string version) { - var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null); + var packageReference = new PackageReference(packageId, new SemanticVersion(version), null, null, false, false); packageReferences.Add(packageReference); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/RunAllProjectPackageScriptsActionTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/RunAllProjectPackageScriptsActionTests.cs index 254c9b842f..f8a18cdab6 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/RunAllProjectPackageScriptsActionTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/RunAllProjectPackageScriptsActionTests.cs @@ -80,9 +80,9 @@ namespace PackageManagement.Tests project.Raise(p => p.PackageReferenceAdded += null, null, eventArgs); } - void FirePackageReferenceRemovedEvent(IPackageManagementProject project, PackageOperationEventArgs eventArgs) + void FirePackageReferenceRemovingEvent(IPackageManagementProject project, PackageOperationEventArgs eventArgs) { - project.Raise(p => p.PackageReferenceRemoved += null, null, eventArgs); + project.Raise(p => p.PackageReferenceRemoving += null, null, eventArgs); } IPackageScript CreatePackageScript() @@ -292,7 +292,7 @@ namespace PackageManagement.Tests string installPath = @"d:\projects\MyProject\packages\foo"; PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(package, installPath); - FirePackageReferenceRemovedEvent(project, eventArgs); + FirePackageReferenceRemovingEvent(project, eventArgs); scriptFactory.AssertWasCalled(factory => factory.CreatePackageUninstallScript(package, installPath)); } @@ -307,7 +307,7 @@ namespace PackageManagement.Tests SetUninstallScriptToReturnFromScriptFactory(uninstallScript); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(); - FirePackageReferenceRemovedEvent(project2, eventArgs); + FirePackageReferenceRemovingEvent(project2, eventArgs); scriptRunner.AssertWasCalled(runner => runner.Run(uninstallScript)); } @@ -322,7 +322,7 @@ namespace PackageManagement.Tests SetUninstallScriptToReturnFromScriptFactory(uninstallScript); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(); - FirePackageReferenceRemovedEvent(project2, eventArgs); + FirePackageReferenceRemovingEvent(project2, eventArgs); Assert.AreEqual(project2, uninstallScript.Project); } @@ -337,7 +337,7 @@ namespace PackageManagement.Tests PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(); action.Dispose(); - FirePackageReferenceRemovedEvent(project, eventArgs); + FirePackageReferenceRemovingEvent(project, eventArgs); scriptRunner.AssertWasNotCalled(runner => runner.Run(uninstallScript)); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs index a03932aef0..0cd517e445 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/RunPackageScriptsActionTests.cs @@ -174,11 +174,11 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Constructor_PackageReferenceIsRemoved_PackageUninstallScriptIsRun() + public void Constructor_PackageReferenceIsBeingRemoved_PackageUninstallScriptIsRun() { CreateAction(); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(); - fakeProject.FirePackageReferenceRemovedEvent(eventArgs); + fakeProject.FirePackageReferenceRemovingEvent(eventArgs); IPackageScript actualScript = fakeScriptRunner.FirstScriptRun; FakePackageScript expectedScript = fakeScriptFactory.FirstPackageUninstallScriptCreated; @@ -187,11 +187,11 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Constructor_PackageReferenceIsRemoved_PackageUninstallScriptIsCreated() + public void Constructor_PackageReferenceIsBeingRemoved_PackageUninstallScriptIsCreated() { CreateAction(); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(@"d:\projects\myproject\packages\test"); - fakeProject.FirePackageReferenceRemovedEvent(eventArgs); + fakeProject.FirePackageReferenceRemovingEvent(eventArgs); string path = fakeScriptFactory.FirstPackageInstallDirectoryPassed; @@ -199,13 +199,13 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Dispose_PackageReferenceIsRemoved_PackageUninstallScriptIsNotRun() + public void Dispose_PackageReferenceIsBeingRemoved_PackageUninstallScriptIsNotRun() { CreateAction(); action.Dispose(); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(); - fakeProject.FirePackageReferenceRemovedEvent(eventArgs); + fakeProject.FirePackageReferenceRemovingEvent(eventArgs); int count = fakeScriptFactory.FakePackageUninstallScriptsCreated.Count; @@ -213,11 +213,11 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Constructor_PackageReferenceIsRemoved_UninstallScriptIsPassedProject() + public void Constructor_PackageReferenceIsBeingRemoved_UninstallScriptIsPassedProject() { CreateAction(); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(); - fakeProject.FirePackageReferenceRemovedEvent(eventArgs); + fakeProject.FirePackageReferenceRemovingEvent(eventArgs); IPackageManagementProject project = fakeScriptFactory.FirstPackageUninstallScriptCreated.Project; @@ -225,12 +225,12 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Constructor_PackageReferenceIsRemoved_UninstallScriptIsPassedPackageFromPackageOperationEventArgs() + public void Constructor_PackageReferenceIsBeingRemoved_UninstallScriptIsPassedPackageFromPackageOperationEventArgs() { CreateAction(); var expectedPackage = new FakePackage(); PackageOperationEventArgs eventArgs = CreatePackageOperationEventArgs(expectedPackage); - fakeProject.FirePackageReferenceRemovedEvent(eventArgs); + fakeProject.FirePackageReferenceRemovingEvent(eventArgs); IPackage package = fakeScriptFactory.FirstPackageUninstallScriptCreated.Package; diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs index 35cb6b62c8..275f6b5c6a 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs @@ -31,7 +31,7 @@ namespace PackageManagement.Tests { fakeSolution = new FakePackageManagementSolution(); fakeSourceRepository = new FakePackageRepository(); - var packageReference = new PackageReference(packageId, version, null, null); + var packageReference = new PackageReference(packageId, version, null, null, false, false); updatePackageInAllProjects = new UpdatePackageInAllProjects(packageReference, fakeSolution, fakeSourceRepository); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs index d35d9bc1ce..4d93702c3e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs @@ -36,23 +36,22 @@ namespace ICSharpCode.Reports.Core.Exporter { throw new ArgumentNullException("converter"); } base.DrawItem(pdfWriter,converter); - base.Decorate(); PdfContentByte contentByte = base.PdfWriter.DirectContent; - iTextSharp.text.Font font = CreateFontFromFactory(this.StyleDecorator); - CalculatePdfFormat pdfFormat = new CalculatePdfFormat(this.StyleDecorator,font); + var font = CreateFontFromFactory(this.StyleDecorator); - ColumnText columnText = new ColumnText(contentByte); + var columnText = new ColumnText(contentByte); if (StyleDecorator.RightToLeft.ToString() == "Yes") { columnText.RunDirection = PdfWriter.RUN_DIRECTION_RTL; } - iTextSharp.text.Rectangle r = base.ConvertToPdfRectangle(); - columnText.SetSimpleColumn(r.Left, r.Top , r.Left + r.Width,r.Top - r.Height,pdfFormat.Leading,pdfFormat.Alignment); - + var pdfRectangle = base.ConvertToPdfRectangle(); + + columnText.SetSimpleColumn(pdfRectangle.Left, pdfRectangle.Top , pdfRectangle.Left + pdfRectangle.Width,pdfRectangle.Top - pdfRectangle.Height); + string formatedText = this.Text; if (!String.IsNullOrEmpty(StyleDecorator.FormatString)) { @@ -63,7 +62,7 @@ namespace ICSharpCode.Reports.Core.Exporter { Chunk chunk = new Chunk(formatedText,font); columnText.AddText(chunk); - + columnText.Alignment = CalculatePdfFormat.PdfAlignment(this.StyleDecorator); columnText.Go(); } @@ -127,65 +126,44 @@ namespace ICSharpCode.Reports.Core.Exporter { internal class CalculatePdfFormat { - TextStyleDecorator textDecorator; - - public CalculatePdfFormat (TextStyleDecorator textDecorator,iTextSharp.text.Font font) - { - if (textDecorator == null) { - throw new ArgumentNullException ("textDecorator"); - } - if (font == null) { - throw new ArgumentNullException("font"); - } - this.textDecorator = textDecorator; - this.Leading = font.Size; - this.CalculateFormat(); - } - - - private void CalculateFormat() + public static int PdfAlignment(TextStyleDecorator textDecorator) { - - this.Alignment = PdfContentByte.ALIGN_LEFT; + int retVal = 0; switch (textDecorator.ContentAlignment) { //Top case ContentAlignment.TopLeft: - this.Alignment = PdfContentByte.ALIGN_LEFT; + retVal = PdfContentByte.ALIGN_LEFT; break; case ContentAlignment.TopCenter: - this.Alignment = PdfContentByte.ALIGN_CENTER; + retVal = PdfContentByte.ALIGN_CENTER; break; case ContentAlignment.TopRight: - this.Alignment = PdfContentByte.ALIGN_RIGHT; + retVal = PdfContentByte.ALIGN_RIGHT; break; // Middle case ContentAlignment.MiddleLeft: - this.Alignment = PdfContentByte.ALIGN_LEFT; + retVal = PdfContentByte.ALIGN_LEFT; break; case ContentAlignment.MiddleCenter: - this.Alignment = PdfContentByte.ALIGN_CENTER; + retVal = PdfContentByte.ALIGN_CENTER; break; case ContentAlignment.MiddleRight: - this.Alignment = PdfContentByte.ALIGN_RIGHT; + retVal = PdfContentByte.ALIGN_RIGHT; break; //Bottom case ContentAlignment.BottomLeft: - this.Alignment = PdfContentByte.ALIGN_LEFT; + retVal = PdfContentByte.ALIGN_LEFT; break; case ContentAlignment.BottomCenter: - this.Alignment = PdfContentByte.ALIGN_CENTER; + retVal = PdfContentByte.ALIGN_CENTER; break; case ContentAlignment.BottomRight: - this.Alignment = PdfContentByte.ALIGN_RIGHT; + retVal = PdfContentByte.ALIGN_RIGHT; break; } + return retVal; } - - public float Leading {get;private set;} - - public int Alignment {get;private set;} - } } diff --git a/src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs b/src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs index a90a60d10d..0116c06811 100644 --- a/src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs +++ b/src/Main/Base/Project/Src/Project/Behaviors/DotNetStartBehavior.cs @@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop.Project if (fx != null) UpdateAppConfig(fx); if (Project.OutputType != OutputType.Library) { - if (DotnetDetection.IsDotnet45Installed() && fx.IsBasedOn(TargetFramework.Net45)) { + if (fx != null && DotnetDetection.IsDotnet45Installed() && fx.IsBasedOn(TargetFramework.Net45)) { Project.SetProperty(null, Project.ActivePlatform, "Prefer32Bit", "True", PropertyStorageLocations.PlatformSpecific, true); } else { Project.SetProperty(null, Project.ActivePlatform, "PlatformTarget", "x86", PropertyStorageLocations.PlatformSpecific, true); diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template index 9b3ad886a3..fb17b850da 100644 --- a/src/Main/GlobalAssemblyInfo.template +++ b/src/Main/GlobalAssemblyInfo.template @@ -28,7 +28,7 @@ internal static class RevisionClass { public const string Major = "4"; public const string Minor = "3"; - public const string Build = "2"; + public const string Build = "3"; public const string Revision = "$INSERTREVISION$"; public const string VersionName = null; // "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1")