Merge main to features/MoveStaticMembers

azure-pipelines-official.yml

@@ -309,75 +309,19 @@ stages:
     pool:
       vmImage: windows-2019
     steps:
-    - checkout: none
-
-    - task: NuGetCommand@2
-      displayName: 'Install RIT from Azure Artifacts'
-      inputs:
-        command: custom
-        arguments: 'install RoslynTools.VisualStudioInsertionTool -PreRelease -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
-
     - powershell: |
-        $response = Invoke-RestMethod -Headers @{Authorization = "Bearer $(System.AccessToken)"} "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
         $branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
-        $branchData = $response.branches.$branchName
-        if (!$branchData)
-        {
-          Write-Host "No PublishData found for branch '$branchName'. Using PublishData for branch 'main'."
-          $branchData = $response.branches.main
-        }
-        if ($null -ne $branchData.insertionCreateDraftPR)
-        {
-          Write-Host "##vso[task.setvariable variable=Insertion.CreateDraftPR]$($branchData.insertionCreateDraftPR)"
-        }
-        if ($null -ne $branchData.insertionTitlePrefix)
-        {
-          Write-Host "##vso[task.setvariable variable=Insertion.TitlePrefix]$($branchData.insertionTitlePrefix)"
-        }
-        if ($null -ne $branchData.insertToolset)
-        {
-          Write-Host "##vso[task.setvariable variable=Insertion.InsertToolset]$($branchData.insertToolset)"
-        }
-
-        Write-Host "##vso[task.setvariable variable=Insertion.AutoComplete]$(-not $branchData.insertionCreateDraftPR)"
         Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"
-        Write-Host "##vso[task.setvariable variable=VSBranchName]$($branchData.vsBranch)"
-      displayName: Set Insertion Variables
+      displayName: Get Branch Name
 
-    - powershell: |
-        mv RoslynTools.VisualStudioInsertionTool.* RIT
-        .\RIT\tools\OneOffInsertion.ps1 `
-          -autoComplete "$(Insertion.AutoComplete)" `
-          -buildQueueName "$(Build.DefinitionName)" `
-          -cherryPick "(default)" `
-          -clientId "$(ClientId)" `
-          -clientSecret "$(ClientSecret)" `
-          -componentAzdoUri "$(System.CollectionUri)" `
-          -componentBranchName "$(ComponentBranchName)" `
-          -componentGitHubRepoName "dotnet/roslyn" `
-          -componentName "Roslyn" `
-          -componentProjectName "internal" `
-          -createDraftPR "$(Insertion.CreateDraftPR)" `
-          -defaultValueSentinel "(default)" `
-          -dropPath "(default)" `
-          -insertCore "(default)" `
-          -insertDevDiv "(default)" `
-          -insertionCount "1" `
-          -insertToolset "$(Insertion.InsertToolset)" `
-          -titlePrefix "$(Insertion.TitlePrefix)" `
-          -titleSuffix "$(Insertion.TitleSuffix)" `
-          -queueValidation "true" `
-          -requiredValueSentinel "REQUIRED" `
-          -reviewerGUID "6c25b447-1d90-4840-8fde-d8b22cb8733e" `
-          -specificBuild "$(Build.BuildNumber)" `
-          -updateAssemblyVersions "(default)" `
-          -updateCoreXTLibraries "(default)" `
-          -visualStudioBranchName "$(VSBranchName)" `
-          -writePullRequest "prid.txt" `
-      displayName: 'Run OneOffInsertion.ps1'
-
-    - script: 'echo. && echo. && type "prid.txt" && echo. && echo.'
-      displayName: 'Report PR URL'
+    - template: eng/pipelines/insert.yml
+      parameters:
+        clientId: $(ClientId)
+        clientSecret: $(ClientSecret)
+        componentBuildProjectName: internal
+        sourceBranch: "$(ComponentBranchName)"
+        publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
+        publishDataAccessToken: "$(System.AccessToken)"
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml

azure-pipelines-pr-validation.yml

@@ -13,6 +13,15 @@ parameters:
   type: number
 - name: CommitSHA
   type: string
+- name: VisualStudioBranchName
+  type: string
+  default: default
+- name: OptionalTitlePrefix
+  type: string
+  default: '[PR Validation]'
+- name: InsertToolset
+  type: boolean
+  default: true
 
 # The variables `_DotNetArtifactsCategory` and `_DotNetValidationArtifactsCategory` are required for proper publishing of build artifacts. See https://github.com/dotnet/roslyn/pull/38259
 variables:
@@ -125,6 +134,7 @@ stages:
                    /p:DotnetPublishUsingPipelines=false
                    /p:IgnoreIbcMergeErrors=true
                    /p:PreReleaseVersionLabel=pr-validation
+                   /p:IgnoreIbcMergeErrors=true
       condition: succeeded()
 
     # Publish OptProf generated JSON files as a build artifact. This allows for easy inspection from
@@ -195,3 +205,31 @@ stages:
     - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
       displayName: Perform Cleanup Tasks
       condition: succeededOrFailed()
