fix pcl projects for dev15 and VS2015 (#744)

NuGet · Jul 11, 2016 · eb89a13 · eb89a13
1 parent 6785f82
commit eb89a13
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Implementation/Extensibility/VsPackageInstaller.cs b/src/NuGet.Clients/NuGet.VisualStudio.Implementation/Extensibility/VsPackageInstaller.cs
@@ -15,6 +15,7 @@
 using NuGet.PackageManagement.VisualStudio;
 using NuGet.Packaging.Core;
 using NuGet.ProjectManagement;
+using NuGet.ProjectManagement.Projects;
 using NuGet.Protocol.Core.Types;
 using NuGet.Resolver;
 using NuGet.Versioning;
@@ -159,8 +160,17 @@ public void InstallPackagesFromRegistryRepository(string keyName, bool isPreUnzi
                 throw new ArgumentException(CommonResources.Argument_Cannot_Be_Null_Or_Empty, nameof(packageVersions));
             }
 
-            PumpingJTF.Run(() =>
+            PumpingJTF.Run(async () =>
                 {
+                    // HACK !!! : This is a hack for PCL projects which send isPreUnzipped = true, but their package source 
+                    // (located at C:\Program Files (x86)\Microsoft SDKs\NuGetPackages) follows the V3
+                    // folder version format.
+                    if (isPreUnzipped)
+                    {
+                        var isProjectJsonProject = await EnvDTEProjectUtility.HasBuildIntegratedConfig(project);
+                        isPreUnzipped = isProjectJsonProject ? false : isPreUnzipped;
+                    }
+
                     // create a repository provider with only the registry repository
                     PreinstalledRepositoryProvider repoProvider = new PreinstalledRepositoryProvider(ErrorHandler, _sourceRepositoryProvider);
                     repoProvider.AddFromRegistry(keyName, isPreUnzipped);