Merge branch 'dev' into 14390-fbp-2

Author: jjonescz

.gdn/.gdnsuppress

@@ -22,7 +22,6 @@
     "Microsoft.VisualStudio.Component.IntelliCode",
     "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
-    "Microsoft.Net.Component.4.6.TargetingPack",
     "Microsoft.VisualStudio.Component.VSSDK",
     "Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
     "Microsoft.VisualStudio.Workload.VisualStudioExtension",

.vsconfig

@@ -25,19 +25,19 @@
     <IsEscrowMode Condition="'$(IsEscrowMode)' == ''">false</IsEscrowMode>
 
     <!-- Visual Studio Insertion Logic -->
-    <VsTargetMajorVersion Condition="'$(VsTargetMajorVersion)' == ''">$([MSBuild]::Add(11, $(MajorNuGetVersion)))</VsTargetMajorVersion>
     <VsTargetBranch Condition="'$(VsTargetBranch)' == '' And '$(IsEscrowMode)' != 'true'">main</VsTargetBranch>
-    <VsTargetChannel Condition="'$(VsTargetChannel)' == '' And '$(IsEscrowMode)' != 'true'">int.$(VsTargetBranch)</VsTargetChannel>
-    <VsTargetChannelForTests Condition="'$(VsTargetChannelForTests)' == '' And '$(IsEscrowMode)' != 'true'">int.$(VsTargetBranch)</VsTargetChannelForTests>
+    <VsTargetChannel Condition="'$(VsTargetChannel)' == '' And '$(IsEscrowMode)' != 'true'">int.main</VsTargetChannel>
 
     <!-- NuGet SDK VS package Semantic Version -->
+    <VsTargetMajorVersion Condition="'$(VsTargetMajorVersion)' == ''">$([MSBuild]::Add(11, $(MajorNuGetVersion)))</VsTargetMajorVersion>
     <NuGetSdkVsSemanticVersion>$(VsTargetMajorVersion).$(MinorNuGetVersion).$(PatchNuGetVersion)</NuGetSdkVsSemanticVersion>
 
-    <!-- This branches are used for creating insertion PRs -->
-    <VsTargetBranch Condition="'$(VsTargetBranch)' == '' And '$(IsEscrowMode)' == 'true'">rel/d$(VsTargetMajorVersion).$(MinorNuGetVersion)</VsTargetBranch>
-    <VsTargetChannel Condition="'$(VsTargetChannel)' == '' And '$(IsEscrowMode)' == 'true'">int.d$(VsTargetMajorVersion).$(MinorNuGetVersion)</VsTargetChannel>
-    <!-- Run Apex/E2E tests on the target release branch -->
-    <VsTargetChannelForTests Condition="'$(VsTargetChannelForTests)' == '' And '$(IsEscrowMode)' == 'true'">$(VsTargetChannel)</VsTargetChannelForTests>
+    <!-- These branches are used for creating insertion PRs -->
+    <VsTargetBranch Condition="'$(VsTargetBranch)' == '' And '$(IsEscrowMode)' == 'true'">rel/insiders</VsTargetBranch>
+    <VsTargetChannel Condition="'$(VsTargetChannel)' == '' And '$(IsEscrowMode)' == 'true'">insiders</VsTargetChannel>
+
+    <!-- Run Apex/E2E tests on the target branch -->
+    <VsTargetChannelForTests Condition="'$(VsTargetChannelForTests)' == ''">$(VsTargetChannel)</VsTargetChannelForTests>
   </PropertyGroup>
 
  <PropertyGroup Condition=" '$(PreReleaseVersion)' == '' ">

build/config.props

@@ -39,8 +39,6 @@ extends:
         enabled: true
       credscan:
         enabled: false
-      suppression:
-        suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress
     pool:
       name: AzurePipelines-EO
       image: 1ESPT-Windows2022
@@ -53,7 +51,6 @@ extends:
     - template: /eng/pipelines/templates/pipeline.yml@self
       parameters:
         isOfficialBuild: true
-        ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/dev'), eq(variables['Build.SourceBranch'], format('refs/heads/{0}', variables['OneLocReleaseBranch']))) }}:
-          RunOneLocBuild: true
         RunBuildForPublishing: ${{parameters.RunBuildForPublishing}}
         SigningType: ${{ parameters.SigningType }}
+        TryRunOneLocBuild: true

eng/pipelines/official.yml

@@ -10,12 +10,9 @@ resources:
       branches:
         include:
         - dev
