Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
719f165
17.9
vzarytovskii Sep 25, 2023
91a38d7
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Sep 26, 2023
6b56124
Merge pull request #16043 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Sep 26, 2023
61e8df7
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Sep 26, 2023
21cc61a
Merge pull request #16046 from dotnet/merges/main-to-release/dev17.9
KevinRansom Sep 26, 2023
947f752
Update 17.9 to insert into VS main
vzarytovskii Oct 3, 2023
fece32b
Merge pull request #16069 from dotnet/vzarytovskii-patch-20
vzarytovskii Oct 4, 2023
709cbbf
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 4, 2023
39ef9ca
Merge pull request #16067 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Oct 4, 2023
9fbaf67
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Oct 9, 2023
b03dc17
Merge pull request #16060 from dotnet/merges/release/dev17.8-to-relea…
vzarytovskii Oct 9, 2023
9ef973f
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Oct 10, 2023
736b745
Merge pull request #16097 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 10, 2023
3dcfb9f
Update azure-pipelines.yml
vzarytovskii Oct 10, 2023
f278367
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Oct 10, 2023
8c92c8c
Merge pull request #16095 from dotnet/merges/release/dev17.8-to-relea…
vzarytovskii Oct 10, 2023
b7d70f3
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 10, 2023
09559b0
Merge pull request #16102 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Oct 11, 2023
70d93b9
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 11, 2023
a313643
Merge pull request #16108 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Oct 11, 2023
2b557d4
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Oct 11, 2023
9425665
Merge pull request #16113 from dotnet/merges/release/dev17.8-to-relea…
vzarytovskii Oct 11, 2023
a566917
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Oct 12, 2023
115cd1e
Merge pull request #16115 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 12, 2023
d6a7683
[main] Update dependencies from dnceng/internal/dotnet-optimization (…
dotnet-bot Oct 13, 2023
363643a
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Oct 13, 2023
d1de6a8
Merge pull request #16122 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Oct 16, 2023
5ce03a3
Merge pull request #16133 from dotnet/merges/release/dev17.8-to-relea…
vzarytovskii Oct 18, 2023
9b5f5e1
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 18, 2023
5797ab0
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
T-Gro Oct 19, 2023
f4388c6
Merge pull request #16131 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 19, 2023
ae936f0
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Oct 19, 2023
e4bf462
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Oct 19, 2023
0ddc4d6
Merge pull request #16144 from dotnet/merges/main-to-release/dev17.9
KevinRansom Oct 19, 2023
99a50c2
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Oct 23, 2023
507114e
Merge pull request #16148 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 23, 2023
aefc020
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 23, 2023
0c5e24d
Merge pull request #16158 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 23, 2023
adb8c7c
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
T-Gro Oct 23, 2023
41b05ce
Merge pull request #16142 from dotnet/merges/release/dev17.8-to-relea…
T-Gro Oct 23, 2023
b31209f
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
T-Gro Oct 24, 2023
e99017a
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Oct 24, 2023
23db43d
Merge pull request #16163 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 24, 2023
c2e72c4
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Oct 24, 2023
16220d3
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
KevinRansom Oct 24, 2023
9a84df1
Merge pull request #16162 from dotnet/merges/release/dev17.8-to-relea…
T-Gro Oct 24, 2023
50c35d7
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Oct 25, 2023
c040d25
Merge pull request #16165 from dotnet/merges/main-to-release/dev17.9
T-Gro Oct 25, 2023
bd98426
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 27, 2023
89add29
Merge pull request #16190 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Oct 30, 2023
7c7526b
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Oct 30, 2023
f15ab7b
Merge pull request #16202 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Oct 31, 2023
74f2a8c
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 1, 2023
72efd42
Merge pull request #16210 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 1, 2023
b103519
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 1, 2023
20a6513
Merge pull request #16215 from dotnet/merges/main-to-release/dev17.9
KevinRansom Nov 3, 2023
02cfab6
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Nov 3, 2023
18a78f9
Merge pull request #16223 from dotnet/merges/main-to-release/dev17.9
T-Gro Nov 6, 2023
e51eb51
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 6, 2023
03a9907
Merge pull request #16235 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 8, 2023
9337895
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 9, 2023
9b11cb3
Merge pull request #16243 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 9, 2023
2aba8f1
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 10, 2023
2050ecf
Merge pull request #16249 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 12, 2023
5227789
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 12, 2023
44766f5
Merge pull request #16263 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 12, 2023
10b59d6
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Nov 13, 2023
ad1a983
Merge pull request #16266 from dotnet/merges/release/dev17.8-to-relea…
vzarytovskii Nov 13, 2023
2e08aa6
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Nov 13, 2023
341b2fb
Merge pull request #16270 from dotnet/merges/release/dev17.8-to-relea…
KevinRansom Nov 13, 2023
9d61d43
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 20, 2023
e9491ad
Merge pull request #16273 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 20, 2023
50bae40
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 20, 2023
5a2ef93
Merge pull request #16310 from dotnet/merges/main-to-release/dev17.9
T-Gro Nov 24, 2023
284c1e9
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
T-Gro Nov 27, 2023
b88819c
Merge pull request #16337 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Nov 29, 2023
08a0ef3
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Nov 29, 2023
a0396b1
Merge pull request #16354 from dotnet/merges/main-to-release/dev17.9
KevinRansom Dec 1, 2023
31a072d
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 1, 2023
e9b9311
Merge pull request #16364 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 1, 2023
58f85b1
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 3, 2023
11a521c
Merge pull request #16365 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 4, 2023
327390c
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 4, 2023
dc5075a
Merge pull request #16374 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 4, 2023
74493d4
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Dec 4, 2023
a2aba5c
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
vzarytovskii Dec 4, 2023
de5c850
Merge pull request #16376 from dotnet/merges/main-to-release/dev17.9
T-Gro Dec 5, 2023
94cf4c5
Merge branch 'release/dev17.9' into merges/release/dev17.8-to-release…
T-Gro Dec 5, 2023
05bb885
Merge pull request #16381 from dotnet/merges/release/dev17.8-to-relea…
T-Gro Dec 5, 2023
2339932
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 5, 2023
d8e4ddf
Merge pull request #16386 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 5, 2023
07ea941
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 5, 2023
48b4a3b
Merge pull request #16388 from dotnet/merges/main-to-release/dev17.9
T-Gro Dec 6, 2023
fd38c78
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 7, 2023
a57b5e7
Merge pull request #16400 from dotnet/merges/main-to-release/dev17.9
T-Gro Dec 7, 2023
01a8ba5
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 7, 2023
e479cbe
Merge pull request #16405 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 8, 2023
f5a09cc
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 8, 2023
bb83216
Merge pull request #16412 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 11, 2023
eae9846
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 11, 2023
325e0af
Merge pull request #16420 from dotnet/merges/main-to-release/dev17.9
KevinRansom Dec 12, 2023
7761506
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Dec 13, 2023
e328bdd
Merge pull request #16426 from dotnet/merges/main-to-release/dev17.9
KevinRansom Dec 13, 2023
8f8bf8f
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Dec 13, 2023
2aefcec
Merge pull request #16433 from dotnet/merges/main-to-release/dev17.9
KevinRansom Dec 13, 2023
98f9308
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 14, 2023
a521e1c
Merge pull request #16437 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 14, 2023
4b6ed21
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
KevinRansom Dec 14, 2023
bdcfe3f
Merge pull request #16441 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 15, 2023
7aa5ff6
Update oneloc settings
vzarytovskii Dec 15, 2023
89ee99b
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Dec 15, 2023
9e4b22d
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Dec 15, 2023
e345621
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Dec 15, 2023
86bbbc1
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Dec 15, 2023
0c48954
Merge pull request #16444 from dotnet/locfiles/4a03a66f-0d31-42a7-b20…
vzarytovskii Dec 18, 2023
2440528
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Dec 22, 2023
ccdd09c
Merge pull request #16465 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Dec 22, 2023
050e753
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Dec 27, 2023
25470d5
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Jan 3, 2024
cc74185
Merge pull request #16486 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Jan 5, 2024
a414783
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Jan 5, 2024
55c2405
Merge pull request #16499 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Jan 9, 2024
70e5fbf
Merge branch 'release/dev17.9' into merges/main-to-release/dev17.9
vzarytovskii Jan 10, 2024
2e4dde8
Merge pull request #16506 from dotnet/merges/main-to-release/dev17.9
vzarytovskii Jan 10, 2024
4db7b21
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Jan 11, 2024
a797911
Update azure-pipelines.yml
vzarytovskii Jan 12, 2024
f5e71b8
Merge branch 'main' into merges/release/dev17.9-to-main
vzarytovskii Jan 12, 2024
4f88e7b
Merge branch 'main' into merges/release/dev17.9-to-main
vzarytovskii Jan 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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