Skip to content

Commit 6af6e78

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 7bc8e1a commit 6af6e78

23 files changed

+29
-29
lines changed

‎src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.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.Caching.Abstractions.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.Primitives" />
99
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
11-
<Compile Include="Microsoft.Extensions.Caching.Abstractions.netcoreapp3.0.cs" />
10+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
11+
<Compile Include="Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs" />
1212
<Reference Include="Microsoft.Extensions.Primitives" />
1313
</ItemGroup>
1414
</Project>

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

File renamed without changes.

‎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;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
9+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
1010
<NoWarn>$(NoWarn);CS1591</NoWarn>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<PackageTags>cache;memorycache;distributedcache</PackageTags>

‎src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.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.Caching.Memory.netstandard2.0.cs" />
@@ -10,8 +10,8 @@
1010
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
1111
<Reference Include="Microsoft.Extensions.Options" />
1212
</ItemGroup>
13-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
14-
<Compile Include="Microsoft.Extensions.Caching.Memory.netcoreapp3.0.cs" />
13+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
14+
<Compile Include="Microsoft.Extensions.Caching.Memory.netcoreapp.cs" />
1515
<Reference Include="Microsoft.Extensions.Caching.Abstractions" />
1616
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1717
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />

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

File renamed without changes.

‎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;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<NoWarn>$(NoWarn);CS1591</NoWarn>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>cache;memorycache</PackageTags>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildThisFileDirectory)..\..\..\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
</PropertyGroup>
88

99
<ItemGroup>

‎src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.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/Caching/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.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/Caching/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Caching/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Caching/samples/MemoryCacheSample/MemoryCacheSample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Caching/samples/ProfilingSample/ProfilingSample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Caching/samples/RedisCacheSample/RedisCacheSample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Caching/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/Caching/samples/SqlServerCacheSample/SqlServerCacheSample.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>net461;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>net461;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/HttpClientFactory/Http/perf/Microsoft.Extensions.Http.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/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.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.Http.netstandard2.0.cs" />
88
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
99
<Reference Include="Microsoft.Extensions.Logging" />
1010
<Reference Include="Microsoft.Extensions.Options" />
1111
</ItemGroup>
12-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
13-
<Compile Include="Microsoft.Extensions.Http.netcoreapp3.0.cs" />
12+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
13+
<Compile Include="Microsoft.Extensions.Http.netcoreapp.cs" />
1414
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1515
<Reference Include="Microsoft.Extensions.Logging" />
1616
<Reference Include="Microsoft.Extensions.Options" />

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

File renamed without changes.

‎src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
Commonly used types:
77
System.Net.Http.IHttpClientFactory
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>aspnetcore;httpclient</PackageTags>

‎src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.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/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.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/HttpClientFactory/samples/HttpClientFactorySample/HttpClientFactorySample.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;net461</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net461</TargetFrameworks>
55
<DebugType>portable</DebugType>
66
<OutputType>Exe</OutputType>
77
</PropertyGroup>

0 commit comments

Comments
 (0)