Skip to content

Commit ec33413

Browse files
eliykateliykat
authored
Merge branch 'main' into ac/pm-28555/add-default-collections-sproc
2 parents e623b18 + 51d90cc commit ec33413

File tree

181 files changed

+18894
-2409
lines changed

Some content is hidden

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

181 files changed

+18894
-2409
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ dotnet_naming_symbols.any_async_methods.applicable_kinds = method
7171
dotnet_naming_symbols.any_async_methods.applicable_accessibilities = *
7272
dotnet_naming_symbols.any_async_methods.required_modifiers = async
7373

74-
dotnet_naming_style.end_in_async.required_prefix =
74+
dotnet_naming_style.end_in_async.required_prefix =
7575
dotnet_naming_style.end_in_async.required_suffix = Async
7676
dotnet_naming_style.end_in_async.capitalization = pascal_case
77-
dotnet_naming_style.end_in_async.word_separator =
77+
dotnet_naming_style.end_in_async.word_separator =
7878

7979
# Obsolete warnings, this should be removed or changed to warning once we address some of the obsolete items.
8080
dotnet_diagnostic.CS0618.severity = suggestion
@@ -85,6 +85,12 @@ dotnet_diagnostic.CS0612.severity = suggestion
8585
# Remove unnecessary using directives https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0005
8686
dotnet_diagnostic.IDE0005.severity = warning
8787

88+
# Specify CultureInfo https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1304
89+
dotnet_diagnostic.CA1304.severity = warning
90+
91+
# Specify IFormatProvider https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1305
92+
dotnet_diagnostic.CA1305.severity = warning
93+
8894
# CSharp code style settings:
8995
[*.cs]
9096
# Prefer "var" everywhere

