feat: Add compiler conditional ServiceDefaults to included projects

src/Admin/Admin.csproj

@@ -7,6 +7,7 @@
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Admin' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Admin-SelfHost' " />
   <ItemGroup>
+    <ProjectReference Include="..\..\ServiceDefaults\ServiceDefaults.csproj" Condition="'$(Configuration)' == 'Debug'" />
     <ProjectReference Include="..\..\util\MySqlMigrations\MySqlMigrations.csproj" />
     <ProjectReference Include="..\..\util\PostgresMigrations\PostgresMigrations.csproj" />
     <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />

src/Admin/Program.cs

@@ -1,4 +1,7 @@
 using Bit.Core.Utilities;
+#if DEBUG
+using Bit.ServiceDefaults;
+#endif
 
 namespace Bit.Admin;
 
@@ -6,7 +9,7 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        Host
+        var builder = Host
             .CreateDefaultBuilder(args)
             .ConfigureCustomAppConfiguration(args)
             .ConfigureWebHostDefaults(webBuilder =>
@@ -17,8 +20,12 @@ public class Program
                 });
                 webBuilder.UseStartup<Startup>();
             })
-            .AddSerilogFileLogging()
+            .AddSerilogFileLogging();
-            .Build()
+
-            .Run();
+#if DEBUG
+        builder.AddServiceDefaults();
+#endif
+
+        builder.Build().Run();
     }
 }

src/Api/Api.csproj

@@ -17,6 +17,7 @@
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Api' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Api-SelfHost' " />
   <ItemGroup>
+    <ProjectReference Include="..\..\ServiceDefaults\ServiceDefaults.csproj" Condition="'$(Configuration)' == 'Debug'" />
     <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>

src/Api/Program.cs

@@ -1,4 +1,7 @@
 using Bit.Core.Utilities;
+#if DEBUG
+using Bit.ServiceDefaults;
+#endif
 
 namespace Bit.Api;
 
@@ -6,15 +9,19 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        Host
+        var builder = Host
             .CreateDefaultBuilder(args)
             .ConfigureCustomAppConfiguration(args)
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
             })
-            .AddSerilogFileLogging()
+            .AddSerilogFileLogging();
-            .Build()
+
-            .Run();
+#if DEBUG
+        builder.AddServiceDefaults();
+#endif
+
+        builder.Build().Run();
     }
 }

src/Billing/Billing.csproj

@@ -14,6 +14,7 @@
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Billing' " />
   <ItemGroup>
+    <ProjectReference Include="..\..\ServiceDefaults\ServiceDefaults.csproj" Condition="'$(Configuration)' == 'Debug'" />
     <ProjectReference Include="..\..\bitwarden_license\src\Commercial.Core\Commercial.Core.csproj" />
     <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
     <ProjectReference Include="..\Core\Core.csproj" />

src/Billing/Program.cs

@@ -1,4 +1,7 @@
 using Bit.Core.Utilities;
+#if DEBUG
+using Bit.ServiceDefaults;
+#endif
 
 namespace Bit.Billing;
 
@@ -6,15 +9,20 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        Host
+        var builder = Host
             .CreateDefaultBuilder(args)
             .UseBitwardenSdk()
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
             })
-            .AddSerilogFileLogging()
+            .AddSerilogFileLogging();
-            .Build()
+
-            .Run();
+#if DEBUG
+        builder.AddServiceDefaults();
+#endif
+
+        builder.Build().Run();
     }
 }
+

src/Identity/Identity.csproj

@@ -8,6 +8,7 @@
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Identity' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Identity-SelfHost' " />
   <ItemGroup>
+    <ProjectReference Include="..\..\ServiceDefaults\ServiceDefaults.csproj" Condition="'$(Configuration)' == 'Debug'" />
     <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>

src/Identity/Program.cs

@@ -1,4 +1,7 @@
 using Bit.Core.Utilities;
+#if DEBUG
+using Bit.ServiceDefaults;
+#endif
 
 namespace Bit.Identity;
 
@@ -6,9 +9,14 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        CreateHostBuilder(args)
+        var builder = CreateHostBuilder(args);
-            .Build()
+
-            .Run();
+#if DEBUG
+        builder.AddServiceDefaults();
+#endif
+
+        builder.Build().Run();
+
     }
 
     public static IHostBuilder CreateHostBuilder(string[] args)

src/Notifications/Notifications.csproj

@@ -16,6 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\ServiceDefaults\ServiceDefaults.csproj" Condition="'$(Configuration)' == 'Debug'" />
     <ProjectReference Include="..\Core\Core.csproj" />
     <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
   </ItemGroup>

src/Notifications/Program.cs

@@ -1,4 +1,7 @@
 using Bit.Core.Utilities;
+#if DEBUG
+using Bit.ServiceDefaults;
+#endif
 
 namespace Bit.Notifications;
 
@@ -6,15 +9,19 @@ public class Program
 {
     public static void Main(string[] args)
     {
-        Host
+        var builder = Host
             .CreateDefaultBuilder(args)
             .ConfigureCustomAppConfiguration(args)
             .ConfigureWebHostDefaults(webBuilder =>
             {
                 webBuilder.UseStartup<Startup>();
             })
-            .AddSerilogFileLogging()
+            .AddSerilogFileLogging();
-            .Build()
+
-            .Run();
+#if DEBUG
+        builder.AddServiceDefaults();
+#endif
+
+        builder.Build().Run();
     }
 }