From b48351354bf9d80a85d407e060421eac3f56da0e Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Wed, 16 Aug 2017 15:44:41 +0100 Subject: [NuGet] Update to NuGet 4.3.0.4339 NuGet 4.3.0.4339 ships with Visual Studio 2017 (15.3) --- main/external/nuget-binary | 2 +- .../DummyDotNetProject.cs | 3 +++ .../DotNetCoreNuGetProjectTests.cs | 11 +++++++++++ .../PackageReferenceNuGetProjectTests.cs | 11 +++++++++++ .../MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs | 9 +++++++++ .../PackageReferenceNuGetProject.cs | 9 +++++++++ 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/main/external/nuget-binary b/main/external/nuget-binary index 6231bba537..ed064aeb53 160000 --- a/main/external/nuget-binary +++ b/main/external/nuget-binary @@ -1 +1 @@ -Subproject commit 6231bba5372334d515dac43c876255765ca2fb6b +Subproject commit ed064aeb537eaa60614b1f664b8054e33bc823cc diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/DummyDotNetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/DummyDotNetProject.cs index 12ec5df69c..f49c34592a 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/DummyDotNetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/DummyDotNetProject.cs @@ -35,6 +35,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers public DummyDotNetProject () : base ("C#") { + // Set the TypeGuid to be a C# project so the default file extension will + // be .csproj and not .mdproj + TypeGuid = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"; Initialize (this); } diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetCoreNuGetProjectTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetCoreNuGetProjectTests.cs index 69135e9943..2652816dd4 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetCoreNuGetProjectTests.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetCoreNuGetProjectTests.cs @@ -500,5 +500,16 @@ namespace MonoDevelop.PackageManagement.Tests Assert.AreEqual ("References", modifiedHintMainProject); Assert.IsNull (modifiedHintProjectWithReference); } + + [Test] + public async Task GetCacheFilePathAsync_BaseIntermediatePathNotSet_BaseIntermediatePathUsedForCacheFilePath () + { + CreateNuGetProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); + string expectedCacheFilePath = @"d:\projects\MyProject\obj\MyProject.csproj.nuget.cache".ToNativePath (); + + string cacheFilePath = await project.GetCacheFilePathAsync (); + + Assert.AreEqual (expectedCacheFilePath, cacheFilePath); + } } } 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 0ca059a5d3..88c7e8e91d 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 @@ -256,6 +256,17 @@ namespace MonoDevelop.PackageManagement.Tests Assert.AreEqual ("2.6.0-*", packageReference.AllowedVersions.Float.ToString ()); } + [Test] + public async Task GetCacheFilePathAsync_BaseIntermediatePathNotSet_BaseIntermediatePathUsedForCacheFilePath () + { + CreateNuGetProject ("MyProject", @"d:\projects\MyProject\MyProject.csproj"); + string expectedCacheFilePath = @"d:\projects\MyProject\obj\MyProject.csproj.nuget.cache".ToNativePath (); + + string cacheFilePath = await project.GetCacheFilePathAsync (); + + Assert.AreEqual (expectedCacheFilePath, cacheFilePath); + } + [Test] public void Create_NoPackageReferences_ReturnsNull () { diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs index bd1900e7ec..2a168cec3d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetCoreNuGetProject.cs @@ -30,6 +30,7 @@ using System.Threading; using System.Threading.Tasks; using MonoDevelop.Core; using MonoDevelop.Projects; +using NuGet.Commands; using NuGet.Frameworks; using NuGet.PackageManagement; using NuGet.Packaging; @@ -205,6 +206,14 @@ namespace MonoDevelop.PackageManagement return GetAssetsFilePathAsync (); } + public override Task GetCacheFilePathAsync () + { + string cacheFilePath = NoOpRestoreUtilities.GetProjectCacheFilePath ( + project.BaseIntermediateOutputPath, + msbuildProjectPath); + return Task.FromResult (cacheFilePath); + } + public override async Task> GetPackageSpecsAsync (DependencyGraphCacheContext context) { PackageSpec existingPackageSpec = GetExistingProjectPackageSpec (context); diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs index 676b47499e..99b7bdf2df 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceNuGetProject.cs @@ -30,6 +30,7 @@ using System.Threading; using System.Threading.Tasks; using MonoDevelop.Core; using MonoDevelop.Projects; +using NuGet.Commands; using NuGet.Frameworks; using NuGet.PackageManagement; using NuGet.Packaging; @@ -196,6 +197,14 @@ namespace MonoDevelop.PackageManagement return GetAssetsFilePathAsync (); } + public override Task GetCacheFilePathAsync () + { + string cacheFilePath = NoOpRestoreUtilities.GetProjectCacheFilePath ( + project.BaseIntermediateOutputPath, + msbuildProjectPath); + return Task.FromResult (cacheFilePath); + } + public override async Task> GetPackageSpecsAsync (DependencyGraphCacheContext context) { PackageSpec existingPackageSpec = GetExistingProjectPackageSpec (context); -- cgit v1.2.3 From 116902aadae5c9f6490d1f0e96428c04a1443a5e Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Wed, 13 Sep 2017 17:49:45 +0100 Subject: [NuGet] Update to NuGet 4.3.1.4445 Fixed bug #59447 - Package is not compatible error for project.json with imports https://bugzilla.xamarin.com/show_bug.cgi?id=59447 Imports in a project.json file are ignored with older NuGet 4.3 versions. Updating to NuGet 4.3.1 fixes this. NuGet bug: https://github.com/NuGet/Home/issues/5806 --- main/external/nuget-binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/external/nuget-binary b/main/external/nuget-binary index ed064aeb53..ebedbf8b90 160000 --- a/main/external/nuget-binary +++ b/main/external/nuget-binary @@ -1 +1 @@ -Subproject commit ed064aeb537eaa60614b1f664b8054e33bc823cc +Subproject commit ebedbf8b90e2f138fa9bc120807abced307fbfb4 -- cgit v1.2.3