-        - release-*
-        - release/*
-        exclude:
-        - release-6.0.x
-        - release-6.3.x
-        - release-6.2.x
+        - release-6.14.x
+        - release-6.12.x
+        - release-5.11.x
   - pipeline: DartLab
     source: DartLab
     branch: main
@@ -111,11 +108,11 @@ stages:
 
           Write-Host "Target Visual Studio branch (full name): $VSBranch"
 
-          # The value will be something like 'main' or 'rel/d16.4';
+          # The value will be something like 'main' or 'rel/insiders';
           # however, the subsequent task which gets bootstrapper details has a parameter (VSBranch)
           # which (as of writing this) requires the branch "short" name.
           # For the 'main' branch, the short name is still 'main'.
-          # For the 'rel/d16.4' branch, the short name is 'd16.4'.
+          # For the 'rel/insiders' branch, the short name is 'insiders'.
           # Ideally, we would not need to figure out the branch short name ourselves,
           # but short-term we will to unblock ourselves.
           $branchParts = $VSBranch.Split('/')

eng/pipelines/optprof.yml

@@ -36,8 +36,6 @@ extends:
         enabled: true
       credscan:
         enabled: false
-      suppression:
-        suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress
     pool:
       name: AzurePipelines-EO
       image: 1ESPT-Windows2022

eng/pipelines/pull_request.yml

@@ -2,8 +2,8 @@ parameters:
 - name: isOfficialBuild
   type: boolean
   default: false
-- name: RunOneLocBuild
-  displayName: Run OneLocBuild
+- name: TryRunOneLocBuild
+  displayName: Run OneLocBuild if on dev or a OneLoc release branch
   type: boolean
   default: false
 - name: RunBuildForPublishing
@@ -43,9 +43,19 @@ stages:
     steps:
     - template: /eng/pipelines/templates/Initialize_Build.yml@self
 
-- ${{ if eq(parameters.RunOneLocBuild, true) }}:
+- ${{ if eq(parameters.TryRunOneLocBuild, true) }}:
   - stage: RunOneLocBuild
     displayName: Run OneLocBuild
+    condition: |
+      and(
+        succeeded(),
+        eq(variables['IsOfficialBuild'], 'true'),
+        or(
+          eq(variables['Build.SourceBranch'], 'refs/heads/dev'),
+          eq(variables['Build.SourceBranch'], variables['OneLocReleaseBranch']),
+          eq(variables['Build.SourceBranch'], format('refs/heads/{0}', variables['OneLocReleaseBranch']))
+        )
+      )
     jobs:
     - template: /eng/common/templates-official/job/onelocbuild.yml
       parameters:

eng/pipelines/templates/pipeline.yml

@@ -112,7 +112,7 @@ private static IEnumerable<string> FindAll(
             // and among other things breaks our build.
             // Consequently, we'll use a convention - only binaries ending in the name Extensions would be loaded.
             var nugetDirectory = Path.GetDirectoryName(typeof(Program).Assembly.Location);
-            if (nugetDirectory == null)
+            if (string.IsNullOrEmpty(nugetDirectory))
             {
                 return paths;
             }

src/NuGet.Clients/NuGet.CommandLine/ExtensionLocator.cs

@@ -10,6 +10,7 @@ public enum FixVulnerabilitiesWithCopilotErrorType
         ServiceBrokerNotAvailable,
         CopilotServiceNotAvailable,
         McpToolServiceNotAvailable,
-        CopilotAccessDenied
+        CopilotAccessDenied,
+        NuGetSolverNotAvailable,
     }
 }

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Telemetry/FixVulnerabilitiesWithCopilotErrorType.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.ServiceHub.Framework;
@@ -26,6 +27,8 @@ internal class FixVulnerablitiesService : IFixVulnerabilitiesService
         private const string AgentModeResponderServiceMoniker = "Microsoft.VisualStudio.Copilot.AgentModeResponder";
         private const string AuthStatusDetermined = "c936efcc-6baa-4ad3-9c2b-7ba750acf18f";
         private const string ServiceName = "Microsoft.VisualStudio.Copilot.SolutionContextProvider";
+        private const string NuGetMCPServerName = "nuget";
+        private const string NuGetSolverToolName = "get-nuget-solver";
 
         private static readonly Guid CopilotReadyUIContext = new(AuthStatusDetermined);
         private static readonly ServiceRpcDescriptor ProviderDescriptor = CopilotDescriptors.CreateContextProviderDescriptor(ServiceName);
@@ -99,6 +102,13 @@ public async Task LaunchFixVulnerabilitiesAsync(CancellationToken cancellationTo
                     string solutionPathContext = $"The current solution file path is: {GetSolutionPath()}.";
                     CopilotContext context = new CopilotContext(ProviderDescriptor.Moniker, ContextDescriptor, request.CorrelationId, solutionPathContext);
                     IReadOnlyList<CopilotFunctionDescriptor> functions = await cfp.GetFunctionsAsync(request.CorrelationId, cancellationToken);
+                    if (functions is null || !functions.Any(f => string.Equals(f.Name, $"{NuGetMCPServerName}_{NuGetSolverToolName}", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        SendTelemetryEvent(FixVulnerabilitiesWithCopilotErrorType.NuGetSolverNotAvailable);
+                        ShowWarningMessage(Resources.Error_NuGetSolverNotAvailable);
+                        return;
+                    }
+
                     CopilotRequest requestWithFunctionsAndContext = request.WithFunctions(functions).WithContext(context);
 
                     try