diff options
author | Matt Ward <matt.ward@microsoft.com> | 2018-12-12 18:11:20 +0300 |
---|---|---|
committer | Matt Ward <matt.ward@microsoft.com> | 2018-12-12 18:28:01 +0300 |
commit | 7ec512f117ea8e0eb3fc931f65fe99de18c88c75 (patch) | |
tree | 721de928b4f0e2b835b7457cd25311379b861f49 /main/src | |
parent | ec2d08ed2df64ec916455430fbe2c069a7aab4e2 (diff) |
[NuGet] Downgrade to NuGet 4.8.0
Downgrade to NuGet 4.8.0.5385
Fixes VSTS #749807 - Fallback folders not used with ASP.NET Core project
Diffstat (limited to 'main/src')
15 files changed, 77 insertions, 154 deletions
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj index f2551e3323..6f0de3c1c1 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.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Versioning.4.8.0\lib\net46\NuGet.Versioning.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> 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 fca51a4a0e..8404664ffa 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,8 +62,6 @@ 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) @@ -135,23 +133,6 @@ 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 () { } 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 b6238b4b3f..e24bd5332e 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,8 +73,6 @@ 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/RestoreTestBase.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RestoreTestBase.cs index ae968de9fb..108d690e2c 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 @@ -112,11 +112,11 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers }; var logger = new LoggerAdapter (context); - context.PackageExtractionContext = new PackageExtractionContext ( - PackageSaveMode.Defaultv2, - PackageExtractionBehavior.XmlDocFileSaveMode, - ClientPolicyContext.GetClientPolicy (settings, logger), - logger); + //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 7393f3e847..f3197f3c68 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.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Versioning.4.8.0\lib\net46\NuGet.Versioning.dll</HintPath> </Reference> <Reference Include="NuGet.Frameworks"> - <HintPath>..\..\..\..\packages\NuGet.Frameworks.4.9.0-rtm.5658\lib\net46\NuGet.Frameworks.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Frameworks.4.8.0\lib\net46\NuGet.Frameworks.dll</HintPath> </Reference> <Reference Include="NuGet.Packaging.Core"> - <HintPath>..\..\..\..\packages\NuGet.Packaging.Core.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.Core.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Packaging.Core.4.8.0\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.9.0-rtm.5658\lib\net46\NuGet.Packaging.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Packaging.4.8.0\lib\net46\NuGet.Packaging.dll</HintPath> </Reference> <Reference Include="NuGet.Configuration"> - <HintPath>..\..\..\..\packages\NuGet.Configuration.4.9.0-rtm.5658\lib\net46\NuGet.Configuration.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Configuration.4.8.0\lib\net46\NuGet.Configuration.dll</HintPath> </Reference> <Reference Include="System.Security" /> <Reference Include="NuGet.PackageManagement"> - <HintPath>..\..\..\..\packages\NuGet.PackageManagement.4.9.0-rtm.5658\lib\net46\NuGet.PackageManagement.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.PackageManagement.4.8.0\lib\net46\NuGet.PackageManagement.dll</HintPath> </Reference> <Reference Include="NuGet.Protocol"> - <HintPath>..\..\..\..\packages\NuGet.Protocol.4.9.0-rtm.5658\lib\net46\NuGet.Protocol.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Protocol.4.8.0\lib\net46\NuGet.Protocol.dll</HintPath> </Reference> <Reference Include="NuGet.Common"> - <HintPath>..\..\..\..\packages\NuGet.Common.4.9.0-rtm.5658\lib\net46\NuGet.Common.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Common.4.8.0\lib\net46\NuGet.Common.dll</HintPath> </Reference> <Reference Include="NuGet.Resolver"> - <HintPath>..\..\..\..\packages\NuGet.Resolver.4.9.0-rtm.5658\lib\net46\NuGet.Resolver.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Resolver.4.8.0\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.9.0-rtm.5658\lib\net46\NuGet.ProjectModel.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.ProjectModel.4.8.0\lib\net46\NuGet.ProjectModel.dll</HintPath> </Reference> <Reference Include="NuGet.LibraryModel"> - <HintPath>..\..\..\..\packages\NuGet.LibraryModel.4.9.0-rtm.5658\lib\net46\NuGet.LibraryModel.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.LibraryModel.4.8.0\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.9.0-rtm.5658\lib\net46\NuGet.Commands.dll</HintPath> + <HintPath>..\..\..\..\packages\NuGet.Commands.4.8.0\lib\net46\NuGet.Commands.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj index ee831aca62..fe47de2d96 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.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Versioning.4.8.0\lib\net46\NuGet.Versioning.dll</HintPath> </Reference> <Reference Include="Microsoft.CSharp" /> <Reference Include="NuGet.LibraryModel"> - <HintPath>..\..\..\packages\NuGet.LibraryModel.4.9.0-rtm.5658\lib\net46\NuGet.LibraryModel.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.LibraryModel.4.8.0\lib\net46\NuGet.LibraryModel.dll</HintPath> </Reference> <Reference Include="NuGet.Frameworks"> - <HintPath>..\..\..\packages\NuGet.Frameworks.4.9.0-rtm.5658\lib\net46\NuGet.Frameworks.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Frameworks.4.8.0\lib\net46\NuGet.Frameworks.dll</HintPath> </Reference> <Reference Include="NuGet.Packaging.Core"> - <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.Core.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.8.0\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.9.0-rtm.5658\lib\net46\NuGet.Packaging.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.4.8.0\lib\net46\NuGet.Packaging.dll</HintPath> </Reference> <Reference Include="NuGet.Configuration"> - <HintPath>..\..\..\packages\NuGet.Configuration.4.9.0-rtm.5658\lib\net46\NuGet.Configuration.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Configuration.4.8.0\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.9.0-rtm.5658\lib\net46\NuGet.DependencyResolver.Core.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.DependencyResolver.Core.4.8.0\lib\net46\NuGet.DependencyResolver.Core.dll</HintPath> </Reference> <Reference Include="NuGet.ProjectModel"> - <HintPath>..\..\..\packages\NuGet.ProjectModel.4.9.0-rtm.5658\lib\net46\NuGet.ProjectModel.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.ProjectModel.4.8.0\lib\net46\NuGet.ProjectModel.dll</HintPath> </Reference> <Reference Include="System.ComponentModel.Composition" /> <Reference Include="NuGet.Commands"> - <HintPath>..\..\..\packages\NuGet.Commands.4.9.0-rtm.5658\lib\net46\NuGet.Commands.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Commands.4.8.0\lib\net46\NuGet.Commands.dll</HintPath> </Reference> <Reference Include="System.Runtime.Serialization" /> <Reference Include="WindowsBase" /> <Reference Include="NuGet.Resolver"> - <HintPath>..\..\..\packages\NuGet.Resolver.4.9.0-rtm.5658\lib\net46\NuGet.Resolver.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Resolver.4.8.0\lib\net46\NuGet.Resolver.dll</HintPath> </Reference> <Reference Include="NuGet.PackageManagement"> - <HintPath>..\..\..\packages\NuGet.PackageManagement.4.9.0-rtm.5658\lib\net46\NuGet.PackageManagement.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.PackageManagement.4.8.0\lib\net46\NuGet.PackageManagement.dll</HintPath> </Reference> <Reference Include="NuGet.Common"> - <HintPath>..\..\..\packages\NuGet.Common.4.9.0-rtm.5658\lib\net46\NuGet.Common.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Common.4.8.0\lib\net46\NuGet.Common.dll</HintPath> </Reference> <Reference Include="NuGet.Protocol"> - <HintPath>..\..\..\packages\NuGet.Protocol.4.9.0-rtm.5658\lib\net46\NuGet.Protocol.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Protocol.4.8.0\lib\net46\NuGet.Protocol.dll</HintPath> </Reference> <Reference Include="NuGet.Indexing"> - <HintPath>..\..\..\packages\NuGet.Indexing.4.9.0-rtm.5658\lib\net46\NuGet.Indexing.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Indexing.4.8.0\lib\net46\NuGet.Indexing.dll</HintPath> </Reference> <Reference Include="NuGet.Credentials"> - <HintPath>..\..\..\packages\NuGet.Credentials.4.9.0-rtm.5658\lib\net46\NuGet.Credentials.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Credentials.4.8.0\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/DotNetCoreNuGetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs index c5b40b9fb2..55f4affa08 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs @@ -334,7 +334,7 @@ namespace MonoDevelop.PackageManagement return true; } - public override Task AddFileToProjectAsync (string filePath) + public 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. diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs index 69770a23ae..0f5cf9b9d3 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/GlobalPackagesExtractor.cs @@ -62,14 +62,14 @@ namespace MonoDevelop.PackageManagement return; var logger = new LoggerAdapter (context); - var solutionManager = new MonoDevelopSolutionManager (solution); - var clientPolicyContext = ClientPolicyContext.GetClientPolicy (solutionManager.Settings, logger); + var signedPackageVerifier = new PackageSignatureVerifier (SignatureVerificationProviderFactory.GetSignatureVerificationProviders ()); var packageExtractionContext = new PackageExtractionContext ( PackageSaveMode.Defaultv3, PackageExtractionBehavior.XmlDocFileSaveMode, - clientPolicyContext, - logger); + logger, + signedPackageVerifier, + SignedPackageVerifierSettings.GetDefault ()); downloadResult.PackageStream.Position = 0; await PackageExtractor.InstallFromSourceAsync ( diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs index cf327e51a3..80d198fbc8 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopBuildIntegratedRestorer.cs @@ -87,18 +87,16 @@ 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,
- isRestoreOriginalAction,
+ spec,
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 7f4e183de3..55edb3eb66 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageSourceProvider.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageSourceProvider.cs @@ -104,46 +104,6 @@ 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 cb8e462a2f..6ee8019f20 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetProjectContext.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetProjectContext.cs @@ -40,7 +40,6 @@ namespace MonoDevelop.PackageManagement IPackageManagementEvents packageManagementEvents;
IDEExecutionContext executionContext;
ISettings settings;
- PackageExtractionContext packageExtractionContext;
public NuGetProjectContext (ISettings settings)
{
@@ -82,20 +81,7 @@ 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; } - } + public PackageExtractionContext PackageExtractionContext { get; set; } }
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs index 97926cee1c..575200ece5 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs @@ -280,7 +280,7 @@ namespace MonoDevelop.PackageManagement return true; } - public override Task AddFileToProjectAsync (string filePath) + public Task AddFileToProjectAsync (string filePath) { if (project.IsFileInProject (filePath)) return Task.CompletedTask; diff --git a/main/src/addins/MonoDevelop.PackageManagement/packages.config b/main/src/addins/MonoDevelop.PackageManagement/packages.config index a3cb41cc3b..841f14de7a 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.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" /> + <package id="NuGet.Commands" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Common" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Configuration" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Credentials" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.DependencyResolver.Core" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Frameworks" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Indexing" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.LibraryModel" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.PackageManagement" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Packaging" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Packaging.Core" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.ProjectModel" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Protocol" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Resolver" version="4.8.0" targetFramework="net461" /> + <package id="NuGet.Versioning" version="4.8.0" 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 6494052fc8..e0fa05576c 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.9.0-rtm.5658\lib\net46\NuGet.Protocol.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Protocol.4.8.0\lib\net46\NuGet.Protocol.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Packaging"> - <HintPath>..\..\..\packages\NuGet.Packaging.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.4.8.0\lib\net46\NuGet.Packaging.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Packaging.Core"> - <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.9.0-rtm.5658\lib\net46\NuGet.Packaging.Core.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Packaging.Core.4.8.0\lib\net46\NuGet.Packaging.Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Frameworks"> - <HintPath>..\..\..\packages\NuGet.Frameworks.4.9.0-rtm.5658\lib\net46\NuGet.Frameworks.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Frameworks.4.8.0\lib\net46\NuGet.Frameworks.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="NuGet.Versioning"> - <HintPath>..\..\..\packages\NuGet.Versioning.4.9.0-rtm.5658\lib\net46\NuGet.Versioning.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.Versioning.4.8.0\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.9.0-rtm.5658\lib\net46\NuGet.PackageManagement.dll</HintPath> + <HintPath>..\..\..\packages\NuGet.PackageManagement.4.8.0\lib\net46\NuGet.PackageManagement.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> diff --git a/main/src/core/MonoDevelop.Startup/app.config b/main/src/core/MonoDevelop.Startup/app.config index 7b4ffba12f..b26e3789d6 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.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Common" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Credentials" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.DependencyResolver.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Indexing" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.LibraryModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.PackageManagement" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Packaging" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Packaging.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.ProjectModel" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Protocol" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Resolver" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="NuGet.Versioning" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.9.0.6" newVersion="4.9.0.6" /> + <bindingRedirect oldVersion="0.0.0.0-4.8.0.6" newVersion="4.8.0.6" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="SQLitePCLRaw.core" publicKeyToken="1488e028ca7ab535" culture="neutral" /> |