+
+- stage: insert
+  displayName: Create Insertion
+  dependsOn:
+    - build
+
+  jobs:
+  - job: insert
+    displayName: Insert to VS
+    pool:
+      vmImage: windows-2019
+    steps:
+    - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
+      displayName: Setting SourceBranchName variable
+      condition: succeeded()
+
+    - template: eng/pipelines/insert.yml
+      parameters:
+        createDraftPR: true
+        autoComplete: false
+        insertToolset: ${{ parameters.InsertToolset }}
+        clientId: $(ClientId)
+        clientSecret: $(ClientSecret)
+        vsBranchName: ${{ parameters.VisualStudioBranchName }}
+        titlePrefix: ${{ parameters.OptionalTitlePrefix }}
+        sourceBranch: $(SourceBranchName)
+        publishDataURI: "https://raw.githubusercontent.com/dotnet/roslyn/main/eng/config/PublishData.json"
+

eng/Tools.props

@@ -8,6 +8,7 @@
       See https://github.com/dotnet/arcade/issues/7205
     -->
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
+    <PackageReference Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
   </ItemGroup>
 
 </Project>

eng/Version.Details.xml

@@ -6,25 +6,25 @@
       <Sha>7e80445ee82adbf9a8e6ae601ac5e239d982afaa</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21377.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21379.1">
       <Uri>https://github.com/dotnet/source-build</Uri>
-      <Sha>3855598428e676010315576808fcca0a29363cfc</Sha>
+      <Sha>088128e88da570109769253bac46f044dcb43370</Sha>
       <SourceBuild RepoName="source-build" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21377.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21378.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cab4a3c50fd042677ea17cfc5171b4ce8b29930f</Sha>
+      <Sha>dd3652e2ae5ea89703a2286295de9efe908974f1</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-3.21373.8">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>5f124755232afa7b9903d6bdfcaeb47f39c8838e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21377.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21378.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cab4a3c50fd042677ea17cfc5171b4ce8b29930f</Sha>
+      <Sha>dd3652e2ae5ea89703a2286295de9efe908974f1</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -90,7 +90,6 @@
     <MicrosoftDiaSymReaderConverterXmlVersion>1.1.0-beta2-20115-01</MicrosoftDiaSymReaderConverterXmlVersion>
     <MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
     <MicrosoftDiaSymReaderPortablePdbVersion>1.5.0</MicrosoftDiaSymReaderPortablePdbVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21319.2</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftExtensionsLoggingVersion>5.0.0</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>5.0.0</MicrosoftExtensionsLoggingConsoleVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>

eng/common/internal/Tools.csproj

@@ -1,5 +1,5 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>

eng/pipelines/insert.yml

