[release/6.4] Update dependencies from dotnet/core-setup

Directory.Build.targets

@@ -1,12 +1,16 @@
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <PropertyGroup>
+    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
+  </PropertyGroup>
 
   <ItemGroup>
-    <!-- HACK: Use the latest version instead of the one bundled with the SDK -->
-    <KnownFrameworkReference Update="Microsoft.NETCore.App">
-      <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'netcoreapp3.0'">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
-      <DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'netcoreapp3.0'">$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
-      <TargetingPackVersion Condition="'%(TargetFramework)' == 'netcoreapp3.0'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
+    <!-- Use the latest version instead of the one bundled with the SDK. -->
+    <KnownFrameworkReference Update="Microsoft.NETCore.App"
+        Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">
+      <LatestRuntimeFrameworkVersion>$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
+      <DefaultRuntimeFrameworkVersion>$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
+      <TargetingPackVersion>$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
     </KnownFrameworkReference>
   </ItemGroup>
 </Project>

eng/Version.Details.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.CSharp" Version="4.6.0-rc2.19458.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.CSharp" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-rc2-19458-11">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0-preview1.19459.38">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>0861098706ac9854dfe5e8b8a2c95bdd07094ef6</Sha>
+      <Sha>0d6763312a2754e45d604ebdc69c8ac7e21a2187</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-rc2-19458-11">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0-preview1.19459.38">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>0861098706ac9854dfe5e8b8a2c95bdd07094ef6</Sha>
+      <Sha>0d6763312a2754e45d604ebdc69c8ac7e21a2187</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="4.6.0-rc2.19458.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.CodeDom" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-rc2.19458.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.ComponentModel.Annotations" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-rc2.19458.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
-    <Dependency Name="System.Data.SqlClient" Version="4.7.0-rc2.19458.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Data.SqlClient" Version="4.8.0-preview1.19459.13" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -16,15 +16,15 @@
     <MySqlDataEntityVersion>6.7.2-beta-ef6</MySqlDataEntityVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/corefx">
-    <MicrosoftCSharpVersion>4.6.0-rc2.19458.3</MicrosoftCSharpVersion>
-    <SystemCodeDomVersion>4.6.0-rc2.19458.3</SystemCodeDomVersion>
-    <SystemComponentModelAnnotationsVersion>4.6.0-rc2.19458.3</SystemComponentModelAnnotationsVersion>
-    <SystemConfigurationConfigurationManagerVersion>4.6.0-rc2.19458.3</SystemConfigurationConfigurationManagerVersion>
-    <SystemDataSqlClientVersion>4.7.0-rc2.19458.3</SystemDataSqlClientVersion>
+    <MicrosoftCSharpVersion>4.7.0-preview1.19459.13</MicrosoftCSharpVersion>
+    <SystemCodeDomVersion>4.7.0-preview1.19459.13</SystemCodeDomVersion>
+    <SystemComponentModelAnnotationsVersion>4.7.0-preview1.19459.13</SystemComponentModelAnnotationsVersion>
+    <SystemConfigurationConfigurationManagerVersion>4.7.0-preview1.19459.13</SystemConfigurationConfigurationManagerVersion>
+    <SystemDataSqlClientVersion>4.8.0-preview1.19459.13</SystemDataSqlClientVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/core-setup">
-    <MicrosoftNETCoreAppRefPackageVersion>3.0.0-rc2-19458-11</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-rc2-19458-11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependency version settings">
     <!--

global.json

