Skip to content

Commit 32cc816

Browse files
author
John Luo
authored
Support netcoreapp3.1 TFM (#2336)
* Support netcoreapp3.1 TFM * Unpin SDK for source build * Update to preview1 branding
1 parent a726923 commit 32cc816

File tree

211 files changed

+303
-335
lines changed

Some content is hidden

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

211 files changed

+303
-335
lines changed

‎azure-pipelines.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -270,18 +270,6 @@ stages:
270270
chmod +x $HOME/bin/jq
271271
echo "##vso[task.prependpath]$HOME/bin"
272272
displayName: Install jq
273-
- task: UseDotNet@2
274-
displayName: 'Use .NET Core sdk'
275-
inputs:
276-
packageType: sdk
277-
# The SDK version selected here is intentionally supposed to use the latest release
278-
# For the purpose of building Linux distros, we can't depend on features of the SDK
279-
# which may not exist in pre-built versions of the SDK
280-
# Pinning to preview 8 since preview 9 has breaking changes
281-
# version: 3.0.x
282-
version: 3.0.100-preview8-013656
283-
installationPath: $(DotNetCoreSdkDir)
284-
includePreviewVersions: true
285273
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release
286274
displayName: Run ci-source-build.sh
287275
- task: PublishBuildArtifacts@1

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<MinorVersion>1</MinorVersion>
1111
<PatchVersion>0</PatchVersion>
1212
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
13-
<PreReleaseVersionLabel>alpha1</PreReleaseVersionLabel>
13+
<PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
1414
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
1515
<!--
1616
We do not support changing reference assemblies in a patch. This ignores

‎eng/common/templates/job/performance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
container: '' # required -- name of the container
88
osGroup: '' # required -- operating system for the job
99
extraSetupParameters: '' # optional -- extra arguments to pass to the setup script
10-
frameworks: ['netcoreapp3.0'] # optional -- list of frameworks to run against
10+
frameworks: ['netcoreapp3.1'] # optional -- list of frameworks to run against
1111
continueOnError: 'false' # optional -- determines whether to continue the build if the step errors
1212
dependsOn: '' # optional -- dependencies of the job
1313
timeoutInMinutes: 320 # optional -- timeout for the job
@@ -20,7 +20,7 @@ jobs:
2020
enableTelemetry: ${{ parameters.enableTelemetry }}
2121
enablePublishBuildArtifacts: true
2222
continueOnError: ${{ parameters.continueOnError }}
23-
23+
2424
jobs:
2525
- job: '${{ parameters.jobName }}'
2626

@@ -51,7 +51,7 @@ jobs:
5151
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
5252
- HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"'
5353
- IsInternal: --internal
54-
54+
5555
- group: DotNet-HelixApi-Access
5656
- group: dotnet-benchview
5757

‎eng/scripts/ci-source-build.sh

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
#
3+
#
44
# This script is meant for testing source build by imitating some of the input parameters and conditions.
55
#
66

@@ -9,26 +9,10 @@ set -euo pipefail
99
scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1010
reporoot="$(dirname "$(dirname "$scriptroot")")"
1111

12-
# For local development, make a backup copy of this file first
13-
if [ ! -f "$reporoot/global.bak.json" ]; then
14-
mv "$reporoot/global.json" "$reporoot/global.bak.json"
15-
fi
16-
17-
# Detect the current version of .NET Core installed
18-
export SDK_VERSION=$(dotnet --version)
19-
echo "The ambient version of .NET Core SDK version = $SDK_VERSION"
20-
21-
# Update the global.json file to match the current .NET environment
22-
cat "$reporoot/global.bak.json" | \
23-
jq '.sdk.version=env.SDK_VERSION' | \
24-
jq '.tools.dotnet=env.SDK_VERSION' | \
25-
jq 'del(.tools.runtimes)' \
26-
> "$reporoot/global.json"
12+
export DotNetBuildFromSource='true'
2713

28-
# Restore the original global.json file
29-
trap "{
30-
mv "$reporoot/global.bak.json" "$reporoot/global.json"
31-
}" EXIT
14+
# Build repo tasks
15+
"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj
3216

