diff --git a/Source/SharpDX.Animation/SharpDX.Animation.csproj b/Source/SharpDX.Animation/SharpDX.Animation.csproj
index cbb473b6d..85863874c 100644
--- a/Source/SharpDX.Animation/SharpDX.Animation.csproj
+++ b/Source/SharpDX.Animation/SharpDX.Animation.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1</TargetFrameworks>
     <PackageId>SharpDX.Animation</PackageId>
     <Product>SharpDX.Animation</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Animation.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Animation</AssemblyTitle>
     <Title>SharpDX.Animation</Title>
     <Description>Assembly providing DirectX - Animation managed API.</Description>
diff --git a/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj b/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj
index b8b60d7c3..ae001f80a 100644
--- a/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj
+++ b/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.D3DCompiler</PackageId>
     <Product>SharpDX.D3DCompiler</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.D3DCompiler.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.D3DCompiler</AssemblyTitle>
     <Title>SharpDX.D3DCompiler</Title>
     <Description>Assembly providing DirectX - D3DCompiler managed API.</Description>
diff --git a/Source/SharpDX.DXGI/SharpDX.DXGI.csproj b/Source/SharpDX.DXGI/SharpDX.DXGI.csproj
index 3caeb3de1..ddb7875e5 100644
--- a/Source/SharpDX.DXGI/SharpDX.DXGI.csproj
+++ b/Source/SharpDX.DXGI/SharpDX.DXGI.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.DXGI</PackageId>
     <Product>SharpDX.DXGI</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.DXGI.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.DXGI</AssemblyTitle>
     <Title>SharpDX.DXGI</Title>
     <Description>Assembly providing DirectX - DXGI managed API.</Description>
diff --git a/Source/SharpDX.Desktop/SharpDX.Desktop.csproj b/Source/SharpDX.Desktop/SharpDX.Desktop.csproj
index 176c9b564..52e185f2b 100644
--- a/Source/SharpDX.Desktop/SharpDX.Desktop.csproj
+++ b/Source/SharpDX.Desktop/SharpDX.Desktop.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45</TargetFrameworks>
     <PackageId>SharpDX.Desktop</PackageId>
     <Product>SharpDX.Desktop</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Desktop.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Desktop</AssemblyTitle>
     <Title>SharpDX.Desktop</Title>
     <Description>Assembly providing APIs related to Desktop platform.</Description>
diff --git a/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj b/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj
index 8aaba17c4..79fc7399a 100644
--- a/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj
+++ b/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct2D1</PackageId>
     <Product>SharpDX.Direct2D1</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct2D1.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Direct2D1</AssemblyTitle>
     <Title>SharpDX.Direct2D1</Title>
     <Description>Assembly providing DirectX - Direct2D, DirectWrite and WIC managed API.</Description>
diff --git a/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj b/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj
index f8a43d21e..6b207e885 100644
--- a/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj
+++ b/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D10</PackageId>
     <Product>SharpDX.Direct3D10</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D10.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Direct3D10</AssemblyTitle>
     <Title>SharpDX.Direct3D10</Title>
     <Description>Assembly providing DirectX - Direct3D10 and Direct3D10.1 managed API.</Description>
diff --git a/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj b/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj
index 7e88127f8..de8d826f7 100644
--- a/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj
+++ b/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D11.Effects</PackageId>
     <Product>SharpDX.Direct3D11.Effects</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D11.Effects.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Direct3D11.Effects</AssemblyTitle>
     <Title>SharpDX.Direct3D11.Effects</Title>
     <Description>Assembly providing DirectX - Effects11 managed API for Direct3D11.</Description>
diff --git a/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj b/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj
index 0211e6e47..41526180b 100644
--- a/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj
+++ b/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D11</PackageId>
     <Product>SharpDX.Direct3D11</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D11.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Direct3D11</AssemblyTitle>
     <Title>SharpDX.Direct3D11</Title>
     <Description>Assembly providing DirectX - Direct3D11, Direct3D11.1 and Effects11 managed API.</Description>
diff --git a/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj b/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj
index 8f6fa4e1a..a24160102 100644
--- a/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj
+++ b/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D12</PackageId>
     <Product>SharpDX.Direct3D12</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D12.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Direct3D12</AssemblyTitle>
     <Title>SharpDX.Direct3D12</Title>
     <Description>Assembly providing DirectX - Direct3D12 managed API.</Description>
diff --git a/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj b/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj
index 02befc32a..eebd3045c 100644
--- a/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj
+++ b/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.Direct3D9</PackageId>
     <Product>SharpDX.Direct3D9</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D9.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Direct3D9</AssemblyTitle>
     <Title>SharpDX.Direct3D9</Title>
     <Description>Assembly providing DirectX - Direct3D9 managed API.</Description>
diff --git a/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj b/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj
index 2da48e44f..b475be6ed 100644
--- a/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj
+++ b/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.DirectComposition</PackageId>
     <Product>SharpDX.DirectComposition</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectComposition.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.DirectComposition</AssemblyTitle>
     <Title>SharpDX.DirectComposition</Title>
     <Description>Assembly providing DirectX - DirectComposition managed API.</Description>
diff --git a/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj b/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj
index 2e6aadc29..a0102ebb8 100644
--- a/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj
+++ b/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.DirectInput</PackageId>
     <Product>SharpDX.DirectInput</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectInput.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.DirectInput</AssemblyTitle>
     <Title>SharpDX.DirectInput</Title>
     <Description>Assembly providing DirectX - DirectInput managed API.</Description>
