From fa10975aa342a3cad68d9056234276719d4ef828 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 27 May 2021 17:32:29 +0200 Subject: [PATCH] Upgrading netcoreapp2.x and NCA3.0 to netcoreapp3.1 Upgrading the netcoreapp2.x and netcoreapp3.0 build configurations in projects to netcoreapp3.1 and cleaning up conditions so that future tfm upgrades require less project file changes. Adding NETStandardError markers to prevent available netstandard2.0 assets being picked instead, same as already done for System.Speech and others. For more details please see the reasoning in the linked issue. Contributes to #53282 --- eng/empty.csproj | 2 +- eng/referenceAssemblies.props | 3 +- .../Common/src/System/Drawing/KnownColor.cs | 7 +-- ...icrosoft.Extensions.Logging.Console.csproj | 13 +++--- ...soft.Extensions.Logging.EventSource.csproj | 26 +++++------ .../Microsoft.Extensions.Primitives.csproj | 23 +++++----- .../pkg/Microsoft.Win32.SystemEvents.pkgproj | 1 + .../src/Microsoft.Win32.SystemEvents.csproj | 20 ++++----- ...XmlSerializer.Generator.runtimeconfig.json | 4 +- .../System.ComponentModel.Composition.pkgproj | 1 + .../System.ComponentModel.Composition.csproj | 10 ++--- .../Composition/Hosting/DirectoryCatalog.cs | 6 +-- .../Hosting/DirectoryCatalogTests.cs | 4 -- .../pkg/System.Data.Odbc.pkgproj | 1 + .../src/System.Data.Odbc.csproj | 25 +++++------ .../pkg/System.Diagnostics.EventLog.pkgproj | 1 + .../src/System.Diagnostics.EventLog.csproj | 27 +++++------ ...tem.Diagnostics.PerformanceCounter.pkgproj | 3 +- ...stem.Diagnostics.PerformanceCounter.csproj | 12 ++--- .../Diagnostics/PerformanceCounterLib.cs | 4 +- ...irectoryServices.AccountManagement.pkgproj | 1 + ...DirectoryServices.AccountManagement.csproj | 8 ++-- ...System.DirectoryServices.Protocols.pkgproj | 1 + .../System.DirectoryServices.Protocols.csproj | 6 +-- .../pkg/System.DirectoryServices.pkgproj | 2 + .../src/System.DirectoryServices.csproj | 20 +++++---- .../ref/System.Drawing.Common.csproj | 24 +++++----- .../src/System.Drawing.Common.csproj | 4 +- .../pkg/System.IO.Pipelines.pkgproj | 1 + .../ref/System.IO.Pipelines.csproj | 16 ++++--- .../src/System.IO.Pipelines.csproj | 12 +++-- .../pkg/System.Management.pkgproj | 1 + .../src/System.Management.csproj | 4 +- ...tem.Reflection.MetadataLoadContext.pkgproj | 1 + ...stem.Reflection.MetadataLoadContext.csproj | 42 ++++++----------- ...em.Runtime.CompilerServices.Unsafe.pkgproj | 1 + ...tem.Runtime.CompilerServices.Unsafe.ilproj | 10 +++-- .../System.Security.Cryptography.Pkcs.csproj | 12 ++--- .../System.Security.Cryptography.Pkcs.csproj | 7 ++- .../pkg/System.Security.Permissions.pkgproj | 1 + .../ref/System.Security.Permissions.csproj | 20 ++++----- .../src/System.Security.Permissions.csproj | 14 +++--- .../System.Security.Principal.Windows.pkgproj | 1 + .../System.Security.Principal.Windows.csproj | 4 +- .../System.Security.Principal.Windows.csproj | 9 ++-- .../System.ServiceModel.Syndication.pkgproj | 1 + .../System.ServiceModel.Syndication.csproj | 14 +++--- .../System.ServiceModel.Syndication.csproj | 15 ++++--- .../src/Internal/SrgsCompiler/BackEnd.cs | 2 +- .../SrgsElementCompilerFactory.cs | 4 +- .../src/Internal/SrgsCompiler/Subset.cs | 2 +- .../src/Internal/SrgsParser/XmlParser.cs | 2 +- .../src/Recognition/SrgsGrammar/SrgsToken.cs | 2 +- .../System.Speech/src/System.Speech.csproj | 13 +++--- .../System.Text.Encoding.CodePages.pkgproj | 4 +- .../src/System.Text.Encoding.CodePages.csproj | 14 +++--- .../pkg/System.Text.Json.pkgproj | 2 + .../ref/System.Text.Json.csproj | 11 +++-- .../src/System.Text.Json.csproj | 45 ++++++------------- .../pkg/System.Threading.Channels.pkgproj | 1 + .../ref/System.Threading.Channels.csproj | 4 +- .../src/System.Threading.Channels.csproj | 4 +- .../pkg/System.Windows.Extensions.pkgproj | 4 +- .../ref/System.Windows.Extensions.csproj | 4 +- .../src/System.Windows.Extensions.csproj | 7 ++- .../Microsoft.Windows.Compatibility.pkgproj | 24 +--------- 66 files changed, 266 insertions(+), 328 deletions(-) diff --git a/eng/empty.csproj b/eng/empty.csproj index 6edde5507fcda..55eefdef1ada4 100644 --- a/eng/empty.csproj +++ b/eng/empty.csproj @@ -9,7 +9,7 @@ --> - netcoreapp2.0 + $(NetCoreAppToolCurrent) diff --git a/eng/referenceAssemblies.props b/eng/referenceAssemblies.props index 4bdcf75ef3197..ac60b93d57b37 100644 --- a/eng/referenceAssemblies.props +++ b/eng/referenceAssemblies.props @@ -2,8 +2,7 @@ - $(AdditionalBuildTargetFrameworks);netstandard2.0 - $(AdditionalBuildTargetFrameworks);netstandard2.1 + $(AdditionalBuildTargetFrameworks);netstandard2.0;netstandard2.1 false diff --git a/src/libraries/Common/src/System/Drawing/KnownColor.cs b/src/libraries/Common/src/System/Drawing/KnownColor.cs index a96bc024c6a2a..2608f2e5f3d89 100644 --- a/src/libraries/Common/src/System/Drawing/KnownColor.cs +++ b/src/libraries/Common/src/System/Drawing/KnownColor.cs @@ -7,12 +7,7 @@ namespace System.Drawing { [TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] -#if NETCOREAPP2_0 - internal -#else - public -#endif - enum KnownColor + public enum KnownColor { // This enum is order dependent!!! // diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index ac104462e1a3d..c9f3ee93875a4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true annotations @@ -35,8 +35,7 @@ - + @@ -51,9 +50,13 @@ - - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 403f2daf8f1da..bf3aab8453c9f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true true @@ -17,30 +17,30 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> + + + + + + + + + - - - - - - - + - - - - + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 5895ee367330c..3843dc8c292d4 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true true @@ -17,20 +17,21 @@ Microsoft.Extensions.Primitives.StringSegment - + - - + + + - - - + + + + + diff --git a/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj b/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj index b1071201e648c..5ef768cc0786e 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj @@ -5,6 +5,7 @@ uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 1045b3750d522..2b9dada8b1ecc 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -2,17 +2,17 @@ true enable - $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows;netcoreapp3.0-windows;net461 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0;net461 true - $(DefineConstants);FEATURE_CER - true - SR.PlatformNotSupported_SystemEvents + $(DefineConstants);FEATURE_CER + true + SR.PlatformNotSupported_SystemEvents - + - - + Link="System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs" + Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))" /> - + - diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/pkg/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json b/src/libraries/Microsoft.XmlSerializer.Generator/pkg/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json index 5978b833d31c8..0d300fe395801 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/pkg/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json +++ b/src/libraries/Microsoft.XmlSerializer.Generator/pkg/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json @@ -1,9 +1,9 @@ { "runtimeOptions": { - "tfm": "netcoreapp2.0", + "tfm": "netcoreapp3.1", "framework": { "name": "Microsoft.NETCore.App", - "version": "2.0.0" + "version": "3.1.0" }, "rollForward": "LatestMajor" } diff --git a/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj b/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj index ae52845b2ee9f..edf42f9de2e78 100644 --- a/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj +++ b/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj @@ -10,6 +10,7 @@ + diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index d60b2055cb977..cf8fe4f6249a0 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 true enable false @@ -8,7 +8,6 @@ SR.PlatformNotSupported_ComponentModel_Composition - $(NoWarn);nullable @@ -181,11 +180,10 @@ Link="Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs" /> + - - - - + diff --git a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs index 2b753c150aab0..6ee624abab6ec 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs +++ b/src/libraries/System.ComponentModel.Composition/src/System/ComponentModel/Composition/Hosting/DirectoryCatalog.cs @@ -22,10 +22,10 @@ namespace System.ComponentModel.Composition.Hosting public partial class DirectoryCatalog : ComposablePartCatalog, INotifyComposablePartCatalogChanged, ICompositionElement { private static bool IsWindows => -#if NETSTANDARD || NETCOREAPP2_0 - RuntimeInformation.IsOSPlatform(OSPlatform.Windows); -#else +#if NETCOREAPP_5_0_OR_GREATER OperatingSystem.IsWindows(); +#else + RuntimeInformation.IsOSPlatform(OSPlatform.Windows); #endif private readonly Lock _thisLock = new Lock(); diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs index 342d8412347ef..25dba9b0f7b4a 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs @@ -23,11 +23,7 @@ public override Assembly MapAssembly(Assembly assembly) return assembly; } -#if FEATURE_INTERNAL_REFLECTIONCONTEXT - public override Type MapType(Type type) -#else public override TypeInfo MapType(TypeInfo type) -#endif { return type; } diff --git a/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj b/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj index 0ee034eaf6e8d..3d67703c71c61 100644 --- a/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj +++ b/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj @@ -5,6 +5,7 @@ uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) + diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index 20d918a90a125..d6e6bd80456eb 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp2.0-FreeBSD;netcoreapp2.0-Linux;netcoreapp2.0-OSX;netcoreapp2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461-windows true $(NoWarn);CA2249;CA1838 enable @@ -10,13 +10,14 @@ true - $(NoWarn);SA1121 - SR.Odbc_PlatformNotSupported - - + $(NoWarn);SA1121 + SR.Odbc_PlatformNotSupported + + $(NoWarn);CS8600;CS8601;CS8602;CS8604 + - + - + @@ -134,8 +135,8 @@ - + + @@ -166,10 +167,4 @@ - - - - - - diff --git a/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj b/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj index 6609d325a9173..9e45e669acb98 100644 --- a/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj +++ b/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj @@ -5,6 +5,7 @@ uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index 33436282ae22e..d220a35053f24 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp2.0-windows;net461;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;net461;netstandard2.0 true $(NoWarn);CA1838 @@ -99,7 +99,16 @@ - + + + + + + + + + @@ -121,20 +130,12 @@ - - - - - - - - - - - + uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) - - + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 4ab5b04836005..317c566411f6d 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -1,15 +1,15 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp2.0-windows;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0;net461 true - true - SR.PlatformNotSupported_PerfCounters + true + SR.PlatformNotSupported_PerfCounters - + @@ -121,7 +121,7 @@ - + @@ -146,7 +146,7 @@ - + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs b/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs index 938bb8818298e..bdd47b922779d 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System/Diagnostics/PerformanceCounterLib.cs @@ -14,7 +14,7 @@ using static Interop.Advapi32; -#if NETCOREAPP2_0 || !NETCOREAPP +#if !NETCOREAPP using MemoryMarshal = System.Diagnostics.PerformanceCounterLib; #endif @@ -105,7 +105,7 @@ internal static string ComputerName } } -#if NETCOREAPP2_0 || !NETCOREAPP +#if !NETCOREAPP internal static T Read(ReadOnlySpan span) where T : struct => System.Runtime.InteropServices.MemoryMarshal.Read(span); diff --git a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj index 7cb832aae46ac..86e4fd6273bc7 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj @@ -11,6 +11,7 @@ runtimes/win/lib/net461 + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index 32c3b650e6499..5208f0039b8b7 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -3,7 +3,7 @@ true $(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE true - $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 true $(NoWarn);CA2249 @@ -92,7 +92,7 @@ - + @@ -103,8 +103,6 @@ - @@ -113,8 +111,8 @@ - + diff --git a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj index 53da13e6ccb81..274c781251d29 100644 --- a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj +++ b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj @@ -12,6 +12,7 @@ runtimes/win/lib/net461 + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index 53027e707cd92..4eb0455b489a1 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-windows;netcoreapp2.0-windows;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netstandard2.0 true @@ -85,7 +85,7 @@ - + @@ -100,9 +100,9 @@ - + diff --git a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj index 280e5cca8709c..6b392134854b8 100644 --- a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj +++ b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj @@ -12,6 +12,8 @@ runtimes/win/lib/net461 + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index 968303d7db94b..b7e9706b02ca5 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 true true enable @@ -9,6 +9,8 @@ SR.DirectoryServices_PlatformNotSupported + + $(NoWarn);CS8600;CS8602;CS8604;CS8605 @@ -146,27 +148,27 @@ - + + - - - - - + - + + + + - + diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj index 36c2fab6898a8..baf975fbb72b1 100644 --- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true enable @@ -13,18 +13,18 @@ - - - - - - - - - - + + + + + + + + + + - + diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index f62446cca0b4b..35425e03b14ad 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -5,7 +5,7 @@ CS0618 $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.0-windows;netcoreapp3.0-Unix;netcoreapp3.0;net461;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0;net461 true enable @@ -361,7 +361,7 @@ - + diff --git a/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj b/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj index 7d757b9d43e84..ef519b99b1a6d 100644 --- a/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj +++ b/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj @@ -19,6 +19,7 @@ + diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 7cb28689989ff..507822d223224 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -1,21 +1,23 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable - true - netcoreapp2.0 - true + true - - + + - + + + + + diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 539d5f0dcef31..3357c47c3b7b6 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true enable @@ -41,23 +41,21 @@ - + - + - + - + diff --git a/src/libraries/System.Management/pkg/System.Management.pkgproj b/src/libraries/System.Management/pkg/System.Management.pkgproj index b30d827d1ffba..fa36b7b68fbc8 100644 --- a/src/libraries/System.Management/pkg/System.Management.pkgproj +++ b/src/libraries/System.Management/pkg/System.Management.pkgproj @@ -11,6 +11,7 @@ runtimes/win/lib/net461 + \ No newline at end of file diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index a63b602192b42..07f592cf332b6 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -3,7 +3,7 @@ true $(NoWarn);0618 true - $(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 true @@ -62,7 +62,7 @@ - + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj b/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj index 7838bccd43db0..2f88ba57ac37e 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/pkg/System.Reflection.MetadataLoadContext.pkgproj @@ -4,6 +4,7 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index d021572a0e0c3..2ef7aa05aedc3 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -3,7 +3,7 @@ System.Reflection true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -77,8 +77,8 @@ - - + + @@ -141,12 +141,19 @@ + - + + + + + + + @@ -155,31 +162,8 @@ - - - - + - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj index 6f18ba2fb8eea..46ea9e67b0a09 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj @@ -18,6 +18,7 @@ + \ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index 1717166026e0e..6c22cf9c86606 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true IMPL @@ -9,10 +9,12 @@ $(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe.xml $(IlasmFlags) -DEBUG=$(DebugOptimization) - - #define netcoreapp + + #define netcoreapp System.Runtime - netstandard + + + netstandard mscorlib diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index fffb9009122e2..07d10f8f66edb 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -1,16 +1,13 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 true enable - - - - + @@ -20,7 +17,7 @@ - + @@ -28,4 +25,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 3f947a6f44e3b..832bd3447c1d3 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -4,7 +4,7 @@ true $(NoWarn);CA5384 enable - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0;netstandard2.0-windows;netstandard2.1;netstandard2.1-windows;netcoreapp3.0-windows;netcoreapp3.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;net461-windows true @@ -549,7 +549,7 @@ - + @@ -645,8 +645,7 @@ - + diff --git a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj index ae0ffda25d1ee..cb976d3857d7a 100644 --- a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj +++ b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj @@ -5,6 +5,7 @@ netcoreapp2.0;net461;uap10.0.16299;$(AllXamarinFrameworks) + \ No newline at end of file diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj index a024bfc9d1a0e..48ec64222b7aa 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,16 +1,12 @@ - net5.0;netstandard2.0;net461;netcoreapp3.0 + net5.0;netcoreapp3.1;netstandard2.0;net461 - - - - - - - - - + + + + + @@ -25,7 +21,7 @@ - + @@ -41,7 +37,7 @@ - + diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index 79fd61e1aa10e..9fc55eece247c 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,10 +1,10 @@ true - $(NetCoreAppCurrent);net5.0;netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 true - + @@ -177,7 +177,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -199,10 +199,10 @@ - + - + @@ -211,11 +211,11 @@ - + diff --git a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index dc12b23d464ca..51b8f66f72d9a 100644 --- a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -7,6 +7,7 @@ + \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index f1a59cde9bf70..401c7aecccd53 100644 --- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 4c9b0a3aaf9a0..9cd81f55f9fa2 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netstandard2.0;netstandard2.0-windows;netstandard2.0-Unix;netcoreapp2.1-windows;netcoreapp2.1-Unix;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netcoreapp3.1-windows;netcoreapp3.1-Unix;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows true enable @@ -12,13 +12,13 @@ + SR.PlatformNotSupported_Principal - SR.PlatformNotSupported_Principal annotations - + @@ -136,8 +136,7 @@ - + diff --git a/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj b/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj index 9d4c48403b1f7..9e1434e92080c 100644 --- a/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj +++ b/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj @@ -5,6 +5,7 @@ uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks) + \ No newline at end of file diff --git a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj index 1bc22f820512e..67f51b77a8624 100644 --- a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj @@ -1,17 +1,12 @@ - $(NetCoreAppCurrent);net461;netcoreapp2.1;netstandard2.0 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true - - - - - - + @@ -21,7 +16,7 @@ - + @@ -29,4 +24,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj index 73c1e6cef3465..86a03a3f7c2ec 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461-windows + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461-windows true true @@ -9,7 +9,7 @@ true true - + @@ -53,17 +53,20 @@ - - - - + + + + + + + diff --git a/src/libraries/System.Speech/src/Internal/SrgsCompiler/BackEnd.cs b/src/libraries/System.Speech/src/Internal/SrgsCompiler/BackEnd.cs index 7052b26d8904f..b30d0c38cc693 100644 --- a/src/libraries/System.Speech/src/Internal/SrgsCompiler/BackEnd.cs +++ b/src/libraries/System.Speech/src/Internal/SrgsCompiler/BackEnd.cs @@ -737,7 +737,7 @@ internal static string NormalizeTokenWhiteSpace(string sToken) sToken = sToken.Trim(Helpers._achTrimChars); // Easy out if there are no consecutive double white spaces - if (sToken.IndexOf(" ", StringComparison.Ordinal) == -1) + if (!sToken.Contains(" ", StringComparison.Ordinal)) { return sToken; } diff --git a/src/libraries/System.Speech/src/Internal/SrgsCompiler/SrgsElementCompilerFactory.cs b/src/libraries/System.Speech/src/Internal/SrgsCompiler/SrgsElementCompilerFactory.cs index 98cf615fc86ba..9339cb23f4d2d 100644 --- a/src/libraries/System.Speech/src/Internal/SrgsCompiler/SrgsElementCompilerFactory.cs +++ b/src/libraries/System.Speech/src/Internal/SrgsCompiler/SrgsElementCompilerFactory.cs @@ -246,7 +246,7 @@ private void ParseToken(ParseElementCollection parent, string sToken, string pro if (pronunciation != null) { // Garbage transition is optional whereas Wildcard is not. So we need additional epsilon transition. - OneOf oneOf = pronunciation.IndexOf(';') >= 0 ? new OneOf(parent._rule, _backend) : null; + OneOf oneOf = pronunciation.Contains(';') ? new OneOf(parent._rule, _backend) : null; for (int iCurPron = 0, iDeliminator = 0; iCurPron < pronunciation.Length; iCurPron = iDeliminator + 1) { @@ -318,7 +318,7 @@ private static string EscapeToken(string sToken) // String t System.Diagnostics.Debug.Assert(!string.IsNullOrEmpty(sToken)); // Easy out if no escape characters - if (sToken.IndexOf("\\/", StringComparison.Ordinal) == -1) + if (!sToken.Contains("\\/", StringComparison.Ordinal)) { return sToken; } diff --git a/src/libraries/System.Speech/src/Internal/SrgsCompiler/Subset.cs b/src/libraries/System.Speech/src/Internal/SrgsCompiler/Subset.cs index ea642f5756711..d8355de84c776 100644 --- a/src/libraries/System.Speech/src/Internal/SrgsCompiler/Subset.cs +++ b/src/libraries/System.Speech/src/Internal/SrgsCompiler/Subset.cs @@ -26,7 +26,7 @@ public Subset(ParseElementCollection parent, Backend backend, string text, Match { continue; } - if (text.IndexOf(ch) >= 0) + if (text.Contains(ch)) { text = text.Replace(ch, ' '); } diff --git a/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs b/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs index f6b262081274d..7ac31ddfa3441 100644 --- a/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs +++ b/src/libraries/System.Speech/src/Internal/SrgsParser/XmlParser.cs @@ -1018,7 +1018,7 @@ private IToken ParseToken(IElement parent, XmlReader reader) ThrowSrgsException(SRID.InvalidEmptyElement, "token"); } - if (content.IndexOf('\"') >= 0) + if (content.Contains('\"')) { ThrowSrgsException(SRID.InvalidTokenString); } diff --git a/src/libraries/System.Speech/src/Recognition/SrgsGrammar/SrgsToken.cs b/src/libraries/System.Speech/src/Recognition/SrgsGrammar/SrgsToken.cs index 1446864360054..e5f6d036ff66f 100644 --- a/src/libraries/System.Speech/src/Recognition/SrgsGrammar/SrgsToken.cs +++ b/src/libraries/System.Speech/src/Recognition/SrgsGrammar/SrgsToken.cs @@ -37,7 +37,7 @@ public string Text // remove all spaces if any string text = value.Trim(Helpers._achTrimChars); - if (string.IsNullOrEmpty(text) || text.IndexOf('\"') >= 0) + if (string.IsNullOrEmpty(text) || text.Contains('\"')) { throw new ArgumentException(SR.Get(SRID.InvalidTokenString), nameof(value)); } diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index e825c111a434a..00b2c99d3a6a9 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -1,20 +1,17 @@  true - $(NetCoreAppCurrent)-windows;netcoreapp2.1-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 true - - $(NoWarn);CS0649;CA2249;SA1129 + $(NoWarn);CS0649;SA1129 false SR.PlatformNotSupported_SystemSpeech $(NoWarn);IDE0079 - - $(NoWarn);IDE0079 @@ -230,9 +227,7 @@ - - - + @@ -243,11 +238,13 @@ + + diff --git a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj index eac52a84aeb98..7150d80c8aa21 100644 --- a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj +++ b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 9c56c17a5de0c..232b1cb17ef84 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows;netstandard2.0;netcoreapp2.0-windows;netstandard2.0-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netstandard2.0-windows;netstandard2.0;net461-windows true true @@ -52,13 +52,10 @@ - + - - - - + @@ -72,8 +69,7 @@ - + @@ -84,7 +80,7 @@ - + diff --git a/src/libraries/System.Text.Json/pkg/System.Text.Json.pkgproj b/src/libraries/System.Text.Json/pkg/System.Text.Json.pkgproj index c714baa66768a..ac2d21ef89d61 100644 --- a/src/libraries/System.Text.Json/pkg/System.Text.Json.pkgproj +++ b/src/libraries/System.Text.Json/pkg/System.Text.Json.pkgproj @@ -14,6 +14,8 @@ .NETCoreApp;UAP + + \ No newline at end of file diff --git a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj index 6d4d4a9b77bb5..dc0bb21c008ca 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj @@ -1,31 +1,30 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable true - + + - - + - + diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index ed42782ca6148..8a6315b1fe7c4 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true @@ -14,10 +14,8 @@ - $(DefineConstants);BUILDING_INBOX_LIBRARY - $(NoWarn);nullable - - netstandard2.0 + $(DefineConstants);BUILDING_INBOX_LIBRARY + $(NoWarn);nullable @@ -276,16 +274,23 @@ - + - + + + + + + + + @@ -294,18 +299,13 @@ + - - - - - - - + @@ -317,21 +317,4 @@ - - - - - - - - - - - - - - - - - diff --git a/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj b/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj index 7cde4645f71ec..28fa02b0c608e 100644 --- a/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj +++ b/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj @@ -12,6 +12,7 @@ + diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index 8feb18682fce6..b1b6add200ce3 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 true enable @@ -12,7 +12,7 @@ - + diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj index b0ad74ab4a030..9fd61f126bfa4 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 true enable @@ -26,7 +26,7 @@ - + diff --git a/src/libraries/System.Windows.Extensions/pkg/System.Windows.Extensions.pkgproj b/src/libraries/System.Windows.Extensions/pkg/System.Windows.Extensions.pkgproj index 89e47fabe9e6d..240cfdfab1b89 100644 --- a/src/libraries/System.Windows.Extensions/pkg/System.Windows.Extensions.pkgproj +++ b/src/libraries/System.Windows.Extensions/pkg/System.Windows.Extensions.pkgproj @@ -2,9 +2,11 @@ - netcoreapp3.0 + netcoreapp3.1 + + \ No newline at end of file diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj index e015f13652225..d04eae0963b75 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.0 + $(NetCoreAppCurrent);netcoreapp3.1 true @@ -17,7 +17,7 @@ - + diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj index 0a7838d5e99f6..916c0b133ea5b 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -1,10 +1,11 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.0-windows;$(NetCoreAppCurrent);netcoreapp3.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1 true - + + SR.PlatformNotSupported_System_Windows_Extensions @@ -53,8 +54,6 @@ - - diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj index 4fe2bdb6ba04d..b6d264834f9c8 100644 --- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj +++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj @@ -86,17 +86,8 @@ - - - netcoreapp2.0 - - - netcoreapp2.1 - - netcoreapp3.0 + netcoreapp3.1 netstandard2.0 @@ -104,22 +95,11 @@ netstandard2.1 - - - 2.0.1 - netcoreapp2.0 - - netcoreapp2.0 - - - netcoreapp2.1 - - - netcoreapp3.0 + netcoreapp3.1 netstandard2.0