Merge main

.github/policies/resourceManagement.yml

@@ -277,34 +277,6 @@ configuration:
       then:
       - closeIssue
 
-    - description: Add "untriaged" label on new issues
-      triggerOnOwnActions: false
-      if:
-      - payloadType: Issues
-      - not:
-          hasLabel:
-            label: untriaged
-      - and:
-          - isAction:
-              action: Opened
-      then:
-      - addLabel:
-          label: untriaged
-
-    - description: Remove "untriaged" label from issues when closed or added to a milestone
-      triggerOnOwnActions: false
-      if:
-      - payloadType: Issues
-      - or:
-        - isAction:
-            action: Closed
-        - isPartOfAnyMilestone
-      - hasLabel:
-          label: untriaged
-      then:
-      - removeLabel:
-          label: untriaged
-
     - description: Add breaking change doc instructions to issue
       if:
       - payloadType: Issues

NuGet.config

@@ -9,8 +9,6 @@
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <!-- We need dotnet7-transport because we depend on Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers (>= 3.3.4-beta1.22504.1) -->
     <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
-    <!-- We need dotnet8 because we depend on Microsoft.CodeAnalysis.NetAnalyzers (>= 8.0.0-preview.23468.1) -->
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <!-- We need dotnet9 because we depend on Roslyn.Diagnostics.Analyzers (>= 3.11.0-beta1.24081.1)-->
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />

Roslyn.sln

@@ -727,6 +727,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks.CodeA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.BuildClient.Package", "src\NuGet\Microsoft.CodeAnalysis.BuildClient.Package\Microsoft.CodeAnalysis.BuildClient.Package.csproj", "{5E4F7448-B00B-4F5B-859F-6ED0354253D5}"
 EndProject
+Project("{9a19103f-16f7-4668-be54-9a1e7a4f7556}") = "Microsoft.CodeAnalysis.SemanticSearch.Extensions", "src\Tools\SemanticSearch\Extensions\Microsoft.CodeAnalysis.SemanticSearch.Extensions.csproj", "{66C8265C-2C79-F259-9807-3E97CA586F1E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1797,6 +1799,10 @@ Global
 		{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66C8265C-2C79-F259-9807-3E97CA586F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66C8265C-2C79-F259-9807-3E97CA586F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66C8265C-2C79-F259-9807-3E97CA586F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66C8265C-2C79-F259-9807-3E97CA586F1E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2137,6 +2143,7 @@ Global
 		{91F9EAA4-ACA2-87EE-868E-6CC3B73D6A11} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
 		{5399BBCC-417F-C710-46DE-EB0C0074C34D} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
 		{5E4F7448-B00B-4F5B-859F-6ED0354253D5} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
+		{66C8265C-2C79-F259-9807-3E97CA586F1E} = {52ABB0E4-C3A1-4897-B51B-18EDA83F5D20}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}

azure-pipelines-pr-validation.yml

@@ -153,12 +153,14 @@ extends:
           displayName: Disable Real-time Monitoring
 
         - task: Powershell@2
+          name: SetOriginalBuildNumber
           displayName: Setting OriginalBuildNumber variable
           condition: succeeded()
           inputs:
             targetType: inline
             script: |
               $originalBuildNumber = "$(Build.BuildNumber)".Split(' - ')[0]
+              Write-Host "##vso[task.setvariable variable=OutputOriginalBuildNumber;isoutput=true;isreadonly=true]$originalBuildNumber"
               Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isreadonly=true]$originalBuildNumber"
 
         - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName;isreadonly=true]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
@@ -326,12 +328,20 @@ extends:
       - job: insert
         variables:
           FancyBuildNumber: $[stageDependencies.build.PRValidationBuild.outputs['FancyBuild.BuildNumber']]
+          OriginalBuildNumber: $[stageDependencies.build.PRValidationBuild.outputs['SetOriginalBuildNumber.OutputOriginalBuildNumber']]
         displayName: Insert to VS
         pool:
           name: VSEngSS-MicroBuild2022-1ES
         steps:
         - download: current
           artifact: VSSetup
+
+        # RIT looks at the build number and cannot handle the fancy build version.
+        # While in normal scenarios this is already set to the original number, we reset it again here in case this is a re-run.
+        - powershell: Write-Host "##vso[build.updatebuildnumber]$(OriginalBuildNumber)"
+          displayName: Reset BuildNumber
+          condition: succeeded()
+
         - powershell: |
             $branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
             Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"

docs/features/incremental-generators.md

@@ -1022,11 +1022,11 @@ The generator would run select1 on the first and second files, producing
 select for the third file, as the input has not changed. It can just use the
 previously cached value.
 
