Skip to content

Commit 2c0c2d5

Browse files
committed
Merge branch 'main' into develop
One-time back-merge to ingest main's accumulated Dependabot/codegen squash-commits (#120, #123, #125, #127, #128, #129) into develop so the develop → main release PR (#131) can land as a clean merge-commit. From this point forward the new branching model takes effect: develop is forward-only and develop → main uses merge-commit (preserving develop's history on main as the second parent), eliminating the need for back-merges like this one. # Conflicts: # .github/workflows/build-release-task.yml # .github/workflows/merge-bot-pull-request.yml
2 parents 4ce4b87 + 9d8b94c commit 2c0c2d5

7 files changed

Lines changed: 298 additions & 60 deletions

File tree

Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project>
22
<ItemGroup>
33
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
4-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
5-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
6-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
7-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.202" />
4+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
5+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
6+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
7+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.203" />
88
<PackageVersion Include="Serilog" Version="4.3.1" />
99
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
1010
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
1111
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
1212
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
13-
<PackageVersion Include="System.CommandLine" Version="2.0.6" />
13+
<PackageVersion Include="System.CommandLine" Version="2.0.7" />
1414
<PackageVersion Include="xunit.analyzers" Version="1.27.0" />
1515
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
1616
<PackageVersion Include="xunit.v3" Version="3.2.2" />

LanguageData/iso6393

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ deh I L Dehwari
15321532
dei I L Demisa
15331533
del del del M L Delaware
15341534
dem I L Dem
1535-
den den den M L Slave (Athapascan)
1535+
den den den M L Slavey
15361536
dep I E Pidgin Delaware
15371537
deq I L Dendi (Central African Republic)
15381538
der I L Deori
@@ -2617,7 +2617,7 @@ imr I L Imroing
26172617
ims I H Marsian
26182618
imt I L Imotong
26192619
imy I H Milyan
2620-
ina ina ina ia I C Interlingua (International Auxiliary Language Association)
2620+
ina ina ina ia I C Interlingua (IALA)
26212621
inb I L Inga
26222622
ind ind ind id I L Indonesian
26232623
ing I L Degexit'an
@@ -2662,7 +2662,7 @@ isn I L Isanzu
26622662
iso I L Isoko
26632663
isr I L Israeli Sign Language
26642664
ist I L Istriot
2665-
isu I L Isu (Menchum Division)
2665+
isu I L Isu
26662666
isv I C Interslavic
26672667
ita ita ita it I L Italian
26682668
itb I L Binongan Itneg
@@ -3070,7 +3070,7 @@ kjk I L Highland Konjo
30703070
kjl I L Western Parbate Kham
30713071
kjm I L Kháng
30723072
kjn I L Kunjen
3073-
kjo I L Harijan Kinnauri
3073+
kjo I L Kinnauri Pahari
30743074
kjp I L Pwo Eastern Karen
30753075
kjq I L Western Keres
30763076
kjr I L Kurudu
@@ -3349,7 +3349,7 @@ kup I L Kunimaipa
33493349
kuq I L Karipuna
33503350
kur kur kur ku M L Kurdish
33513351
kus I L Kusaal
3352-
kut kut kut I L Kutenai
3352+
kut kut kut I L Ktunaxa
33533353
kuu I L Upper Kuskokwim
33543354
kuv I L Kur
33553355
kuw I L Kpagua
@@ -3903,7 +3903,7 @@ mcy I L South Watut
39033903
mcz I L Mawan
39043904
mda I L Mada (Nigeria)
39053905
mdb I L Morigi
3906-
mdc I L Male (Papua New Guinea)
3906+
mdc I L Soq
39073907
mdd I L Mbum
39083908
mde I L Maba (Chad)
39093909
mdf mdf mdf I L Moksha
@@ -3924,7 +3924,7 @@ mdu I L Mboko
39243924
mdv I L Santa Lucía Monteverde Mixtec
39253925
mdw I L Mbosi
39263926
mdx I L Dizin
3927-
mdy I L Male (Ethiopia)
3927+
mdy I L Male
39283928
mdz I L Suruí Do Pará
39293929
mea I L Menka
39303930
meb I L Ikobi
@@ -6066,7 +6066,7 @@ sro I L Campidanese Sardinian
60666066
srp srp srp sr I L Serbian
60676067
srq I L Sirionó
60686068
srr srr srr I L Serer
6069-
srs I L Sarsi
6069+
srs I L Tsuut'ina
60706070
srt I L Sauri
60716071
sru I L Suruí
60726072
srv I L Southern Sorsoganon
@@ -6209,7 +6209,7 @@ szl I L Silesian
62096209
szn I L Sula
62106210
szp I L Suabo
62116211
szs I L Solomon Islands Sign Language
6212-
szv I L Isu (Fako Division)
6212+
szv I L Isubu
62136213
szw I L Sawai
62146214
szy I L Sakizaya
62156215
taa I L Lower Tanana
@@ -6658,6 +6658,7 @@ tuz I L Turka
66586658
tva I L Vaghua
66596659
tvd I L Tsuvadi
66606660
tve I L Te'un
6661+
tvg I E Tugunese
66616662
tvi I L Tulai
66626663
tvk I L Southeast Ambrym
66636664
tvl tvl tvl I L Tuvalu
@@ -6963,7 +6964,7 @@ vun I L Vunjo
69636964
vut I L Vute
69646965
vwa I L Awa (China)
69656966
waa I L Walla Walla
6966-
wab I L Wab
6967+
wab I L Yote
69676968
wac I E Wasco-Wishram
69686969
wad I L Wamesa
69696970
wae I L Walser
@@ -7606,7 +7607,7 @@ ykk I L Yakaikeke
76067607
ykl I L Khlula
76077608
ykm I L Kap
76087609
ykn I L Kua-nsi
7609-
yko I L Yasa
7610+
yko I L Iyasa
76107611
ykr I L Yekora
76117612
ykt I L Kathu
76127613
yku I L Kuamasi
@@ -7793,6 +7794,7 @@ zha zha zha za M L Zhuang
77937794
zhb I L Zhaba
77947795
zhd I L Dai Zhuang
77957796
zhi I L Zhire
7797+
zhk I L Kurdish Sign Language
77967798
zhn I L Nong Zhuang
77977799
zho chi zho zh M L Chinese
77987800
zhw I L Zhoa

