diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
index 038f1d38f95..c955c4e2ded 100644
--- a/src/EFCore/EFCore.csproj
+++ b/src/EFCore/EFCore.csproj
@@ -31,6 +31,13 @@ Microsoft.EntityFrameworkCore.DbSet
     <ProjectReference Condition="'$(BuildingByReSharper)' != 'true'" Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="build\**\*">
+      <Pack>True</Pack>
+      <PackagePath>build</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Properties\CoreStrings.Designer.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
diff --git a/src/EFCore/build/net6.0/Microsoft.EntityFrameworkCore.props b/src/EFCore/build/net6.0/Microsoft.EntityFrameworkCore.props
new file mode 100644
index 00000000000..98e6f23de2f
--- /dev/null
+++ b/src/EFCore/build/net6.0/Microsoft.EntityFrameworkCore.props
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
+  </PropertyGroup>
+</Project>