diff --git a/azure-pipelines/vs-insertion-experimental.yml b/azure-pipelines/vs-insertion-experimental.yml index fe2a1134de5..6cbdac4eaa1 100644 --- a/azure-pipelines/vs-insertion-experimental.yml +++ b/azure-pipelines/vs-insertion-experimental.yml @@ -24,6 +24,7 @@ parameters: displayName: 'Insertion Target Branch (select for manual insertion)' values: - main + - rel/d18.0 - rel/d17.14 - rel/d17.13 - rel/d17.12 diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml index f4025af8cc2..94486895eb4 100644 --- a/azure-pipelines/vs-insertion.yml +++ b/azure-pipelines/vs-insertion.yml @@ -44,6 +44,7 @@ parameters: values: - auto - main + - rel/d18.0 - rel/d17.14 - rel/d17.13 - rel/d17.12 @@ -65,6 +66,8 @@ 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.0') }}: + value: 'rel/d18.0' ${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}: value: 'rel/d17.14' ${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}: diff --git a/eng/Versions.props b/eng/Versions.props index 8790c9acd9c..76fdff319f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,10 +3,10 @@ - 18.0.0 + 18.0.0release 17.14.8 15.1.0.0 - preview + servicing