diff --git a/.config/service-branch-merge.json b/.config/service-branch-merge.json index ec35ec5bcb5..3b63f58b0cc 100644 --- a/.config/service-branch-merge.json +++ b/.config/service-branch-merge.json @@ -12,10 +12,6 @@ "release/dev17.14": { "MergeToBranch": "main", "ExtraSwitches": "-QuietComments" - }, - "main": { - "MergeToBranch": "release/dev18.0", - "ExtraSwitches": "-QuietComments" } } } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 73800a45424..800d86d9380 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,14 +26,12 @@ trigger: variables: # Release branch for F# - # Should be 'current' release branch name, i.e. 'release/dev17.10' in dotnet/fsharp/refs/heads/main, 'release/dev17.10' in dotnet/fsharp/refs/heads/release/dev17.10 and 'release/dev17.9' in dotnet/fsharp/refs/heads/release/dev17.9 - # Should **never** be 'main' in dotnet/fsharp/refs/heads/main, since it will start inserting to VS twice. + # The future "product" gets developed in main, so should be main in main. + # When servicing branch gets created, this should maintain the mapping between F# servicing and VS servicing branches - name: FSharpReleaseBranchName - value: release/dev18.0 + value: main # VS Insertion branch name (NOT the same as F# branch) - # Should be previous release branch or 'main' in 'main' and 'main' in release branch - # (since for all *new* release branches we insert into VS main and for all *previous* releases we insert into corresponding VS release), - # i.e. 'rel/d17.9' *or* 'main' in dotnet/fsharp/refs/heads/main and 'main' in F# dotnet/fsharp/refs/heads/release/dev17.10 (latest release branch) + # ( for main we insert into VS main and for all *previous* releases we insert into corresponding VS release), - name: VSInsertionTargetBranchName value: main - name: _TeamName @@ -87,7 +85,7 @@ extends: #-------------------------------------------------------------------------------------------------------------------# # Signed build # #-------------------------------------------------------------------------------------------------------------------# - # Localization: we only run it for specific release branches + # Localization: we only run it for main - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: - template: /eng/common/templates-official/job/onelocbuild.yml@self parameters: diff --git a/eng/Versions.props b/eng/Versions.props index e980929a585..e97929c9d4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 6 + 7 preview$(FSharpPreReleaseIteration)