-AdditionalText               | Select1        | Select2
------------------------------|----------------|-----------
-**Text{ Path: "diff.txt" }** | **"diff.txt"** |
-**Text{ Path: "def.txt" }**  | **"def.txt"**  |
-Text{ Path: "ghi.txt" }      | "ghi.txt"      |
+AdditionalText               | Select1              | Select2
+-----------------------------|----------------------|-----------
+**Text{ Path: "diff.txt" }** | **"diff.txt"** (new) |
+**Text{ Path: "def.txt" }**  | **"def.txt"** (new)  |
+Text{ Path: "ghi.txt" }      | "ghi.txt"  (reuse)   |
 
 Next the driver would look to run Select2. It would operate on `"diff.txt"`
 producing `"prefix_diff.txt"`, but when it comes to `"def.txt"` it can observe
@@ -1038,9 +1038,9 @@ it can just use the cached value from before. Similarly the cached state of
 
 AdditionalText               | Select1        | Select2
 -----------------------------|----------------|----------------------
-**Text{ Path: "diff.txt" }** | **"diff.txt"** | **"prefix_diff.txt"**
-**Text{ Path: "def.txt" }**  | **"def.txt"**  | "prefix_def.txt"
-Text{ Path: "ghi.txt" }      | "ghi.txt"      | "prefix_ghi.txt"
+**Text{ Path: "diff.txt" }** | **"diff.txt"** | **"prefix_diff.txt"** (new)
+**Text{ Path: "def.txt" }**  | **"def.txt"**  | "prefix_def.txt" (reuse)
+Text{ Path: "ghi.txt" }      | "ghi.txt"      | "prefix_ghi.txt" (reuse)
 
 In this way, only changes that are consequential flow through the pipeline, and
 duplicate work is avoided. If a generator only relies on `AdditionalTexts` then

eng/Directory.Packages.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <!-- Versions used by several individual references below -->
     <RoslynDiagnosticsNugetPackageVersion>3.11.0-beta1.24081.1</RoslynDiagnosticsNugetPackageVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23468.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.3-beta1.24319.1</MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.796-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
     <_BasicReferenceAssembliesVersion>1.8.3</_BasicReferenceAssembliesVersion>
@@ -53,13 +52,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.8.1" />
 
     <!--
       Visual Studio
     -->
     <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.13.40008" />
-    <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.36524" />
+    <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.12.40391" />
     <PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.40008" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="17.12.2037-preview3" />
@@ -78,6 +77,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Search" Version="17.10.961-preview.2" />
     <PackageVersion Include="Microsoft.VisualStudio.WinForms.Interfaces" Version="17.0.0-previews-4-31709-430" />
     <PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.9.29-preview-0001" />
+    <PackageVersion Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" Version="18.0.533-alpha" />
     <PackageVersion Include="VsWebSite.Interop" Version="8.0.50727" />
     <PackageVersion Include="NuGet.VisualStudio" Version="6.0.0-preview.0.15" />
     <PackageVersion Include="NuGet.VisualStudio.Contracts" Version="6.0.0-preview.0.15" />
@@ -117,7 +117,7 @@
     <!--
       VS Debugger
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.Debugger.Contracts" Version="17.13.0-beta.25105.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Debugger.Contracts" Version="18.0.0-beta.25379.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Debugger.Engine-implementation" Version="17.13.1121201-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Debugger.Metadata-implementation" Version="17.13.1121201-preview" />
 
@@ -252,7 +252,7 @@
     <PackageVersion Include="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-22302-02" />
     <PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22302-02" />
     <PackageVersion Include="Microsoft.Metadata.Visualizer" Version="1.0.0-beta3.21075.2" />
-    <PackageVersion Include="Microsoft.ILVerification" Version="8.0.0-rtm.23523.3" />
+    <PackageVersion Include="Microsoft.ILVerification" Version="9.0.7" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Cache" Version="17.3.26-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.Diagnostics.Measurement" Version="17.9.36343-preview.3" />

eng/Signing.props

@@ -61,4 +61,13 @@
     <FileSignInfo Include="Microsoft.VisualStudio.Threading.dll" CertificateName="MicrosoftSHA2" />
     <FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
   </ItemGroup>
+
+  <!--
+    VS cloudbuild fails to restore when using test signed nuget packages due to certificate errors.
+    To avoid this issue, we sign the package contents, but skip signing the actual package file.
+  -->
+  <ItemGroup Condition="'$(PreReleaseVersionLabel)' == 'pr-validation' And '$(DotNetSignType)' == 'test'">
+    <FileExtensionSignInfo Update=".nupkg" CertificateName="None" />
+  </ItemGroup>
+
 </Project>