diff options
43 files changed, 382 insertions, 112 deletions
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests.csproj index 8de9902bef..46309c87e8 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests.csproj +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests.csproj @@ -16,7 +16,7 @@ <Reference Include="System" /> <Reference Include="System.Xml" /> <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\..\packages\NuGet.Versioning.4.7.0\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Versioning.4.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj index 50e3d412f7..f2551e3323 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj @@ -26,7 +26,7 @@ <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\packages\NuGet.Versioning.4.7.0\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Versioning.4.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/NuGetPackageServicesProxy.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/NuGetPackageServicesProxy.cs index e5a51c1307..338d8e72bb 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/NuGetPackageServicesProxy.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/NuGetPackageServicesProxy.cs @@ -90,12 +90,13 @@ namespace MonoDevelop.PackageManagement.Refactoring Runtime.RunInMainThread (delegate { var repositoryProvider = SourceRepositoryProviderFactory.CreateSourceRepositoryProvider (); var repository = repositoryProvider.CreateRepository (new PackageSource (source)); + var solutionManager = PackageManagementServices.Workspace.GetSolutionManager (project.ParentSolution); var action = new InstallNuGetPackageAction ( new [] { repository }, - PackageManagementServices.Workspace.GetSolutionManager (project.ParentSolution), + solutionManager, new DotNetProjectProxy ((DotNetProject)project), - new NuGetProjectContext ()) { + new NuGetProjectContext (solutionManager.Settings)) { PackageId = packageId, Version = string.IsNullOrEmpty (version) ? null : new NuGetVersion (version), IncludePrerelease = includePrerelease, diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetSettings.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetSettings.cs index bcc8f7a077..fca51a4a0e 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetSettings.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetSettings.cs @@ -62,6 +62,8 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers return new List<KeyValuePair<string, string>> (); } +#pragma warning disable CS0618 // Type or member is obsolete + public Dictionary<string, List<SettingValue>> SettingValues = new Dictionary<string, List<SettingValue>> (); public IList<SettingValue> GetSettingValues (string section, bool isPath = false) @@ -132,6 +134,39 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers { throw new NotImplementedException (); } + +#pragma warning restore CS0618 // Type or member is obsolete + + public SettingSection GetSection (string sectionName) + { + return null; + } + + public void AddOrUpdate (string sectionName, SettingItem item) + { + throw new NotImplementedException (); + } + + public void Remove (string sectionName, SettingItem item) + { + throw new NotImplementedException (); + } + + public void SaveToDisk () + { + } + + public IList<string> GetConfigFilePaths () + { + var paths = new List<string> (); + paths.Add (FileName); + return paths; + } + + public IList<string> GetConfigRoots () + { + throw new NotImplementedException (); + } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSearchMetadata.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSearchMetadata.cs index e24bd5332e..b6238b4b3f 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSearchMetadata.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSearchMetadata.cs @@ -73,6 +73,8 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers public bool PrefixReserved { get; set; } + public LicenseMetadata LicenseMetadata { get; set; } + public Task<IEnumerable<VersionInfo>> GetVersionsAsync () { throw new NotImplementedException (); diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSourceProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSourceProvider.cs index 3f5ad60cdd..fdbc82ac67 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSourceProvider.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageSourceProvider.cs @@ -71,8 +71,48 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers SavedPackageSources = sources.ToList ();
PackageSources.Clear ();
PackageSources.AddRange (sources);
- }
-
+ } + + public PackageSource GetPackageSourceByName (string name) + { + throw new NotImplementedException (); + } + + public PackageSource GetPackageSourceBySource (string source) + { + throw new NotImplementedException (); + } + + public void RemovePackageSource (string name) + { + throw new NotImplementedException (); + } + + public void EnablePackageSource (string name) + { + throw new NotImplementedException (); + } + + public void DisablePackageSource (string name) + { + throw new NotImplementedException (); + } + + public void UpdatePackageSource (PackageSource source, bool updateCredentials, bool updateEnabled) + { + throw new NotImplementedException (); + } + + public void AddPackageSource (PackageSource source) + { + throw new NotImplementedException (); + } + + public bool IsPackageSourceEnabled (string name) + { + throw new NotImplementedException (); + } + public string DefaultPushSource { get; set; }
}
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RestoreTestBase.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RestoreTestBase.cs index 79f888e12b..ae968de9fb 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RestoreTestBase.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RestoreTestBase.cs @@ -30,8 +30,13 @@ using System.Threading; using System.Threading.Tasks; using MonoDevelop.Core; using MonoDevelop.Projects; -using NUnit.Framework; +using NuGet.Configuration; using NuGet.PackageManagement; +using NuGet.Packaging; +using NuGet.Packaging.PackageExtraction; +using NuGet.Packaging.Signing; +using NuGet.ProjectManagement; +using NUnit.Framework; using UnitTests; namespace MonoDevelop.PackageManagement.Tests.Helpers @@ -99,5 +104,21 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers projects, CancellationToken.None); } + + protected INuGetProjectContext CreateNuGetProjectContext (ISettings settings) + { + var context = new FakeNuGetProjectContext { + LogToConsole = true + }; + + var logger = new LoggerAdapter (context); + context.PackageExtractionContext = new PackageExtractionContext ( + PackageSaveMode.Defaultv2, + PackageExtractionBehavior.XmlDocFileSaveMode, + ClientPolicyContext.GetClientPolicy (settings, logger), + logger); + + return context; + } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj index aca449f90a..f18d7b0fb1 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj @@ -22,13 +22,13 @@ <HintPath>..\..\..\..\packages\Microsoft.Web.Xdt.2.1.2\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath> </Reference> <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\..\packages\NuGet.Versioning.4.7.0\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Versioning.4.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> </Reference> <Reference Include="NuGet.Frameworks"> - <HintPath>..\..\..\..\packages\NuGet.Frameworks.4.7.0\lib\net46\NuGet.Frameworks.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Frameworks.4.9.0-rtm.5658\lib\net46\NuGet.Frameworks.dll</HintPath> </Reference> <Reference Include="NuGet.Packaging.Core"> - <HintPath>..\..\..\..\packages\NuGet.Packaging.Core.4.7.0\lib\net46\NuGet.Packaging.Core.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Packaging.Core.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.Core.dll</HintPath> </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.IO.Compression"> @@ -36,39 +36,39 @@ <Private>False</Private> </Reference> <Reference Include="NuGet.Packaging"> - <HintPath>..\..\..\..\packages\NuGet.Packaging.4.7.0\lib\net46\NuGet.Packaging.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Packaging.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.dll</HintPath> </Reference> <Reference Include="NuGet.Configuration"> - <HintPath>..\..\..\..\packages\NuGet.Configuration.4.7.0\lib\net46\NuGet.Configuration.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Configuration.4.9.0-rtm.5658\lib\net46\NuGet.Configuration.dll</HintPath> </Reference> <Reference Include="System.Security" /> <Reference Include="NuGet.PackageManagement"> - <HintPath>..\..\..\..\packages\NuGet.PackageManagement.4.7.0\lib\net46\NuGet.PackageManagement.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.PackageManagement.4.9.0-rtm.5658\lib\net46\NuGet.PackageManagement.dll</HintPath> </Reference> <Reference Include="NuGet.Protocol"> - <HintPath>..\..\..\..\packages\NuGet.Protocol.4.7.0\lib\net46\NuGet.Protocol.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Protocol.4.9.0-rtm.5658\lib\net46\NuGet.Protocol.dll</HintPath> </Reference> <Reference Include="NuGet.Common"> - <HintPath>..\..\..\..\packages\NuGet.Common.4.7.0\lib\net46\NuGet.Common.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Common.4.9.0-rtm.5658\lib\net46\NuGet.Common.dll</HintPath> </Reference> <Reference Include="NuGet.Resolver"> - <HintPath>..\..\..\..\packages\NuGet.Resolver.4.7.0\lib\net46\NuGet.Resolver.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Resolver.4.9.0-rtm.5658\lib\net46\NuGet.Resolver.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> <HintPath>..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="NuGet.ProjectModel"> - <HintPath>..\..\..\..\packages\NuGet.ProjectModel.4.7.0\lib\net46\NuGet.ProjectModel.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.ProjectModel.4.9.0-rtm.5658\lib\net46\NuGet.ProjectModel.dll</HintPath> </Reference> <Reference Include="NuGet.LibraryModel"> - <HintPath>..\..\..\..\packages\NuGet.LibraryModel.4.7.0\lib\net46\NuGet.LibraryModel.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.LibraryModel.4.9.0-rtm.5658\lib\net46\NuGet.LibraryModel.dll</HintPath> </Reference> <Reference Include="System.Collections.Immutable"> <HintPath>..\..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Commands"> - <HintPath>..\..\..\..\packages\NuGet.Commands.4.7.0\lib\net46\NuGet.Commands.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Commands.4.9.0-rtm.5658\lib\net46\NuGet.Commands.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AssemblyReferenceWithConditionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AssemblyReferenceWithConditionTests.cs index 2f06fa1d0a..5ab2f3284f 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AssemblyReferenceWithConditionTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AssemblyReferenceWithConditionTests.cs @@ -61,9 +61,7 @@ namespace MonoDevelop.PackageManagement.Tests Task UpdateNuGetPackage (DotNetProject project, string packageId) { var solutionManager = new MonoDevelopSolutionManager (project.ParentSolution); - var context = new FakeNuGetProjectContext { - LogToConsole = true - }; + var context = CreateNuGetProjectContext (solutionManager.Settings); var packageManager = new MonoDevelopNuGetPackageManager (solutionManager); var action = new UpdateNuGetPackageAction ( diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/FullyQualifiedReferencePathTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/FullyQualifiedReferencePathTests.cs index ad00e8ba8b..e55854396b 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/FullyQualifiedReferencePathTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/FullyQualifiedReferencePathTests.cs @@ -72,9 +72,8 @@ namespace MonoDevelop.PackageManagement.Tests Task UpdateNuGetPackage (DotNetProject project, string packageId) { var solutionManager = new MonoDevelopSolutionManager (project.ParentSolution); - var context = new FakeNuGetProjectContext { - LogToConsole = true - }; + var context = CreateNuGetProjectContext (solutionManager.Settings); + var packageManager = new MonoDevelopNuGetPackageManager (solutionManager); var action = new UpdateNuGetPackageAction ( diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNuGetProjectTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNuGetProjectTests.cs index d804947cba..13d2cac696 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNuGetProjectTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNuGetProjectTests.cs @@ -27,13 +27,14 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using MonoDevelop.Core; using MonoDevelop.PackageManagement.Tests.Helpers; using MonoDevelop.Projects; -using NUnit.Framework; using NuGet.Packaging.Core; using NuGet.ProjectManagement; using NuGet.ProjectModel; using NuGet.Versioning; +using NUnit.Framework; namespace MonoDevelop.PackageManagement.Tests { @@ -328,5 +329,62 @@ namespace MonoDevelop.PackageManagement.Tests Assert.IsNull (nugetProject); } + + [Test] + public async Task AddFile_NewFile_AddsFileToProject () + { + CreateNuGetProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); + string fileName = @"d:\projects\MyProject\src\NewFile.cs".ToNativePath (); + + await project.AddFileToProjectAsync (fileName); + + ProjectFile fileItem = dotNetProject.Files.GetFile (fileName); + var expectedFileName = new FilePath (fileName); + Assert.AreEqual (expectedFileName, fileItem.FilePath); + Assert.AreEqual (Projects.BuildAction.Compile, fileItem.BuildAction); + Assert.IsTrue (project.IsSaved); + } + + [Test] + public async Task AddFile_NewTextFile_AddsFileToProjectWithCorrectItemType () + { + CreateNuGetProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); + string fileName = @"d:\projects\MyProject\src\NewFile.txt".ToNativePath (); + + await project.AddFileToProjectAsync (fileName); + + ProjectFile fileItem = dotNetProject.Files.GetFile (fileName); + var expectedFileName = new FilePath (fileName); + Assert.AreEqual (expectedFileName, fileItem.FilePath); + Assert.AreEqual (Projects.BuildAction.None, fileItem.BuildAction); + } + + [Test] + public async Task AddFile_RelativeFileNameUsed_AddsFileToProject () + { + CreateNuGetProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); + string fileName = @"d:\projects\MyProject\src\NewFile.cs".ToNativePath (); + string relativeFileName = @"src\NewFile.cs".ToNativePath (); + + await project.AddFileToProjectAsync (relativeFileName); + + ProjectFile fileItem = dotNetProject.Files.GetFile (fileName); + var expectedFileName = new FilePath (fileName); + Assert.AreEqual (expectedFileName, fileItem.FilePath); + Assert.AreEqual (Projects.BuildAction.Compile, fileItem.BuildAction); + } + + [Test] + public async Task AddFile_FileAlreadyExistsInProject_FileIsNotAddedToProject () + { + CreateNuGetProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); + string fileName = @"d:\projects\MyProject\src\NewFile.cs".ToNativePath (); + + await project.AddFileToProjectAsync (fileName); + await project.AddFileToProjectAsync (fileName); + + int projectItemsCount = dotNetProject.Files.Count; + Assert.AreEqual (1, projectItemsCount); + } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSpecCreatorTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSpecCreatorTests.cs index e7e0e0add8..c5a86625d9 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSpecCreatorTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSpecCreatorTests.cs @@ -42,6 +42,8 @@ namespace MonoDevelop.PackageManagement.Tests [TestFixture] public class PackageSpecCreatorTests { +#pragma warning disable CS0618 // Type or member is obsolete + PackageSpec spec; FakeDotNetProject project; FakeSolution solution; @@ -104,7 +106,7 @@ namespace MonoDevelop.PackageManagement.Tests void AddPackagesPath (string path) { - settings.SetValue (SettingsUtility.ConfigSection, "globalPackagesFolder", path); + settings.SetValue (ConfigurationConstants.Config, "globalPackagesFolder", path); } void AddFallbackFolder (params string[] folders) @@ -342,6 +344,7 @@ namespace MonoDevelop.PackageManagement.Tests } [Test] + [Ignore ("PackageSpecCreatorTests will be removed in 7.8 when MSBuild used to get package spec info")] public void CreatePackageSpec_PackagesPath_RestoreMetadataHasPackagesPathTakenFromSettings () { CreateProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); @@ -371,6 +374,7 @@ namespace MonoDevelop.PackageManagement.Tests } [Test] + [Ignore ("PackageSpecCreatorTests will be removed in 7.8 when MSBuild used to get package spec info")] public void CreatePackageSpec_PackageSources_RestoreMetadataHasSourcesTakenFromSettings () { CreateProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); @@ -389,6 +393,7 @@ namespace MonoDevelop.PackageManagement.Tests } [Test] + [Ignore ("PackageSpecCreatorTests will be removed in 7.8 when MSBuild used to get package spec info")] public void CreatePackageSpec_FallbackFolders_RestoreMetadataHasFallbackFoldersTakenFromSettings () { CreateProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); @@ -497,6 +502,7 @@ namespace MonoDevelop.PackageManagement.Tests } [Test] + [Ignore ("PackageSpecCreatorTests will be removed in 7.8 when MSBuild used to get package spec info")] public void CreatePackageSpec_RestoreAdditionalProjectFallbackFolders_IncludedInFallbackFolders () { CreateProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); @@ -622,6 +628,7 @@ namespace MonoDevelop.PackageManagement.Tests } [Test] + [Ignore ("PackageSpecCreatorTests will be removed in 7.8 when MSBuild used to get package spec info")] public void CreatePackageSpec_RestoreAdditionalProjectSources_IncludedSources () { CreateProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); @@ -722,5 +729,7 @@ namespace MonoDevelop.PackageManagement.Tests Assert.AreEqual (0, spec.RestoreMetadata.Sources.Count); } + +#pragma warning restore CS0618 // Type or member is obsolete } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateXamarinFormsBuildTest.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateXamarinFormsBuildTest.cs index 3de650ddf8..6b20e6a00c 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateXamarinFormsBuildTest.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateXamarinFormsBuildTest.cs @@ -105,9 +105,7 @@ namespace MonoDevelop.PackageManagement.Tests Task UpdateNuGetPackage (DotNetProject project, string packageId, string packageVersion) { var solutionManager = new MonoDevelopSolutionManager (project.ParentSolution); - var context = new FakeNuGetProjectContext { - LogToConsole = true - }; + var context = CreateNuGetProjectContext (solutionManager.Settings); var sources = solutionManager.CreateSourceRepositoryProvider ().GetRepositories (); var action = new InstallNuGetPackageAction (sources, solutionManager, new DotNetProjectProxy (project), context); diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml index b30a4f1c1f..75d7c075c4 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml @@ -5,6 +5,7 @@ <Import assembly="Microsoft.Web.XmlTransform.dll" />
<Import assembly="NuGet.Packaging.dll" />
<Import assembly="NuGet.Frameworks.dll" />
+ <Import assembly="NuGet.Versioning.dll" />
</Runtime>
<Extension path = "/MonoDevelop/Ide/Commands">
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj index 35e64ef69d..565c6bc3f8 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj @@ -21,17 +21,17 @@ <HintPath>..\..\..\packages\Microsoft.Web.Xdt.2.1.2\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath> </Reference> <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\packages\NuGet.Versioning.4.7.0\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Versioning.4.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="NuGet.LibraryModel"> - <HintPath>..\..\..\packages\NuGet.LibraryModel.4.7.0\lib\net46\NuGet.LibraryModel.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.LibraryModel.4.9.0-rtm.5658\lib\net46\NuGet.LibraryModel.dll</HintPath> </Reference> <Reference Include="NuGet.Frameworks"> - <HintPath>..\..\..\packages\NuGet.Frameworks.4.7.0\lib\net46\NuGet.Frameworks.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Frameworks.4.9.0-rtm.5658\lib\net46\NuGet.Frameworks.dll</HintPath> </Reference> <Reference Include="NuGet.Packaging.Core"> - <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.7.0\lib\net46\NuGet.Packaging.Core.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.Core.dll</HintPath> </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.IO.Compression"> @@ -39,44 +39,44 @@ <Private>False</Private> </Reference> <Reference Include="NuGet.Packaging"> - <HintPath>..\..\..\packages\NuGet.Packaging.4.7.0\lib\net46\NuGet.Packaging.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.dll</HintPath> </Reference> <Reference Include="NuGet.Configuration"> - <HintPath>..\..\..\packages\NuGet.Configuration.4.7.0\lib\net46\NuGet.Configuration.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Configuration.4.9.0-rtm.5658\lib\net46\NuGet.Configuration.dll</HintPath> </Reference> <Reference Include="System.Net.Http" /> <Reference Include="System.IdentityModel" /> <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.ServiceModel" /> <Reference Include="NuGet.DependencyResolver.Core"> - <HintPath>..\..\..\packages\NuGet.DependencyResolver.Core.4.7.0\lib\net46\NuGet.DependencyResolver.Core.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.DependencyResolver.Core.4.9.0-rtm.5658\lib\net46\NuGet.DependencyResolver.Core.dll</HintPath> </Reference> <Reference Include="NuGet.ProjectModel"> - <HintPath>..\..\..\packages\NuGet.ProjectModel.4.7.0\lib\net46\NuGet.ProjectModel.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.ProjectModel.4.9.0-rtm.5658\lib\net46\NuGet.ProjectModel.dll</HintPath> </Reference> <Reference Include="System.ComponentModel.Composition" /> <Reference Include="NuGet.Commands"> - <HintPath>..\..\..\packages\NuGet.Commands.4.7.0\lib\net46\NuGet.Commands.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Commands.4.9.0-rtm.5658\lib\net46\NuGet.Commands.dll</HintPath> </Reference> <Reference Include="System.Runtime.Serialization" /> <Reference Include="WindowsBase" /> <Reference Include="NuGet.Resolver"> - <HintPath>..\..\..\packages\NuGet.Resolver.4.7.0\lib\net46\NuGet.Resolver.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Resolver.4.9.0-rtm.5658\lib\net46\NuGet.Resolver.dll</HintPath> </Reference> <Reference Include="NuGet.PackageManagement"> - <HintPath>..\..\..\packages\NuGet.PackageManagement.4.7.0\lib\net46\NuGet.PackageManagement.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.PackageManagement.4.9.0-rtm.5658\lib\net46\NuGet.PackageManagement.dll</HintPath> </Reference> <Reference Include="NuGet.Common"> - <HintPath>..\..\..\packages\NuGet.Common.4.7.0\lib\net46\NuGet.Common.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Common.4.9.0-rtm.5658\lib\net46\NuGet.Common.dll</HintPath> </Reference> <Reference Include="NuGet.Protocol"> - <HintPath>..\..\..\packages\NuGet.Protocol.4.7.0\lib\net46\NuGet.Protocol.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Protocol.4.9.0-rtm.5658\lib\net46\NuGet.Protocol.dll</HintPath> </Reference> <Reference Include="NuGet.Indexing"> - <HintPath>..\..\..\packages\NuGet.Indexing.4.7.0\lib\net46\NuGet.Indexing.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Indexing.4.9.0-rtm.5658\lib\net46\NuGet.Indexing.dll</HintPath> </Reference> <Reference Include="NuGet.Credentials"> - <HintPath>..\..\..\packages\NuGet.Credentials.4.7.0\lib\net46\NuGet.Credentials.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Credentials.4.9.0-rtm.5658\lib\net46\NuGet.Credentials.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AllPackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AllPackagesViewModel.cs index 921754b2ff..f1c5036f80 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AllPackagesViewModel.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AllPackagesViewModel.cs @@ -87,7 +87,7 @@ namespace MonoDevelop.PackageManagement : this (
solutionManager,
dotNetProject,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
recentPackagesRepository)
{
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs index f20e8543fe..13329a1bda 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs @@ -352,5 +352,12 @@ namespace MonoDevelop.PackageManagement { return true; } + + public override Task AddFileToProjectAsync (string filePath) + { + // NuGet does nothing here for .NET Core sdk projects so we also do nothing. + // This method is called when adding the packages lock file to the project. + return Task.CompletedTask; + } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs index f1f0c100a7..69770a23ae 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs @@ -49,6 +49,7 @@ namespace MonoDevelop.PackageManagement Solution solution, PackageIdentity packageIdentity, DownloadResourceResult downloadResult, + INuGetProjectContext context, CancellationToken token) { string globalPackagesFolder = await GetPackagesDirectory (solution); @@ -60,14 +61,15 @@ namespace MonoDevelop.PackageManagement if (File.Exists (hashPath)) return; - var signedPackageVerifier = new PackageSignatureVerifier (SignatureVerificationProviderFactory.GetSignatureVerificationProviders ()); + var logger = new LoggerAdapter (context); + var solutionManager = new MonoDevelopSolutionManager (solution); + var clientPolicyContext = ClientPolicyContext.GetClientPolicy (solutionManager.Settings, logger); var packageExtractionContext = new PackageExtractionContext ( PackageSaveMode.Defaultv3, PackageExtractionBehavior.XmlDocFileSaveMode, - NullLogger.Instance, - signedPackageVerifier, - SignedPackageVerifierSettings.GetDefault ()); + clientPolicyContext, + logger); downloadResult.PackageStream.Position = 0; await PackageExtractor.InstallFromSourceAsync ( diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/HttpClientFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/HttpClientFactory.cs index 32ad9560f4..0222a6a372 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/HttpClientFactory.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/HttpClientFactory.cs @@ -25,11 +25,13 @@ // THE SOFTWARE. using System; +using System.Linq; using System.Net; using System.Net.Http; using NuGet.Configuration; using NuGet.Protocol; using NuGet.Protocol.Core.Types; +using NuGet.Common; using NuGet.Credentials; namespace MonoDevelop.PackageManagement @@ -84,7 +86,8 @@ namespace MonoDevelop.PackageManagement if (existingCredentialService != null) { return existingCredentialService.CreateNonInteractive (); } - return new CredentialService (new ICredentialProvider[0], nonInteractive: true); + var lazyProvider = AsyncLazy.New (() => Enumerable.Empty<ICredentialProvider> ()); + return new CredentialService (lazyProvider, nonInteractive: true, handlesDefaultCredentials: false); } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ItemTemplateNuGetPackageInstaller.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ItemTemplateNuGetPackageInstaller.cs index 0dc56c1b98..39a8ef54dd 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ItemTemplateNuGetPackageInstaller.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ItemTemplateNuGetPackageInstaller.cs @@ -74,7 +74,7 @@ namespace MonoDevelop.PackageManagement var installPackageActions = new List<InstallNuGetPackageAction> (); - var context = new NuGetProjectContext { + var context = new NuGetProjectContext (solutionManager.Settings) { FileConflictResolution = FileConflictAction.IgnoreAll }; diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs index 65a78f32f5..dba89df8aa 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs @@ -86,16 +86,18 @@ namespace MonoDevelop.PackageManagement var now = DateTime.UtcNow;
Action<SourceCacheContext> cacheContextModifier = c => c.MaxAge = now;
bool forceRestore = false;
+ bool isRestoreOriginalAction = true;
var restoreSummaries = await DependencyGraphRestoreUtility.RestoreAsync (
solutionManager,
+ spec,
context,
new RestoreCommandProvidersCache (),
cacheContextModifier,
sourceRepositories,
Guid.NewGuid (),
forceRestore,
- spec,
+ isRestoreOriginalAction,
context.Logger,
cancellationToken);
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageSourceProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageSourceProvider.cs index 2dbab5dff6..7f4e183de3 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageSourceProvider.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageSourceProvider.cs @@ -59,11 +59,13 @@ namespace MonoDevelop.PackageManagement } } + [Obsolete ("DisablePackageSource(PackageSource source) is deprecated. Please use DisablePackageSource(string name) instead.")] public void DisablePackageSource (PackageSource source) { packageSourceProvider.DisablePackageSource (source); } + [Obsolete ("IsPackageSourceEnabled(PackageSource source) is deprecated. Please use IsPackageSourceEnabled(string name) instead.")] public bool IsPackageSourceEnabled (PackageSource source) { return packageSourceProvider.IsPackageSourceEnabled (source); @@ -102,6 +104,46 @@ namespace MonoDevelop.PackageManagement ProtocolVersion = 3 }; } + + public PackageSource GetPackageSourceByName (string name) + { + return packageSourceProvider.GetPackageSourceByName (name); + } + + public PackageSource GetPackageSourceBySource (string source) + { + return packageSourceProvider.GetPackageSourceBySource (source); + } + + public void RemovePackageSource (string name) + { + packageSourceProvider.RemovePackageSource (name); + } + + public void EnablePackageSource (string name) + { + packageSourceProvider.EnablePackageSource (name); + } + + public void DisablePackageSource (string name) + { + packageSourceProvider.DisablePackageSource (name); + } + + public void UpdatePackageSource (PackageSource source, bool updateCredentials, bool updateEnabled) + { + packageSourceProvider.UpdatePackageSource (source, updateCredentials, updateEnabled); + } + + public void AddPackageSource (PackageSource source) + { + packageSourceProvider.AddPackageSource (source); + } + + public bool IsPackageSourceEnabled (string name) + { + return packageSourceProvider.IsPackageSourceEnabled (name); + } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetProjectContext.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetProjectContext.cs index 7f9f8cc28c..cb8e462a2f 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetProjectContext.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetProjectContext.cs @@ -26,8 +26,11 @@ using System;
using System.Xml.Linq;
+using NuGet.Configuration;
using NuGet.PackageManagement;
using NuGet.Packaging;
+using NuGet.Packaging.PackageExtraction;
+using NuGet.Packaging.Signing;
using NuGet.ProjectManagement;
namespace MonoDevelop.PackageManagement
@@ -36,9 +39,12 @@ namespace MonoDevelop.PackageManagement {
IPackageManagementEvents packageManagementEvents;
IDEExecutionContext executionContext;
+ ISettings settings;
+ PackageExtractionContext packageExtractionContext;
- public NuGetProjectContext ()
+ public NuGetProjectContext (ISettings settings)
{
+ this.settings = settings;
packageManagementEvents = PackageManagementServices.PackageManagementEvents;
var commonOperations = new MonoDevelopCommonOperations ();
executionContext = new IDEExecutionContext (commonOperations);
@@ -50,7 +56,6 @@ namespace MonoDevelop.PackageManagement public NuGetActionType ActionType { get; set; } public XDocument OriginalPackagesConfig { get; set; } - public PackageExtractionContext PackageExtractionContext { get; set; } public Guid OperationId { get; set; }
public ISourceControlManagerProvider SourceControlManagerProvider { @@ -76,6 +81,21 @@ namespace MonoDevelop.PackageManagement return packageManagementEvents.OnResolveFileConflict (message); } + + public PackageExtractionContext PackageExtractionContext { + get {
+ if (packageExtractionContext == null) { + var logger = new LoggerAdapter (this); + packageExtractionContext = new PackageExtractionContext ( + PackageSaveMode.Defaultv2, + PackageExtractionBehavior.XmlDocFileSaveMode, + ClientPolicyContext.GetClientPolicy (settings, logger), + logger);
+ }
+ return packageExtractionContext;
+ }
+ set { packageExtractionContext = value; } + } }
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs index 3b57c0d147..36ba1ea477 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs @@ -151,7 +151,7 @@ namespace MonoDevelop.PackageManagement Runtime.RunInMainThread (() => {
var solutionManager = PackageManagementServices.Workspace.GetSolutionManager (project.ParentSolution);
var dotNetProject = new DotNetProjectProxy ((DotNetProject)project);
- var context = new NuGetProjectContext ();
+ var context = new NuGetProjectContext (solutionManager.Settings);
actions = packages.Select (packageReference => {
var action = new InstallNuGetPackageAction (
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs index f9e6fb1855..12dde0634a 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs @@ -304,5 +304,26 @@ namespace MonoDevelop.PackageManagement { return true; } + + public override Task AddFileToProjectAsync (string filePath) + { + if (project.IsFileInProject (filePath)) + return Task.CompletedTask; + + return Runtime.RunInMainThread (async () => { + var fullPath = GetFullPath (filePath); + string buildAction = project.GetDefaultBuildAction (fullPath); + var fileItem = new ProjectFile (fullPath) { + BuildAction = buildAction + }; + project.AddFile (fileItem); + await SaveProject (); + }); + } + + string GetFullPath (string relativePath) + { + return project.BaseDirectory.Combine (relativePath); + } } } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs index fd0ff05c0d..244c9c428c 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs @@ -26,12 +26,14 @@ using System;
using System.Collections.Generic;
-using System.IO;
+using System.IO; +using System.Linq;
using System.Net; using System.Net.Http;
using System.Threading; using System.Threading.Tasks; using MonoDevelop.Core; +using NuGet.Common; using NuGet.Credentials; namespace MonoDevelop.PackageManagement
@@ -111,7 +113,8 @@ namespace MonoDevelop.PackageManagement HttpClient CreateHttpClient(PackageSourceViewModel packageSource)
{ - var credentialService = new CredentialService (new ICredentialProvider[0], true);
+ var lazyProvider = AsyncLazy.New (() => Enumerable.Empty<ICredentialProvider> ()); + var credentialService = new CredentialService (lazyProvider, true, false);
return HttpClientFactory.CreateHttpClient ( packageSource.GetPackageSource (), credentialService); diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSpecCreator.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSpecCreator.cs index 056a2123c1..54bc39f197 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSpecCreator.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSpecCreator.cs @@ -97,7 +97,7 @@ namespace MonoDevelop.PackageManagement static ProjectRestoreMetadata CreateRestoreMetadata (PackageSpec packageSpec, IDotNetProject project, ISettings settings) { return new ProjectRestoreMetadata { - ConfigFilePaths = SettingsUtility.GetConfigFilePaths (settings).ToList (), + ConfigFilePaths = settings.GetConfigFilePaths (), FallbackFolders = GetFallbackPackageFolders (settings, project), PackagesPath = GetPackagesPath (settings, project), ProjectStyle = ProjectStyle.PackageReference, diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs index 1aa40311d0..9cc6e06f32 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs @@ -105,15 +105,16 @@ namespace MonoDevelop.PackageManagement ProjectTemplatePackageReference packageReference)
{
var primaryRepositories = repositoryProvider.GetRepositories (packageReference).ToList ();
- var secondaryRepositories = GetSecondaryRepositories (primaryRepositories, packageReference);
+ var secondaryRepositories = GetSecondaryRepositories (primaryRepositories, packageReference); + var solutionManager = PackageManagementServices.Workspace.GetSolutionManager (dotNetProject.ParentSolution);
- var context = new NuGetProjectContext {
+ var context = new NuGetProjectContext (solutionManager.Settings) {
FileConflictResolution = FileConflictAction.IgnoreAll
};
return new InstallNuGetPackageAction (
primaryRepositories,
secondaryRepositories,
- PackageManagementServices.Workspace.GetSolutionManager (dotNetProject.ParentSolution),
+ solutionManager,
new DotNetProjectProxy (dotNetProject),
context) {
LicensesMustBeAccepted = packageReference.RequireLicenseAcceptance,
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallNuGetPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallNuGetPackageAction.cs index 02deb183cd..6c6e25eedf 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallNuGetPackageAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallNuGetPackageAction.cs @@ -46,7 +46,7 @@ namespace MonoDevelop.PackageManagement : this (
project,
solutionManager,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
PackageManagementServices.PackageManagementEvents)
{
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndCheckForUpdatesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndCheckForUpdatesAction.cs index 4936974448..23fb9dd04e 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndCheckForUpdatesAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndCheckForUpdatesAction.cs @@ -180,7 +180,7 @@ namespace MonoDevelop.PackageManagement await restoreManager.RestoreMissingPackagesAsync (
solutionManager.SolutionDirectory,
packagesToRestore,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
downloadContext,
cancellationToken);
}
@@ -194,7 +194,7 @@ namespace MonoDevelop.PackageManagement if (nugetAwareRestorer != null) {
await nugetAwareRestorer.RestoreMissingPackagesAsync (
nugetAwareProjectsToBeRestored,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
cancellationToken);
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndUninstallNuGetPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndUninstallNuGetPackageAction.cs index 8e1176ae9d..23a78d41c3 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndUninstallNuGetPackageAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreAndUninstallNuGetPackageAction.cs @@ -43,6 +43,7 @@ namespace MonoDevelop.PackageManagement RestoreNuGetPackagesInProjectAction restoreAction; UninstallNuGetPackageAction uninstallAction; IDotNetProject dotNetProject; + IMonoDevelopSolutionManager solutionManager; MSBuildNuGetProject nugetProject; PackagePathResolver packagePathResolver; @@ -50,6 +51,7 @@ namespace MonoDevelop.PackageManagement IMonoDevelopSolutionManager solutionManager, IDotNetProject dotNetProject) { + this.solutionManager = solutionManager; this.dotNetProject = dotNetProject; nugetProject = solutionManager.GetNuGetProject (dotNetProject) as MSBuildNuGetProject; @@ -119,7 +121,7 @@ namespace MonoDevelop.PackageManagement if (result) { return await nugetProject.PackagesConfigNuGetProject.UninstallPackageAsync ( new PackageIdentity (PackageId, Version), - new NuGetProjectContext (), + new NuGetProjectContext (solutionManager.Settings), cancellationToken ); } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesAction.cs index 17082338bf..3d14f361f5 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesAction.cs @@ -131,7 +131,7 @@ namespace MonoDevelop.PackageManagement using (var monitor = new PackageRestoreMonitor (restoreManager)) {
await restoreManager.RestoreMissingPackagesInSolutionAsync (
solutionManager.SolutionDirectory,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
cancellationToken);
}
}
@@ -145,7 +145,7 @@ namespace MonoDevelop.PackageManagement if (nugetAwareRestorer != null) {
await nugetAwareRestorer.RestoreMissingPackagesAsync (
nugetAwareProjects,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
cancellationToken);
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInNuGetAwareProjectAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInNuGetAwareProjectAction.cs index 45b598a151..e31d834c9d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInNuGetAwareProjectAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInNuGetAwareProjectAction.cs @@ -34,6 +34,7 @@ namespace MonoDevelop.PackageManagement { IPackageManagementEvents packageManagementEvents; NuGetAwareProjectPackageRestoreManager restoreManager; + IMonoDevelopSolutionManager solutionManager; INuGetAwareProject nugetAwareProject; public RestoreNuGetPackagesInNuGetAwareProjectAction ( @@ -41,6 +42,7 @@ namespace MonoDevelop.PackageManagement IMonoDevelopSolutionManager solutionManager) { nugetAwareProject = (INuGetAwareProject)project; + this.solutionManager = solutionManager; packageManagementEvents = PackageManagementServices.PackageManagementEvents; @@ -75,7 +77,7 @@ namespace MonoDevelop.PackageManagement { await restoreManager.RestoreMissingPackagesAsync ( nugetAwareProject, - new NuGetProjectContext (), + new NuGetProjectContext (solutionManager.Settings), cancellationToken); packageManagementEvents.OnPackagesRestored (); diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInProjectAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInProjectAction.cs index 903da4e1bd..7ccd7cb36b 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInProjectAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreNuGetPackagesInProjectAction.cs @@ -90,7 +90,7 @@ namespace MonoDevelop.PackageManagement await restoreManager.RestoreMissingPackagesAsync (
solutionManager.SolutionDirectory,
nugetProject,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
downloadContext,
cancellationToken);
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackageAction.cs index 2e2d904ab7..301ece69d8 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackageAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackageAction.cs @@ -51,7 +51,7 @@ namespace MonoDevelop.PackageManagement : this (
solutionManager,
dotNetProject,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
new MonoDevelopNuGetPackageManager (solutionManager),
PackageManagementServices.PackageManagementEvents)
{
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackagesAction.cs index 7b6d06065b..4280099f75 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackagesAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallNuGetPackagesAction.cs @@ -51,7 +51,7 @@ namespace MonoDevelop.PackageManagement : this ( solutionManager, dotNetProject, - new NuGetProjectContext (), + new NuGetProjectContext (solutionManager.Settings), new MonoDevelopNuGetPackageManager (solutionManager), PackageManagementServices.PackageManagementEvents) { diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllNuGetPackagesInProjectAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllNuGetPackagesInProjectAction.cs index 58971af02d..3e6ccd9eaf 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllNuGetPackagesInProjectAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllNuGetPackagesInProjectAction.cs @@ -59,7 +59,7 @@ namespace MonoDevelop.PackageManagement : this (
solutionManager,
new DotNetProjectProxy (dotNetProject),
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
new MonoDevelopNuGetPackageManager (solutionManager),
new MonoDevelopPackageRestoreManager (solutionManager),
PackageManagementServices.PackageManagementEvents)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateNuGetPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateNuGetPackageAction.cs index 99a2af0eae..5dd6df78d4 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateNuGetPackageAction.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateNuGetPackageAction.cs @@ -53,7 +53,7 @@ namespace MonoDevelop.PackageManagement : this (
solutionManager,
dotNetProject,
- new NuGetProjectContext (),
+ new NuGetProjectContext (solutionManager.Settings),
new MonoDevelopNuGetPackageManager (solutionManager),
PackageManagementServices.PackageManagementEvents)
{
diff --git a/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs b/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs index 3f60eea582..cffe492937 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs @@ -9,6 +9,7 @@ using System.Net; using System.Threading; using System.Threading.Tasks; using MonoDevelop.Core; +using NuGet.Common; using NuGet.Configuration; namespace NuGet.Credentials @@ -138,7 +139,9 @@ namespace NuGet.Credentials public CredentialService CreateNonInteractive () { - return new CredentialService (Providers, nonInteractive: true); + bool handlesDefaultCredentials = Providers.Any (provider => provider is DefaultCredentialsCredentialProvider); + var lazyProviders = AsyncLazy.New (() => Providers) +; return new CredentialService (lazyProviders, nonInteractive: true, handlesDefaultCredentials: handlesDefaultCredentials); } /// <summary> diff --git a/main/src/addins/MonoDevelop.PackageManagement/packages.config b/main/src/addins/MonoDevelop.PackageManagement/packages.config index 9c7923bc7e..a3cb41cc3b 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/packages.config +++ b/main/src/addins/MonoDevelop.PackageManagement/packages.config @@ -3,19 +3,19 @@ <package id="Lucene.Net" version="3.0.3" targetFramework="net461" /> <package id="Microsoft.Web.Xdt" version="2.1.2" targetFramework="net461" /> <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" /> - <package id="NuGet.Commands" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Common" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Configuration" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Credentials" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.DependencyResolver.Core" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Frameworks" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Indexing" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.LibraryModel" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.PackageManagement" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Packaging" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Packaging.Core" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.ProjectModel" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Protocol" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Resolver" version="4.7.0" targetFramework="net461" /> - <package id="NuGet.Versioning" version="4.7.0" targetFramework="net461" /> + <package id="NuGet.Commands" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Common" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Configuration" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Credentials" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.DependencyResolver.Core" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Frameworks" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Indexing" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.LibraryModel" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.PackageManagement" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Packaging" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Packaging.Core" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.ProjectModel" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Protocol" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Resolver" version="4.9.0-rtm.5658" targetFramework="net461" /> + <package id="NuGet.Versioning" version="4.9.0-rtm.5658" targetFramework="net461" /> </packages>
\ No newline at end of file diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj index b5cf42cc18..6494052fc8 100644 --- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj +++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj @@ -14,28 +14,28 @@ <Reference Include="System" /> <Reference Include="System.Xml" /> <Reference Include="NuGet.Protocol"> - <HintPath>..\..\..\packages\NuGet.Protocol.4.7.0\lib\net46\NuGet.Protocol.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Protocol.4.9.0-rtm.5658\lib\net46\NuGet.Protocol.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Packaging"> - <HintPath>..\..\..\packages\NuGet.Packaging.4.7.0\lib\net46\NuGet.Packaging.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Packaging.Core"> - <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.7.0\lib\net46\NuGet.Packaging.Core.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Frameworks"> - <HintPath>..\..\..\packages\NuGet.Frameworks.4.7.0\lib\net46\NuGet.Frameworks.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Frameworks.4.9.0-rtm.5658\lib\net46\NuGet.Frameworks.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\packages\NuGet.Versioning.4.7.0\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Versioning.4.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> <Reference Include="NuGet.PackageManagement"> - <HintPath>..\..\..\packages\NuGet.PackageManagement.4.7.0\lib\net46\NuGet.PackageManagement.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.PackageManagement.4.9.0-rtm.5658\lib\net46\NuGet.PackageManagement.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingNuGetProject.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingNuGetProject.cs index 2db0f33801..e837511ebf 100644 --- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingNuGetProject.cs +++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/PackagingNuGetProject.cs @@ -91,7 +91,7 @@ namespace MonoDevelop.Packaging bool developmentDependency = false; if (IsNuGetBuildPackagingPackage (packageIdentity)) { - await GlobalPackagesExtractor.Extract (project.ParentSolution, packageIdentity, downloadResourceResult, token); + await GlobalPackagesExtractor.Extract (project.ParentSolution, packageIdentity, downloadResourceResult, nuGetProjectContext, token); developmentDependency = true; GenerateNuGetBuildPackagingTargets (packageIdentity); diff --git a/main/src/core/MonoDevelop.Startup/app.config b/main/src/core/MonoDevelop.Startup/app.config index 8d287296d2..7b4ffba12f 100644 --- a/main/src/core/MonoDevelop.Startup/app.config +++ b/main/src/core/MonoDevelop.Startup/app.config @@ -172,63 +172,63 @@ </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Commands" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Credentials" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.DependencyResolver.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Indexing" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.LibraryModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.PackageManagement" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Packaging" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Packaging.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.ProjectModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Protocol" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Resolver" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Versioning" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.7.0.5" newVersion="4.7.0.5" /> + <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="SQLitePCLRaw.core" publicKeyToken="1488e028ca7ab535" culture="neutral" /> |