diff --git a/Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.csproj b/Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.csproj
index 6702eb352..92aebafd2 100644
--- a/Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.csproj
+++ b/Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1</TargetFrameworks>
     <PackageId>SharpDX.DirectManipulation</PackageId>
     <Product>SharpDX.DirectManipulation</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectManipulation.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.DirectManipulation</AssemblyTitle>
     <Title>SharpDX.DirectManipulation</Title>
     <Description>Assembly providing DirectX - DirectManipulation managed API.</Description>
diff --git a/Source/SharpDX.DirectSound/SharpDX.DirectSound.csproj b/Source/SharpDX.DirectSound/SharpDX.DirectSound.csproj
index 79f7dde9c..5d75c80ca 100644
--- a/Source/SharpDX.DirectSound/SharpDX.DirectSound.csproj
+++ b/Source/SharpDX.DirectSound/SharpDX.DirectSound.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.DirectSound</PackageId>
     <Product>SharpDX.DirectSound</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectSound.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.DirectSound</AssemblyTitle>
     <Title>SharpDX.DirectSound</Title>
     <Description>Assembly providing DirectX - DirectSound managed API.</Description>
diff --git a/Source/SharpDX.Mathematics/SharpDX.Mathematics.csproj b/Source/SharpDX.Mathematics/SharpDX.Mathematics.csproj
index ff64975b2..c88289cf8 100644
--- a/Source/SharpDX.Mathematics/SharpDX.Mathematics.csproj
+++ b/Source/SharpDX.Mathematics/SharpDX.Mathematics.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Mathematics</PackageId>
     <Product>SharpDX.Mathematics</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Mathematics.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.Mathematics</AssemblyTitle>
     <Title>SharpDX.Mathematics</Title>
     <Description>Assembly providing DirectX - Mathematics managed API.</Description>
diff --git a/Source/SharpDX.MediaFoundation/SharpDX.MediaFoundation.csproj b/Source/SharpDX.MediaFoundation/SharpDX.MediaFoundation.csproj
index afb3f69b6..c7ca5943b 100644
--- a/Source/SharpDX.MediaFoundation/SharpDX.MediaFoundation.csproj
+++ b/Source/SharpDX.MediaFoundation/SharpDX.MediaFoundation.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.MediaFoundation</PackageId>
     <Product>SharpDX.MediaFoundation</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.MediaFoundation.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.MediaFoundation</AssemblyTitle>
     <Title>SharpDX.MediaFoundation</Title>
     <Description>Assembly providing DirectX - MediaFoundation managed API.</Description>
diff --git a/Source/SharpDX.RawInput/SharpDX.RawInput.csproj b/Source/SharpDX.RawInput/SharpDX.RawInput.csproj
index 58f6f5420..e01b093c3 100644
--- a/Source/SharpDX.RawInput/SharpDX.RawInput.csproj
+++ b/Source/SharpDX.RawInput/SharpDX.RawInput.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45</TargetFrameworks>
     <PackageId>SharpDX.RawInput</PackageId>
     <Product>SharpDX.RawInput</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.RawInput.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.RawInput</AssemblyTitle>
     <Title>SharpDX.RawInput</Title>
     <Description>Assembly providing DirectX - RawInput managed API.</Description>
diff --git a/Source/SharpDX.XAudio2/SharpDX.XAudio2.csproj b/Source/SharpDX.XAudio2/SharpDX.XAudio2.csproj
index b4ee8b6b6..f314f7fff 100644
--- a/Source/SharpDX.XAudio2/SharpDX.XAudio2.csproj
+++ b/Source/SharpDX.XAudio2/SharpDX.XAudio2.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.XAudio2</PackageId>
     <Product>SharpDX.XAudio2</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.XAudio2.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.XAudio2</AssemblyTitle>
     <Title>SharpDX.XAudio2</Title>
     <Description>Assembly providing DirectX - XAudio2, X3DAudio and XAPO managed API.</Description>
diff --git a/Source/SharpDX.XInput/SharpDX.XInput.csproj b/Source/SharpDX.XInput/SharpDX.XInput.csproj
index 65f129370..602108a48 100644
--- a/Source/SharpDX.XInput/SharpDX.XInput.csproj
+++ b/Source/SharpDX.XInput/SharpDX.XInput.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.XInput</PackageId>
     <Product>SharpDX.XInput</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.XInput.xml</DocumentationFile>
     <AssemblyTitle>SharpDX.XInput</AssemblyTitle>
     <Title>SharpDX.XInput</Title>
     <Description>Assembly providing DirectX - XInput managed API.</Description>
diff --git a/Source/SharpDX/SharpDX.csproj b/Source/SharpDX/SharpDX.csproj
index 8b2a42afb..7f2084412 100644
--- a/Source/SharpDX/SharpDX.csproj
+++ b/Source/SharpDX/SharpDX.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX</PackageId>
     <Product>SharpDX</Product>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.xml</DocumentationFile>
     <AssemblyTitle>SharpDX</AssemblyTitle>
     <Title>SharpDX</Title>
     <Description>Core assembly for all SharpDX assemblies.</Description>
diff --git a/Source/Tools/SharpGen/MSDNDoc.zip b/Source/Tools/SharpGen/MSDNDoc.zip
index 33668de9a..55562983c 100644
Binary files a/Source/Tools/SharpGen/MSDNDoc.zip and b/Source/Tools/SharpGen/MSDNDoc.zip differ