diff --git a/.config/git-merge-flow-config.jsonc b/.config/git-merge-flow-config.jsonc index f1070da2f95..13efaeba878 100644 --- a/.config/git-merge-flow-config.jsonc +++ b/.config/git-merge-flow-config.jsonc @@ -28,9 +28,9 @@ }, // 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 + "MergeToBranch": "vs18.3" }, - // MSBuild latest release to main + // Automate opening PRs to merge msbuild's vs18.3 (SDK 10.0.2xx) into main "vs18.3": { "MergeToBranch": "main" } diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml index 10542091113..76f7ff3a5d1 100644 --- a/azure-pipelines/vs-insertion.yml +++ b/azure-pipelines/vs-insertion.yml @@ -44,6 +44,7 @@ parameters: values: - auto - main + - rel/d18.4 - rel/d18.3 - rel/d18.0 - rel/d17.14 @@ -67,7 +68,9 @@ parameters: variables: # `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS - name: AutoInsertTargetBranch - ${{ if eq(variables['Build.SourceBranchName'], 'vs18.3') }}: + ${{ if eq(variables['Build.SourceBranchName'], 'vs18.4') }}: + value: 'rel/d18.4' + ${{ elseif eq(variables['Build.SourceBranchName'], 'vs18.3') }}: value: 'rel/d18.3' ${{ elseif eq(variables['Build.SourceBranchName'], 'vs18.0') }}: value: 'rel/d18.0' diff --git a/eng/Versions.props b/eng/Versions.props index 74765ef67d5..fb60b6444c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ - 18.3.0 + 18.4.0 preview 18.0.2 15.1.0.0