Support netcoreapp3.1 TFM (dotnet/extensions#2336)

* Support netcoreapp3.1 TFM * Unpin SDK for source build * Update to preview1 branding Commit migrated from dotnet/extensions@32cc816
maryamariyan · Sep 13, 2019 · d528d93 · d528d93
1 parent 4647914
commit d528d93
Show file tree

Hide file tree

Showing 131 changed files with 193 additions and 199 deletions.
diff --git a/src/libraries/Common/src/Extensions/ActivatorUtilities/ActivatorUtilities.cs b/src/libraries/Common/src/Extensions/ActivatorUtilities/ActivatorUtilities.cs
@@ -402,7 +402,7 @@ public object CreateInstance(IServiceProvider provider)
                     }
                 }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
                 return _constructor.Invoke(BindingFlags.DoNotWrapExceptions, binder: null, parameters: _parameterValues, culture: null);
 #else
                 try

diff --git a/src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreConfig.cs b/src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreConfig.cs
@@ -30,8 +30,12 @@ public DefaultCoreConfig()
             Add(Job.Core
 #if NETCOREAPP2_1
                 .With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21))
-#else
+#elif NETCOREAPP3_0
                 .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
+#elif NETCOREAPP3_1
+                .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
+#else
+#error Target frameworks need to be updated.
 #endif
                 .With(new GcMode { Server = true })
                 .With(RunStrategy.Throughput));

diff --git a/src/libraries/Common/tests/Extensions/DotNetMuxerTests.cs b/src/libraries/Common/tests/Extensions/DotNetMuxerTests.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
 using System.IO;
 using System.Runtime.InteropServices;
 using Xunit;

diff --git a/src/libraries/Common/tests/Extensions/Microsoft.Extensions.Sources.Tests.csproj b/src/libraries/Common/tests/Extensions/Microsoft.Extensions.Sources.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/...on/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs b/...on/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs
@@ -29,7 +29,7 @@ public void ConditionalFactSkip()
             Assert.True(false, "This test should always be skipped.");
         }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
         [ConditionalFact]
         [FrameworkSkipCondition(RuntimeFrameworks.CLR)]
         public void ThisTestMustRunOnCoreCLR()

diff --git a/.../tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs b/.../tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs
@@ -81,7 +81,7 @@ public void TestAlwaysRun()
             Assert.True(true);
         }
 
-#if NETCOREAPP3_0
+#if NETCOREAPP
         [ConditionalTheory]
         [FrameworkSkipCondition(RuntimeFrameworks.CLR)]
         [MemberData(nameof(GetInts))]

diff --git a/.../TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj b/.../TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
 
     <!-- allow skipped tests -->
     <NoWarn>$(NoWarn);xUnit1004</NoWarn>

diff --git a/...soft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/...soft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj
@@ -1,14 +1,14 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Caching.Abstractions.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Caching.Abstractions.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 </Project>
diff --git a/...ons.Caching.Abstractions.netcoreapp3.0.cs → ...nsions.Caching.Abstractions.netcoreapp.cs b/...ons.Caching.Abstractions.netcoreapp3.0.cs → ...nsions.Caching.Abstractions.netcoreapp.cs
diff --git a/...soft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/...soft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj
@@ -5,8 +5,8 @@
 Commonly used types:
 Microsoft.Extensions.Caching.Distributed.IDistributedCache
 Microsoft.Extensions.Caching.Memory.IMemoryCache</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;memorycache;distributedcache</PackageTags>

diff --git a/...raries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/...raries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj
@@ -1,7 +1,7 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Caching.Memory.netstandard2.0.cs" />
@@ -10,8 +10,8 @@
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Options"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Caching.Memory.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Caching.Memory.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Caching.Abstractions"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />

diff --git a/...xtensions.Caching.Memory.netcoreapp3.0.cs → ...t.Extensions.Caching.Memory.netcoreapp.cs b/...xtensions.Caching.Memory.netcoreapp3.0.cs → ...t.Extensions.Caching.Memory.netcoreapp.cs
diff --git a/...raries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/...raries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;memorycache</PackageTags>