@@ -1,14 +1,14 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-013656",
+    "dotnet": "3.1.100-preview1-014024",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimeVersion)"
       ]
     }
   },
   "sdk": {
-    "version": "3.0.100-preview8-013656"
+    "version": "3.1.100-preview1-014024"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19458.2"

src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj

@@ -10,6 +10,8 @@
     <IsPackable>True</IsPackable>
     <PackageTags>$(PackageTags);SQL Compact;CE</PackageTags>
     <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
+    <!-- Working around https://github.com/NuGet/Home/issues/8467 -->
+    <NoWarn>$(NoWarn);NU5131</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec

@@ -8,6 +8,10 @@
         <dependency id="EntityFramework" version="$Version$" exclude="Build,Analyzers" />
         <dependency id="Microsoft.SqlServer.Compact" version="$MicrosoftSqlServerCompactVersion$" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="EntityFramework" version="$Version$" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.SqlServer.Compact" version="$MicrosoftSqlServerCompactVersion$" exclude="Build,Analyzers" />
+      </group>
     </dependencies>
   </metadata>
   <files>

src/NuGet/EntityFramework/EntityFramework.NuGet.csproj

@@ -2,7 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net40;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;net40;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSource>false</IncludeSource>
     <IsPackable>True</IsPackable>
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <NuspecProperty Include="Configuration=$(Configuration)" />
+    <NuspecProperty Include="DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework)" />
     <NuspecProperty Include="NeutralLanguage=$(NeutralLanguage)" />
     <NuspecProperty Include="MicrosoftCSharpVersion=$(MicrosoftCSharpVersion)" />
     <NuspecProperty Include="SystemCodeDomVersion=$(SystemCodeDomVersion)" />
@@ -27,15 +28,15 @@
     <NuspecProperty Include="IntermediateOutputPath=$(IntermediateOutputPath)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <ProjectReference Include="..\..\Microsoft.Data.Entity.Build.Tasks\Microsoft.Data.Entity.Build.Tasks.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\EntityFramework.SqlServer\EntityFramework.SqlServer.csproj" />
     <ProjectReference Include="..\..\ef6\ef6.csproj" />
   </ItemGroup>
-  
+
   <!-- TODO: Use dotnet/arcade#204 when available -->
   <Target Name="GenerateContent"
           BeforeTargets="GenerateNuspec"

src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec

@@ -31,9 +31,9 @@
     <file src="../../../artifacts/bin/ef6/$Configuration$/net40/ef6.pdb" target="tools/net40/any/" />
     <file src="../../../artifacts/bin/ef6/$Configuration$/net45/ef6.exe" target="tools/net45/any/" />
     <file src="../../../artifacts/bin/ef6/$Configuration$/net45/ef6.pdb" target="tools/net45/any/" />
-    <file src="../../../artifacts/bin/ef6/$Configuration$/netcoreapp3.0/ef6.dll" target="tools/netcoreapp3.0/any/" />
-    <file src="../../../artifacts/bin/ef6/$Configuration$/netcoreapp3.0/ef6.pdb" target="tools/netcoreapp3.0/any/" />
-    <file src="../../../artifacts/bin/ef6/$Configuration$/netcoreapp3.0/ef6.runtimeconfig.json" target="tools/netcoreapp3.0/any/" />
+    <file src="../../../artifacts/bin/ef6/$Configuration$/$DefaultNetCoreTargetFramework$/ef6.dll" target="tools/$DefaultNetCoreTargetFramework$/any/" />
+    <file src="../../../artifacts/bin/ef6/$Configuration$/$DefaultNetCoreTargetFramework$/ef6.pdb" target="tools/$DefaultNetCoreTargetFramework$/any/" />
+    <file src="../../../artifacts/bin/ef6/$Configuration$/$DefaultNetCoreTargetFramework$/ef6.runtimeconfig.json" target="tools/$DefaultNetCoreTargetFramework$/any/" />
     <file src="../../../artifacts/bin/ef6/x86/$Configuration$/net40/ef6.exe" target="tools/net40/win-x86/" />
     <file src="../../../artifacts/bin/ef6/x86/$Configuration$/net40/ef6.pdb" target="tools/net40/win-x86/" />
     <file src="../../../artifacts/bin/ef6/x86/$Configuration$/net45/ef6.exe" target="tools/net45/win-x86/" />

src/NuGet/EntityFramework/tools/EntityFramework6.psm1

@@ -869,7 +869,7 @@ function EF6($project, $startupProject, $workingDir, $params)
         $projectAssetsFile = GetCpsProperty $project 'ProjectAssetsFile'
         $runtimeConfig = Join-Path $targetDir ($targetName + '.runtimeconfig.json')
         $runtimeFrameworkVersion = GetCpsProperty $project 'RuntimeFrameworkVersion'
-        $efPath = Join-Path $PSScriptRoot 'netcoreapp3.0\any\ef6.dll'
+        $efPath = Join-Path $PSScriptRoot 'netcoreapp3.1\any\ef6.dll'
 
         $dotnetParams = 'exec', '--depsfile', $depsFile
 

src/ef6/AppDomainExecutor.cs

@@ -88,6 +88,6 @@ protected override void Execute(string operation, object resultHandler, IDiction
     }
 }
 
