diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index a9e60ac9f0..d42ad6f44a 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -6,6 +6,11 @@
     <RootNamespace>Bit.Api</RootNamespace>
     <UserSecretsId>bitwarden-Api</UserSecretsId>
     <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Api/Utilities/ServiceCollectionExtensions.cs b/src/Api/Utilities/ServiceCollectionExtensions.cs
index f5105acd44..2bd2bcbeff 100644
--- a/src/Api/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Api/Utilities/ServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using Bit.Core;
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.Swagger;
@@ -32,6 +33,11 @@ namespace Bit.Api.Utilities
 
                 config.DescribeAllParametersInCamelCase();
                 // config.UseReferencedDefinitionsForEnums();
+
+                var apiFilePath = Path.Combine(System.AppContext.BaseDirectory, "Api.xml");
+                config.IncludeXmlComments(apiFilePath, true);
+                var coreFilePath = Path.Combine(System.AppContext.BaseDirectory, "Core.xml");
+                config.IncludeXmlComments(coreFilePath);
             });
         }
     }
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 438cef5c80..fc737f77e3 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -1,9 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>Bit.Core</RootNamespace>
     <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;1591;1573</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>