From 9f307b665359bcb40adbb1886a8c83505bcb3882 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <Tomas.Grosup@gmail.com>
Date: Fri, 4 Jul 2025 09:42:32 +0200
Subject: [PATCH 1/5] Stop auto servicing from main

---
 .config/service-branch-merge.json | 4 ----
 1 file changed, 4 deletions(-)

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"
         }
     }
 }

From 55166fe2527e29fc7fa87e3c7c33414d60514725 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <Tomas.Grosup@gmail.com>
Date: Fri, 4 Jul 2025 09:47:19 +0200
Subject: [PATCH 2/5] Update VS insertion mapping

---
 azure-pipelines.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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:

From e68c7aadfc16f6534ae5da57a7641709f777f3a6 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <Tomas.Grosup@gmail.com>
Date: Fri, 4 Jul 2025 12:21:19 +0200
Subject: [PATCH 3/5] Update Versions.props

---
 eng/Versions.props | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 0611637828d..a28bc35cc19 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,8 +9,10 @@
   </PropertyGroup>
   <!-- Version number computation -->
   <PropertyGroup>
-    <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
-    <!-- These have to be in sync with latest release branch -->
+    <!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
+         the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
+    <FSharpPreReleaseIteration>6</FSharpPreReleaseIteration>
+    <PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
     <!-- F# Version components -->
     <FSMajorVersion>10</FSMajorVersion>
     <FSMinorVersion>0</FSMinorVersion>

From a3f78c2a463f5cda6fa3ca4c31aca7389b19db53 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <Tomas.Grosup@gmail.com>
Date: Fri, 4 Jul 2025 12:21:35 +0200
Subject: [PATCH 4/5] Update Versions.props

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a28bc35cc19..9f5cf886a6a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   <PropertyGroup>
     <!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
          the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
-    <FSharpPreReleaseIteration>6</FSharpPreReleaseIteration>
+    <FSharpPreReleaseIteration>7</FSharpPreReleaseIteration>
     <PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
     <!-- F# Version components -->
     <FSMajorVersion>10</FSMajorVersion>

From 6fcaebca9608dde47aaaf43baca0988960905a3f Mon Sep 17 00:00:00 2001
From: Tomas Grosup <Tomas.Grosup@gmail.com>
Date: Fri, 4 Jul 2025 12:23:25 +0200
Subject: [PATCH 5/5] Update FSharp.Compiler.Service.fsproj

---
 src/Compiler/FSharp.Compiler.Service.fsproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 3953da89448..5db9b2e1b29 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -55,7 +55,6 @@
     <PackageDescription>The F# Compiler Services package for F# $(FSLanguageVersion) exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications.  Contains code from the F# Software Foundation.</PackageDescription>
     <PackageReleaseNotes>/blob/main/docs/release-notes/.FSharp.Compiler.Service/$(FSharpLibrariesChangelogVersion).md</PackageReleaseNotes>
     <PackageTags>F#, fsharp, interactive, compiler, editor</PackageTags>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PackageIconFullPath>$(MSBuildThisFileDirectory)logo.png</PackageIconFullPath>
   </PropertyGroup>