diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2a3efcc3035..070e38c9006 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -15,5 +15,23 @@
     <CopyLocalLockFileAssemblies Condition="'$(TargetFramework)'=='netstandard2.0'">true</CopyLocalLockFileAssemblies>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
+
+  <Target Name="AssemblyInfos"
+        BeforeTargets="CoreGenerateAssemblyInfo"
+        Inputs="@InternalsVisibleTo" Outputs="%(InternalsVisibleTo.Identity)"
+        Condition="$(IsPackable) == True">
+    <PropertyGroup>
+      <ExposedAssembly>%(InternalsVisibleTo.Identity)</ExposedAssembly>
+      <VersionNamespaced>$(ExposedAssembly.Replace("Nest", "Nest$(MajorVersion)").Replace("Elasticsearch.Net","Elasticsearch.Net$(MajorVersion)"))</VersionNamespaced>
+    </PropertyGroup>
+    <ItemGroup>
+      <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>%(InternalsVisibleTo.Identity), PublicKey=$(ExposedPublicKey)</_Parameter1>
+      </AssemblyAttribute>
+      <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>$(VersionNamespaced), PublicKey=$(ExposedPublicKey)</_Parameter1>
+      </AssemblyAttribute>
+    </ItemGroup>
+  </Target>
   
 </Project>
\ No newline at end of file