Skip to content

Commit 70e5fbf

Browse files
authored
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
2 parents 2fa2bd4 + 55c2405 commit 70e5fbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+617
-607
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ stages:
8686
# Signed build #
8787
#-------------------------------------------------------------------------------------------------------------------#
8888
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
89-
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.8') }}:
89+
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.9') }}:
9090
- template: /eng/common/templates/job/onelocbuild.yml
9191
parameters:
9292
MirrorRepo: fsharp
93-
MirrorBranch: release/dev17.8
93+
MirrorBranch: release/dev17.9
9494
LclSource: lclFilesfromPackage
9595
LclPackageId: 'LCL-JUNO-PROD-FSHARP'
9696
- template: /eng/common/templates/jobs/jobs.yml
@@ -806,7 +806,7 @@ stages:
806806
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
807807
- template: eng/release/insert-into-vs.yml
808808
parameters:
809-
componentBranchName: refs/heads/release/dev17.8
809+
componentBranchName: refs/heads/release/dev17.9
810810
insertTargetBranch: main
811811
insertTeamEmail: [email protected]
812812
insertTeamName: 'F#'

src/Compiler/xlf/FSComp.txt.cs.xlf

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)