[NuGet] Fix build

Fixed assembly conflict errors on building for System.Net.Http and
System.IO.Compression. NuGet 5 is using these assemblies from .NET
Framework 4.7.2 so we need to exclude the assets from the equivalent
NuGet packages since the NuGet package versions are too old.

Fixed the test build errors. Some tests are still failing since the
package extraction context has not been implemented.

8 files changed, 48 insertions, 2 deletions

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetProjectContext.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetProjectContext.cs
index 89cbdffe03..3a74507a43 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetProjectContext.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetProjectContext.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Xml.Linq;
+using NuGet.Common;
 using NuGet.Packaging;
 using NuGet.ProjectManagement;
 
@@ -68,6 +69,14 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{
 			return FileConflictAction.Ignore;
 		}
+
+		public void Log (ILogMessage message)
+		{
+		}
+
+		public void ReportError (ILogMessage message)
+		{
+		}
 	}
 }
 
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 8404664ffa..3826e4a417 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
+
 		public Dictionary<string, List<SettingValue>> SettingValues = new Dictionary<string, List<SettingValue>> ();
 
 		public IList<SettingValue> GetSettingValues (string section, bool isPath = false)
@@ -133,6 +135,8 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			throw new NotImplementedException ();
 		}
 
+#pragma warning restore CS0618
+
 		public void SaveToDisk ()
 		{
 		}
@@ -148,6 +152,21 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{
 			throw new NotImplementedException ();
 		}
+
+		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 ();
+		}
 	}
 }
 
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRestoreManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRestoreManager.cs
index 76972ec662..aeddd7ad53 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRestoreManager.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRestoreManager.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using NuGet.Common;
 using NuGet.Frameworks;
 using NuGet.PackageManagement;
 using NuGet.Packaging;
@@ -144,6 +145,16 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{
 			throw new NotImplementedException ();
 		}
+
+		public Task<PackageRestoreResult> RestoreMissingPackagesInSolutionAsync (string solutionDirectory, INuGetProjectContext nuGetProjectContext, ILogger logger, CancellationToken token)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Task<PackageRestoreResult> RestoreMissingPackagesAsync (string solutionDirectory, IEnumerable<PackageRestoreData> packages, INuGetProjectContext nuGetProjectContext, PackageDownloadContext downloadContext, ILogger logger, CancellationToken token)
+		{
+			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.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
index f6068af048..6df56664d1 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
@@ -28,6 +28,8 @@
     <PackageReference Include="NuGet.PackageManagement" Version="5.0.0-rtm.5856" PrivateAssets="runtime" />
     <PackageReference Include="Castle.Core" Version="4.2.1" PrivateAssets="runtime" />
     <PackageReference Include="Moq" Version="4.7.145" PrivateAssets="runtime" />
+    <!-- Ensure .NET 4.7.2's System.Net.Http is used not the one from this NuGet package -->
+    <PackageReference Include="System.Net.Http" Version="4.3.3" ExcludeAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/NuGetHttpSourceAuthenticationHandlerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/NuGetHttpSourceAuthenticationHandlerTests.cs
index 61898383cb..c32ac8620f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/NuGetHttpSourceAuthenticationHandlerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/NuGetHttpSourceAuthenticationHandlerTests.cs
@@ -25,7 +25,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void Constructor_WithSourceCredentials_InitializesClientHandler ()
 		{
 			var packageSource = new PackageSource ("http://package.source.net", "source") {
-				Credentials = new PackageSourceCredential ("source", "user", "password", isPasswordClearText: true)
+				Credentials = new PackageSourceCredential ("source", "user", "password", isPasswordClearText: true, validAuthenticationTypesText: null)
 			};
 			var clientHandler = new TestHttpClientHandler ();
 			var credentialService = Mock.Of<ICredentialService> ();
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
index 814770b14d..d3c12f8c7c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
@@ -11,7 +11,6 @@
 		<Import assembly="NuGet.Common.dll" />

 		<Import assembly="NuGet.Protocol.dll" />

 		<Import assembly="NuGet.Configuration.dll" />

-		<Import assembly="NuGet.Packaging.Core.dll" />

 		<Import assembly="NuGet.ProjectModel.dll" />

 	</Runtime>

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
index 3d3707e50f..c1177198f9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
@@ -28,6 +28,10 @@
     <Reference Include="WindowsBase" />
     <PackageReference Include="NuGet.PackageManagement" Version="5.0.0-rtm.5856" PrivateAssets="runtime" />
     <PackageReference Include="NuGet.Indexing" Version="5.0.0-rtm.5856" PrivateAssets="runtime" />
+    <!-- Ensure .NET 4.7.2's System.Net.Http is used not the one from this NuGet package -->
+    <PackageReference Include="System.Net.Http" Version="4.3.3" ExcludeAssets="all" />
+    <!-- Ensure .NET 4.7.2's System.IO.Compression is used not the one from this NuGet package -->
+    <PackageReference Include="System.IO.Compression" Version="4.1.0" ExcludeAssets="all" />
     <IncludeCopyLocal Include="Lucene.Net.dll" />
     <IncludeCopyLocal Include="Microsoft.Web.XmlTransform.dll" />
     <IncludeCopyLocal Include="NuGet.Commands.dll" />