33-
export DotNetBuildFromSource='true'
34-
"$reporoot/eng/common/build.sh" --restore --build --pack "$@"
17+
# Build projects
18+
"$reporoot/eng/common/build.sh" --restore --build --pack "$@"

‎eng/targets/ReferenceAssembly.targets

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,16 @@
4040
<Exec Condition="'$(OS)' != 'Windows_NT'"
4141
Command="echo '$(ProjectListContentLines.Replace('\t','\\t'))' > $(_RefProjectFileOutputPath)" />
4242

43+
<Message Importance="High" Text="Generated $(_RefProjectFileOutputPath)" />
4344
</Target>
4445

4546
<Target Name="_GenerateProjectSourceInner" Returns="@(ProjectListContent)" DependsOnTargets="Build" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
4647
<PropertyGroup>
48+
<_RefSourceFileTFM>$(TargetFramework)</_RefSourceFileTFM>
49+
<_RefSourceFileTFM Condition="$(TargetFramework.StartsWith('netcoreapp'))">netcoreapp</_RefSourceFileTFM>
50+
4751
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
48-
<_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs</_RefSourceFileName>
52+
<_RefSourceFileName>$(AssemblyName).$(_RefSourceFileTFM).cs</_RefSourceFileName>
4953
<_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName)</_RefSourceFileOutputPath>
5054
</PropertyGroup>
5155

@@ -61,9 +65,11 @@
6165
<_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)"</_GenAPICmd>
6266
<_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)"</_GenAPICmd>
6367
<_GenAPICmd>$(_GenAPICmd) --header-file "$(RepoRoot)/eng/LicenseHeader.txt"</_GenAPICmd>
68+
<_GenAPICmd>$(_GenAPICmd) --exclude-api-list "$(RepoRoot)/eng/GenAPI.exclusions.txt"</_GenAPICmd>
6469
</PropertyGroup>
6570

6671
<MakeDir Directories="$(_RefSourceOutputPath)" />
72+
<Message Importance="High" Text="Generating $(_RefSourceFileOutputPath)" />
6773
<Exec Command="$(_GenAPICmd)" />
6874

6975
<ItemGroup>
@@ -73,10 +79,6 @@
7379
</ItemGroup>
7480

7581
<PropertyGroup>
76-
<ProjectListFile>$(MSBuildThisFileDirectory)..\eng\ProjectReferences.props</ProjectListFile>
77-
<RefsTargetFramework>$(TargetFrameworks)</RefsTargetFramework>
78-
<RefsTargetFramework Condition="'$(RefsTargetFramework)' == ''">$(TargetFramework)</RefsTargetFramework>
79-
8082
<ReferencesContent>
8183
<![CDATA[
8284
<ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'">
@@ -92,4 +94,4 @@
9294
</ItemGroup>
9395
</Target>
9496

95-
</Project>
97+
</Project>

‎eng/tools/BaselineGenerator/BaselineGenerator.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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<StartArguments>-s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</StartArguments>
66
<StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
77
</PropertyGroup>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview8-013656"
3+
"version": "3.1.100-preview1-014024"
44
},
55
"tools": {
6-
"dotnet": "3.0.100-preview8-013656",
6+
"dotnet": "3.1.100-preview1-014024",
77
"runtimes": {
88
"dotnet": [
99
"$(MicrosoftNETCoreAppRuntimeVersion)"

‎src/Analyzers/Async/test/Microsoft.DotNet.Analyzers.Async.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
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<!-- Analyzers tests can't find netfx ref assemblies from a package -->
77
<UsingToolNetFrameworkReferenceAssemblies Condition="'$(OS)' == 'Windows_NT'">false</UsingToolNetFrameworkReferenceAssemblies>

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

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

File renamed without changes.

‎src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.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 of key-value pair based configuration.
77
Commonly used types:
88
Microsoft.Extensions.Configuration.IConfiguration

‎src/Configuration/Config.AzureKeyVault/samples/KeyVaultSample.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>

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

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

File renamed without changes.

‎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;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<IsPackable>true</IsPackable>
88
<IsShipping>true</IsShipping>
99
</PropertyGroup>

‎src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.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>

0 commit comments

Comments
 (0)