Merge branch 'main' into copilot/fix-unhandled-exception-getcompilecommands

Author: JanProvaznik

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.config/git-merge-flow-config.jsonc

@@ -26,8 +26,12 @@
         "vs17.14": {
             "MergeToBranch": "vs18.0"
         },
-        // MSBuild latest release to main
+        // Automate opening PRs to merge msbuild's vs18.0 (SDK 10.0.1xx) into vs18.3 (SDK 10.0.2xx, VS)
         "vs18.0": {
+            "MergeToBranch": "main" // update to flow through vs18.3 after we fork for release
+        },
+        // MSBuild latest release to main
+        "vs18.3": {
             "MergeToBranch": "main"
         }
     }

.opt-prof.yml

@@ -54,6 +54,7 @@ stages:
     name: OptProfProfilingWorkflow
     displayName: OptProf Profiling Workflow
     optOptimizationInputsDropName: $(OptimizationInputsDropName)
+    previousOptimizationInputsDropName: $(PreviousOptimizationInputsDropName)
     cloudBuildResourceName: ComponentBuildUnderTest
     testLabPoolName: VS-Platform # The test lab pool to run your tests in
     testMachineCleanUpStrategy: ${{parameters.testMachineCleanUpStrategy}}
@@ -93,3 +94,30 @@ stages:
         arguments: -BootstrapperInfoJsonURI '$(Pipeline.Workspace)\ComponentBuildUnderTest\MicroBuildOutputs\BootstrapperInfo.json' -VSBranch '$(VSBootstrapperBranch)' -OutVariableName 'VisualStudio.InstallationUnderTest.BootstrapperURL'
     preDeployAndRunTestsStepList:
     - download: ComponentBuildUnderTest
+    prePublishOptimizationInputsDropStepList:
+    - download: ComponentBuildUnderTest
+      artifact: VSSetup
+      patterns: '**\Metadata.json'
+      displayName: Download Optprof Metadata # to determine LKG data source
+    - powershell: |
+        try {
+          $metadataPath = Get-ChildItem -Path '$(Pipeline.Workspace)\ComponentBuildUnderTest\VSSetup' -Filter 'Metadata.json' -Recurse -ErrorAction Stop | Select-Object -First 1
+          if (-not $metadataPath) {
+            throw "Metadata.json was not found under $(Pipeline.Workspace)\ComponentBuildUnderTest\VSSetup"
+          }
+
+          $metadata = Get-Content -Raw -Path $metadataPath.FullName | ConvertFrom-Json
+          $dropName = $metadata.OptimizationData
+          if ([string]::IsNullOrWhiteSpace($dropName)) {
+            throw 'Metadata.json did not include an OptimizationData value'
+          }
+
+          Write-Host "PreviousOptimizationInputsDropName: $dropName"
+          Set-AzurePipelinesVariable 'PreviousOptimizationInputsDropName' $dropName
+        }
+        catch {
+          Write-Host $_
+          Write-Error 'Failed to set PreviousOptimizationInputsDropName pipeline variable'
+          throw
+        }
+      displayName: Set PreviousOptimizationInputsDropName

.vsts-dotnet-ci.yml

@@ -533,11 +533,14 @@ jobs:
 - job: CodeCoverage
   displayName: "Code Coverage"
   dependsOn:
+  - IfOnlyDocumentionChanged
   - BootstrapMSBuildOnFullFrameworkWindows
   - BootstrapMSBuildOnCoreWindows
   - FullReleaseOnWindows
   - CoreBootstrappedOnLinux
   - CoreOnMac
+  variables:
+    onlyDocChanged: $[ dependencies.IfOnlyDocumentionChanged.outputs['SetIfOnlyDocumentionChangedVaribale.onlyDocChanged'] ]
   pool:
     vmImage: 'windows-2022'
   steps:
@@ -562,32 +565,36 @@ jobs:
       buildType: 'current'
       artifactName: 'LinuxCoreCoverage'
       targetPath: '$(Build.SourcesDirectory)/artifacts/TestResults/CoverageResults/LinuxCore'
+    condition: eq(variables.onlyDocChanged, 0)
   - task: DownloadPipelineArtifact@2
     inputs:
       buildType: 'current'
       artifactName: 'MacCoreCoverage'
       targetPath: '$(Build.SourcesDirectory)/artifacts/TestResults/CoverageResults/MacCore'
+    condition: eq(variables.onlyDocChanged, 0)
 
   - task: PowerShell@2
     displayName: Process coverage reports
     inputs:
       filePath: $(Build.SourcesDirectory)\eng\process-coverage.ps1
       arguments: -repoRoot $(Build.SourcesDirectory) -coverageArtifactsDir $(Build.SourcesDirectory)/artifacts/CoverageResults
       pwsh: true
