Skip to content

Commit bffe794

Browse files
author
John Luo
committed
Update tfm in master to netcoreap5.0
1 parent b7b95b2 commit bffe794

File tree

36 files changed

+91
-86
lines changed

36 files changed

+91
-86
lines changed

‎Directory.Build.targets‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
Version="$(MicrosoftNetCompilersToolsetVersion)"
4444
PrivateAssets="all"
4545
IsImplicitlyDefined="true" />
46-
47-
<!-- Reference netstandard library at incoming dependency flow version, not bundled sdk version. -->
48-
<FrameworkReference Update="NETStandard.Library"
49-
Condition="'$(TargetFramework)' == 'netstandard2.1'"
50-
TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)" />
5146
</ItemGroup>
5247

5348
<ItemGroup Condition="'$(Language)' == 'C#' AND '$(IsReferenceAssemblyProject)' == 'true'">

‎eng/Workarounds.AfterArcade.targets‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,34 @@
55

66
<!-- Workaround for the evaluation order in which Arcade assigns test properties. -->
77
<TestRunnerName Condition="'$(IsUnitTestProject)' == 'false'"/>
8+
9+
<!-- Workaround while there is no 5.0 SDK available, suppress unsupported version error -->
10+
<NETCoreAppMaximumVersion>5.0</NETCoreAppMaximumVersion>
811
</PropertyGroup>
912

1013
<ItemGroup>
11-
<!--
12-
Workaround the cyclical nature of building .NET Core itself.
14+
<!-- Workaround while there is no 5.0 SDK available, copy known apphost/framework reference info from 3.0 -->
15+
<KnownAppHostPack
16+
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
17+
TargetFramework="netcoreapp5.0"
18+
/>
19+
<KnownFrameworkReference
20+
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
21+
TargetFramework="netcoreapp5.0"
22+
/>
23+
</ItemGroup>
1324

14-
The SDK implies a default version of .NET Core and .NET Standard to use, but that is typically too stale for this repo.
15-
This sets the version of the reference and runtime packs which should be used
16-
-->
17-
<KnownFrameworkReference Update="Microsoft.NETCore.App">
18-
<!-- Always update the 'latest version', whether the repo is servicing or not. -->
19-
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">$(MicrosoftNETCoreAppRuntimeVersion)</LatestRuntimeFrameworkVersion>
20-
<!-- Only update the default runtime version for preview builds. -->
21-
<DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRuntimeVersion)</DefaultRuntimeFrameworkVersion>
22-
<!-- Only update the targeting pack version for preview builds. -->
23-
<TargetingPackVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
24-
</KnownFrameworkReference>
25+
<ItemGroup>
26+
<!-- Reference base shared framework at incoming dependency flow version, not bundled sdk version. -->
27+
<FrameworkReference
28+
Update="Microsoft.NETCore.App"
29+
Condition="'$(TargetFramework)' == 'netcoreapp5.0'"
30+
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
31+
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
32+
/>
33+
</ItemGroup>
2534

35+
<ItemGroup>
2636
<KnownFrameworkReference Update="NETStandard.Library">
2737
<!-- Workaround for netstandard2.1 projects until we can get a preview 8 SDK containing https://github.com/dotnet/sdk/pull/3463 fix. -->
2838
<RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
Commonly used types:
66
Microsoft.Extensions.Caching.Distributed.IDistributedCache
77
Microsoft.Extensions.Caching.Memory.IMemoryCache</Description>
8-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
9-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
9+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
1010
<NoWarn>$(NoWarn);CS1591</NoWarn>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<PackageTags>cache;memorycache;distributedcache</PackageTags>

‎src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj‎

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

33
<PropertyGroup>
44
<Description>In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<NoWarn>$(NoWarn);CS1591</NoWarn>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>cache;memorycache</PackageTags>

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

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

33
<PropertyGroup>
44
<Description>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<IsPackable>true</IsPackable>
88
<IsShipping>true</IsShipping>
99
</PropertyGroup>

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

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

33
<PropertyGroup>
44
<Description>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<PackageTags>$(PackageTags);commandline</PackageTags>
88
<IsPackable>true</IsPackable>
99
<IsShipping>true</IsShipping>

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

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

33
<PropertyGroup>
44
<Description>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<PackageTags>$(PackageTags);envvar;environmentvariable</PackageTags>
88
<IsPackable>true</IsPackable>
99
<IsShipping>true</IsShipping>

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

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

33
<PropertyGroup>
44
<Description>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<IsPackable>true</IsPackable>
88
<IsShipping>true</IsShipping>
99
</PropertyGroup>

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

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

33
<PropertyGroup>
44
<Description>INI configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<PackageTags>$(PackageTags);ini</PackageTags>
88
<IsPackable>true</IsPackable>
99
<IsShipping>true</IsShipping>

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

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

33
<PropertyGroup>
44
<Description>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netcoreapp5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp5.0</TargetFrameworks>
77
<PackageTags>$(PackageTags);json</PackageTags>
88
<IsPackable>true</IsPackable>
99
<IsShipping>true</IsShipping>

0 commit comments

Comments
 (0)