diff --git a/...icrosoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/...icrosoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\Logging\Logging.Testing\src\build\Microsoft.Extensions.Logging.Testing.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ons.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/...ons.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj
@@ -1,14 +1,14 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.Abstractions.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Abstractions.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Primitives"  />
   </ItemGroup>
 </Project>
diff --git a/...nfiguration.Abstractions.netcoreapp3.0.cs → ....Configuration.Abstractions.netcoreapp.cs b/...nfiguration.Abstractions.netcoreapp3.0.cs → ....Configuration.Abstractions.netcoreapp.cs
diff --git a/...ons.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/...ons.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <Description>Abstractions of key-value pair based configuration.
 Commonly used types:
 Microsoft.Extensions.Configuration.IConfiguration

diff --git a/...soft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/...soft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj
@@ -1,14 +1,14 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.Binder.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Binder.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.Binder.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
 </Project>
diff --git a/...ons.Configuration.Binder.netcoreapp3.0.cs → ...nsions.Configuration.Binder.netcoreapp.cs b/...ons.Configuration.Binder.netcoreapp3.0.cs → ...nsions.Configuration.Binder.netcoreapp.cs
diff --git a/...soft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/...soft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>

diff --git a/...ensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/...ensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...sions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/...sions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj
@@ -1,14 +1,14 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.CommandLine.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.CommandLine.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
 </Project>
diff --git a/...onfiguration.CommandLine.netcoreapp3.0.cs → ...s.Configuration.CommandLine.netcoreapp.cs b/...onfiguration.CommandLine.netcoreapp3.0.cs → ...s.Configuration.CommandLine.netcoreapp.cs
diff --git a/...sions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/...sions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <PackageTags>$(PackageTags);commandline</PackageTags>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>

diff --git a/...nfiguration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/...nfiguration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...n.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/...n.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
@@ -1,14 +1,14 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
   </ItemGroup>
 </Project>
diff --git a/...ion.EnvironmentVariables.netcoreapp3.0.cs → ...ration.EnvironmentVariables.netcoreapp.cs b/...ion.EnvironmentVariables.netcoreapp3.0.cs → ...ration.EnvironmentVariables.netcoreapp.cs
diff --git a/...n.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/...n.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <PackageTags>$(PackageTags);envvar;environmentvariable</PackageTags>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>

diff --git a/...nmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/...nmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/...Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj
@@ -1,15 +1,15 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical"  />
   </ItemGroup>

diff --git a/...iguration.FileExtensions.netcoreapp3.0.cs → ...onfiguration.FileExtensions.netcoreapp.cs b/...iguration.FileExtensions.netcoreapp3.0.cs → ...onfiguration.FileExtensions.netcoreapp.cs
diff --git a/...Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/...Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>

diff --git a/...ation.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj b/...ation.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/.../Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/.../Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj
@@ -1,15 +1,15 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.Ini.netstandard2.0.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Ini.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.Ini.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
   </ItemGroup>

diff --git a/...nsions.Configuration.Ini.netcoreapp3.0.cs → ...xtensions.Configuration.Ini.netcoreapp.cs b/...nsions.Configuration.Ini.netcoreapp3.0.cs → ...xtensions.Configuration.Ini.netcoreapp.cs
diff --git a/.../Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/.../Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>INI configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <PackageTags>$(PackageTags);ini</PackageTags>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>

diff --git a/...ft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj b/...ft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/...icrosoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj
@@ -1,7 +1,7 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.Extensions.Configuration.Json.netstandard2.0.cs" />
@@ -10,8 +10,8 @@
     <Reference Include="System.Text.Json"  />
     <Reference Include="System.Threading.Tasks.Extensions"  />
   </ItemGroup>
-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.Extensions.Configuration.Json.netcoreapp3.0.cs" />
+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <Compile Include="Microsoft.Extensions.Configuration.Json.netcoreapp.cs" />
     <Reference Include="Microsoft.Extensions.Configuration"  />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions"  />
   </ItemGroup>

diff --git a/...sions.Configuration.Json.netcoreapp3.0.cs → ...tensions.Configuration.Json.netcoreapp.cs b/...sions.Configuration.Json.netcoreapp3.0.cs → ...tensions.Configuration.Json.netcoreapp.cs
diff --git a/...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/...icrosoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <PackageTags>$(PackageTags);json</PackageTags>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>

diff --git a/....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj b/....Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>