From 84a78721ee63be8f04a0e47f6ef7037ebd1bf69b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 20 May 2021 15:15:25 +0200 Subject: [PATCH 01/26] Don't reference ns.dll inside shared framework The netstandard.dll shim shouldn't be referenced inside the shared framework as it's a compat shim that shouldn't be required to compose the shared framework. This removes the necessity of a separate RefPath build and improves incremental build times as only the few OOB projects that require the shim would need to rebuild. --- eng/Versions.props | 1 + eng/references.targets | 7 ------- .../ref/Microsoft.Win32.Registry.csproj | 13 +++++++++---- .../ref/System.Diagnostics.DiagnosticSource.csproj | 11 ++++++++--- .../src/System.Diagnostics.DiagnosticSource.csproj | 2 +- .../src/System/Drawing/NumericsExtensions.cs | 5 ----- .../ref/System.Formats.Asn1.csproj | 9 +++++++-- .../ref/System.IO.FileSystem.AccessControl.csproj | 13 +++++++++---- .../src/System/Net/Http/Headers/HeaderUtilities.cs | 1 - .../src/System/Net/Quic/QuicOptions.cs | 1 - .../src/System/Net/WebClient.cs | 1 - .../System.Runtime.CompilerServices.Unsafe.csproj | 8 +++++++- .../System.Runtime.CompilerServices.Unsafe.ilproj | 1 - .../ref/System.Threading.Tasks.Dataflow.csproj | 7 +++++-- 14 files changed, 47 insertions(+), 33 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ecdbf5c6d6da7c..78cd914fcee4df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,6 +105,7 @@ 6.0.0-preview.6.21274.1 6.0.0-preview.6.21274.1 4.3.0 + 4.3.0 4.5.4 4.5.0 1.1.1 diff --git a/eng/references.targets b/eng/references.targets index 42763624c5eded..6adcba93322895 100644 --- a/eng/references.targets +++ b/eng/references.targets @@ -7,13 +7,6 @@ <_FindDependencies>false - - - - - diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index da35db4f3001fa..7ce5dcabc07ea9 100644 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,14 +1,19 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 + true enable - - - + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index a323120307be3b..f3afcc64064ac1 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,6 +1,7 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 + true false enable @@ -11,9 +12,13 @@ - + - + + + + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 42a0662cd2777b..784a7f8883ffe7 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/NumericsExtensions.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/NumericsExtensions.cs index 1f468afdae269a..5cb3fa10ddd02d 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/NumericsExtensions.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/NumericsExtensions.cs @@ -1,12 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; -using System.Linq; using System.Numerics; -using System.Text; -using System.Threading.Tasks; namespace System.Drawing { diff --git a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj index ee0ebfbfe10401..7867e755abebca 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -1,12 +1,17 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 + true enable - + + + + + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index 48ce7b7289990a..f5e8f7a871140f 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,15 +1,20 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable + true - - - + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HeaderUtilities.cs b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HeaderUtilities.cs index d3802a1571fcef..5d6e87bee1d4cd 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HeaderUtilities.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/Headers/HeaderUtilities.cs @@ -6,7 +6,6 @@ using System.Diagnostics; using System.Globalization; using System.IO; -using System.Net.Mail; using System.Text; namespace System.Net.Http.Headers diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicOptions.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicOptions.cs index 86dd644aaac1c7..e63f0bf2ca28ae 100644 --- a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicOptions.cs +++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicOptions.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/src/libraries/System.Net.WebClient/src/System/Net/WebClient.cs b/src/libraries/System.Net.WebClient/src/System/Net/WebClient.cs index 4c7dbd63f5d58e..0c32b6d906d2a1 100644 --- a/src/libraries/System.Net.WebClient/src/System/Net/WebClient.cs +++ b/src/libraries/System.Net.WebClient/src/System/Net/WebClient.cs @@ -8,7 +8,6 @@ using System.Globalization; using System.IO; using System.Net.Cache; -using System.Net.Http; using System.Security; using System.Text; using System.Threading; diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj index 50264a40f84c38..766ea9a8ae7fec 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj @@ -3,9 +3,15 @@ true false enable - netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + + + + + + \ 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 6c22cf9c866068..d742a0bf2d1dce 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,7 +1,6 @@  $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true IMPL OPT diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index 6a5bb818fe9b7e..925e102aaee110 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -1,11 +1,14 @@ - netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 enable + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))" /> + + + From 0d414d3d07c14d38fafa8460efe83619f1d55ee8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 20 May 2021 15:20:36 +0200 Subject: [PATCH 02/26] Add netcoreapp2.0 config to SystemEvents Adding a netcoreapp2.0 configuration to SystemEvents as the source assembly targets netcoreapp2.0 and this avoid the netstandard shim to be used. The additional configuration shouldn't pose a problem as with an eventual convergance of reference and src projects, we will likely not mix universes between ref and src anymore and build the additional matching universe assemblies. --- .../ref/Microsoft.Win32.SystemEvents.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj index 32515389382276..f25b1babbe88d0 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj @@ -1,10 +1,14 @@ - netstandard2.0;net461 + netcoreapp2.0;netstandard2.0;net461 enable + + + + \ No newline at end of file From 35497b1663ad040ff53dff294f4ba74a687cedac Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 20 May 2021 15:23:13 +0200 Subject: [PATCH 03/26] Reference netstandard shim in OOBs that require it There are a few OOB projects that require the netstandard.dll shim as they intentionally reference projects that only expose a netstandard configuration. --- .../src/System.Diagnostics.EventLog.csproj | 1 + ...stem.Diagnostics.PerformanceCounter.csproj | 1 + ...DirectoryServices.AccountManagement.csproj | 1 + .../src/System.Management.csproj | 1 + .../src/System.Runtime.Caching.csproj | 47 ++++++++++--------- .../src/System.Security.Permissions.csproj | 1 + ...em.ServiceProcess.ServiceController.csproj | 4 +- 7 files changed, 31 insertions(+), 25 deletions(-) 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 79220464303ad7..5c1a1695790d79 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -110,6 +110,7 @@ + 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 317c566411f6d7..b95ae75d47dcbb 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -125,6 +125,7 @@ + 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 5208f0039b8b74..9214d016143bab 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -98,6 +98,7 @@ + diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 07f592cf332b6f..0ff030f41bedb7 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -64,6 +64,7 @@ + diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index 8d6b815161d0d6..a9edac9c9a9437 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -4,29 +4,6 @@ netcoreapp3.1;netcoreapp3.1-windows;netstandard2.0;netstandard2.0-windows true - - - - - - - - - - - - - - - - - - - - - - - @@ -82,6 +59,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 9fc55eece247cf..46bbc6e1ebac2b 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -204,6 +204,7 @@ + diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 7cf866982fc86f..83715c2e7f725e 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -73,8 +73,8 @@ - + + From 15f7a63e8edad0b09c4aeded24f7226b47d02994 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 21 May 2021 00:12:23 +0200 Subject: [PATCH 04/26] Add fallback folder for NetCoreAppCurrent for ApiCompat --- eng/resolveContract.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets index f41be687441991..d98ef8dffb7bd7 100644 --- a/eng/resolveContract.targets +++ b/eng/resolveContract.targets @@ -3,6 +3,8 @@ @(ReferencePath->'%(RelativeDir)'->Distinct()) + + $(ContractDependencyPaths);$(MicrosoftNetCoreAppRefPackRefDir) From a2458630221ed04e2a960530ebcdc448106d6ec3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 21 May 2021 11:23:51 +0200 Subject: [PATCH 05/26] Fix unix configurations --- .../src/System.IO.FileSystem.AccessControl.csproj | 15 +++++++++------ .../CodeAnalysis/NullableAttributes.cs | 2 +- .../src/System.Security.AccessControl.csproj | 6 +++--- .../ref/System.Security.Principal.Windows.csproj | 1 - .../src/System.Security.Principal.Windows.csproj | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index a3d152ecf94b40..803045baa196f5 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,21 +1,24 @@ - $(NetCoreAppCurrent)-windows;netstandard2.0;netstandard2.0-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows true enable + true true SR.PlatformNotSupported_AccessControl - + + + - + - + - + @@ -112,7 +115,7 @@ - + diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs index 586d76d022275a..43db7aa85f8412 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs @@ -4,7 +4,7 @@ namespace System.Diagnostics.CodeAnalysis { // These attributes already shipped with .NET Core 3.1 in System.Runtime -#if !NETCOREAPP3_0 && !NETCOREAPP3_1 && !NETSTANDARD2_1 +#if !NETCOREAPP3_1 && !NETSTANDARD2_1 /// Specifies that null is allowed as an input even if the corresponding type disallows it. [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)] #if SYSTEM_PRIVATE_CORELIB diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 4f1fd6cd42513e..0685b279468d18 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;net461-windows;netstandard2.0-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows true enable @@ -10,7 +10,7 @@ true SR.PlatformNotSupported_AccessControl - + @@ -80,7 +80,7 @@ - + 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 401c7aecccd53b..9ec2638f81ef66 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,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true enable 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 9cd81f55f9fa20..a94ec44cbc81f9 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 @@ -2,9 +2,9 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;netcoreapp3.1-windows;netcoreapp3.1-Unix;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows - true enable + true From 494691db151f9647eab6b6c04843ee8940735d12 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 21 May 2021 17:42:36 +0200 Subject: [PATCH 06/26] Fix NullableAttribute ifdefs and trim using --- .../System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs | 1 - .../src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs b/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs index ac05989f6ea862..0eae170576a7d6 100644 --- a/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs +++ b/src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Text; diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs index 43db7aa85f8412..586d76d022275a 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs @@ -4,7 +4,7 @@ namespace System.Diagnostics.CodeAnalysis { // These attributes already shipped with .NET Core 3.1 in System.Runtime -#if !NETCOREAPP3_1 && !NETSTANDARD2_1 +#if !NETCOREAPP3_0 && !NETCOREAPP3_1 && !NETSTANDARD2_1 /// Specifies that null is allowed as an input even if the corresponding type disallows it. [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)] #if SYSTEM_PRIVATE_CORELIB From 755997188dabce5feea1197f2d767f4cc038f371 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 21 May 2021 23:39:40 +0200 Subject: [PATCH 07/26] More fixes --- .../src/Microsoft.NETCore.Platforms.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index 299a8b2ceb7342..7df7aa604d64b8 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -44,9 +44,9 @@ - - - + + + From 86f2e60aa97afd49163239965fb88c9eed332fd8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 25 May 2021 17:25:24 +0200 Subject: [PATCH 08/26] Add additional .NETCoreApp configurations to avoid NS shim Adding netcoreapp3.1 assets to libraries to avoid the netstandard.dll shim as a dependency. The secondary motive for adding these configurations is to keep source and ref configurations in sync to avoid weird cases where P2Ps resolve assets from different assembly universes depending on if it's a source or reference assembly. The only libraries that still go through the netstandard.dll shim are the Microsoft.Extensions ones. --- .../Common/src/System/CodeDom/CodeObject.cs | 2 + .../src/System/CodeDom/CodeTypeReference.cs | 4 +- .../src/System/Security/IdentityHelper.cs | 2 + ...crosoft.Extensions.Logging.Abstractions.cs | 2 +- ...oft.Extensions.Logging.Abstractions.csproj | 5 ++- .../src/LogValuesFormatter.cs | 2 +- ...oft.Extensions.Logging.Abstractions.csproj | 2 +- ...icrosoft.Extensions.Logging.Console.csproj | 9 +++- ...soft.Extensions.Logging.EventSource.csproj | 7 ++- .../Microsoft.Extensions.Primitives.csproj | 8 ++-- .../ref/Microsoft.Win32.Registry.csproj | 10 +++-- .../src/Microsoft.Win32.Registry.csproj | 8 ++-- .../System.CodeDom/ref/System.CodeDom.csproj | 12 ++++- .../Microsoft/VisualBasic/VBCodeGenerator.cs | 6 ++- .../System.CodeDom/src/System.CodeDom.csproj | 16 ++++++- .../ref/System.Collections.Immutable.cs | 6 ++- .../ref/System.Collections.Immutable.csproj | 7 ++- .../src/System.Collections.Immutable.csproj | 6 +-- .../Immutable/IImmutableDictionary.cs | 2 + .../Immutable/ImmutableHashSet_1.cs | 2 +- .../Immutable/ImmutableSortedSet_1.cs | 2 +- .../System.ComponentModel.Composition.csproj | 6 ++- ...stem.Configuration.ConfigurationManager.cs | 2 + ....Configuration.ConfigurationManager.csproj | 27 ++++++++--- ....Configuration.ConfigurationManager.csproj | 30 ++++++++++++- .../ConfigurationLockCollection.cs | 6 ++- .../Configuration/ConfigurationProperty.cs | 9 +++- .../ConfigurationSectionCollection.cs | 6 ++- .../ConfigurationSectionGroupCollection.cs | 6 ++- .../System.Data.Odbc/ref/System.Data.Odbc.cs | 6 +-- .../ref/System.Data.Odbc.csproj | 8 +++- ...System.Diagnostics.DiagnosticSource.csproj | 7 ++- .../ref/System.Diagnostics.EventLog.csproj | 13 ++++-- ...stem.Diagnostics.PerformanceCounter.csproj | 8 +++- ...DirectoryServices.AccountManagement.csproj | 9 +++- .../System.DirectoryServices.Protocols.csproj | 9 +++- .../ref/System.DirectoryServices.cs | 2 +- .../ref/System.DirectoryServices.csproj | 20 ++++++--- .../ref/System.Formats.Asn1.csproj | 9 +++- .../src/System.Formats.Asn1.csproj | 45 +++++++++---------- .../src/System.Formats.Cbor.csproj | 2 +- .../System.IO.FileSystem.AccessControl.csproj | 11 +++-- .../System.IO.FileSystem.AccessControl.csproj | 10 ++--- .../ref/System.IO.Pipes.AccessControl.csproj | 7 ++- .../ref/System.Management.csproj | 12 ++++- .../ref/System.Reflection.Metadata.csproj | 5 ++- .../src/System.Reflection.Metadata.csproj | 7 ++- .../Internal/Utilities/DecimalUtilities.cs | 4 +- ...stem.Reflection.MetadataLoadContext.csproj | 5 ++- .../ref/System.Security.AccessControl.csproj | 8 +++- .../src/System.Security.AccessControl.csproj | 2 +- ...Security.Cryptography.ProtectedData.csproj | 5 ++- ...Security.Cryptography.ProtectedData.csproj | 15 ++++--- .../Security/Cryptography/ProtectedData.cs | 2 +- ...em.ServiceProcess.ServiceController.csproj | 11 +++-- ...em.ServiceProcess.ServiceController.csproj | 18 ++++---- .../System.Speech/ref/System.Speech.csproj | 9 +++- .../ref/System.Text.Encoding.CodePages.csproj | 8 +++- .../System.Threading.Tasks.Dataflow.csproj | 5 ++- .../System.Threading.Tasks.Dataflow.csproj | 9 +++- 60 files changed, 364 insertions(+), 139 deletions(-) diff --git a/src/libraries/Common/src/System/CodeDom/CodeObject.cs b/src/libraries/Common/src/System/CodeDom/CodeObject.cs index 1a4898c9610e7d..f780fb625504ff 100644 --- a/src/libraries/Common/src/System/CodeDom/CodeObject.cs +++ b/src/libraries/Common/src/System/CodeDom/CodeObject.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#nullable enable + using System.Collections; using System.Collections.Specialized; diff --git a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs index ffeb0c92d406ac..9dea07ba7f4f7c 100644 --- a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs +++ b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs @@ -5,6 +5,8 @@ using System.Diagnostics; using System.Globalization; +#nullable enable + #if CODEDOM namespace System.CodeDom #else @@ -283,7 +285,7 @@ public CodeTypeReference(string typeName, params CodeTypeReference[] typeArgumen #if CODEDOM public CodeTypeReference(CodeTypeParameter typeParameter) : - this(typeParameter?.Name) + this(typeParameter?.Name!) { Options = CodeTypeReferenceOptions.GenericTypeParameter; } diff --git a/src/libraries/Common/src/System/Security/IdentityHelper.cs b/src/libraries/Common/src/System/Security/IdentityHelper.cs index 9ce528a47c347f..f7bec51d8deb9f 100644 --- a/src/libraries/Common/src/System/Security/IdentityHelper.cs +++ b/src/libraries/Common/src/System/Security/IdentityHelper.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#nullable enable + using System.Diagnostics; using System.IO; using System.Reflection; diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs index 60c0cd253078ea..199ddc52f2e570 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs @@ -129,7 +129,7 @@ public partial class Logger : Microsoft.Extensions.Logging.ILogger, Microsoft public Logger(Microsoft.Extensions.Logging.ILoggerFactory factory) { } System.IDisposable Microsoft.Extensions.Logging.ILogger.BeginScope(TState state) { throw null; } bool Microsoft.Extensions.Logging.ILogger.IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) { throw null; } - void Microsoft.Extensions.Logging.ILogger.Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception exception, System.Func formatter) { } + void Microsoft.Extensions.Logging.ILogger.Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func formatter) { } } public enum LogLevel { diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj index 0086184386da10..6176e297a83778 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,9 +1,12 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LogValuesFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LogValuesFormatter.cs index aed4014fdc6ba5..24dfb06b014928 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LogValuesFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LogValuesFormatter.cs @@ -233,7 +233,7 @@ private object FormatArgument(object? value) { var vsb = new ValueStringBuilder(stackalloc char[256]); bool first = true; - foreach (object e in enumerable) + foreach (object? e in enumerable) { if (!first) { diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index d63b42d63f3a67..7d18ebe3eed552 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true true diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index 41c181ec7a7d01..2171b00f81b561 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 true @@ -16,4 +16,11 @@ + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj index fe5b5ee697d378..80dba555dd552b 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 @@ -9,4 +9,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj index 10861efa679855..e349c19f02dc6d 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -1,13 +1,15 @@ - netstandard2.0;netstandard2.1;net461 + netcoreapp3.1;netstandard2.0;net461 - + + + + diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index 7ce5dcabc07ea9..588ad1ff8a5265 100644 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -8,12 +8,16 @@ - + + + - + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 845a6e4ab2f5e0..dfd80bbdf35af0 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -2,7 +2,7 @@ true $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows true $(NoWarn);CA2249 enable @@ -12,7 +12,7 @@ true $(NoWarn);CA1823 - + - + - + diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj index a32fa0a3e062bb..078681bc5ffedc 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj @@ -1,12 +1,20 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 - + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs index 028476723aedbe..371249ef4b2560 100644 --- a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs +++ b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs @@ -865,7 +865,11 @@ protected override void GenerateArrayCreateExpression(CodeArrayCreateExpression string typeName = GetTypeOutput(e.CreateType); Output.Write(typeName); - if (typeName.IndexOf('(') == -1) // string.Contains(char) is .NetCore2.1+ specific +#if NETCOREAPP + if (typeName.Contains('(')) +#else + if (typeName.IndexOf('(') == -1) +#endif { Output.Write("()"); } diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj index 84dd24091ba613..540a5e08c058bb 100644 --- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj @@ -2,7 +2,7 @@ true $(DefineConstants);CODEDOM - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 false @@ -129,4 +129,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs index 7e060514da2bfb..3894709facbe94 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs @@ -6,7 +6,9 @@ namespace System.Collections.Immutable { +#pragma warning disable CS8714 // The type 'TKey' cannot be used as type parameter 'TKey' in the generic type or method 'IReadOnlyDictionary'. Nullability of type argument 'TKey' doesn't match 'notnull' constraint. public partial interface IImmutableDictionary : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyDictionary, System.Collections.IEnumerable +#pragma warning restore CS8714 { System.Collections.Immutable.IImmutableDictionary Add(TKey key, TValue value); System.Collections.Immutable.IImmutableDictionary AddRange(System.Collections.Generic.IEnumerable> pairs); @@ -417,7 +419,7 @@ public static partial class ImmutableHashSet public static System.Collections.Immutable.ImmutableHashSet ToImmutableHashSet(this System.Collections.Immutable.ImmutableHashSet.Builder builder) { throw null; } } - #if !NETSTANDARD2_0 && !NETFRAMEWORK +#if NET5_0_OR_GREATER public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet @@ -905,7 +907,7 @@ public static partial class ImmutableSortedSet public static System.Collections.Immutable.ImmutableSortedSet ToImmutableSortedSet(this System.Collections.Immutable.ImmutableSortedSet.Builder builder) { throw null; } } -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if NET5_0_OR_GREATER public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 3d1674e34b356b..9fa1b1a650ac5a 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -12,6 +12,11 @@ + + + + + diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index b9993c0d4afcc1..6bb52c40f4fa6d 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -94,7 +94,6 @@ - @@ -102,7 +101,4 @@ - - - diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs index 3ba72af5b89ea1..bc7f8026f274dd 100644 --- a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs +++ b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs @@ -11,7 +11,9 @@ namespace System.Collections.Immutable /// /// The type of the key. /// The type of the value. +#pragma warning disable CS8714 // The type 'TKey' cannot be used as type parameter 'TKey' in the generic type or method 'IReadOnlyDictionary'. Nullability of type argument 'TKey' doesn't match 'notnull' constraint. public interface IImmutableDictionary : IReadOnlyDictionary +#pragma warning restore CS8714 { /// /// Gets an empty dictionary with equivalent ordering and key/value comparison rules. diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs index 3f67d39ef067ab..bfcae53cf8083c 100644 --- a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs +++ b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableHashSet_1.cs @@ -14,7 +14,7 @@ namespace System.Collections.Immutable /// The type of elements in the set. [DebuggerDisplay("Count = {Count}")] [DebuggerTypeProxy(typeof(ImmutableEnumerableDebuggerProxy<>))] -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if NET5_0_OR_GREATER public sealed partial class ImmutableHashSet : IImmutableSet, IHashKeyCollection, IReadOnlyCollection, ICollection, ISet, IReadOnlySet, ICollection, IStrongEnumerable.Enumerator> #else public sealed partial class ImmutableHashSet : IImmutableSet, IHashKeyCollection, IReadOnlyCollection, ICollection, ISet, ICollection, IStrongEnumerable.Enumerator> diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs index 1beb3df403dbd2..c0e69a79ec782d 100644 --- a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs +++ b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/ImmutableSortedSet_1.cs @@ -19,7 +19,7 @@ namespace System.Collections.Immutable /// [DebuggerDisplay("Count = {Count}")] [DebuggerTypeProxy(typeof(ImmutableEnumerableDebuggerProxy<>))] -#if !NETSTANDARD2_0 && !NETFRAMEWORK +#if NET5_0_OR_GREATER public sealed partial class ImmutableSortedSet : IImmutableSet, ISortKeyCollection, IReadOnlySet, IReadOnlyList, IList, ISet, IList, IStrongEnumerable.Enumerator> #else public sealed partial class ImmutableSortedSet : IImmutableSet, ISortKeyCollection, IReadOnlyList, IList, ISet, IList, IStrongEnumerable.Enumerator> diff --git a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj index 543c5c85ca1d35..c0fcd7902fad42 100644 --- a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj @@ -1,10 +1,14 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 enable + + + + \ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs index b418b345716161..afcaa306050b76 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs @@ -1052,6 +1052,7 @@ public partial class SettingsAttributeDictionary : System.Collections.Hashtable { public SettingsAttributeDictionary() { } public SettingsAttributeDictionary(System.Configuration.SettingsAttributeDictionary attributes) { } + protected SettingsAttributeDictionary(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { } } public abstract partial class SettingsBase { @@ -1070,6 +1071,7 @@ public virtual void Save() { } public partial class SettingsContext : System.Collections.Hashtable { public SettingsContext() { } + protected SettingsContext(System.Runtime.Serialization.SerializationInfo serializationInfo, System.Runtime.Serialization.StreamingContext streamingContext) { } } [System.AttributeUsageAttribute(System.AttributeTargets.Property)] public sealed partial class SettingsDescriptionAttribute : System.Attribute diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj index f1892d24df1750..0fc3f466376f90 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -1,17 +1,30 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 $(NoWarn);CS0618 - - - + + + + + + + - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index a7fcc9e7abaeb5..169fc3ab1af4d9 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 false @@ -253,6 +253,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationLockCollection.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationLockCollection.cs index f2f9b647546a00..60867e30f4190d 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationLockCollection.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationLockCollection.cs @@ -220,7 +220,11 @@ internal bool DefinedInParent(string name) string parentListEnclosed = "," + _seedList + ","; if (name.Equals(_ignoreName) || - (parentListEnclosed.IndexOf("," + name + ",", StringComparison.Ordinal) >= 0)) +#if NETCOREAPP + parentListEnclosed.Contains("," + name + ",", StringComparison.Ordinal)) +#else + parentListEnclosed.IndexOf("," + name + ",", StringComparison.Ordinal) >= 0) +#endif return true; return _internalDictionary.Contains(name) && (((ConfigurationValueFlags)_internalDictionary[name] & ConfigurationValueFlags.Inherited) != 0); diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs index 7602d12216380b..67d9313ee219ff 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs @@ -133,7 +133,14 @@ internal ConfigurationProperty(PropertyInfo info) if (collectionAttribute != null) { - if (collectionAttribute.AddItemName.IndexOf(',') == -1) AddElementName = collectionAttribute.AddItemName; // string.Contains(char) is .NetCore2.1+ specific +#if NETCOREAPP + if (collectionAttribute.AddItemName.Contains(',')) +#else + if (collectionAttribute.AddItemName.IndexOf(',') == -1) +#endif + { + AddElementName = collectionAttribute.AddItemName; + } RemoveElementName = collectionAttribute.RemoveItemName; ClearElementName = collectionAttribute.ClearItemsName; } diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionCollection.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionCollection.cs index d00befe43ef2c4..e322ba08097d0f 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionCollection.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionCollection.cs @@ -92,7 +92,11 @@ public ConfigurationSection Get(string name) throw ExceptionUtil.ParameterNullOrEmpty(nameof(name)); // prevent GetConfig from returning config not in this collection - if (name.IndexOf('/') >= 0) // string.Contains(char) is .NetCore2.1+ specific +#if NETCOREAPP + if (name.Contains('/')) +#else + if (name.IndexOf('/') >= 0) +#endif return null; // get the section from the config record diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionGroupCollection.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionGroupCollection.cs index 408ca76170bbe4..7b696a06fb703e 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionGroupCollection.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationSectionGroupCollection.cs @@ -89,7 +89,11 @@ public ConfigurationSectionGroup Get(string name) throw ExceptionUtil.ParameterNullOrEmpty(nameof(name)); // prevent GetConfig from returning config not in this collection - if (name.IndexOf('/') >= 0) // string.Contains(char) is .NetCore2.1+ specific +#if NETCOREAPP + if (name.Contains('/')) +#else + if (name.IndexOf('/') >= 0) +#endif return null; // get the section group diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs index 5a2a8319a5777f..235db70c644a3f 100644 --- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs +++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs @@ -48,7 +48,7 @@ protected override void Dispose(bool disposing) { } public override object? ExecuteScalar() { throw null; } public override void Prepare() { } public void ResetCommandTimeout() { } - object? System.ICloneable.Clone() { throw null; } + object System.ICloneable.Clone() { throw null; } } public sealed partial class OdbcCommandBuilder : System.Data.Common.DbCommandBuilder { @@ -154,7 +154,7 @@ public event System.Data.Odbc.OdbcRowUpdatingEventHandler? RowUpdating { add { } protected override System.Data.Common.RowUpdatingEventArgs CreateRowUpdatingEvent(System.Data.DataRow dataRow, System.Data.IDbCommand? command, System.Data.StatementType statementType, System.Data.Common.DataTableMapping tableMapping) { throw null; } protected override void OnRowUpdated(System.Data.Common.RowUpdatedEventArgs value) { } protected override void OnRowUpdating(System.Data.Common.RowUpdatingEventArgs value) { } - object? System.ICloneable.Clone() { throw null; } + object System.ICloneable.Clone() { throw null; } } public sealed partial class OdbcDataReader : System.Data.Common.DbDataReader { @@ -287,7 +287,7 @@ public OdbcParameter(string? name, object? value) { } public override object? Value { get { throw null; } set { } } public override void ResetDbType() { } public void ResetOdbcType() { } - object? System.ICloneable.Clone() { throw null; } + object System.ICloneable.Clone() { throw null; } public override string ToString() { throw null; } } [System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.Data.Design.DBParametersEditor, Microsoft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Drawing.Design.UITypeEditor, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj index ab06317e28cd68..9b14848ef42427 100644 --- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj @@ -1,10 +1,16 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable + + + + + + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index f3afcc64064ac1..c4a0e62c6f0467 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 true false enable @@ -18,7 +18,10 @@ - + + + + diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj index 2d78eb78addf9e..13d8dd886b589a 100644 --- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj @@ -1,13 +1,20 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 - - + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj index dd9d4370bcbdbc..8e37074e8cd0b3 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj @@ -1,10 +1,16 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 true + + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj index 300e3c2c284393..ae77b54b24fd6b 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj @@ -1,11 +1,16 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 - + + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj index c5b64e36ad9cad..ea208f9caf2f81 100644 --- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 @@ -8,4 +8,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs index 3e31f111d0eecd..9ca1248ba64847 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.cs @@ -419,7 +419,7 @@ internal PropertyCollection() { } public void CopyTo(System.DirectoryServices.PropertyValueCollection[] array, int index) { } public System.Collections.IDictionaryEnumerator GetEnumerator() { throw null; } void System.Collections.ICollection.CopyTo(System.Array array, int index) { } - void System.Collections.IDictionary.Add(object key, object value) { } + void System.Collections.IDictionary.Add(object key, object? value) { } void System.Collections.IDictionary.Clear() { } bool System.Collections.IDictionary.Contains(object value) { throw null; } void System.Collections.IDictionary.Remove(object key) { } diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj index c49656ee622804..d7bc79553bc975 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 true enable @@ -9,9 +9,19 @@ - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj index 7867e755abebca..2db955114925e5 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -1,17 +1,22 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable - + + + + + + diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index 059af38e99b740..6ff758b1cc33bd 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true @@ -47,29 +47,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj index 23462998e03ebd..2984c152980a8c 100644 --- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj @@ -1,6 +1,6 @@ - net5.0;$(NetCoreAppCurrent) + $(NetCoreAppCurrent);net5.0 true true enable diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index f5e8f7a871140f..0670000b5b072c 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable true @@ -9,12 +9,17 @@ - + + + - + + + + \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 803045baa196f5..469d8b5ad91754 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,22 +1,19 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows true enable - true true SR.PlatformNotSupported_AccessControl - - + - + diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index 06496ad316466e..353f432a561c48 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj @@ -1,20 +1,19 @@ - net5.0;netstandard2.0;net461 + net5.0;netcoreapp3.1;netstandard2.0;net461 enable - + - - + diff --git a/src/libraries/System.Management/ref/System.Management.csproj b/src/libraries/System.Management/ref/System.Management.csproj index dad99c2aecffba..7036834d5ac3f6 100644 --- a/src/libraries/System.Management/ref/System.Management.csproj +++ b/src/libraries/System.Management/ref/System.Management.csproj @@ -1,12 +1,20 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 - + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index 5ae1a3762e53af..c15631f7d38c83 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -2,7 +2,7 @@ true false - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable @@ -15,4 +15,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index b07bbd75ebac27..d11dcebefc1da0 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -3,7 +3,7 @@ true en-US false - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -15,10 +15,10 @@ + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> @@ -249,7 +249,6 @@ - diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs index 3733a4b45a5a0e..809c7a089a706e 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs @@ -7,7 +7,7 @@ internal static class DecimalUtilities { public static int GetScale(this decimal value) { -#if NETCOREAPP +#if NETCOREAPP_5_0_OR_GREATER Span bits = stackalloc int[4]; decimal.GetBits(value, bits); return unchecked((byte)(bits[3] >> 16)); @@ -18,7 +18,7 @@ public static int GetScale(this decimal value) public static void GetBits(this decimal value, out bool isNegative, out byte scale, out uint low, out uint mid, out uint high) { -#if NETCOREAPP +#if NETCOREAPP_5_0_OR_GREATER Span bits = stackalloc int[4]; decimal.GetBits(value, bits); #else diff --git a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj index c065d83b357a6e..e13d016cba8ea7 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj @@ -1,9 +1,12 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable + + + \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 403a6436ed2bdd..8f7e4febc3a99e 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 true enable @@ -12,7 +12,11 @@ - + + + + + \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 0685b279468d18..e79d53ebe49b38 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows true enable diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj index 96113201a7a080..f0c3299b0010d4 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable @@ -10,4 +10,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 58751f82564713..8f0798c0205913 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -1,16 +1,16 @@ true - netstandard2.0-windows;net461-windows;netstandard2.0 + netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows enable true true - SR.PlatformNotSupported_CryptographyProtectedData + SR.PlatformNotSupported_CryptographyProtectedData - + - + - + + + + + + diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs b/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs index 0e6b65bea16644..49f2b1331e00b0 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs @@ -59,7 +59,7 @@ private static byte[] ProtectOrUnprotect(byte[] inputData, byte[]? optionalEntro try { bool success = protect ? - Interop.Crypt32.CryptProtectData(ref userDataBlob, null, ref optionalEntropyBlob, IntPtr.Zero, IntPtr.Zero, flags, out outputBlob) : + Interop.Crypt32.CryptProtectData(ref userDataBlob, null!, ref optionalEntropyBlob, IntPtr.Zero, IntPtr.Zero, flags, out outputBlob) : Interop.Crypt32.CryptUnprotectData(ref userDataBlob, IntPtr.Zero, ref optionalEntropyBlob, IntPtr.Zero, IntPtr.Zero, flags, out outputBlob); if (!success) { diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index 57dffa178d8ea1..aaab8e80558e1d 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -1,16 +1,21 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable + + + - - + + + + \ No newline at end of file diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 83715c2e7f725e..a0947eb7084925 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;netstandard2.0;netstandard2.0-windows;net461-windows + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows true $(NoWarn);CA2249 enable @@ -10,9 +10,9 @@ true true - SR.PlatformNotSupported_ServiceController + SR.PlatformNotSupported_ServiceController - + - - + + + + @@ -91,13 +93,13 @@ - + - + - + diff --git a/src/libraries/System.Speech/ref/System.Speech.csproj b/src/libraries/System.Speech/ref/System.Speech.csproj index c8543d1332372b..9a8f2b437c242b 100644 --- a/src/libraries/System.Speech/ref/System.Speech.csproj +++ b/src/libraries/System.Speech/ref/System.Speech.csproj @@ -1,8 +1,15 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj index 532f6e7ebe4359..1587176c224c41 100644 --- a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj @@ -1,13 +1,17 @@ enable - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + true - + + + + \ No newline at end of file diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index 925e102aaee110..d41ccd4c1b8f4d 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 enable @@ -11,4 +11,7 @@ + + + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 0625f1b876b92f..a0a0f93ba75881 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 - true + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 enable @@ -52,12 +51,18 @@ + + + + + + From b1b8c5e48ab82a7c8ec2933d8eae58829111ebb8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 May 2021 19:20:11 +0200 Subject: [PATCH 09/26] Rebase errors fixed --- eng/Versions.props | 1 - .../ref/Microsoft.Win32.SystemEvents.csproj | 4 ++-- .../src/System.Collections.Immutable.csproj | 5 ++++- .../src/System.Diagnostics.EventLog.csproj | 1 - .../src/System.Diagnostics.PerformanceCounter.csproj | 1 - .../src/System.DirectoryServices.AccountManagement.csproj | 1 - .../System.Formats.Asn1/ref/System.Formats.Asn1.csproj | 7 +++---- .../ref/System.IO.FileSystem.AccessControl.csproj | 1 - .../src/System.IO.FileSystem.AccessControl.csproj | 1 - .../System.Management/src/System.Management.csproj | 1 - .../src/System.Runtime.Caching.csproj | 1 - .../ref/System.Security.Permissions.csproj | 1 - .../src/System.Security.Permissions.csproj | 1 - src/libraries/System.Text.Json/ref/System.Text.Json.csproj | 1 - 14 files changed, 9 insertions(+), 18 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 78cd914fcee4df..ecdbf5c6d6da7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,7 +105,6 @@ 6.0.0-preview.6.21274.1 6.0.0-preview.6.21274.1 4.3.0 - 4.3.0 4.5.4 4.5.0 1.1.1 diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj index f25b1babbe88d0..176e30b0cbec3e 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj @@ -1,13 +1,13 @@ - netcoreapp2.0;netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable - + diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 6bb52c40f4fa6d..8c30653fd526a0 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -85,7 +85,10 @@ Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs" /> - + + + + 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 5c1a1695790d79..79220464303ad7 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -110,7 +110,6 @@ - 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 b95ae75d47dcbb..317c566411f6d7 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -125,7 +125,6 @@ - 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 9214d016143bab..5208f0039b8b74 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -98,7 +98,6 @@ - diff --git a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj index 2db955114925e5..de6f3d1b625f67 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -1,15 +1,11 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true enable - - - @@ -19,4 +15,7 @@ + + + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index 0670000b5b072c..b4f6b58eb72a9f 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -2,7 +2,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable - true diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 469d8b5ad91754..96d9bafcb0a04c 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows - true enable diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 0ff030f41bedb7..07f592cf332b6f 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -64,7 +64,6 @@ - diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index a9edac9c9a9437..359be0a570c616 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -60,7 +60,6 @@ - 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 48ec64222b7aab..34fd93a4d69bd8 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -38,7 +38,6 @@ - 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 46bbc6e1ebac2b..9fc55eece247cf 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -204,7 +204,6 @@ - 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 dc0bb21c008ca5..254882756ad125 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj @@ -22,7 +22,6 @@ - From 7526e0432de2d167ac91e1bf58c8f02c427284df Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 31 May 2021 17:35:43 +0200 Subject: [PATCH 10/26] Remove unnecessary netcoreapp3.1 configs --- ...oft.Extensions.Logging.Abstractions.csproj | 6 ++--- ...oft.Extensions.Logging.Abstractions.csproj | 3 +-- ...icrosoft.Extensions.Logging.Console.csproj | 3 +++ ...icrosoft.Extensions.Logging.Console.csproj | 2 +- .../Microsoft.Extensions.Primitives.csproj | 1 - .../ref/Microsoft.Win32.Registry.csproj | 6 +---- .../src/Microsoft.Win32.Registry.csproj | 3 +-- .../src/Microsoft.Win32.SystemEvents.csproj | 2 +- .../System.CodeDom/Directory.Build.props | 2 ++ .../System.CodeDom/ref/System.CodeDom.csproj | 10 +------- .../System.CodeDom/src/System.CodeDom.csproj | 4 ++-- .../ref/System.Collections.Immutable.cs | 2 -- .../ref/System.Collections.Immutable.csproj | 7 +----- .../src/System.Collections.Immutable.csproj | 2 +- .../Immutable/IImmutableDictionary.cs | 2 -- .../Directory.Build.props | 1 + ...stem.Configuration.ConfigurationManager.cs | 4 ++++ ....Configuration.ConfigurationManager.csproj | 18 ++++---------- ....Configuration.ConfigurationManager.csproj | 9 +++---- .../Configuration/ClientConfigurationHost.cs | 2 ++ .../Internal/DelegatingConfigHost.cs | 2 ++ .../Internal/IInternalConfigHost.cs | 2 ++ .../Internal/InternalConfigHost.cs | 2 ++ .../Configuration/SettingsPropertyValue.cs | 6 +++++ ...System.Diagnostics.DiagnosticSource.csproj | 5 +--- .../src/System.Diagnostics.EventLog.csproj | 7 +++--- ...stem.Diagnostics.PerformanceCounter.csproj | 7 +++--- ...DirectoryServices.AccountManagement.csproj | 7 +++--- .../System.DirectoryServices.Protocols.csproj | 2 +- .../System.DirectoryServices.Protocols.csproj | 6 ++--- .../ref/System.DirectoryServices.csproj | 1 + .../src/System.DirectoryServices.csproj | 7 +++--- .../ref/System.Formats.Asn1.csproj | 7 +----- .../src/System.Formats.Asn1.csproj | 5 +--- .../ref/System.Formats.Cbor.csproj | 2 +- .../System.IO.FileSystem.AccessControl.csproj | 6 +---- .../System.IO.FileSystem.AccessControl.csproj | 5 +--- .../ref/System.IO.Pipes.AccessControl.csproj | 8 +++++-- .../src/System.IO.Pipes.AccessControl.csproj | 2 +- .../ref/System.Management.csproj | 6 ++++- .../src/System.Management.csproj | 8 +++---- .../ref/System.Reflection.Metadata.csproj | 5 +--- .../src/System.Reflection.Metadata.csproj | 4 ++-- ...stem.Reflection.MetadataLoadContext.csproj | 1 + .../src/System.Runtime.Caching.csproj | 3 ++- .../ref/System.Security.AccessControl.csproj | 6 +---- .../src/System.Security.AccessControl.csproj | 2 +- .../System.Security.Cryptography.Pkcs.csproj | 1 + ...Security.Cryptography.ProtectedData.csproj | 6 ++--- ...Security.Cryptography.ProtectedData.csproj | 2 +- .../ref/System.Security.Permissions.csproj | 5 ++-- .../src/System.Security.Permissions.csproj | 1 + .../System.Security.Principal.Windows.csproj | 2 +- ...em.ServiceProcess.ServiceController.csproj | 8 +++---- ...em.ServiceProcess.ServiceController.csproj | 3 +-- .../System.Speech/src/System.Speech.csproj | 24 +++++++++---------- .../src/System.Text.Encoding.CodePages.csproj | 2 +- .../src/System.Text.Encodings.Web.csproj | 15 ++++++------ .../ref/System.Text.Json.csproj | 1 + .../System.Threading.Tasks.Dataflow.csproj | 5 +--- .../System.Threading.Tasks.Dataflow.csproj | 7 +----- 61 files changed, 134 insertions(+), 161 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj index 6176e297a83778..8a736a657507a6 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,12 +1,12 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable - - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 7d18ebe3eed552..71e35b67179fa7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true + $(NetCoreAppCurrent);netstandard2.0;net461 true true diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index 2171b00f81b561..c37b5d1bebd047 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -6,6 +6,9 @@ + + + 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 c9f3ee93875a41..a4fa3412533097 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 @@ -30,7 +30,7 @@ Link="Common\Interop\Windows\Interop.GetStdHandle.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 3843dc8c292d43..25f981a38034e0 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -3,7 +3,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true true - true false Primitives shared by framework extensions. Commonly used types include: diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index 588ad1ff8a5265..6c1d89fa6ad4ac 100644 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -17,7 +16,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index dfd80bbdf35af0..4c759ebdffaaa7 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -2,8 +2,7 @@ true $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows - true + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows $(NoWarn);CA2249 enable 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 2b9dada8b1ecc3..5ad7ad0d8a77b0 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 true diff --git a/src/libraries/System.CodeDom/Directory.Build.props b/src/libraries/System.CodeDom/Directory.Build.props index e14d822dacdf69..6821d51759dd1c 100644 --- a/src/libraries/System.CodeDom/Directory.Build.props +++ b/src/libraries/System.CodeDom/Directory.Build.props @@ -9,5 +9,7 @@ System.CodeDom.CodeObject System.CodeDom.Compiler.CodeDomProvider Microsoft.CSharp.CSharpCodeProvider Microsoft.VisualBasic.VBCodeProvider + true + browser;ios;tvos;maccatalyst \ No newline at end of file diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj index 078681bc5ffedc..3267a92c1d628a 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 @@ -9,12 +9,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj index 540a5e08c058bb..7977a719807fb3 100644 --- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj @@ -2,7 +2,7 @@ true $(DefineConstants);CODEDOM - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 false @@ -129,7 +129,7 @@ - + diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs index 3894709facbe94..b70fcca6b235c6 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs @@ -6,9 +6,7 @@ namespace System.Collections.Immutable { -#pragma warning disable CS8714 // The type 'TKey' cannot be used as type parameter 'TKey' in the generic type or method 'IReadOnlyDictionary'. Nullability of type argument 'TKey' doesn't match 'notnull' constraint. public partial interface IImmutableDictionary : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyDictionary, System.Collections.IEnumerable -#pragma warning restore CS8714 { System.Collections.Immutable.IImmutableDictionary Add(TKey key, TValue value); System.Collections.Immutable.IImmutableDictionary AddRange(System.Collections.Generic.IEnumerable> pairs); diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 9fa1b1a650ac5a..3d1674e34b356b 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 true enable @@ -12,11 +12,6 @@ - - - - - diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 8c30653fd526a0..4dc16aa650bc01 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 true enable diff --git a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs index bc7f8026f274dd..3ba72af5b89ea1 100644 --- a/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs +++ b/src/libraries/System.Collections.Immutable/src/System/Collections/Immutable/IImmutableDictionary.cs @@ -11,9 +11,7 @@ namespace System.Collections.Immutable /// /// The type of the key. /// The type of the value. -#pragma warning disable CS8714 // The type 'TKey' cannot be used as type parameter 'TKey' in the generic type or method 'IReadOnlyDictionary'. Nullability of type argument 'TKey' doesn't match 'notnull' constraint. public interface IImmutableDictionary : IReadOnlyDictionary -#pragma warning restore CS8714 { /// /// Gets an empty dictionary with equivalent ordering and key/value comparison rules. diff --git a/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props index 24e9eeb056f084..844af4fbfc939c 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props +++ b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props @@ -3,6 +3,7 @@ Open true + browser Provides types that support using configuration files. Commonly Used Types: diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs index afcaa306050b76..f4171af9de41d2 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.cs @@ -1383,7 +1383,9 @@ public virtual void DeleteStream(string streamName) { } public virtual string GetConfigPathFromLocationSubPath(string configPath, string locationSubPath) { throw null; } public virtual System.Type GetConfigType(string typeName, bool throwOnError) { throw null; } public virtual string GetConfigTypeName(System.Type t) { throw null; } +#pragma warning disable SYSLIB0003 public virtual void GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord configRecord, out System.Security.PermissionSet permissionSet, out bool isHostReady) { throw null; } +#pragma warning restore SYSLIB0003 public virtual string GetStreamName(string configPath) { throw null; } public virtual string GetStreamNameForConfigSource(string streamName, string configSource) { throw null; } public virtual object GetStreamVersion(string streamName) { throw null; } @@ -1471,7 +1473,9 @@ public partial interface IInternalConfigHost string GetConfigPathFromLocationSubPath(string configPath, string locationSubPath); System.Type GetConfigType(string typeName, bool throwOnError); string GetConfigTypeName(System.Type t); +#pragma warning disable SYSLIB0003 void GetRestrictedPermissions(System.Configuration.Internal.IInternalConfigRecord configRecord, out System.Security.PermissionSet permissionSet, out bool isHostReady); +#pragma warning restore SYSLIB0003 string GetStreamName(string configPath); string GetStreamNameForConfigSource(string streamName, string configSource); object GetStreamVersion(string streamName); diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj index 0fc3f466376f90..fa1f81b9e19873 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 $(NoWarn);CS0618 @@ -11,20 +11,10 @@ + + + - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index 169fc3ab1af4d9..104386de5edba7 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -1,12 +1,12 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 false - true + true @@ -251,7 +251,8 @@ - + @@ -285,7 +286,7 @@ - + diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigurationHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigurationHost.cs index c906306c539276..190ec71abaf03d 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigurationHost.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigurationHost.cs @@ -282,6 +282,7 @@ public override Stream OpenStreamForRead(string streamName) if (streamName == null) return null; +#pragma warning disable SYSLIB0014 // WebClient is obsolete. // scheme is http WebClient client = new WebClient(); @@ -298,6 +299,7 @@ public override Stream OpenStreamForRead(string streamName) fileData = client.DownloadData(streamName); } catch { } +#pragma warning restore SYSLIB0014 if (fileData == null) return null; diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs index f1b958b78d6a20..46e588ce644c2e 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/DelegatingConfigHost.cs @@ -231,10 +231,12 @@ public virtual void RefreshConfigPaths() public virtual IDisposable Impersonate() => new DummyDisposable(); +#pragma warning disable SYSLIB0003 // Obsolete: CAS public virtual void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady) { permissionSet = new PermissionSet(null); isHostReady = true; } +#pragma warning restore SYSLIB0003 // Obsolete: CAS } } diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs index f3d0e54cbdd546..b03989bfb87097 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/IInternalConfigHost.cs @@ -103,6 +103,8 @@ string EncryptSection(string clearTextXml, ProtectedConfigurationProvider protec IDisposable Impersonate(); +#pragma warning disable SYSLIB0003 // Obsolete: CAS void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady); +#pragma warning restore SYSLIB0003 // Obsolete: CAS } } diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs index 8f2f2d4154e188..52a7360c506a5a 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/InternalConfigHost.cs @@ -304,10 +304,12 @@ internal static bool StaticIsFile(string streamName) public IDisposable Impersonate() => new DummyDisposable(); +#pragma warning disable SYSLIB0003 public void GetRestrictedPermissions(IInternalConfigRecord configRecord, out PermissionSet permissionSet, out bool isHostReady) { permissionSet = new PermissionSet(null); isHostReady = true; } +#pragma warning restore SYSLIB0003 } } diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsPropertyValue.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsPropertyValue.cs index 481ca485d460a1..769c736f72c78b 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsPropertyValue.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/SettingsPropertyValue.cs @@ -101,7 +101,9 @@ private object Deserialize() { using (MemoryStream ms = new MemoryStream((byte[])SerializedValue)) { +#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete and should not be used. value = (new BinaryFormatter()).Deserialize(ms); +#pragma warning restore SYSLIB0011 } } else @@ -212,7 +214,9 @@ private static object GetObjectFromString(Type type, SettingsSerializeAs seriali byte[] buffer = Convert.FromBase64String(serializedValue); using (MemoryStream ms = new MemoryStream(buffer)) { +#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete and should not be used. return (new BinaryFormatter()).Deserialize(ms); +#pragma warning restore SYSLIB0011 } } else @@ -249,8 +253,10 @@ private object SerializePropertyValue() { using (MemoryStream ms = new MemoryStream()) { +#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete and should not be used. BinaryFormatter bf = new BinaryFormatter(); bf.Serialize(ms, _value); +#pragma warning restore SYSLIB0011 return ms.ToArray(); } } diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index c4a0e62c6f0467..a113e54e783975 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + net5.0;netstandard2.0;net461 true false enable @@ -15,9 +15,6 @@ - - - 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 79220464303ad7..42a9fe53a55d14 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,14 +1,14 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;net461;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 true $(NoWarn);CA1838 - true - SR.PlatformNotSupported_EventLog + true + SR.PlatformNotSupported_EventLog @@ -110,6 +110,7 @@ + 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 317c566411f6d7..2ee7b0031ca8be 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;netcoreapp3.1-windows;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 true true - SR.PlatformNotSupported_PerfCounters + SR.PlatformNotSupported_PerfCounters - + @@ -125,6 +125,7 @@ + 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 5208f0039b8b74..58734432e6f58b 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -3,15 +3,15 @@ true $(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 true $(NoWarn);CA2249 - SR.DirectoryServicesAccountManagement_PlatformNotSupported + SR.DirectoryServicesAccountManagement_PlatformNotSupported - + @@ -98,6 +98,7 @@ + diff --git a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj index ea208f9caf2f81..f63b71f0a7c58a 100644 --- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -6,7 +6,7 @@ - + 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 4eb0455b489a1c..989cc76c322ffb 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -2,14 +2,14 @@ true true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netcoreapp3.1;netstandard2.0 true - SR.DirectoryServicesProtocols_PlatformNotSupported + SR.DirectoryServicesProtocols_PlatformNotSupported - + diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj index d7bc79553bc975..05cc27bbd5e896 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -15,6 +15,7 @@ + diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index b7e9706b02ca56..618f32863e605b 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -1,18 +1,18 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 true true enable - SR.DirectoryServices_PlatformNotSupported + SR.DirectoryServices_PlatformNotSupported $(NoWarn);CS8600;CS8602;CS8604;CS8605 - + @@ -149,6 +149,7 @@ + diff --git a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj index de6f3d1b625f67..adb92a819c4622 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -10,11 +10,6 @@ - - - - - diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index 6ff758b1cc33bd..4cd4f0320ea547 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 true @@ -50,11 +50,8 @@ - - - diff --git a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj index f2aa426354bd44..c07625b1b85ac2 100644 --- a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index b4f6b58eb72a9f..5669c053515732 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -17,8 +17,4 @@ - - - - \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 96d9bafcb0a04c..5a99e24dc5946c 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows enable @@ -89,9 +89,6 @@ Link="Common\System\IO\FileSystem.Attributes.Windows.cs" /> - diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index 353f432a561c48..04cc7921b00f20 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj @@ -1,6 +1,6 @@ - net5.0;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 enable @@ -13,7 +13,11 @@ - + + + + + diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index f1f4091ea1f781..bec5c79ce021e1 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -2,7 +2,6 @@ enable $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net5.0-windows;net5.0;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows - true @@ -32,6 +31,7 @@ + diff --git a/src/libraries/System.Management/ref/System.Management.csproj b/src/libraries/System.Management/ref/System.Management.csproj index 7036834d5ac3f6..18b7fb4064a3cd 100644 --- a/src/libraries/System.Management/ref/System.Management.csproj +++ b/src/libraries/System.Management/ref/System.Management.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 @@ -9,7 +9,11 @@ + + + + diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 07f592cf332b6f..28a2b20c61b3d9 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -3,14 +3,13 @@ true $(NoWarn);0618 true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 - true + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 - SR.PlatformNotSupported_SystemManagement + SR.PlatformNotSupported_SystemManagement - + + diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index c15631f7d38c83..5ae1a3762e53af 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -2,7 +2,7 @@ true false - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -15,7 +15,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index d11dcebefc1da0..654ed3f9062797 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -3,8 +3,7 @@ true en-US false - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -249,6 +248,7 @@ + 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 2ef7aa05aedc33..2f2ed9a8cdfa0f 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -150,6 +150,7 @@ + diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index 359be0a570c616..a4c099aae4d2c9 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -1,7 +1,7 @@ true - netcoreapp3.1;netcoreapp3.1-windows;netstandard2.0;netstandard2.0-windows + netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0 true @@ -60,6 +60,7 @@ + diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 8f7e4febc3a99e..3490dae5605665 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 true enable @@ -15,8 +15,4 @@ - - - - \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index e79d53ebe49b38..0685b279468d18 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows true enable 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 832bd3447c1d38..3c58c1a3bdaac9 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 @@ -646,6 +646,7 @@ + diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj index f0c3299b0010d4..7b9702905467cc 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index 8f0798c0205913..7a10f1803b3f87 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -1,7 +1,7 @@ true - netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows enable 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 34fd93a4d69bd8..37ede8ee4f07a9 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,6 +1,6 @@ - net5.0;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 @@ -37,7 +37,8 @@ - + + 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 9fc55eece247cf..4ec4a83dc086fd 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -204,6 +204,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 a94ec44cbc81f9..ceba3103466f26 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;netcoreapp3.1-windows;netcoreapp3.1-Unix;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows enable diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index aaab8e80558e1d..456cce2285e756 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -13,9 +13,7 @@ - - - - + + \ No newline at end of file diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index a0947eb7084925..0341f65eed2818 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows true $(NoWarn);CA2249 enable @@ -81,7 +81,6 @@ - diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index 00b2c99d3a6a91..04079d1bf1b39c 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -1,28 +1,19 @@  true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 - true + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 $(NoWarn);CS0649;SA1129 false - SR.PlatformNotSupported_SystemSpeech + + true + SR.PlatformNotSupported_SystemSpeech $(NoWarn);IDE0079 - - - true - - - - true - ExceptionStringTable - - @@ -201,6 +192,12 @@ + + + true + ExceptionStringTable + + upstable_chs.upsmap @@ -228,6 +225,7 @@ + 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 232b1cb17ef84a..52167513433925 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)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows true true diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index a4c22190c26287..23c0e5be693472 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 true enable @@ -38,21 +38,23 @@ - + - + - + + + + - @@ -62,9 +64,8 @@ - + - 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 254882756ad125..dc0bb21c008ca5 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj @@ -22,6 +22,7 @@ + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index d41ccd4c1b8f4d..925e102aaee110 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 enable @@ -11,7 +11,4 @@ - - - diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index a0a0f93ba75881..2a87946567c2b4 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 enable @@ -51,15 +51,10 @@ - - - - - From 5e963d90dc5556d66b4df710ea7a8c7ed2c27666 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 31 May 2021 17:49:37 +0200 Subject: [PATCH 11/26] Add one more config --- .../System.Runtime.Caching/src/System.Runtime.Caching.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index a4c099aae4d2c9..49cecf419b6c0c 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -1,7 +1,7 @@ true - netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0 true From 774f5aece2f8cafa7ba58568111816a60f082deb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 31 May 2021 17:56:46 +0200 Subject: [PATCH 12/26] Undo ExcludeNetCoreAppCurrent changes --- .../src/Microsoft.Extensions.Logging.Abstractions.csproj | 1 + .../src/Microsoft.Extensions.Primitives.csproj | 1 + .../Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj | 1 + .../src/System.IO.FileSystem.AccessControl.csproj | 1 + .../src/System.IO.Pipes.AccessControl.csproj | 1 + src/libraries/System.Management/src/System.Management.csproj | 1 + .../src/System.Reflection.Metadata.csproj | 1 + .../src/System.Runtime.CompilerServices.Unsafe.ilproj | 1 + .../ref/System.Security.Principal.Windows.csproj | 1 + .../src/System.Security.Principal.Windows.csproj | 1 + src/libraries/System.Speech/src/System.Speech.csproj | 1 + .../ref/System.Text.Encoding.CodePages.csproj | 1 - .../src/System.Threading.Tasks.Dataflow.csproj | 1 + 13 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 71e35b67179fa7..d63b42d63f3a67 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -2,6 +2,7 @@ $(NetCoreAppCurrent);netstandard2.0;net461 + true true true 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 25f981a38034e0..97fe163e4ca61a 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,7 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + true true true diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 4c759ebdffaaa7..739f5c29fa748c 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -3,6 +3,7 @@ true $(DefineConstants);REGISTRY_ASSEMBLY $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + true $(NoWarn);CA2249 enable diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 5a99e24dc5946c..2a1d231499b552 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,6 +1,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + true enable diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index bec5c79ce021e1..879631a2473b65 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -2,6 +2,7 @@ enable $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net5.0-windows;net5.0;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + true diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 28a2b20c61b3d9..f6b38ac511fd60 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -4,6 +4,7 @@ $(NoWarn);0618 true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 + true diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index 654ed3f9062797..16cc0f2190d911 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -4,6 +4,7 @@ en-US false $(NetCoreAppCurrent);netstandard2.0;net461 + true enable 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 d742a0bf2d1dce..6c22cf9c866068 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,7 @@  $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + true IMPL OPT 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 9ec2638f81ef66..401c7aecccd53b 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,7 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + true enable 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 ceba3103466f26..7c8527619dd796 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 @@ -2,6 +2,7 @@ true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows + true enable diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index 04079d1bf1b39c..b1af109a55a2f8 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -2,6 +2,7 @@ true $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 + true $(NoWarn);CS0649;SA1129 diff --git a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj index 1587176c224c41..d37062131e3652 100644 --- a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj @@ -2,7 +2,6 @@ enable $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 2a87946567c2b4..6413fdad55d260 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -1,6 +1,7 @@ $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 + true enable From 2c3d9f0591054280d328e9ee2c09d07edf3db1fb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 31 May 2021 18:36:04 +0200 Subject: [PATCH 13/26] Update Microsoft.NETCore.Platforms.csproj --- .../src/Microsoft.NETCore.Platforms.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index 7df7aa604d64b8..299a8b2ceb7342 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -44,9 +44,9 @@ - - - + + + From f8fa9c75b76ce252c796271f17c6b6f2de036c7b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 1 Jun 2021 13:52:56 +0200 Subject: [PATCH 14/26] Disable failing CodeDom tests --- .../tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs b/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs index 06a31a17c32557..ed341ca92732e0 100644 --- a/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs +++ b/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs @@ -444,6 +444,7 @@ public void ExplicitImplementation_BuiltIns_UsesTypeNamesForBetterCompilerHandli } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void Arrays_SingleDimensional_PrimitiveTypes() { var arrayMethod = new CodeMemberMethod(); @@ -539,6 +540,7 @@ Return retValue } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void Arrays_WithinArrays_Empty_NonPrimitiveTypes() { var arrayMethod = new CodeMemberMethod(); @@ -2082,6 +2084,7 @@ End Class } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void Indexers() { CodeNamespace nspace = new CodeNamespace("NSPC"); @@ -2362,6 +2365,7 @@ End Class [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] [ActiveIssue("https://github.com/dotnet/runtime/issues/50879", TestPlatforms.Android)] public void ProviderSupports() { @@ -3187,6 +3191,7 @@ End Class } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void GenericTypesAndConstraints() { CodeNamespace ns = new CodeNamespace("NS"); From 577c0f7928f2e5353bdbbf658e1ff02bebba6207 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 10:48:57 +0200 Subject: [PATCH 15/26] Update RequiresUnreferencedCodeAttribute.cs --- .../CodeAnalysis/RequiresUnreferencedCodeAttribute.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs index bcb31753c4084e..c2f1b5ef382e93 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/RequiresUnreferencedCodeAttribute.cs @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#nullable enable + namespace System.Diagnostics.CodeAnalysis { /// From 4db5ecd93eef0d8940f3c998a5437c26ad4ec52d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 10:53:18 +0200 Subject: [PATCH 16/26] Update Microsoft.Extensions.Primitives.csproj --- .../src/Microsoft.Extensions.Primitives.csproj | 1 - 1 file changed, 1 deletion(-) 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 97fe163e4ca61a..25f981a38034e0 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -1,7 +1,6 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - true true true From f5123ffe9332bd4089826d70551ed43a5d65abff Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 10:53:31 +0200 Subject: [PATCH 17/26] Update System.Diagnostics.DiagnosticSource.csproj --- .../ref/System.Diagnostics.DiagnosticSource.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index a113e54e783975..8ff018779a3d73 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,7 +1,6 @@ net5.0;netstandard2.0;net461 - true false enable @@ -24,4 +23,4 @@ - \ No newline at end of file + From 1b9c2db75b48bb6e8c7eefefc75d04a67c0fbb8e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Jun 2021 23:17:46 +0200 Subject: [PATCH 18/26] Disable failing tests --- .../tests/Mono/ConfigurationSectionTest.cs | 1 + .../System.Management/net6.0/disableVerifyClosure.targets | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs index 273f85d04f28f9..bd9525b22d9069 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs @@ -39,6 +39,7 @@ namespace MonoTests.System.Configuration public class ConfigurationSectionTest { [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/53960", TargetFrameworkMonikers.Netcoreapp)] public void TwoConfigElementsInARow() // Bug #521231 { string config = @""; diff --git a/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets new file mode 100644 index 00000000000000..99dd4f942f183d --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets @@ -0,0 +1,7 @@ + + + false + \ No newline at end of file From f6175b8df0eab251d1bf2093ee8d83c74064b5fd Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 09:08:01 +0200 Subject: [PATCH 19/26] Apply suggestions from code review Co-authored-by: Buyaa Namnan --- src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs | 2 +- .../System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs | 2 +- .../src/System/Configuration/ConfigurationProperty.cs | 2 +- .../src/System.ServiceProcess.ServiceController.csproj | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs index 9dea07ba7f4f7c..177b7fae539d49 100644 --- a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs +++ b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs @@ -285,7 +285,7 @@ public CodeTypeReference(string typeName, params CodeTypeReference[] typeArgumen #if CODEDOM public CodeTypeReference(CodeTypeParameter typeParameter) : - this(typeParameter?.Name!) + this(typeParameter?.Name) { Options = CodeTypeReferenceOptions.GenericTypeParameter; } diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs index 371249ef4b2560..a25eb3ed7f4fa3 100644 --- a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs +++ b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs @@ -866,7 +866,7 @@ protected override void GenerateArrayCreateExpression(CodeArrayCreateExpression Output.Write(typeName); #if NETCOREAPP - if (typeName.Contains('(')) + if (!typeName.Contains('(')) #else if (typeName.IndexOf('(') == -1) #endif diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs index 67d9313ee219ff..7f4299b69f76c6 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ConfigurationProperty.cs @@ -134,7 +134,7 @@ internal ConfigurationProperty(PropertyInfo info) if (collectionAttribute != null) { #if NETCOREAPP - if (collectionAttribute.AddItemName.Contains(',')) + if (!collectionAttribute.AddItemName.Contains(',')) #else if (collectionAttribute.AddItemName.IndexOf(',') == -1) #endif diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 6d2f62dafd4229..31a228519be6c9 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -72,8 +72,6 @@ - - From a65671c3f51cc2f4961bcbf5b218287766f3c6d7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 09:09:26 +0200 Subject: [PATCH 20/26] Update VBCodeGenerationTests.cs --- .../tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs b/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs index ed341ca92732e0..06a31a17c32557 100644 --- a/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs +++ b/src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/VBCodeGenerationTests.cs @@ -444,7 +444,6 @@ public void ExplicitImplementation_BuiltIns_UsesTypeNamesForBetterCompilerHandli } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void Arrays_SingleDimensional_PrimitiveTypes() { var arrayMethod = new CodeMemberMethod(); @@ -540,7 +539,6 @@ Return retValue } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void Arrays_WithinArrays_Empty_NonPrimitiveTypes() { var arrayMethod = new CodeMemberMethod(); @@ -2084,7 +2082,6 @@ End Class } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void Indexers() { CodeNamespace nspace = new CodeNamespace("NSPC"); @@ -2365,7 +2362,6 @@ End Class [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] [ActiveIssue("https://github.com/dotnet/runtime/issues/50879", TestPlatforms.Android)] public void ProviderSupports() { @@ -3191,7 +3187,6 @@ End Class } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/53522", TargetFrameworkMonikers.Netcoreapp)] public void GenericTypesAndConstraints() { CodeNamespace ns = new CodeNamespace("NS"); From 459305d99d07398e3d72d6788c096a61482e2700 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 09:09:50 +0200 Subject: [PATCH 21/26] Update ConfigurationSectionTest.cs --- .../tests/Mono/ConfigurationSectionTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs index bd9525b22d9069..273f85d04f28f9 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationSectionTest.cs @@ -39,7 +39,6 @@ namespace MonoTests.System.Configuration public class ConfigurationSectionTest { [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/53960", TargetFrameworkMonikers.Netcoreapp)] public void TwoConfigElementsInARow() // Bug #521231 { string config = @""; From 01a9ab2047c400ef1893fccda757101888d5f6f8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 09:12:25 +0200 Subject: [PATCH 22/26] Update CodeTypeReference.cs --- src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs index 177b7fae539d49..281691f7907f6c 100644 --- a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs +++ b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs @@ -75,7 +75,7 @@ public CodeTypeReference(string typeName, CodeTypeReferenceOptions codeTypeRefer Initialize(typeName, codeTypeReferenceOption); } - public CodeTypeReference(string typeName) + public CodeTypeReference(string? typeName) { Initialize(typeName); } From 2da8671935e8b0cddab2b9f3efa19c41face881a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 09:13:07 +0200 Subject: [PATCH 23/26] Update Microsoft.Extensions.Logging.Console.csproj --- .../ref/Microsoft.Extensions.Logging.Console.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index b4ceb1c7ca9a7c..844061afb56f2d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -8,7 +8,7 @@ - + From f461ee87301ec214a388e84ca6260d84a00dcddf Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 09:18:27 +0200 Subject: [PATCH 24/26] Update disableVerifyClosure.targets --- .../System.Management/net6.0/disableVerifyClosure.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets index 99dd4f942f183d..48b43b0c496ffa 100644 --- a/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets +++ b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets @@ -1,7 +1,7 @@ - + - false - \ No newline at end of file + + From 3855df9f0b7825e5da7ce144ca742309d55950a7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 10:43:11 +0200 Subject: [PATCH 25/26] Update disableVerifyClosure.targets --- .../System.Management/net6.0/disableVerifyClosure.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets index 48b43b0c496ffa..e3d9affc41542a 100644 --- a/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets +++ b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets @@ -1,3 +1,4 @@ + + From 120d839549ca1ab55c555991fbd1370163ba1421 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Jun 2021 22:13:53 +0200 Subject: [PATCH 26/26] PR feedback --- .../src/Interop/Windows/Crypt32/Interop.CryptProtectData.cs | 2 +- .../System/Reflection/Internal/Utilities/DecimalUtilities.cs | 4 ++-- .../src/System/Security/Cryptography/ProtectedData.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CryptProtectData.cs b/src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CryptProtectData.cs index bf6cc60b985033..6fab3a93fad5f4 100644 --- a/src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CryptProtectData.cs +++ b/src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CryptProtectData.cs @@ -13,7 +13,7 @@ internal static partial class Crypt32 [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool CryptProtectData( [In] ref DATA_BLOB pDataIn, - [In] string szDataDescr, + [In] string? szDataDescr, [In] ref DATA_BLOB pOptionalEntropy, [In] IntPtr pvReserved, [In] IntPtr pPromptStruct, diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs index 809c7a089a706e..3733a4b45a5a0e 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/DecimalUtilities.cs @@ -7,7 +7,7 @@ internal static class DecimalUtilities { public static int GetScale(this decimal value) { -#if NETCOREAPP_5_0_OR_GREATER +#if NETCOREAPP Span bits = stackalloc int[4]; decimal.GetBits(value, bits); return unchecked((byte)(bits[3] >> 16)); @@ -18,7 +18,7 @@ public static int GetScale(this decimal value) public static void GetBits(this decimal value, out bool isNegative, out byte scale, out uint low, out uint mid, out uint high) { -#if NETCOREAPP_5_0_OR_GREATER +#if NETCOREAPP Span bits = stackalloc int[4]; decimal.GetBits(value, bits); #else diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs b/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs index 49f2b1331e00b0..0e6b65bea16644 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System/Security/Cryptography/ProtectedData.cs @@ -59,7 +59,7 @@ private static byte[] ProtectOrUnprotect(byte[] inputData, byte[]? optionalEntro try { bool success = protect ? - Interop.Crypt32.CryptProtectData(ref userDataBlob, null!, ref optionalEntropyBlob, IntPtr.Zero, IntPtr.Zero, flags, out outputBlob) : + Interop.Crypt32.CryptProtectData(ref userDataBlob, null, ref optionalEntropyBlob, IntPtr.Zero, IntPtr.Zero, flags, out outputBlob) : Interop.Crypt32.CryptUnprotectData(ref userDataBlob, IntPtr.Zero, ref optionalEntropyBlob, IntPtr.Zero, IntPtr.Zero, flags, out outputBlob); if (!success) {