+    condition: eq(variables.onlyDocChanged, 0)
   - task: PublishBuildArtifacts@1
     displayName: Publish Artifact $(Build.BuildNumber) Coverage
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)/artifacts/CoverageResults/merged.coverage'
       ArtifactName: '$(Build.BuildNumber) Coverage'
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables.onlyDocChanged, 0))
   - task: PublishBuildArtifacts@1
     displayName: Publish Artifact $(Build.BuildNumber) Cobertura
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)/artifacts/CoverageResults/merged.cobertura.xml'
       ArtifactName: '$(Build.BuildNumber) Cobertura'
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables.onlyDocChanged, 0))
   - task: PublishCodeCoverageResults@2
     inputs:
       summaryFileLocation: '$(Build.SourcesDirectory)/artifacts/CoverageResults/merged.coverage'
       pathToSources: $(Build.SourcesDirectory)
+    condition: eq(variables.onlyDocChanged, 0)
 - template: /eng/common/templates/jobs/source-build.yml

.vsts-dotnet.yml

@@ -49,7 +49,7 @@ variables:
     - name: SkipApplyOptimizationData
       value: true
   - name: EnableReleaseOneLocBuild
-    value: true # Enable loc for vs18.1
+    value: true
   - name: Codeql.Enabled
     value: true
   - group: DotNet-MSBuild-SDLValidation-Params
@@ -122,6 +122,7 @@ extends:
 
     - stage: build
       displayName: Build
+      dependsOn: [] # empty dependency list to enable parallelization with localization stage
       jobs:
       - template: /azure-pipelines/.vsts-dotnet-build-jobs.yml@self
         parameters:

Directory.Build.props

@@ -84,10 +84,6 @@ ates https://learn.microsoft.com/en-gb/dotnet/fundamentals/syslib-diagnostics/sy
 
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
 
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <DirectoryPackagesPropsPath>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', 'eng', 'Packages.props'))</DirectoryPackagesPropsPath>
-
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
   </PropertyGroup>
 

Directory.Build.targets

@@ -18,8 +18,7 @@
   </ItemGroup>
 
   <!-- Global Analyzer Config -->
-  <ItemGroup Condition="'$(ProjectIsDeprecated)' != 'true'">
-    <!-- Include Common.globalconfig for non-deprecated projects-->
+  <ItemGroup>
     <EditorConfigFiles Include="$(MSBuildThisFileDirectory)eng/Common.globalconfig" />
   </ItemGroup>
 

eng/Packages.props Directory.Packages.propseng/Packages.props renamed to Directory.Packages.props

@@ -1,7 +1,13 @@
 <Project>
+
   <!-- Import references updated by Dependabot.
        This file is for package references updated manually or by Darc/Maestro. -->
-  <Import Project="dependabot\Packages.props" />
+  <Import Project="$(RepositoryEngineeringDir)dependabot\Directory.Packages.props" />
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally Condition="'$(ManagePackageVersionsCentrally)' == ''">true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled Condition="'$(CentralPackageTransitivePinningEnabled)' == ''">true</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
 
   <!--
     Make sure to update the binding redirects (in src\MSBuild\app.config and src\MSBuild\app.amd64.config) for any changes to
@@ -43,6 +49,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.Collector" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.OpenTelemetry.ClientExtensions" Version="$(MicrosoftVisualStudioOpenTelemetryVersion)" />
 
-    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
+    <!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Directory.Packages.props -->
   </ItemGroup>
+
 </Project>

azure-pipelines/vs-insertion-experimental.yml

@@ -179,7 +179,7 @@ extends:
             DefaultConfigValues: $(InsertConfigValues)
             InsertionReviewers: MSBuild
             CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
-            InsertionBuildPolicy: Request Perf DDRITs
+            InsertionBuildPolicies: 'Request Perf DDRITs'
             ConnectedVSDropServiceName: 'VSEng-VSDrop-MI'
           env:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)

azure-pipelines/vs-insertion.yml

@@ -270,19 +270,6 @@ extends:
             nuGetFeedType: internal
             publishVstsFeed: VS
             allowPackageConflicts: false
-        - template: /azure-pipelines/WIFtoPATauth.yml@self
-          parameters:
-            wifServiceConnectionName: azure-public/vside package push
-            deadPATServiceConnectionId: 42175e93-c771-4a4f-a132-3cca78f44b3b
-        - task: 1ES.PublishNuGet@1
-          condition: ${{ eq(parameters.SkipUploadingPackages, false) }}
-          displayName: 'Push MSBuild packages to VSSDK'
-          inputs:
-            packageParentPath: '$(Build.ArtifactStagingDirectory)'
-            packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern)
-            nuGetFeedType: external
-            publishFeedCredentials: azure-public/vssdk
-            allowPackageConflicts: false
         - task: PowerShell@2
           name: PrintTargetBranch
           inputs:
@@ -306,7 +293,7 @@ extends:
             CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
             AutoCompletePR: $(AutoCompleteEnabled)
             AutoCompleteMergeStrategy: Squash
-            InsertionBuildPolicy: Request Perf DDRITs
+            InsertionBuildPolicies: 'Request Perf DDRITs'
             ConnectedVSDropServiceName: 'VSEng-VSDrop-MI'
           env:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)