Merge in 'release/6.0' changes

dotnet · May 16, 2022 · 796d2f8 · 796d2f8
2 parents 5b9ad90 + 813322f
commit 796d2f8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git 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="buildTransitive\**\*">
+      <Pack>True</Pack>
+      <PackagePath>buildTransitive</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Properties\CoreStrings.Designer.tt">
       <Generator>TextTemplatingFileGenerator</Generator>

diff --git a/src/EFCore/buildTransitive/net6.0/Microsoft.EntityFrameworkCore.props b/src/EFCore/buildTransitive/net6.0/Microsoft.EntityFrameworkCore.props
@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--
+         MAUI (and other size-conscient profiles) trim the nullability attributes, causing the EF Core NRT support to break.
+         This prevents the attributes from being trimmed.
+    -->
+    <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
+  </PropertyGroup>
+</Project>