diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ee79daa9ebf..1e5aaebbdf9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,13 +29,13 @@ variables: # 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. - name: FSharpReleaseBranchName - value: release/dev17.12 + value: release/dev17.13 # 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) - name: VSInsertionTargetBranchName - value: rel/d17.12 + value: main - name: _TeamName value: FSharp - name: TeamName @@ -88,7 +88,7 @@ extends: # Signed build # #-------------------------------------------------------------------------------------------------------------------# # Localization: we only run it for specific release branches - - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.12') }}: + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.13') }}: - template: /eng/common/templates-official/job/onelocbuild.yml@self parameters: MirrorRepo: fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 614ced1604c..d89aec3f3cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ $(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).* - 12 + 13 9 $(FSBuildVersion) $(FSRevisionVersion) @@ -53,7 +53,7 @@ 17 - 12 + 13 $(VSMajorVersion).0 $(VSMajorVersion).$(VSMinorVersion).0 $(VSAssemblyVersionPrefix).0