diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9dd49304462..5f7da97f9b9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -270,18 +270,6 @@ stages: chmod +x $HOME/bin/jq echo "##vso[task.prependpath]$HOME/bin" displayName: Install jq - - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - # The SDK version selected here is intentionally supposed to use the latest release - # For the purpose of building Linux distros, we can't depend on features of the SDK - # which may not exist in pre-built versions of the SDK - # Pinning to preview 8 since preview 9 has breaking changes - # version: 3.0.x - version: 3.0.100-preview8-013656 - installationPath: $(DotNetCoreSdkDir) - includePreviewVersions: true - script: ./eng/scripts/ci-source-build.sh --ci --configuration Release displayName: Run ci-source-build.sh - task: PublishBuildArtifacts@1 diff --git a/eng/Versions.props b/eng/Versions.props index c0b1424c4e2..0b95bc4fa43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 0 $(MajorVersion).$(MinorVersion).$(PatchVersion) - alpha1 + preview1 $(VersionPrefix).0 false diff --git a/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj index 9ab2457b499..50eab405b28 100644 --- a/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp3.0.cs b/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs similarity index 100% rename from src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp3.0.cs rename to src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.netcoreapp.cs diff --git a/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index 3ff41adc182..40b3f185bcf 100644 --- a/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/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 - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true cache;memorycache;distributedcache diff --git a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index 6908d1a59ac..68812807eb9 100644 --- a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -10,8 +10,8 @@ - - + + diff --git a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.netcoreapp3.0.cs b/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.netcoreapp.cs similarity index 100% rename from src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.netcoreapp3.0.cs rename to src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.netcoreapp.cs diff --git a/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj index b3f1a2e9830..3d42c1707b4 100644 --- a/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -2,8 +2,8 @@ In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true cache;memorycache diff --git a/src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj index ce34f235031..a0fee41c97d 100644 --- a/src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj +++ b/src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj b/src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj index a8c9b2f7a77..6f95bd50684 100644 --- a/src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj +++ b/src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Caching/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj b/src/Caching/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj index ee8aaeb2ceb..6edc56986da 100644 --- a/src/Caching/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj +++ b/src/Caching/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Caching/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj b/src/Caching/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj index 56ef71c64aa..eba2e7db569 100644 --- a/src/Caching/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj +++ b/src/Caching/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj @@ -1,7 +1,7 @@ - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Caching/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj b/src/Caching/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj index 5dae3631bef..bf8385bb31a 100644 --- a/src/Caching/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj +++ b/src/Caching/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Caching/samples/MemoryCacheSample/MemoryCacheSample.csproj b/src/Caching/samples/MemoryCacheSample/MemoryCacheSample.csproj index 56ef71c64aa..eba2e7db569 100644 --- a/src/Caching/samples/MemoryCacheSample/MemoryCacheSample.csproj +++ b/src/Caching/samples/MemoryCacheSample/MemoryCacheSample.csproj @@ -1,7 +1,7 @@ - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Caching/samples/ProfilingSample/ProfilingSample.csproj b/src/Caching/samples/ProfilingSample/ProfilingSample.csproj index 56ef71c64aa..eba2e7db569 100644 --- a/src/Caching/samples/ProfilingSample/ProfilingSample.csproj +++ b/src/Caching/samples/ProfilingSample/ProfilingSample.csproj @@ -1,7 +1,7 @@ - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Caching/samples/RedisCacheSample/RedisCacheSample.csproj b/src/Caching/samples/RedisCacheSample/RedisCacheSample.csproj index 6afb9627f22..6e02195b08b 100644 --- a/src/Caching/samples/RedisCacheSample/RedisCacheSample.csproj +++ b/src/Caching/samples/RedisCacheSample/RedisCacheSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Caching/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj b/src/Caching/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj index 1fab37728ba..2921fac1716 100644 --- a/src/Caching/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj +++ b/src/Caching/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Caching/samples/SqlServerCacheSample/SqlServerCacheSample.csproj b/src/Caching/samples/SqlServerCacheSample/SqlServerCacheSample.csproj index d7d4eda83dc..bb5f8cfbe3d 100644 --- a/src/Caching/samples/SqlServerCacheSample/SqlServerCacheSample.csproj +++ b/src/Caching/samples/SqlServerCacheSample/SqlServerCacheSample.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj index 6b574ec3b27..cb4bf8226c4 100644 --- a/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netcoreapp3.0.cs b/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netcoreapp3.0.cs rename to src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.netcoreapp.cs diff --git a/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index ce441b5ffb2..367e597d27e 100644 --- a/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,8 +1,8 @@  - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) Abstractions of key-value pair based configuration. Commonly used types: Microsoft.Extensions.Configuration.IConfiguration diff --git a/src/Configuration/Config.AzureKeyVault/samples/KeyVaultSample.csproj b/src/Configuration/Config.AzureKeyVault/samples/KeyVaultSample.csproj index aee7104a90e..fba2d438513 100644 --- a/src/Configuration/Config.AzureKeyVault/samples/KeyVaultSample.csproj +++ b/src/Configuration/Config.AzureKeyVault/samples/KeyVaultSample.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net461 + $(DefaultNetCoreTargetFramework);net461 portable Exe diff --git a/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj index 76f59c4ff0d..fe971910fa5 100644 --- a/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.netcoreapp3.0.cs b/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.netcoreapp3.0.cs rename to src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.netcoreapp.cs diff --git a/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index d6fcba08547..7b336a56e7e 100644 --- a/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -2,8 +2,8 @@ Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.Tests.csproj index 254380ae084..7feebd457bf 100644 --- a/src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.Tests.csproj +++ b/src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj index 22f21ba0a42..fde3620e688 100644 --- a/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netcoreapp3.0.cs b/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netcoreapp3.0.cs rename to src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.netcoreapp.cs diff --git a/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index eb792011808..8966564bac4 100644 --- a/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -2,8 +2,8 @@ Command line configuration provider implementation for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);commandline true true diff --git a/src/Configuration/Config.CommandLine/test/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/src/Configuration/Config.CommandLine/test/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj index d2069733e27..be4f48b38c5 100644 --- a/src/Configuration/Config.CommandLine/test/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj +++ b/src/Configuration/Config.CommandLine/test/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index dca01be4f6b..7bf045d908d 100644 --- a/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp3.0.cs b/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp3.0.cs rename to src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.netcoreapp.cs diff --git a/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index aaec24827ee..6e95fafa1bb 100644 --- a/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -2,8 +2,8 @@ Environment variables configuration provider implementation for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);envvar;environmentvariable true true diff --git a/src/Configuration/Config.EnvironmentVariables/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/src/Configuration/Config.EnvironmentVariables/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj index c8aa2ae845b..9f477e5d40c 100644 --- a/src/Configuration/Config.EnvironmentVariables/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj +++ b/src/Configuration/Config.EnvironmentVariables/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj index 6b0454854c2..1f674584666 100644 --- a/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netcoreapp3.0.cs b/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netcoreapp3.0.cs rename to src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.netcoreapp.cs diff --git a/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index 15c0679efad..3ddd53c1892 100644 --- a/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -2,8 +2,8 @@ Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/Configuration/Config.FileExtensions/test/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj b/src/Configuration/Config.FileExtensions/test/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj index 90841eb8938..07b150c9b45 100644 --- a/src/Configuration/Config.FileExtensions/test/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj +++ b/src/Configuration/Config.FileExtensions/test/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj index e5936f87e31..8e3d6896f3c 100644 --- a/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.netcoreapp3.0.cs b/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.netcoreapp3.0.cs rename to src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.netcoreapp.cs diff --git a/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index 1f650046d76..3739129821c 100644 --- a/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -2,8 +2,8 @@ INI configuration provider implementation for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);ini true true diff --git a/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj b/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj index bf19b8b62c1..a4fbec1a2b6 100644 --- a/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj +++ b/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj index 2203dcc047d..488418fa9fc 100644 --- a/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -10,8 +10,8 @@ - - + + diff --git a/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.netcoreapp3.0.cs b/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.netcoreapp3.0.cs rename to src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.netcoreapp.cs diff --git a/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 0fec4aec03f..8b14a9a151e 100644 --- a/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -2,8 +2,8 @@ JSON configuration provider implementation for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);json true true diff --git a/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj b/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj index ff81d8bd885..661386210e0 100644 --- a/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj +++ b/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj index 4e074ab493c..5500c4ddc81 100644 --- a/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj +++ b/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp3.0.cs b/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp3.0.cs rename to src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.netcoreapp.cs diff --git a/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj index 10f41fa9f49..7f9c5e7eb19 100644 --- a/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj +++ b/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj @@ -2,8 +2,8 @@ Configuration provider that uses files in a directory for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj b/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj index 95a73ae6cfd..096cf2e2e0d 100644 --- a/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj +++ b/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj b/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj index ace142c0c57..1230e6663f9 100644 --- a/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj +++ b/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj index 4d40549a391..aaa946ccd2b 100644 --- a/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netcoreapp3.0.cs b/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netcoreapp3.0.cs rename to src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.netcoreapp.cs diff --git a/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index 4187bd5f395..bf88139bc98 100644 --- a/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -2,8 +2,8 @@ User secrets configuration provider implementation for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);secrets;usersecrets true true diff --git a/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj b/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj index 158fbb72c92..2a337a91ec5 100644 --- a/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj +++ b/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj index fb1df3e6cba..81dca84962e 100644 --- a/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.netcoreapp3.0.cs b/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.netcoreapp.cs similarity index 100% rename from src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.netcoreapp3.0.cs rename to src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.netcoreapp.cs diff --git a/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index 3a055260df9..9468359d7af 100644 --- a/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -2,8 +2,8 @@ XML configuration provider implementation for Microsoft.Extensions.Configuration. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);xml true true diff --git a/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj index c2dc80237de..b1c7d4a1ee6 100644 --- a/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj +++ b/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj index 5cfa71396be..05ed80b364a 100644 --- a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.netcoreapp3.0.cs b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.netcoreapp.cs similarity index 100% rename from src/Configuration/Config/ref/Microsoft.Extensions.Configuration.netcoreapp3.0.cs rename to src/Configuration/Config/ref/Microsoft.Extensions.Configuration.netcoreapp.cs diff --git a/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj b/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj index dc93341da79..dfa2c258f58 100644 --- a/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj +++ b/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj @@ -2,8 +2,8 @@ Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/Configuration/Config/test/Microsoft.Extensions.Configuration.Tests.csproj b/src/Configuration/Config/test/Microsoft.Extensions.Configuration.Tests.csproj index 61dad1abc59..0fdc75dc626 100644 --- a/src/Configuration/Config/test/Microsoft.Extensions.Configuration.Tests.csproj +++ b/src/Configuration/Config/test/Microsoft.Extensions.Configuration.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj b/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj index 4c993034998..396ed6bcc4d 100644 --- a/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj +++ b/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/DependencyInjection/DI.External.Tests/test/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/DependencyInjection/DI.External.Tests/test/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj index 75d75fc294d..d6b2f1e61e8 100644 --- a/src/DependencyInjection/DI.External.Tests/test/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj +++ b/src/DependencyInjection/DI.External.Tests/test/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Microsoft.Extensions.DependencyInjection false diff --git a/src/DependencyInjection/DI/perf/Microsoft.Extensions.DependencyInjection.Performance.csproj b/src/DependencyInjection/DI/perf/Microsoft.Extensions.DependencyInjection.Performance.csproj index 48239583c90..5416076c95b 100644 --- a/src/DependencyInjection/DI/perf/Microsoft.Extensions.DependencyInjection.Performance.csproj +++ b/src/DependencyInjection/DI/perf/Microsoft.Extensions.DependencyInjection.Performance.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) Exe true diff --git a/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj index 179706a8852..d0f4865cccb 100644 --- a/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -1,10 +1,10 @@ - netcoreapp3.0;netstandard2.0;netstandard2.1 + netcoreapp3.1;netstandard2.0;netstandard2.1 - - + + diff --git a/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.netcoreapp3.0.cs b/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.netcoreapp.cs similarity index 100% rename from src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.netcoreapp3.0.cs rename to src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.netcoreapp.cs diff --git a/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj b/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj index c87d8f9519f..eb488c62521 100644 --- a/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj @@ -2,7 +2,7 @@ Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection. - netcoreapp3.0;net461;netstandard2.0;netstandard2.1 + $(DefaultNetCoreTargetFramework);net461;netstandard2.0;netstandard2.1 true dependencyinjection;di true diff --git a/src/DependencyInjection/DI/src/ServiceLookup/CallSiteFactory.cs b/src/DependencyInjection/DI/src/ServiceLookup/CallSiteFactory.cs index 53324efd7d3..6ecf446d972 100644 --- a/src/DependencyInjection/DI/src/ServiceLookup/CallSiteFactory.cs +++ b/src/DependencyInjection/DI/src/ServiceLookup/CallSiteFactory.cs @@ -71,11 +71,7 @@ private void Populate() internal ServiceCallSite GetCallSite(Type serviceType, CallSiteChain callSiteChain) { -#if NETCOREAPP2_0 - return _callSiteCache.GetOrAdd(serviceType, (type, chain) => CreateCallSite(type, chain), callSiteChain); -#else return _callSiteCache.GetOrAdd(serviceType, type => CreateCallSite(type, callSiteChain)); -#endif } internal ServiceCallSite GetCallSite(ServiceDescriptor serviceDescriptor, CallSiteChain callSiteChain) diff --git a/src/DependencyInjection/DI/src/ServiceLookup/CallSiteRuntimeResolver.cs b/src/DependencyInjection/DI/src/ServiceLookup/CallSiteRuntimeResolver.cs index be39fdcf5e4..f0754bc7aa7 100644 --- a/src/DependencyInjection/DI/src/ServiceLookup/CallSiteRuntimeResolver.cs +++ b/src/DependencyInjection/DI/src/ServiceLookup/CallSiteRuntimeResolver.cs @@ -36,7 +36,7 @@ protected override object VisitConstructor(ConstructorCallSite constructorCallSi } } -#if NETCOREAPP3_0 +#if NETCOREAPP return constructorCallSite.ConstructorInfo.Invoke(BindingFlags.DoNotWrapExceptions, binder: null, parameters: parameterValues, culture: null); #else try diff --git a/src/DependencyInjection/DI/src/ServiceLookup/StackGuard.cs b/src/DependencyInjection/DI/src/ServiceLookup/StackGuard.cs index a297c0d12f2..55820ed0717 100644 --- a/src/DependencyInjection/DI/src/ServiceLookup/StackGuard.cs +++ b/src/DependencyInjection/DI/src/ServiceLookup/StackGuard.cs @@ -18,12 +18,6 @@ internal sealed class StackGuard public bool TryEnterOnCurrentStack() { -#if NETCOREAPP2_0 - if (RuntimeHelpers.TryEnsureSufficientExecutionStack()) - { - return true; - } -#else try { RuntimeHelpers.EnsureSufficientExecutionStack(); @@ -32,7 +26,6 @@ public bool TryEnterOnCurrentStack() catch (InsufficientExecutionStackException) { } -#endif if (_executionStackCount < MaxExecutionStackCount) { diff --git a/src/DependencyInjection/DI/test/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/DependencyInjection/DI/test/Microsoft.Extensions.DependencyInjection.Tests.csproj index 07659b6bcb8..53a41a9f8a1 100644 --- a/src/DependencyInjection/DI/test/Microsoft.Extensions.DependencyInjection.Tests.csproj +++ b/src/DependencyInjection/DI/test/Microsoft.Extensions.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Microsoft.Extensions.DependencyInjection diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj index df3dedee576..57dd0b0c7de 100644 --- a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj +++ b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.netcoreapp2.0.cs b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.netcoreapp.cs similarity index 100% rename from src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.netcoreapp2.0.cs rename to src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.netcoreapp.cs diff --git a/src/DiagnosticAdapter/test/Microsoft.Extensions.DiagnosticAdapter.Tests.csproj b/src/DiagnosticAdapter/test/Microsoft.Extensions.DiagnosticAdapter.Tests.csproj index 6bca266baac..f69049219ff 100644 --- a/src/DiagnosticAdapter/test/Microsoft.Extensions.DiagnosticAdapter.Tests.csproj +++ b/src/DiagnosticAdapter/test/Microsoft.Extensions.DiagnosticAdapter.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj index cadffc34556..5a9634f812d 100644 --- a/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp3.0.cs b/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs similarity index 100% rename from src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp3.0.cs rename to src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.netcoreapp.cs diff --git a/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index dff946a6bf4..49e129e4950 100644 --- a/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -7,8 +7,8 @@ Commonly used types: Microsoft.Extensions.FileProviders.IDirectoryContents Microsoft.Extensions.FileProviders.IFileInfo Microsoft.Extensions.FileProviders.IFileProvider - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj index 2af44470fbe..3a84bbc1903 100644 --- a/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp3.0.cs b/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs similarity index 100% rename from src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp3.0.cs rename to src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.netcoreapp.cs diff --git a/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index e8d3cfc0eb4..ccec2c0978a 100644 --- a/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -3,8 +3,8 @@ Microsoft.Extensions.FileProviders Composite file and directory providers for Microsoft.Extensions.FileProviders. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj index d7ea3c7e068..327550c9f52 100644 --- a/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj +++ b/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileProviders.Composite - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj index e9407f9164b..355c5b738e5 100644 --- a/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.cs b/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs similarity index 100% rename from src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.cs rename to src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.cs diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj index d36323e3b15..dc49b3fd75c 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -3,10 +3,10 @@ Microsoft.Extensions.FileProviders File provider for files in embedded resources for Microsoft.Extensions.FileProviders. - netstandard2.0;netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) $(MSBuildProjectName).multitarget.nuspec - netcoreapp3.0 - $(MSBuildProjectName).netcoreapp3.0.nuspec + $(DefaultNetCoreTargetFramework) + $(MSBuildProjectName).netcoreapp.nuspec true true diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec index 874c90c79dc..59a0e89b7f7 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec similarity index 94% rename from src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.nuspec rename to src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec index f98f0b4ad5a..b0e9df48756 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp3.0.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj b/src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj index 83777477026..a199e438375 100644 --- a/src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj +++ b/src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/FileProviders/Manifest.MSBuildTask/test/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj b/src/FileProviders/Manifest.MSBuildTask/test/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj index ed68958fe87..06afd574e83 100644 --- a/src/FileProviders/Manifest.MSBuildTask/test/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj +++ b/src/FileProviders/Manifest.MSBuildTask/test/Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) diff --git a/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj index 72d70f381cf..911986bd25e 100644 --- a/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp3.0.cs b/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs similarity index 100% rename from src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp3.0.cs rename to src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.netcoreapp.cs diff --git a/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index 12a11002427..dee9f559acc 100644 --- a/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -3,8 +3,8 @@ Microsoft.Extensions.FileProviders File provider for physical files for Microsoft.Extensions.FileProviders. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true true diff --git a/src/FileProviders/Physical/test/Microsoft.Extensions.FileProviders.Physical.Tests.csproj b/src/FileProviders/Physical/test/Microsoft.Extensions.FileProviders.Physical.Tests.csproj index a6aa6dcf1ae..856ab374c3f 100644 --- a/src/FileProviders/Physical/test/Microsoft.Extensions.FileProviders.Physical.Tests.csproj +++ b/src/FileProviders/Physical/test/Microsoft.Extensions.FileProviders.Physical.Tests.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileProviders.Physical - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/FileSystemGlobbing/test/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj b/src/FileSystemGlobbing/test/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj index b26d41313b3..b153c2f218a 100644 --- a/src/FileSystemGlobbing/test/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj +++ b/src/FileSystemGlobbing/test/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileSystemGlobbing - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj index f7514489fa3..e09ee439814 100644 --- a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj +++ b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp3.0.cs b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp.cs similarity index 100% rename from src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp3.0.cs rename to src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.netcoreapp.cs diff --git a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj index f41b257c632..aeb85d3e760 100644 --- a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj +++ b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj @@ -7,8 +7,8 @@ Commonly Used Types Microsoft.Extensions.Diagnostics.HealthChecks.IHealthCheck Microsoft.Extensions.Diagnostics.HealthChecks - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true diagnostics;healthchecks diff --git a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index 2286087bc78..a2080b28d3d 100644 --- a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp3.0.cs b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp.cs similarity index 100% rename from src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp3.0.cs rename to src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.netcoreapp.cs diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index 40056850113..35c789a691f 100644 --- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -6,8 +6,8 @@ Commonly Used Types: Microsoft.Extensions.Diagnostics.HealthChecks.HealthCheckService Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true diagnostics;healthchecks diff --git a/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj b/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj index 21763e51651..b6fa1537da1 100644 --- a/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj +++ b/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Microsoft.Extensions.Diagnostics.HealthChecks diff --git a/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj index d503f490e5c..b779045c5c8 100644 --- a/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -11,8 +11,8 @@ - - + + diff --git a/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netcoreapp3.0.cs b/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netcoreapp.cs similarity index 100% rename from src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netcoreapp3.0.cs rename to src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.netcoreapp.cs diff --git a/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index 05928d254f7..fc4e84b4452 100644 --- a/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -2,8 +2,8 @@ .NET Core hosting and startup abstractions for applications. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true hosting diff --git a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj index bb98b6a93d2..b5cdd311659 100644 --- a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netstandard2.1;netcoreapp3.0 + netstandard2.0;netstandard2.1;netcoreapp3.1 @@ -34,8 +34,8 @@ - - + + diff --git a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.netcoreapp3.0.cs b/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.netcoreapp.cs similarity index 100% rename from src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.netcoreapp3.0.cs rename to src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.netcoreapp.cs diff --git a/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj index c452f4f03f2..7f57888ba32 100644 --- a/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -2,8 +2,8 @@ .NET Core hosting and startup infrastructures for applications. - netstandard2.0;netstandard2.1;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true hosting diff --git a/src/Hosting/Hosting/test/HostBuilderTests.cs b/src/Hosting/Hosting/test/HostBuilderTests.cs index 7cfc2cadadc..e889a587100 100644 --- a/src/Hosting/Hosting/test/HostBuilderTests.cs +++ b/src/Hosting/Hosting/test/HostBuilderTests.cs @@ -141,7 +141,7 @@ public void DefaultIHostEnvironmentValues() { var env = hostContext.HostingEnvironment; Assert.Equal(Environments.Production, env.EnvironmentName); -#if NETCOREAPP3_0 +#if NETCOREAPP Assert.NotNull(env.ApplicationName); #elif NET472 // Note GetEntryAssembly returns null for the net4x console test runner. @@ -157,7 +157,7 @@ public void DefaultIHostEnvironmentValues() { var env = host.Services.GetRequiredService(); Assert.Equal(Environments.Production, env.EnvironmentName); -#if NETCOREAPP3_0 +#if NETCOREAPP Assert.NotNull(env.ApplicationName); #elif NET472 // Note GetEntryAssembly returns null for the net4x console test runner. diff --git a/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj index 18d794aac7f..4733e40d728 100644 --- a/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj +++ b/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Hosting/IntegrationTesting/src/Common/Tfm.cs b/src/Hosting/IntegrationTesting/src/Common/Tfm.cs index 20c4bc79075..ad06c7e77d7 100644 --- a/src/Hosting/IntegrationTesting/src/Common/Tfm.cs +++ b/src/Hosting/IntegrationTesting/src/Common/Tfm.cs @@ -12,6 +12,7 @@ public static class Tfm public const string NetCoreApp21 = "netcoreapp2.1"; public const string NetCoreApp22 = "netcoreapp2.2"; public const string NetCoreApp30 = "netcoreapp3.0"; + public const string NetCoreApp31 = "netcoreapp3.1"; public static bool Matches(string tfm1, string tfm2) { diff --git a/src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj b/src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj index 9307930d098..74e72701e30 100644 --- a/src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj +++ b/src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj @@ -2,7 +2,7 @@ .NET Core Extensions helpers to deploy applications to for testing. - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 false $(NoWarn);CS1591 true diff --git a/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj b/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj index 24bc4da4e3d..e46cdaf983f 100644 --- a/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj +++ b/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) diff --git a/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj b/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj index 383edc335ab..af9052accfa 100644 --- a/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj +++ b/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Hosting/samples/GenericHostSample/GenericHostSample.csproj b/src/Hosting/samples/GenericHostSample/GenericHostSample.csproj index 4be03201671..d23233d9f01 100644 --- a/src/Hosting/samples/GenericHostSample/GenericHostSample.csproj +++ b/src/Hosting/samples/GenericHostSample/GenericHostSample.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net461 + $(DefaultNetCoreTargetFramework);net461 GenericHostSample.WindowsServiceControlled Exe latest diff --git a/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj index 6f120cb531f..4afeec43fbc 100644 --- a/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj +++ b/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Hosting/test/FunctionalTests/ShutdownTests.cs b/src/Hosting/test/FunctionalTests/ShutdownTests.cs index ae305eccbfb..ce54a47a9ac 100644 --- a/src/Hosting/test/FunctionalTests/ShutdownTests.cs +++ b/src/Hosting/test/FunctionalTests/ShutdownTests.cs @@ -55,7 +55,7 @@ private async Task ExecuteShutdownTest(string testName, string shutdownMechanic) RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - TargetFramework = Tfm.NetCoreApp30, + TargetFramework = Tfm.NetCoreApp31, ApplicationType = ApplicationType.Portable, PublishApplicationBeforeDeployment = true, StatusMessagesEnabled = false diff --git a/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj b/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj index c0a4c3b1ed6..b1ddbcb34aa 100644 --- a/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj +++ b/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) Exe diff --git a/src/HttpClientFactory/Http/perf/Microsoft.Extensions.Http.Performance.csproj b/src/HttpClientFactory/Http/perf/Microsoft.Extensions.Http.Performance.csproj index 7d806822561..3fa887586f5 100644 --- a/src/HttpClientFactory/Http/perf/Microsoft.Extensions.Http.Performance.csproj +++ b/src/HttpClientFactory/Http/perf/Microsoft.Extensions.Http.Performance.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) Exe true true diff --git a/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj b/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj index 79013981a34..4b1d7520e80 100644 --- a/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.netcoreapp3.0.cs b/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.netcoreapp.cs similarity index 100% rename from src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.netcoreapp3.0.cs rename to src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.netcoreapp.cs diff --git a/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj b/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj index a40a68ee85d..b7c800e035e 100644 --- a/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj +++ b/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj @@ -6,8 +6,8 @@ Commonly used types: System.Net.Http.IHttpClientFactory - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true aspnetcore;httpclient diff --git a/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj b/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj index 398c0c3680d..157aaf0a1d9 100644 --- a/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj +++ b/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj b/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj index bcd4830ce6f..55d4030507f 100644 --- a/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj +++ b/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/HttpClientFactory/samples/HttpClientFactorySample/HttpClientFactorySample.csproj b/src/HttpClientFactory/samples/HttpClientFactorySample/HttpClientFactorySample.csproj index 54f09444bef..7dd2e8e9627 100644 --- a/src/HttpClientFactory/samples/HttpClientFactorySample/HttpClientFactorySample.csproj +++ b/src/HttpClientFactory/samples/HttpClientFactorySample/HttpClientFactorySample.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net461 + $(DefaultNetCoreTargetFramework);net461 portable Exe diff --git a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj index 61980aa9209..3c075253472 100644 --- a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj +++ b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.netcoreapp3.0.cs b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.netcoreapp.cs similarity index 100% rename from src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.netcoreapp3.0.cs rename to src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.netcoreapp.cs diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj index 044c843b281..a45484e0d3a 100644 --- a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj +++ b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj @@ -1,8 +1,8 @@  - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) Abstractions and features for interop between .NET and JavaScript code. javascript;interop true diff --git a/src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj b/src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj index bff8fb3f99d..ba3a91a94eb 100644 --- a/src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj +++ b/src/JSInterop/Microsoft.JSInterop/test/Microsoft.JSInterop.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj index 6404d5ae8ec..c45066d3cbd 100644 --- a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj +++ b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp3.0.cs b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs similarity index 100% rename from src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp3.0.cs rename to src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs diff --git a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj index 09b8bf65b79..4b881604014 100644 --- a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj +++ b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj @@ -6,8 +6,8 @@ Commonly used types: Microsoft.Extensions.Localization.IStringLocalizer Microsoft.Extensions.Localization.IStringLocalizer<T> - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true localization diff --git a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj index 735277e7541..b6df43f5db3 100644 --- a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj +++ b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -10,8 +10,8 @@ - - + + diff --git a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp3.0.cs b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp.cs similarity index 100% rename from src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp3.0.cs rename to src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp.cs diff --git a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj index 86ebaf1970f..b6b059ce827 100644 --- a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj +++ b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj @@ -3,8 +3,8 @@ Microsoft .NET Extensions Application localization services and default implementation based on ResourceManager to load localized assembly resources. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true localization diff --git a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests.csproj b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests.csproj index 17254e21105..70e7a6de1a9 100644 --- a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests.csproj +++ b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Logging/Logging.Analyzers/test/Microsoft.Extensions.Logging.Analyzer.Tests.csproj b/src/Logging/Logging.Analyzers/test/Microsoft.Extensions.Logging.Analyzer.Tests.csproj index 75032662bd8..48f40c18c4c 100644 --- a/src/Logging/Logging.Analyzers/test/Microsoft.Extensions.Logging.Analyzer.Tests.csproj +++ b/src/Logging/Logging.Analyzers/test/Microsoft.Extensions.Logging.Analyzer.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 true false diff --git a/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj b/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj index 54b36b5aabb..b1a396085de 100644 --- a/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj +++ b/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj index 9f7498f802d..df24ac1b52b 100644 --- a/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netcoreapp3.0.cs b/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netcoreapp.cs similarity index 100% rename from src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netcoreapp3.0.cs rename to src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.netcoreapp.cs diff --git a/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index b46b3119a23..4ef5201cba1 100644 --- a/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -2,8 +2,8 @@ Configuration support for Microsoft.Extensions.Logging. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true true diff --git a/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index 3bfcd30a1cd..1bcb18fb2f3 100644 --- a/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.netcoreapp3.0.cs b/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.netcoreapp.cs similarity index 100% rename from src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.netcoreapp3.0.cs rename to src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.netcoreapp.cs diff --git a/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index 72a55381d75..f907dbcf7c5 100644 --- a/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -2,8 +2,8 @@ Console logger provider implementation for Microsoft.Extensions.Logging. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true true diff --git a/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj index 86a9724530f..9d20b2a46be 100644 --- a/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netcoreapp3.0.cs b/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netcoreapp.cs similarity index 100% rename from src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netcoreapp3.0.cs rename to src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.netcoreapp.cs diff --git a/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 560d20564e5..9e4e8768e0e 100644 --- a/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -2,8 +2,8 @@ Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine(). - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true true diff --git a/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj index aa72f71cef7..d74fe72a311 100644 --- a/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netcoreapp3.0.cs b/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netcoreapp.cs similarity index 100% rename from src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netcoreapp3.0.cs rename to src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.netcoreapp.cs diff --git a/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index d2a5d47a40f..1b0e8438191 100644 --- a/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -2,8 +2,8 @@ Windows Event Log logger provider implementation for Microsoft.Extensions.Logging. - netstandard2.0;net461;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;net461;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 $(PackageTags);eventlog;windowseventlog true diff --git a/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj index 2ec3bb4d5c8..f03cb415975 100644 --- a/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netcoreapp3.0.cs b/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netcoreapp.cs similarity index 100% rename from src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netcoreapp3.0.cs rename to src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.netcoreapp.cs diff --git a/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index f0e878a3ab4..182fd068ec1 100644 --- a/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -2,8 +2,8 @@ EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(PackageTags);EventSource;ETW true true diff --git a/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj b/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj index 57e510639a6..500fce45bdd 100644 --- a/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj +++ b/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Logging/Logging.Testing/test/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/Logging/Logging.Testing/test/Microsoft.Extensions.Logging.Testing.Tests.csproj index e4e19773e3f..7b478d5ce9f 100644 --- a/src/Logging/Logging.Testing/test/Microsoft.Extensions.Logging.Testing.Tests.csproj +++ b/src/Logging/Logging.Testing/test/Microsoft.Extensions.Logging.Testing.Tests.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj index 4acc3642d14..630139f8053 100644 --- a/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj @@ -1,14 +1,14 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netcoreapp3.0.cs b/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netcoreapp.cs similarity index 100% rename from src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netcoreapp3.0.cs rename to src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.netcoreapp.cs diff --git a/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index 496775d7125..16dda708a5c 100644 --- a/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -2,8 +2,8 @@ TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent(). - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true logging;tracesource diff --git a/src/Logging/Logging/perf/Microsoft.Extensions.Logging.Performance.csproj b/src/Logging/Logging/perf/Microsoft.Extensions.Logging.Performance.csproj index 0b494c9402f..f34e864c98a 100644 --- a/src/Logging/Logging/perf/Microsoft.Extensions.Logging.Performance.csproj +++ b/src/Logging/Logging/perf/Microsoft.Extensions.Logging.Performance.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) Exe diff --git a/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj b/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj index bc6cea2644a..2a3bde70178 100644 --- a/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -10,8 +10,8 @@ - - + + diff --git a/src/Logging/Logging/ref/Microsoft.Extensions.Logging.netcoreapp3.0.cs b/src/Logging/Logging/ref/Microsoft.Extensions.Logging.netcoreapp.cs similarity index 100% rename from src/Logging/Logging/ref/Microsoft.Extensions.Logging.netcoreapp3.0.cs rename to src/Logging/Logging/ref/Microsoft.Extensions.Logging.netcoreapp.cs diff --git a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj index 54e77ec36d7..9956a47fbf0 100644 --- a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj @@ -2,8 +2,8 @@ Logging infrastructure default implementation for Microsoft.Extensions.Logging. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true true diff --git a/src/Logging/samples/SampleApp/SampleApp.csproj b/src/Logging/samples/SampleApp/SampleApp.csproj index a47dbf96938..9d04421accd 100644 --- a/src/Logging/samples/SampleApp/SampleApp.csproj +++ b/src/Logging/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.0 + net461;$(DefaultNetCoreTargetFramework) Exe diff --git a/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj b/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj index aac8c073b46..d2e08e29734 100644 --- a/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj +++ b/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Logging/test/TraceSourceLoggerProviderTest.cs b/src/Logging/test/TraceSourceLoggerProviderTest.cs index 4a2ba025dee..a21c162782b 100644 --- a/src/Logging/test/TraceSourceLoggerProviderTest.cs +++ b/src/Logging/test/TraceSourceLoggerProviderTest.cs @@ -66,7 +66,7 @@ public override void WriteLine(string message) } } } -#elif NETCOREAPP3_0 +#elif NETCOREAPP #else #error Target framework needs to be updated #endif diff --git a/src/Logging/test/TraceSourceScopeTest.cs b/src/Logging/test/TraceSourceScopeTest.cs index 6a59787e914..5971ecccf6b 100644 --- a/src/Logging/test/TraceSourceScopeTest.cs +++ b/src/Logging/test/TraceSourceScopeTest.cs @@ -33,7 +33,7 @@ public static void DiagnosticsScope_PushesAndPops_LogicalOperationStack() Assert.Same(a, c); Assert.Same(state, b); } -#elif NETCOREAPP3_0 +#elif NETCOREAPP #else #error Target framework needs to be updated #endif diff --git a/src/ObjectPool/perf/Microsoft.Extensions.ObjectPool.Performance.csproj b/src/ObjectPool/perf/Microsoft.Extensions.ObjectPool.Performance.csproj index 5251217662f..9114e0e013d 100644 --- a/src/ObjectPool/perf/Microsoft.Extensions.ObjectPool.Performance.csproj +++ b/src/ObjectPool/perf/Microsoft.Extensions.ObjectPool.Performance.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) Exe true true diff --git a/src/ObjectPool/test/Microsoft.Extensions.ObjectPool.Tests.csproj b/src/ObjectPool/test/Microsoft.Extensions.ObjectPool.Tests.csproj index 1f2ad67664d..cc308fa8a00 100644 --- a/src/ObjectPool/test/Microsoft.Extensions.ObjectPool.Tests.csproj +++ b/src/ObjectPool/test/Microsoft.Extensions.ObjectPool.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 6ee158c6567..1127c3ff30c 100644 --- a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -10,8 +10,8 @@ - - + + diff --git a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp3.0.cs b/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp.cs similarity index 100% rename from src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp3.0.cs rename to src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.netcoreapp.cs diff --git a/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 0d302806cdb..b417e4c8c83 100644 --- a/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -2,8 +2,8 @@ Provides additional configuration specific functionality related to Options. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true aspnetcore;configuration;options true diff --git a/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj index b6b07f83b39..0c4b98069be 100644 --- a/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netcoreapp3.0.cs b/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netcoreapp.cs similarity index 100% rename from src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netcoreapp3.0.cs rename to src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.netcoreapp.cs diff --git a/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index be2be354bb2..c44c8b7b6ec 100644 --- a/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -2,8 +2,8 @@ Provides additional DataAnnotations specific functionality related to Options. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true aspnetcore;validation;options true diff --git a/src/Options/Options/ref/Microsoft.Extensions.Options.csproj b/src/Options/Options/ref/Microsoft.Extensions.Options.csproj index 266f8d08b07..65eb954f83c 100644 --- a/src/Options/Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/Options/Options/ref/Microsoft.Extensions.Options.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp3.0.cs b/src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp.cs similarity index 100% rename from src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp3.0.cs rename to src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp.cs diff --git a/src/Options/Options/src/Microsoft.Extensions.Options.csproj b/src/Options/Options/src/Microsoft.Extensions.Options.csproj index b9baa3d0d47..f86a9f1ad06 100644 --- a/src/Options/Options/src/Microsoft.Extensions.Options.csproj +++ b/src/Options/Options/src/Microsoft.Extensions.Options.csproj @@ -2,8 +2,8 @@ Provides a strongly typed way of specifying and accessing settings using dependency injection. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true aspnetcore;options true diff --git a/src/Options/test/Microsoft.Extensions.Options.Tests.csproj b/src/Options/test/Microsoft.Extensions.Options.Tests.csproj index 48758fe1176..b5e11f2dc39 100644 --- a/src/Options/test/Microsoft.Extensions.Options.Tests.csproj +++ b/src/Options/test/Microsoft.Extensions.Options.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Primitives/perf/Microsoft.Extensions.Primitives.Performance.csproj b/src/Primitives/perf/Microsoft.Extensions.Primitives.Performance.csproj index 6a49975e14a..0c640addcf9 100644 --- a/src/Primitives/perf/Microsoft.Extensions.Primitives.Performance.csproj +++ b/src/Primitives/perf/Microsoft.Extensions.Primitives.Performance.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) Exe true true diff --git a/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj index 33e0b9204cf..76b14f997cf 100644 --- a/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -1,15 +1,15 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 - - + + diff --git a/src/Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp3.0.cs b/src/Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp.cs similarity index 100% rename from src/Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp3.0.cs rename to src/Primitives/ref/Microsoft.Extensions.Primitives.netcoreapp.cs diff --git a/src/Primitives/src/CancellationChangeToken.cs b/src/Primitives/src/CancellationChangeToken.cs index e91e113837e..c8dcf19a554 100644 --- a/src/Primitives/src/CancellationChangeToken.cs +++ b/src/Primitives/src/CancellationChangeToken.cs @@ -31,7 +31,7 @@ public CancellationChangeToken(CancellationToken cancellationToken) /// public IDisposable RegisterChangeCallback(Action callback, object state) { -#if NETCOREAPP3_0 +#if NETCOREAPP try { return Token.UnsafeRegister(callback, state); diff --git a/src/Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/Primitives/src/Microsoft.Extensions.Primitives.csproj index 639d32e9605..81dc5fe5977 100644 --- a/src/Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -5,8 +5,8 @@ Microsoft.Extensions.Primitives.IChangeToken Microsoft.Extensions.Primitives.StringValues Microsoft.Extensions.Primitives.StringSegment - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true true diff --git a/src/Primitives/test/Microsoft.Extensions.Primitives.Tests.csproj b/src/Primitives/test/Microsoft.Extensions.Primitives.Tests.csproj index 54b1c40ca2b..8dc0ca80baf 100644 --- a/src/Primitives/test/Microsoft.Extensions.Primitives.Tests.csproj +++ b/src/Primitives/test/Microsoft.Extensions.Primitives.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/Shared/src/ActivatorUtilities/ActivatorUtilities.cs b/src/Shared/src/ActivatorUtilities/ActivatorUtilities.cs index 3fd2b557ffe..4d05ebf5896 100644 --- a/src/Shared/src/ActivatorUtilities/ActivatorUtilities.cs +++ b/src/Shared/src/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/Shared/src/BenchmarkRunner/DefaultCoreConfig.cs b/src/Shared/src/BenchmarkRunner/DefaultCoreConfig.cs index a61833ab269..83296350170 100644 --- a/src/Shared/src/BenchmarkRunner/DefaultCoreConfig.cs +++ b/src/Shared/src/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/Shared/test/DotNetMuxerTests.cs b/src/Shared/test/DotNetMuxerTests.cs index 2f412e292ed..8840d87bb84 100644 --- a/src/Shared/test/DotNetMuxerTests.cs +++ b/src/Shared/test/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/Shared/test/Microsoft.Extensions.Sources.Tests.csproj b/src/Shared/test/Microsoft.Extensions.Sources.Tests.csproj index daf7eef7ea6..5d7cd465c1c 100644 --- a/src/Shared/test/Microsoft.Extensions.Sources.Tests.csproj +++ b/src/Shared/test/Microsoft.Extensions.Sources.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 true diff --git a/src/Shared/testassets/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj b/src/Shared/testassets/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj index 6368289f65e..05ca293b6ea 100644 --- a/src/Shared/testassets/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj +++ b/src/Shared/testassets/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Exe diff --git a/src/Shared/testassets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj b/src/Shared/testassets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj index 6368289f65e..05ca293b6ea 100644 --- a/src/Shared/testassets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj +++ b/src/Shared/testassets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Exe diff --git a/src/Shared/testassets/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj b/src/Shared/testassets/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj index 6368289f65e..05ca293b6ea 100644 --- a/src/Shared/testassets/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj +++ b/src/Shared/testassets/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Exe diff --git a/src/Shared/testassets/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj b/src/Shared/testassets/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj index 6368289f65e..05ca293b6ea 100644 --- a/src/Shared/testassets/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj +++ b/src/Shared/testassets/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Exe diff --git a/src/Shared/testassets/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj b/src/Shared/testassets/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj index 6368289f65e..05ca293b6ea 100644 --- a/src/Shared/testassets/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj +++ b/src/Shared/testassets/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Exe diff --git a/src/Shared/testassets/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj b/src/Shared/testassets/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj index 6368289f65e..05ca293b6ea 100644 --- a/src/Shared/testassets/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj +++ b/src/Shared/testassets/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 Exe diff --git a/src/Shared/testassets/MockHostTypes/MockHostTypes.csproj b/src/Shared/testassets/MockHostTypes/MockHostTypes.csproj index 3272f8d93ae..57b6e1ae58f 100644 --- a/src/Shared/testassets/MockHostTypes/MockHostTypes.csproj +++ b/src/Shared/testassets/MockHostTypes/MockHostTypes.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 diff --git a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj index 7c439bb7c19..89726db83ff 100644 --- a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj +++ b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + $(DefaultNetCoreTargetFramework) true false diff --git a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/build/Microsoft.Internal.Extensions.Refs.props b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/build/Microsoft.Internal.Extensions.Refs.props index 42bac2c389a..03474d2b1d6 100644 --- a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/build/Microsoft.Internal.Extensions.Refs.props +++ b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/build/Microsoft.Internal.Extensions.Refs.props @@ -1,5 +1,5 @@ - $(MSBuildThisFileDirectory)..\ref\netcoreapp3.0\ + $(MSBuildThisFileDirectory)..\ref\netcoreapp3.1\ diff --git a/src/TestingUtils/Internal.AspNetCore.Analyzers/test/Internal.AspNetCore.Analyzers.Tests.csproj b/src/TestingUtils/Internal.AspNetCore.Analyzers/test/Internal.AspNetCore.Analyzers.Tests.csproj index 0a0852d723e..99dcca9dc17 100644 --- a/src/TestingUtils/Internal.AspNetCore.Analyzers/test/Internal.AspNetCore.Analyzers.Tests.csproj +++ b/src/TestingUtils/Internal.AspNetCore.Analyzers/test/Internal.AspNetCore.Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 true false diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs b/src/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs index 0f1c6ada460..fefe6c5a42d 100644 --- a/src/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs +++ b/src/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/src/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs b/src/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs index 12deaba4f9b..e88a3334f29 100644 --- a/src/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs +++ b/src/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/src/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj index e9d0dca4aeb..5a7366503d6 100644 --- a/src/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj +++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472 $(NoWarn);xUnit1004 diff --git a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj index 628691a220f..283cb96e98c 100644 --- a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj +++ b/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.0 + netstandard2.0;netcoreapp3.1 @@ -9,8 +9,8 @@ - - + + diff --git a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.netcoreapp3.0.cs b/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.netcoreapp.cs similarity index 100% rename from src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.netcoreapp3.0.cs rename to src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.netcoreapp.cs diff --git a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj index 2ed725eac7e..364f4d3d866 100644 --- a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj +++ b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj @@ -2,8 +2,8 @@ Contains registration and configuration APIs to add the core framework encoders to a dependency injection container. - netstandard2.0;netcoreapp3.0 - netcoreapp3.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 true aspnetcore diff --git a/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj b/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj index 68ad589e3f6..0f93bf3fc67 100755 --- a/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj +++ b/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net472 + $(DefaultNetCoreTargetFramework);net472