Introduce the Server SDK to the rest of our services (#6915)

justindbaur · web-flow · commit d4de03a7621c · 2026-02-02T10:27:25.000-05:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,6 +13,10 @@
     <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">true</TreatWarningsAsErrors>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <BitIncludeAuthentication>false</BitIncludeAuthentication>
+    <BitIncludeFeatures>false</BitIncludeFeatures>
+  </PropertyGroup>
 
   <PropertyGroup>
 
diff --git a/bitwarden_license/src/Scim/Scim.csproj b/bitwarden_license/src/Scim/Scim.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Scim</UserSecretsId>
diff --git a/bitwarden_license/src/Sso/Sso.csproj b/bitwarden_license/src/Sso/Sso.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Sso</UserSecretsId>
diff --git a/global.json b/global.json
@@ -6,6 +6,6 @@
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "4.1.0",
     "Microsoft.Build.Sql": "1.0.0",
-    "Bitwarden.Server.Sdk": "1.2.0"
+    "Bitwarden.Server.Sdk": "1.4.0"
   }
 }
diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Admin</UserSecretsId>
diff --git a/src/Admin/Program.cs b/src/Admin/Program.cs
@@ -8,7 +8,7 @@ public static void Main(string[] args)
     {
         Host
             .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.ConfigureKestrel(o =>
diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
@@ -1,4 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
+
   <PropertyGroup>
     <UserSecretsId>bitwarden-Api</UserSecretsId>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
diff --git a/src/Api/Program.cs b/src/Api/Program.cs
@@ -8,7 +8,7 @@ public static void Main(string[] args)
     {
         Host
             .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
diff --git a/src/Events/Events.csproj b/src/Events/Events.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Events</UserSecretsId>
diff --git a/src/Events/Program.cs b/src/Events/Program.cs
@@ -8,7 +8,7 @@ public static void Main(string[] args)
     {
         Host
             .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
diff --git a/src/EventsProcessor/EventsProcessor.csproj b/src/EventsProcessor/EventsProcessor.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-EventsProcessor</UserSecretsId>
diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Icons</UserSecretsId>
diff --git a/src/Icons/Program.cs b/src/Icons/Program.cs
@@ -8,6 +8,7 @@ public static void Main(string[] args)
     {
         Host
             .CreateDefaultBuilder(args)
+            .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Identity</UserSecretsId>
diff --git a/src/Identity/Program.cs b/src/Identity/Program.cs
@@ -15,7 +15,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
     {
         return Host
             .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj
@@ -1,4 +1,5 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Sdk Name="Bitwarden.Server.Sdk" />
 
   <PropertyGroup>
     <UserSecretsId>bitwarden-Notifications</UserSecretsId>
diff --git a/src/Notifications/Program.cs b/src/Notifications/Program.cs
@@ -8,7 +8,7 @@ public static void Main(string[] args)
     {
         Host
             .CreateDefaultBuilder(args)
-            .ConfigureCustomAppConfiguration(args)
+            .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
diff --git a/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj b/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
@@ -9,9 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
     <PackageReference Include="xunit.v3" Version="3.0.1" />
diff --git a/test/IntegrationTestCommon/IntegrationTestCommon.csproj b/test/IntegrationTestCommon/IntegrationTestCommon.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<Project Sdk="Microsoft.NET.Sdk.Web">`
	`2`	`+ <Sdk Name="Bitwarden.Server.Sdk" />`
`2`	`3`
`3`	`4`	`<PropertyGroup>`
`4`	`5`	`<UserSecretsId>bitwarden-Scim</UserSecretsId>`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"msbuild-sdks": {`
`7`	`7`	`"Microsoft.Build.Traversal": "4.1.0",`
`8`	`8`	`"Microsoft.Build.Sql": "1.0.0",`
`9`		`- "Bitwarden.Server.Sdk": "1.2.0"`
	`9`	`+ "Bitwarden.Server.Sdk": "1.4.0"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public static void Main(string[] args)`
`8`	`8`	`{`
`9`	`9`	`Host`
`10`	`10`	`.CreateDefaultBuilder(args)`
`11`		`- .ConfigureCustomAppConfiguration(args)`
	`11`	`+ .UseBitwardenSdk()`
`12`	`12`	`.ConfigureWebHostDefaults(webBuilder =>`
`13`	`13`	`{`
`14`	`14`	`webBuilder.ConfigureKestrel(o =>`