@@ -0,0 +1,178 @@
+parameters:
+  # These are actually booleans but must be defined as string.
+  # Parameters are evaluated at compile time, but all variables are strings at compile time.
+  # So in order to pass a parameter that comes from a variable these must be typed as string.
+  - name: createDraftPR
+    type: string
+    default: ''
+  - name: autoComplete
+    type: string
+    default: ''
+  - name: insertToolset
+    type: string
+    default: ''
+
+  - name: clientId
+    type: string
+  - name: clientSecret
+    type: string
+  - name: publishDataURI
+    type: string
+  - name: publishDataAccessToken
+    type: string
+    default: ''
+
+  - name: vsBranchName
+    type: string
+    default: ''
+  - name: componentBuildProjectName
+    type: string
+    default: ''
+  - name: titlePrefix
+    type: string
+    default: ''
+
+  - name: sourceBranch
+    type: string
+
+steps:
+  - checkout: none
+
+  - task: NuGetCommand@2
+    displayName: 'Install RIT from Azure Artifacts'
+    inputs:
+      command: custom
+      arguments: 'install RoslynTools.VisualStudioInsertionTool -PreRelease -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
+
+  - powershell: |
+      $authorization = if ("" -ne $Env:PublishDataAccessToken) { "Bearer $Env:PublishDataAccessToken" } else { "" }
+      $response = Invoke-RestMethod -Headers @{Authorization = $authorization} "${{ parameters.publishDataURI }}"
+      $branchName = "${{ parameters.sourceBranch }}"
+      $branchData = $response.branches.$branchName
+      if (!$branchData)
+      {
+        Write-Host "No PublishData found for branch '$branchName'. Using PublishData for branch 'main'."
+        $branchData = $response.branches.main
+      }
+
+      # Set our template variables to reasonable defaults
+      Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$($true)"
+      Write-Host "##vso[task.setvariable variable=Template.AutoComplete]$($false)"
+      Write-Host "##vso[task.setvariable variable=Template.TitlePrefix]$('')"
+      Write-Host "##vso[task.setvariable variable=Template.TitleSuffix]$('[Skip-SymbolCheck]')"
+      Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($true)"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('')"
+      Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$('')"
+
+      Write-Host "##vso[task.setvariable variable=Template.ComponentBranchName]$branchName"
+      Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$($branchData.vsBranch)"
+
+      # Overwrite the default template variables with the values from PublishData for this sourceBranch
+      if ($null -ne $branchData.insertionCreateDraftPR)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$($branchData.insertionCreateDraftPR)"
+      }
+
+      if ($null -ne $branchData.insertionCreateDraftPR)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.AutoComplete]$(-not $branchData.insertionCreateDraftPR)"
+      }
+
+      if ($null -ne $branchData.insertionTitlePrefix)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.TitlePrefix]$($branchData.insertionTitlePrefix)"
+      }
+
+      if ($null -ne $branchData.insertToolset)
+      {
+        Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($branchData.insertToolset)"
+      }
+
+    displayName: Set Variables from PublishData
+    env:
+      PublishDataAccessToken: ${{ parameters.publishDataAccessToken }}
+
+  - powershell: |
+      # Overwrite template variables with values passed into this template as parameters
+      if ("" -ne $Env:CreateDraftPR)
+      {
+        Write-Host "Setting CreateDraftPR to $Env:CreateDraftPR"
+        Write-Host "##vso[task.setvariable variable=Template.CreateDraftPR]$Env:CreateDraftPR"
+      }
+
+      if ("" -ne $Env:AutoComplete)
+      {
+        Write-Host "Setting AutoComplete to $Env:AutoComplete"
+        Write-Host "##vso[task.setvariable variable=Template.AutoComplete]$Env:AutoComplete"
+      }
+
+      if ("" -ne $Env:TitlePrefix)
+      {
+        Write-Host "Setting TitlePrefix to $Env:TitlePrefix"
+        Write-Host "##vso[task.setvariable variable=Template.TitlePrefix]$Env:TitlePrefix"
+      }
+
+      if ("" -ne $Env:InsertToolset)
+      {
+        Write-Host "Setting InsertToolset to $Env:InsertToolset"
+        Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$Env:InsertToolset"
+      }
+
+      # Workaround for pipeline parameters not supporting optional empty parameters.
+      if ("" -ne $Env:VSBranchName -and "default" -ne $Env:VSBranchName)
+      {
+        Write-Host "Setting VSBranchName to $Env:VSBranchName"
+        Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$Env:VSBranchName"
+      }
+
+      if ("" -ne $Env:ComponentBuildProjectName)
+      {
+        Write-Host "Setting component Azdo parameters $('$(System.CollectionUri)') and $Env:ComponentBuildProjectName"
+        Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('$(System.CollectionUri)')"
+        Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$Env:ComponentBuildProjectName"
+      }
+
+    displayName: Set Variables from Input Parameters
+    env:
+      CreateDraftPR: ${{ parameters.createDraftPR }}
+      AutoComplete: ${{ parameters.autoComplete }}
+      TitlePrefix: ${{ parameters.titlePrefix }}
+      InsertToolset: ${{ parameters.insertToolset }}
+      VSBranchName: ${{ parameters.vsBranchName }}
+      ComponentBuildProjectName: ${{ parameters.componentBuildProjectName }}
+
+  # Now that everything is set, actually perform the insertion.
+  - powershell: |
+      mv RoslynTools.VisualStudioInsertionTool.* RIT
+      .\RIT\tools\OneOffInsertion.ps1 `
+        -autoComplete "$(Template.AutoComplete)" `
+        -buildQueueName "$(Build.DefinitionName)" `
+        -cherryPick "(default)" `
+        -clientId "${{ parameters.clientId }}" `
+        -clientSecret "${{ parameters.clientSecret }}" `
+        -componentAzdoUri "$(Template.ComponentAzdoUri)" `
+        -componentProjectName "$(Template.ComponentProjectName)" `
+        -componentName "Roslyn" `
+        -componentGitHubRepoName "dotnet/roslyn" `
+        -componentBranchName "$(Template.ComponentBranchName)" `
+        -createDraftPR "$(Template.CreateDraftPR)" `
+        -defaultValueSentinel "(default)" `
+        -dropPath "(default)" `
+        -insertCore "(default)" `
+        -insertDevDiv "(default)" `
+        -insertionCount "1" `
+        -insertToolset "$(Template.InsertToolset)" `
+        -titlePrefix "$(Template.TitlePrefix)" `
+        -titleSuffix "$(Template.TitleSuffix)" `
+        -queueValidation "true" `
+        -requiredValueSentinel "REQUIRED" `
+        -reviewerGUID "6c25b447-1d90-4840-8fde-d8b22cb8733e" `
+        -specificBuild "$(Build.BuildNumber)" `
+        -updateAssemblyVersions "(default)" `
+        -updateCoreXTLibraries "(default)" `
+        -visualStudioBranchName "$(Template.VSBranchName)" `
+        -writePullRequest "prid.txt" `
+    displayName: 'Run OneOffInsertion.ps1'
+
+  - script: 'echo. && echo. && type "prid.txt" && echo. && echo.'
+    displayName: 'Report PR URL'

global.json

@@ -10,7 +10,7 @@
     "xcopy-msbuild": "16.10.0-preview2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21377.2",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21377.2"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21378.2",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2"
   }
 }