Skip to content

Commit

Permalink
Merge release/dev17.9 to main (#16516)
Browse files Browse the repository at this point in the history
* 17.9

* Update 17.9 to insert into VS main

* Update azure-pipelines.yml

* [main] Update dependencies from dnceng/internal/dotnet-optimization (#16104) (#16117)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update oneloc settings

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2336396

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2336396

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2336396

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2336396

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493 (#16451)

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

---------

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2350228 (#16505)

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2348599

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2348599

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2348599

* Update azure-pipelines.yml

---------

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
6 people authored Jan 12, 2024
1 parent 9464915 commit b0c2106
Show file tree
Hide file tree
Showing 53 changed files with 683 additions and 673 deletions.
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ stages:
# Signed build #
#-------------------------------------------------------------------------------------------------------------------#
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.8') }}:
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.9') }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
MirrorRepo: fsharp
MirrorBranch: release/dev17.8
MirrorBranch: release/dev17.9
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-FSHARP'
- template: /eng/common/templates/jobs/jobs.yml
Expand Down Expand Up @@ -806,8 +806,8 @@ stages:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng/release/insert-into-vs.yml
parameters:
componentBranchName: refs/heads/release/dev17.8
insertTargetBranch: main
componentBranchName: refs/heads/release/dev17.9
insertTargetBranch: rel/d17.9
insertTeamEmail: fsharpteam@microsoft.com
insertTeamName: 'F#'
completeInsertion: 'auto'
42 changes: 21 additions & 21 deletions src/Compiler/xlf/FSComp.txt.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b0c2106

Please sign in to comment.