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/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/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/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/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/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);
}