LanguageData/iso6393.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9398,7 +9398,7 @@
93989398
"Part2T": "den",
93999399
"Scope": "M",
94009400
"LanguageType": "L",
9401-
"RefName": "Slave (Athapascan)"
9401+
"RefName": "Slavey"
94029402
},
94039403
{
94049404
"Id": "dep",
@@ -16111,7 +16111,7 @@
1611116111
"Part1": "ia",
1611216112
"Scope": "I",
1611316113
"LanguageType": "C",
16114-
"RefName": "Interlingua (International Auxiliary Language Association)"
16114+
"RefName": "Interlingua (IALA)"
1611516115
},
1611616116
{
1611716117
"Id": "inb",
@@ -16392,7 +16392,7 @@
1639216392
"Id": "isu",
1639316393
"Scope": "I",
1639416394
"LanguageType": "L",
16395-
"RefName": "Isu (Menchum Division)"
16395+
"RefName": "Isu"
1639616396
},
1639716397
{
1639816398
"Id": "isv",
@@ -18901,7 +18901,7 @@
1890118901
"Id": "kjo",
1890218902
"Scope": "I",
1890318903
"LanguageType": "L",
18904-
"RefName": "Harijan Kinnauri"
18904+
"RefName": "Kinnauri Pahari"
1890518905
},
1890618906
{
1890718907
"Id": "kjp",
@@ -20608,7 +20608,7 @@
2060820608
"Part2T": "kut",
2060920609
"Scope": "I",
2061020610
"LanguageType": "L",
20611-
"RefName": "Kutenai"
20611+
"RefName": "Ktunaxa"
2061220612
},
2061320613
{
2061420614
"Id": "kuu",
@@ -24002,7 +24002,7 @@
2400224002
"Id": "mdc",
2400324003
"Scope": "I",
2400424004
"LanguageType": "L",
24005-
"RefName": "Male (Papua New Guinea)"
24005+
"RefName": "Soq"
2400624006
},
2400724007
{
2400824008
"Id": "mdd",
@@ -24132,7 +24132,7 @@
2413224132
"Id": "mdy",
2413324133
"Scope": "I",
2413424134
"LanguageType": "L",
24135-
"RefName": "Male (Ethiopia)"
24135+
"RefName": "Male"
2413624136
},
2413724137
{
2413824138
"Id": "mdz",
@@ -37254,7 +37254,7 @@
3725437254
"Id": "srs",
3725537255
"Scope": "I",
3725637256
"LanguageType": "L",
37257-
"RefName": "Sarsi"
37257+
"RefName": "Tsuut\u0027ina"
3725837258
},
3725937259
{
3726037260
"Id": "srt",
@@ -38134,7 +38134,7 @@
3813438134
"Id": "szv",
3813538135
"Scope": "I",
3813638136
"LanguageType": "L",
38137-
"RefName": "Isu (Fako Division)"
38137+
"RefName": "Isubu"
3813838138
},
3813938139
{
3814038140
"Id": "szw",
@@ -40889,6 +40889,12 @@
4088940889
"LanguageType": "L",
4089040890
"RefName": "Te\u0027un"
4089140891
},
40892+
{
40893+
"Id": "tvg",
40894+
"Scope": "I",
40895+
"LanguageType": "E",
40896+
"RefName": "Tugunese"
40897+
},
4089240898
{
4089340899
"Id": "tvi",
4089440900
"Scope": "I",
@@ -42763,7 +42769,7 @@
4276342769
"Id": "wab",
4276442770
"Scope": "I",
4276542771
"LanguageType": "L",
42766-
"RefName": "Wab"
42772+
"RefName": "Yote"
4276742773
},
4276842774
{
4276942775
"Id": "wac",
@@ -46645,7 +46651,7 @@
4664546651
"Id": "yko",
4664646652
"Scope": "I",
4664746653
"LanguageType": "L",
46648-
"RefName": "Yasa"
46654+
"RefName": "Iyasa"
4664946655
},
4665046656
{
4665146657
"Id": "ykr",
@@ -47777,6 +47783,12 @@
4777747783
"LanguageType": "L",
4777847784
"RefName": "Zhire"
4777947785
},
47786+
{
47787+
"Id": "zhk",
47788+
"Scope": "I",
47789+
"LanguageType": "L",
47790+
"RefName": "Kurdish Sign Language"
47791+
},
4778047792
{
4778147793
"Id": "zhn",
4778247794
"Scope": "I",

0 commit comments

Comments
 (0)