IsCPSCapabilityComplaint -> IsCPSCapabilityCompliant

Author: davkean

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/CpsPackageReferenceProjectProvider.cs

@@ -75,15 +75,15 @@ public async Task<NuGetProject> TryCreateNuGetProjectAsync(
             }
 
             // Check if the project is not CPS capable or if it is CPS capable that its opt'd in PackageReferences
-            if (!VsHierarchyUtility.IsCPSCapabilityComplaint(hierarchy) &&
+            if (!VsHierarchyUtility.IsCPSCapabilityCompliant(hierarchy) ||
                 !VsHierarchyUtility.IsProjectCapabilityCompliant(hierarchy))
             {
                 return null;
             }
 
             var buildProperties = vsProject.BuildProperties;
 
-            // read MSBuild property RestoreProjectStyle, TargetFramework, and TargetFrameworks
+            // read MSBuild property RestoreProjectStyle
             var restoreProjectStyle = await buildProperties.GetPropertyValueAsync(ProjectBuildProperties.RestoreProjectStyle);
 
             // check for RestoreProjectStyle property is set and if not set to PackageReference then return false

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/NuGetProjectFactory.cs

@@ -70,7 +70,7 @@ public async Task<NuGetProject> TryCreateNuGetProjectAsync(
             await _threadingService.JoinableTaskFactory.SwitchToMainThreadAsync();
 
             if (vsProjectAdapter.VsHierarchy != null &&
-                VsHierarchyUtility.IsCPSCapabilityComplaint(vsProjectAdapter.VsHierarchy))
+                VsHierarchyUtility.IsCPSCapabilityCompliant(vsProjectAdapter.VsHierarchy))
             {
                 // Lazy load the CPS enabled JoinableTaskFactory for the UI.
                 NuGetUIThreadHelper.SetJoinableTaskFactoryFromService(ProjectServiceAccessor.Value as IProjectServiceAccessor);
@@ -130,7 +130,7 @@ public async Task<TProject> CreateNuGetProjectAsync<TProject>(
             }
 
             if (vsProjectAdapter.VsHierarchy != null &&
-                VsHierarchyUtility.IsCPSCapabilityComplaint(vsProjectAdapter.VsHierarchy))
+                VsHierarchyUtility.IsCPSCapabilityCompliant(vsProjectAdapter.VsHierarchy))
             {
                 // Lazy load the CPS enabled JoinableTaskFactory for the UI.
                 NuGetUIThreadHelper.SetJoinableTaskFactoryFromService(ProjectServiceAccessor.Value as IProjectServiceAccessor);

src/NuGet.Clients/NuGet.VisualStudio.Common/VsHierarchyUtility.cs

@@ -113,7 +113,7 @@ public static string[] GetProjectTypeGuids(IVsHierarchy hierarchy, string defaul
         /// Check for CPS capability in IVsHierarchy. All CPS projects will have CPS capability except VisualC projects.
         /// So checking for VisualC explicitly with a OR flag.
         /// </summary>
-        public static bool IsCPSCapabilityComplaint(IVsHierarchy hierarchy)
+        public static bool IsCPSCapabilityCompliant(IVsHierarchy hierarchy)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 

src/NuGet.Clients/NuGet.VisualStudio.Implementation/Extensibility/VsPackageInstaller.cs

@@ -71,7 +71,7 @@ private void RunJTFWithCorrectContext(Project project, Func<Task> asyncTask)
 
                     var vsHierarchy = VsHierarchyUtility.ToVsHierarchy(project);
                     if (vsHierarchy != null &&
-                        VsHierarchyUtility.IsCPSCapabilityComplaint(vsHierarchy))
+                        VsHierarchyUtility.IsCPSCapabilityCompliant(vsHierarchy))
                     {
                         // Lazy load the CPS enabled JoinableTaskFactory for the UI.
                         NuGetUIThreadHelper.SetJoinableTaskFactoryFromService(ProjectServiceAccessor.Value as IProjectServiceAccessor);

test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/Services/NuGetProjectManagerServiceTests.cs

@@ -144,7 +144,7 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
                 nuGetProjectServices.SetupGet(x => x.ScriptService)
                     .Returns(Mock.Of<IProjectScriptHostService>());
 
-                var project = new NetCorePackageReferenceProject(
+                var project = new CpsPackageReferenceProject(
                     projectName: projectName,
                     projectUniqueName: projectFullPath,
                     projectFullPath: projectFullPath,