-#elif !NETCOREAPP3_0
+#elif !NETCOREAPP
 #error Unexpected target framework
 #endif

src/ef6/Commands/ProjectCommandBase.cs

@@ -81,7 +81,7 @@ protected ExecutorBase CreateExecutor()
                     Config.Value(),
                     RootNamespace.Value(),
                     Language.Value());
-#elif NETCOREAPP3_0
+#elif NETCOREAPP
                 return new ReflectionExecutor(
                 Assembly.Value(),
                 DataDir.Value(),

src/ef6/Program.cs

@@ -19,7 +19,7 @@ internal static class Program
 
         private static int Main(string[] args)
         {
-#if NET45 || NETCOREAPP3_0
+#if NET45 || NETCOREAPP
             if (Console.IsOutputRedirected)
             {
                 Console.OutputEncoding = Encoding.UTF8;

src/ef6/ResXResourceWriter.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
 
 using System.IO;
 using System.Text;

src/ef6/ef6.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net40;net45</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net40;net45</TargetFrameworks>
     <RootNamespace>System.Data.Entity.Tools</RootNamespace>
   </PropertyGroup>
 

test/EntityFramework/FunctionalTests.ProviderAgnostic/FunctionalTests.ProviderAgnostic.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <RootNamespace>System.Data.Entity</RootNamespace>
     <AssemblyName>EntityFramework.FunctionalTests.ProviderAgnostic</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net452;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);EF_FUNCTIONALS</DefineConstants>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
   </PropertyGroup>
@@ -38,7 +38,7 @@
     <ProjectReference Include="..\FunctionalTests.Transitional\FunctionalTests.Transitional.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <None Update="App.config">
       <Link>xunit.console.dll.config</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <RootNamespace>System.Data.Entity</RootNamespace>
     <AssemblyName>EntityFramework.FunctionalTests.Transitional</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net452;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">

test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ExceptionTestExtensions.cs

@@ -9,7 +9,7 @@ namespace System.Data.Entity
 
     public static class ExceptionTestExtensions
     {
-#if NETCOREAPP3_0
+#if NETCOREAPP
         // (Parameter '{parameter name}')
         private const string ParameterSeparator = " (";
 #else

test/EntityFramework/FunctionalTests/FunctionalTests.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <RootNamespace>System.Data.Entity</RootNamespace>
     <AssemblyName>EntityFramework.FunctionalTests</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net452;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);EF_FUNCTIONALS</DefineConstants>
     <NoWarn>$(NoWarn);CS0169</NoWarn>
   </PropertyGroup>
@@ -332,7 +332,7 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <None Update="xunit.console.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

test/EntityFramework/FunctionalTests/ProductivityApi/DbContextTests.cs

@@ -175,7 +175,7 @@ public void
         private void Database_Name_is_from_App_Config_if_convention_name_matches_named_connection_string(
             DbCompiledModel model = null)
         {
-            // Act 
+            // Act
             using (var context = model == null ? new AllTypeKeysContext() : new AllTypeKeysContext(model))
             {
                 // Assert that name of database is taken from app config rather than the convention way,
@@ -379,7 +379,7 @@ public void Verify_DbContext_construction_using_named_connection_string_and_mode
 
         [Fact]
         public void DbContext_construction_using_named_connection_string_and_model_Ctor_where_model_defines_a_subset_of_entities_on_context(
-            
+
             )
         {
             DbContext_construction_using_connection_string_and_model_Ctor(
@@ -710,8 +710,8 @@ public void SaveChangesAsync_performs_DetectChanges()
 
         private void SaveChanges_performs_DetectChanges_implementation(Func<DbContext, int> saveChanges)
         {
-            // NOTE: This is split out into a separate test from the above test because 
-            //       it is important no other APIs are called between the modification 
+            // NOTE: This is split out into a separate test from the above test because
+            //       it is important no other APIs are called between the modification
             //       and calling SaveChanges due to other APIs calling DetectChanges implicitly
 
             ExtendedSqlAzureExecutionStrategy.ExecuteNew(
@@ -900,7 +900,7 @@ public void SaveChanges_bubbles_UpdateException()
 #if !NET40
 
         [Fact(
-#if NETCOREAPP3_0
+#if NETCOREAPP
             Skip = "Deadlocks on .Result"
 #endif
             )]
@@ -2406,7 +2406,7 @@ private void Lazy_loading_can_be_changed_after_DbContext_is_created_but_before_i
         [Fact]
         public void
             Changing_lazy_loading_flag_after_ObjectContext_is_initialized_causes_lazy_loading_flag_in_DbContext_and_ObjectContext_to_change(
-            
+
             )
         {
             using (var context = new F1Context())
@@ -3434,7 +3434,7 @@ public void EnsureTransactionsForFunctionsAndCommands_is_passed_through_to_exist
         #endregion
 
         #region Test EntityConnection-Store Connection state correlation when opening EntityConnection implicitly through context
-        
+
         [ExtendedFact(SkipForSqlAzure = true, Justification = "Streaming queries are not reliable on SQL Azure")]
         public void Implicit_EntityConnection_throws_if_close_underlying_StoreConnection()
         {

test/EntityFramework/FunctionalTests/ProductivityApi/FindTests.cs

@@ -18,7 +18,7 @@ namespace ProductivityApiTests
     /// </summary>
     public class FindTests : FunctionalTestBase
     {
-#if NETCOREAPP3_0
+#if NETCOREAPP
         // (Parameter '{parameter name}')
         private const string ParameterSeparator = " (";
 #else

test/EntityFramework/FunctionalTests/TestModels/ArubaModel/ArubaContext.cs

@@ -28,17 +28,17 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Entity<ArubaFailure>().ToTable("ArubaFailures");
             modelBuilder.Entity<ArubaBaseline>().ToTable("ArubaBaselines");
             modelBuilder.Entity<ArubaTestFailure>().ToTable("ArubaTestFailures");
-            
+
             // composite key, non-integer key
             modelBuilder.Entity<ArubaTask>().HasKey(k => new { k.Id, k.Name });
-            
+
             // need to map key explicitly, otherwise we get into invalid state
             modelBuilder.Entity<ArubaRun>().HasMany(r => r.Tasks).WithRequired().Map(m => { });
-            
+
             // non-generated key
             modelBuilder.Entity<ArubaOwner>().Property(p => p.Id).HasDatabaseGeneratedOption(DatabaseGeneratedOption.None);
             modelBuilder.Entity<ArubaRun>().Property(p => p.Id).HasDatabaseGeneratedOption(DatabaseGeneratedOption.None);
-            
+
             modelBuilder.Entity<ArubaRun>().HasRequired(r => r.RunOwner).WithRequiredDependent(o => o.OwnedRun);
             modelBuilder.Entity<ArubaAllTypes>().Property(p => p.c6_smalldatetime).HasColumnType("smalldatetime");
             modelBuilder.Entity<ArubaAllTypes>().Property(p => p.c7_decimal_28_4).HasColumnType("decimal").HasPrecision(28, 4);
@@ -80,7 +80,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
 
             modelBuilder.Entity<ArubaOwner>().Property(o => o.FirstName).HasMaxLength(30);
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
             modelBuilder.Entity<ArubaAllTypes>().Ignore(x => x.c31_geography);
             modelBuilder.Entity<ArubaAllTypes>().Ignore(x => x.c32_geometry);
             modelBuilder.Entity<ArubaAllTypes>().Ignore(x => x.c36_geometry_linestring);

test/EntityFramework/FunctionalTests/TestModels/ArubaModel/ArubaStoredProceduresContext.cs

@@ -30,7 +30,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
                 .MapToStoredProcedures(
                     m => m.Insert(d => d.LeftKeyParameter(l => l.Id, "Left_id").RightKeyParameter(r => r.Id, "Right_Id")));
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
             modelBuilder.Entity<ArubaAllTypes>().Ignore(x => x.c31_geography);
             modelBuilder.Entity<ArubaAllTypes>().Ignore(x => x.c32_geometry);
             modelBuilder.Entity<ArubaAllTypes>().Ignore(x => x.c36_geometry_linestring);