‎.vscode/launch.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,28 @@
6969
"preLaunchTask": "buildFullServer",
7070
"stopAll": true
7171
},
72+
{
73+
"name": "Full Server with Seeder API",
74+
"configurations": [
75+
"run-Admin",
76+
"run-API",
77+
"run-Events",
78+
"run-EventsProcessor",
79+
"run-Identity",
80+
"run-Sso",
81+
"run-Icons",
82+
"run-Billing",
83+
"run-Notifications",
84+
"run-SeederAPI"
85+
],
86+
"presentation": {
87+
"hidden": false,
88+
"group": "AA_compounds",
89+
"order": 6
90+
},
91+
"preLaunchTask": "buildFullServerWithSeederApi",
92+
"stopAll": true
93+
},
7294
{
7395
"name": "Self Host: Bit",
7496
"configurations": [
@@ -204,6 +226,17 @@
204226
},
205227
"preLaunchTask": "buildSso",
206228
},
229+
{
230+
"name": "Seeder API",
231+
"configurations": [
232+
"run-SeederAPI"
233+
],
234+
"presentation": {
235+
"hidden": false,
236+
"group": "cloud",
237+
},
238+
"preLaunchTask": "buildSeederAPI",
239+
},
207240
{
208241
"name": "Admin Self Host",
209242
"configurations": [
@@ -270,6 +303,17 @@
270303
},
271304
"preLaunchTask": "buildSso",
272305
},
306+
{
307+
"name": "Seeder API Self Host",
308+
"configurations": [
309+
"run-SeederAPI-SelfHost"
310+
],
311+
"presentation": {
312+
"hidden": false,
313+
"group": "self-host",
314+
},
315+
"preLaunchTask": "buildSeederAPI",
316+
}
273317
],
274318
"configurations": [
275319
// Configurations represent run-only scenarios so that they can be used in multiple compounds
@@ -311,6 +355,25 @@
311355
"/Views": "${workspaceFolder}/Views"
312356
}
313357
},
358+
{
359+
"name": "run-SeederAPI",
360+
"presentation": {
361+
"hidden": true,
362+
},
363+
"requireExactSource": true,
364+
"type": "coreclr",
365+
"request": "launch",
366+
"program": "${workspaceFolder}/util/SeederApi/bin/Debug/net8.0/SeederApi.dll",
367+
"args": [],
368+
"cwd": "${workspaceFolder}/util/SeederApi",
369+
"stopAtEntry": false,
370+
"env": {
371+
"ASPNETCORE_ENVIRONMENT": "Development",
372+
},
373+
"sourceFileMap": {
374+
"/Views": "${workspaceFolder}/Views"
375+
}
376+
},
314377
{
315378
"name": "run-Billing",
316379
"presentation": {
@@ -488,6 +551,27 @@
488551
"/Views": "${workspaceFolder}/Views"
489552
}
490553
},
554+
{
555+
"name": "run-SeederAPI-SelfHost",
556+
"presentation": {
557+
"hidden": true,
558+
},
559+
"requireExactSource": true,
560+
"type": "coreclr",
561+
"request": "launch",
562+
"program": "${workspaceFolder}/util/SeederApi/bin/Debug/net8.0/SeederApi.dll",
563+
"args": [],
564+
"cwd": "${workspaceFolder}/util/SeederApi",
565+
"stopAtEntry": false,
566+
"env": {
567+
"ASPNETCORE_ENVIRONMENT": "Development",
568+
"ASPNETCORE_URLS": "http://localhost:5048",
569+
"developSelfHosted": "true",
570+
},
571+
"sourceFileMap": {
572+
"/Views": "${workspaceFolder}/Views"
573+
}
574+
},
491575
{
492576
"name": "run-Admin-SelfHost",
493577
"presentation": {

‎.vscode/tasks.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@
4343
"label": "buildFullServer",
4444
"hide": true,
4545
"dependsOrder": "sequence",
46+
"dependsOn": [
47+
"buildAdmin",
48+
"buildAPI",
49+
"buildEventsProcessor",
50+
"buildIdentity",
51+
"buildSso",
52+
"buildIcons",
53+
"buildBilling",
54+
"buildNotifications"
55+
],
56+
},
57+
{
58+
"label": "buildFullServerWithSeederApi",
59+
"hide": true,
60+
"dependsOrder": "sequence",
4661
"dependsOn": [
4762
"buildAdmin",
4863
"buildAPI",
@@ -52,6 +67,7 @@
5267
"buildIcons",
5368
"buildBilling",
5469
"buildNotifications",
70+
"buildSeederAPI"
5571
],
5672
},
5773
{
@@ -89,6 +105,9 @@
89105
"/property:GenerateFullPaths=true",
90106
"/consoleloggerparameters:NoSummary"
91107
],
108+
"options": {
109+
"cwd": "${workspaceFolder}"
110+
},
92111
"problemMatcher": "$msCompile"
93112
},
94113
{
@@ -102,6 +121,9 @@
102121
"/property:GenerateFullPaths=true",
103122
"/consoleloggerparameters:NoSummary"
104123
],
124+
"options": {
125+
"cwd": "${workspaceFolder}"
126+
},
105127
"problemMatcher": "$msCompile"
106128
},
107129
{
@@ -115,6 +137,9 @@
115137
"/property:GenerateFullPaths=true",
116138
"/consoleloggerparameters:NoSummary"
117139
],
140+
"options": {
141+
"cwd": "${workspaceFolder}"
142+
},
118143
"problemMatcher": "$msCompile"
119144
},
120145
{
@@ -128,6 +153,9 @@
128153
"/property:GenerateFullPaths=true",
129154
"/consoleloggerparameters:NoSummary"
130155
],
156+
"options": {
157+
"cwd": "${workspaceFolder}"
158+
},
131159
"problemMatcher": "$msCompile"
132160
},
133161
{
@@ -141,6 +169,9 @@
141169
"/property:GenerateFullPaths=true",
142170
"/consoleloggerparameters:NoSummary"
143171
],
172+
"options": {
173+
"cwd": "${workspaceFolder}"
174+
},
144175
"problemMatcher": "$msCompile"
145176
},
146177
{
@@ -154,6 +185,9 @@
154185
"/property:GenerateFullPaths=true",
155186
"/consoleloggerparameters:NoSummary"
156187
],
188+
"options": {
189+
"cwd": "${workspaceFolder}"
190+
},
157191
"problemMatcher": "$msCompile"
158192
},
159193
{
@@ -167,6 +201,9 @@
167201
"/property:GenerateFullPaths=true",
168202
"/consoleloggerparameters:NoSummary"
169203
],
204+
"options": {
205+
"cwd": "${workspaceFolder}"
206+
},
170207
"problemMatcher": "$msCompile"
171208
},
172209
{
@@ -180,6 +217,29 @@
180217
"/property:GenerateFullPaths=true",
181218
"/consoleloggerparameters:NoSummary"
182219
],
220+
"options": {
221+
"cwd": "${workspaceFolder}"
222+
},
223+
"problemMatcher": "$msCompile",
224+
"group": {
225+
"kind": "build",
226+
"isDefault": true
227+
}
228+
},
229+
{
230+
"label": "buildSeederAPI",
231+
"hide": true,
232+
"command": "dotnet",
233+
"type": "process",
234+
"args": [
235+
"build",
236+
"${workspaceFolder}/util/SeederApi/SeederApi.csproj",
237+
"/property:GenerateFullPaths=true",
238+
"/consoleloggerparameters:NoSummary"
239+
],
240+
"options": {
241+
"cwd": "${workspaceFolder}"
242+
},
183243
"problemMatcher": "$msCompile",
184244
"group": {
185245
"kind": "build",
@@ -197,6 +257,9 @@
197257
"/property:GenerateFullPaths=true",
198258
"/consoleloggerparameters:NoSummary"
199259
],
260+
"options": {
261+
"cwd": "${workspaceFolder}"
262+
},
200263
"problemMatcher": "$msCompile",
201264
"group": {
202265
"kind": "build",
@@ -214,6 +277,9 @@
214277
"/property:GenerateFullPaths=true",
215278
"/consoleloggerparameters:NoSummary"
216279
],
280+
"options": {
281+
"cwd": "${workspaceFolder}"
282+
},
217283
"problemMatcher": "$msCompile",
218284
"group": {
219285
"kind": "build",
@@ -224,6 +290,9 @@
224290
"label": "test",
225291
"type": "shell",
226292
"command": "dotnet test",
293+
"options": {
294+
"cwd": "${workspaceFolder}"
295+
},
227296
"group": {
228297
"kind": "test",
229298
"isDefault": true

‎Directory.Build.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55

6-
<Version>2025.12.2</Version>
6+
<Version>2026.1.0</Version>
77

88
<RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
99
<ImplicitUsings>enable</ImplicitUsings>
@@ -13,21 +13,21 @@
1313
<TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">true</TreatWarningsAsErrors>
1414
</PropertyGroup>
1515

16-
16+
1717
<PropertyGroup>
18-
18+
1919
<MicrosoftNetTestSdkVersion>18.0.1</MicrosoftNetTestSdkVersion>
20-
20+
2121
<XUnitVersion>2.6.6</XUnitVersion>
22-
22+
2323
<XUnitRunnerVisualStudioVersion>2.5.6</XUnitRunnerVisualStudioVersion>
24-
24+
2525
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
26-
26+
2727
<NSubstituteVersion>5.1.0</NSubstituteVersion>
28-
28+
2929
<AutoFixtureXUnit2Version>4.18.1</AutoFixtureXUnit2Version>
30-
30+
3131
<AutoFixtureAutoNSubstituteVersion>4.18.1</AutoFixtureAutoNSubstituteVersion>
3232
</PropertyGroup>
3333
</Project>

‎bitwarden-server.sln‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RustSdk", "util\RustSdk\Rus
137137
EndProject
138138
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedWeb.Test", "test\SharedWeb.Test\SharedWeb.Test.csproj", "{AD59537D-5259-4B7A-948F-0CF58E80B359}"
139139
EndProject
140+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SeederApi", "util\SeederApi\SeederApi.csproj", "{9F08DFBB-482B-4C9D-A5F4-6BDA6EC2E68F}"
141+
EndProject
142+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SeederApi.IntegrationTest", "test\SeederApi.IntegrationTest\SeederApi.IntegrationTest.csproj", "{A2E067EF-609C-4D13-895A-E054C61D48BB}"
143+
EndProject
140144
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSO.Test", "bitwarden_license\test\SSO.Test\SSO.Test.csproj", "{7D98784C-C253-43FB-9873-25B65C6250D6}"
141145
EndProject
142146
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sso.IntegrationTest", "bitwarden_license\test\Sso.IntegrationTest\Sso.IntegrationTest.csproj", "{FFB09376-595B-6F93-36F0-70CAE90AFECB}"
143147
EndProject
148+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.IntegrationTest", "test\Server.IntegrationTest\Server.IntegrationTest.csproj", "{E75E1F10-BC6F-4EB1-BA75-D897C45AEA0D}"
149+
EndProject
144150
Global
145151
GlobalSection(SolutionConfigurationPlatforms) = preSolution
146152
Debug|Any CPU = Debug|Any CPU
@@ -353,6 +359,14 @@ Global
353359
{AD59537D-5259-4B7A-948F-0CF58E80B359}.Debug|Any CPU.Build.0 = Debug|Any CPU
354360
{AD59537D-5259-4B7A-948F-0CF58E80B359}.Release|Any CPU.ActiveCfg = Release|Any CPU
355361
{AD59537D-5259-4B7A-948F-0CF58E80B359}.Release|Any CPU.Build.0 = Release|Any CPU
362+
{9F08DFBB-482B-4C9D-A5F4-6BDA6EC2E68F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
363+
{9F08DFBB-482B-4C9D-A5F4-6BDA6EC2E68F}.Debug|Any CPU.Build.0 = Debug|Any CPU
364+
{9F08DFBB-482B-4C9D-A5F4-6BDA6EC2E68F}.Release|Any CPU.ActiveCfg = Release|Any CPU
365+
{9F08DFBB-482B-4C9D-A5F4-6BDA6EC2E68F}.Release|Any CPU.Build.0 = Release|Any CPU
366+
{A2E067EF-609C-4D13-895A-E054C61D48BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
367+
{A2E067EF-609C-4D13-895A-E054C61D48BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
368+
{A2E067EF-609C-4D13-895A-E054C61D48BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
369+
{A2E067EF-609C-4D13-895A-E054C61D48BB}.Release|Any CPU.Build.0 = Release|Any CPU
356370
{7D98784C-C253-43FB-9873-25B65C6250D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
357371
{7D98784C-C253-43FB-9873-25B65C6250D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
358372
{7D98784C-C253-43FB-9873-25B65C6250D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -361,6 +375,10 @@ Global
361375
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
362376
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
363377
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Release|Any CPU.Build.0 = Release|Any CPU
378+
{E75E1F10-BC6F-4EB1-BA75-D897C45AEA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
379+
{E75E1F10-BC6F-4EB1-BA75-D897C45AEA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
380+
{E75E1F10-BC6F-4EB1-BA75-D897C45AEA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
381+
{E75E1F10-BC6F-4EB1-BA75-D897C45AEA0D}.Release|Any CPU.Build.0 = Release|Any CPU
364382
EndGlobalSection
365383
GlobalSection(SolutionProperties) = preSolution
366384
HideSolutionNode = FALSE
@@ -417,8 +435,11 @@ Global
417435
{17A89266-260A-4A03-81AE-C0468C6EE06E} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
418436
{D1513D90-E4F5-44A9-9121-5E46E3E4A3F7} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
419437
{AD59537D-5259-4B7A-948F-0CF58E80B359} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
438+
{9F08DFBB-482B-4C9D-A5F4-6BDA6EC2E68F} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
439+
{A2E067EF-609C-4D13-895A-E054C61D48BB} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
420440
{7D98784C-C253-43FB-9873-25B65C6250D6} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
421441
{FFB09376-595B-6F93-36F0-70CAE90AFECB} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
442+
{E75E1F10-BC6F-4EB1-BA75-D897C45AEA0D} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
422443
EndGlobalSection
423444
GlobalSection(ExtensibilityGlobals) = postSolution
424445
SolutionGuid = {E01CBF68-2E20-425F-9EDB-E0A6510CA92F}

0 commit comments

Comments
 (0)