Skip to content

Commit a9b82fa

Browse files
author
John Luo
authored
Support netcoreapp3.1 TFM (dotnet/extensions#2336)
* Support netcoreapp3.1 TFM * Unpin SDK for source build * Update to preview1 branding \n\nCommit migrated from dotnet/extensions@32cc816
1 parent 453a4c8 commit a9b82fa

File tree

49 files changed

+70
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+70
-66
lines changed

‎src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.Configuration" />
99
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
1010
</ItemGroup>
11-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
12-
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp3.0.cs" />
11+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
12+
<Compile Include="Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs" />
1313
<Reference Include="Microsoft.Extensions.Configuration" />
1414
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
1515
</ItemGroup>

‎src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp3.0.cs renamed to ‎src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs

File renamed without changes.

‎src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Description>Configuration provider that uses files in a directory for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<IsPackable>true</IsPackable>
88
<IsShipping>true</IsShipping>
99
</PropertyGroup>

‎src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
99
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
11-
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.cs" />
10+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
11+
<Compile Include="Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs" />
1212
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
1313
</ItemGroup>
1414
</Project>

‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.cs renamed to ‎src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs

File renamed without changes.

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace>
55
<Description>File provider for files in embedded resources for Microsoft.Extensions.FileProviders.</Description>
6-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<NuspecFile>$(MSBuildProjectName).multitarget.nuspec</NuspecFile>
8-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
9-
<NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp3.0.nuspec</NuspecFile>
8+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
9+
<NuspecFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildProjectName).netcoreapp.nuspec</NuspecFile>
1010
<IsPackable>true</IsPackable>
1111
<IsShipping>true</IsShipping>
1212
</PropertyGroup>

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
$CommonMetadataElements$
55
<dependencies>
6-
<group targetFramework=".NETCoreApp3.0">
6+
<group targetFramework=".NETCoreApp3.1">
77
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
88
</group>
99
<group targetFramework=".NETStandard2.0">

‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.nuspec renamed to ‎src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
$CommonMetadataElements$
55
<dependencies>
6-
<group targetFramework=".NETCoreApp3.0">
6+
<group targetFramework=".NETCoreApp3.1">
77
<dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$version$" exclude="Build,Analyzers" />
88
</group>
99
</dependencies>

‎src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/FileProviders/Manifest.MSBuildTask/test/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netstandard2.0.cs" />
88

99
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
11-
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp3.0.cs" />
10+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
11+
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp.cs" />
1212

1313
</ItemGroup>
1414
</Project>

‎src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp3.0.cs renamed to ‎src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp.cs

File renamed without changes.

‎src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Commonly Used Types
77
Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck
88
</Description>
99
<RootNamespace>Microsoft.Extensions.Diagnostics.HealthChecks</RootNamespace>
10-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
11-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
11+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
1212
<NoWarn>$(NoWarn);CS1591</NoWarn>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1414
<PackageTags>diagnostics;healthchecks</PackageTags>

‎src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
99
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
1010
<Reference Include="Microsoft.Extensions.Options" />
1111
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
13-
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp3.0.cs" />
12+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
13+
<Compile Include="Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp.cs" />
1414
<Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
1515
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
1616
<Reference Include="Microsoft.Extensions.Options" />

‎src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp3.0.cs renamed to ‎src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp.cs

File renamed without changes.

‎src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Commonly Used Types:
66
Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckService
77
Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder
88
</Description>
9-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
10-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<PackageTags>diagnostics;healthchecks</PackageTags>

‎src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(RepoRoot)src\Logging\Logging.Testing\src\build\Microsoft.Extensions.Logging.Testing.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
6+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
77
<RootNamespace>Microsoft.Extensions.Diagnostics.HealthChecks</RootNamespace>
88
</PropertyGroup>
99

‎src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.JSInterop.netstandard2.0.cs" />
88
<Reference Include="System.Text.Json" />
99
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
11-
<Compile Include="Microsoft.JSInterop.netcoreapp3.0.cs" />
10+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
11+
<Compile Include="Microsoft.JSInterop.netcoreapp.cs" />
1212

1313
</ItemGroup>
1414
</Project>

‎src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.netcoreapp3.0.cs renamed to ‎src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.netcoreapp.cs

File renamed without changes.

‎src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
66
<Description>Abstractions and features for interop between .NET and JavaScript code.</Description>
77
<PackageTags>javascript;interop</PackageTags>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.Localization.Abstractions.netstandard2.0.cs" />
88

99
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
11-
<Compile Include="Microsoft.Extensions.Localization.Abstractions.netcoreapp3.0.cs" />
10+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
11+
<Compile Include="Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs" />
1212

1313
</ItemGroup>
1414
</Project>

‎src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp3.0.cs renamed to ‎src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs

File renamed without changes.

‎src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
Commonly used types:
77
Microsoft.Extensions.Localization.IStringLocalizer
88
Microsoft.Extensions.Localization.IStringLocalizer&lt;T&gt;</Description>
9-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
10-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
1111
<NoWarn>$(NoWarn);CS1591</NoWarn>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<PackageTags>localization</PackageTags>

‎src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- This file is automatically generated. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.Extensions.Localization.netstandard2.0.cs" />
@@ -10,8 +10,8 @@
1010
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />
1111
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
1212
</ItemGroup>
13-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
14-
<Compile Include="Microsoft.Extensions.Localization.netcoreapp3.0.cs" />
13+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
14+
<Compile Include="Microsoft.Extensions.Localization.netcoreapp.cs" />
1515
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1616
<Reference Include="Microsoft.Extensions.Options" />
1717
<Reference Include="Microsoft.Extensions.Localization.Abstractions" />

‎src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp3.0.cs renamed to ‎src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp.cs

File renamed without changes.

‎src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<Product>Microsoft .NET Extensions</Product>
55
<Description>Application localization services and default implementation based on ResourceManager to load localized assembly resources.</Description>
6-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
7-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
7+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
88
<NoWarn>$(NoWarn);CS1591</NoWarn>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>localization</PackageTags>

‎src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/ObjectPool/perf/Microsoft.Extensions.ObjectPool.Performance.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ServerGarbageCollection>true</ServerGarbageCollection>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/ObjectPool/test/Microsoft.Extensions.ObjectPool.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Shared/src/ActivatorUtilities/ActivatorUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public object CreateInstance(IServiceProvider provider)
402402
}
403403
}
404404

405-
#if NETCOREAPP3_0
405+
#if NETCOREAPP
406406
return _constructor.Invoke(BindingFlags.DoNotWrapExceptions, binder: null, parameters: _parameterValues, culture: null);
407407
#else
408408
try

‎src/Shared/src/BenchmarkRunner/DefaultCoreConfig.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ public DefaultCoreConfig()
3030
Add(Job.Core
3131
#if NETCOREAPP2_1
3232
.With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21))
33-
#else
33+
#elif NETCOREAPP3_0
3434
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
35+
#elif NETCOREAPP3_1
36+
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
37+
#else
38+
#error Target frameworks need to be updated.
3539
#endif
3640
.With(new GcMode { Server = true })
3741
.With(RunStrategy.Throughput));

‎src/Shared/test/DotNetMuxerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
#if NETCOREAPP3_0
4+
#if NETCOREAPP
55
using System.IO;
66
using System.Runtime.InteropServices;
77
using Xunit;

‎src/Shared/test/Microsoft.Extensions.Sources.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
</PropertyGroup>
77

‎src/Shared/testassets/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Shared/testassets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Shared/testassets/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Shared/testassets/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Shared/testassets/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Shared/testassets/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)