From bbf96599d501732c2ba8b2b14e93efa0e9643442 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 11 Jun 2021 00:32:53 +0200 Subject: [PATCH] Don't reference the netstandard shim inside the shared framework (#53023) * 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. * 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. Co-authored-by: Buyaa Namnan --- eng/references.targets | 7 --- eng/resolveContract.targets | 2 + .../Crypt32/Interop.CryptProtectData.cs | 2 +- .../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 +- ...icrosoft.Extensions.Logging.Console.csproj | 12 ++++- ...icrosoft.Extensions.Logging.Console.csproj | 2 +- ...soft.Extensions.Logging.EventSource.csproj | 7 ++- .../Microsoft.Extensions.Primitives.csproj | 8 +-- .../ref/Microsoft.Win32.Registry.csproj | 11 +++-- .../src/Microsoft.Win32.Registry.csproj | 6 +-- .../ref/Microsoft.Win32.SystemEvents.csproj | 6 ++- .../src/Microsoft.Win32.SystemEvents.csproj | 2 +- .../System.CodeDom/Directory.Build.props | 2 + .../System.CodeDom/ref/System.CodeDom.csproj | 4 +- .../Microsoft/VisualBasic/VBCodeGenerator.cs | 6 ++- .../System.CodeDom/src/System.CodeDom.csproj | 16 +++++- .../ref/System.Collections.Immutable.cs | 4 +- .../src/System.Collections.Immutable.csproj | 9 ++-- .../Immutable/ImmutableHashSet_1.cs | 2 +- .../Immutable/ImmutableSortedSet_1.cs | 2 +- .../System.ComponentModel.Composition.csproj | 6 ++- .../Directory.Build.props | 1 + ...stem.Configuration.ConfigurationManager.cs | 6 +++ ....Configuration.ConfigurationManager.csproj | 19 ++++--- ....Configuration.ConfigurationManager.csproj | 37 ++++++++++++-- .../Configuration/ClientConfigurationHost.cs | 2 + .../ConfigurationLockCollection.cs | 6 ++- .../Configuration/ConfigurationProperty.cs | 9 +++- .../ConfigurationSectionCollection.cs | 6 ++- .../ConfigurationSectionGroupCollection.cs | 6 ++- .../Internal/DelegatingConfigHost.cs | 2 + .../Internal/IInternalConfigHost.cs | 2 + .../Internal/InternalConfigHost.cs | 2 + .../Configuration/SettingsPropertyValue.cs | 6 +++ .../System.Data.Odbc/ref/System.Data.Odbc.cs | 6 +-- .../ref/System.Data.Odbc.csproj | 8 ++- ...System.Diagnostics.DiagnosticSource.csproj | 12 +++-- ...System.Diagnostics.DiagnosticSource.csproj | 2 +- .../ref/System.Diagnostics.EventLog.csproj | 13 +++-- .../src/System.Diagnostics.EventLog.csproj | 7 +-- ...stem.Diagnostics.PerformanceCounter.csproj | 8 ++- ...stem.Diagnostics.PerformanceCounter.csproj | 7 +-- ...DirectoryServices.AccountManagement.csproj | 9 +++- ...DirectoryServices.AccountManagement.csproj | 7 +-- .../System.DirectoryServices.Protocols.csproj | 11 ++++- .../System.DirectoryServices.Protocols.csproj | 6 +-- .../ref/System.DirectoryServices.cs | 2 +- .../ref/System.DirectoryServices.csproj | 21 ++++++-- .../src/System.DirectoryServices.csproj | 7 +-- .../src/System/Drawing/NumericsExtensions.cs | 5 -- .../ref/System.Formats.Asn1.csproj | 8 ++- .../src/System.Formats.Asn1.csproj | 40 +++++++-------- .../ref/System.Formats.Cbor.csproj | 2 +- .../src/System.Formats.Cbor.csproj | 2 +- .../System.IO.FileSystem.AccessControl.csproj | 11 +++-- .../System.IO.FileSystem.AccessControl.csproj | 12 ++--- .../ref/System.IO.Pipes.AccessControl.csproj | 9 ++-- .../src/System.IO.Pipes.AccessControl.csproj | 1 + .../ref/System.Management.csproj | 16 +++++- .../src/System.Management.csproj | 7 +-- .../Net/Http/Headers/HeaderUtilities.cs | 1 - .../src/System/Net/Quic/QuicOptions.cs | 1 - .../src/System/Net/WebClient.cs | 1 - .../BrowserWebSockets/BrowserWebSocket.cs | 1 - .../RequiresUnreferencedCodeAttribute.cs | 2 + .../src/System.Reflection.Metadata.csproj | 4 +- ...stem.Reflection.MetadataLoadContext.csproj | 5 +- ...stem.Reflection.MetadataLoadContext.csproj | 1 + .../src/System.Runtime.Caching.csproj | 49 ++++++++++--------- ...tem.Runtime.CompilerServices.Unsafe.csproj | 8 ++- .../ref/System.Security.AccessControl.csproj | 2 +- .../src/System.Security.AccessControl.csproj | 6 +-- .../System.Security.Cryptography.Pkcs.csproj | 1 + ...Security.Cryptography.ProtectedData.csproj | 5 +- ...Security.Cryptography.ProtectedData.csproj | 15 ++++-- .../ref/System.Security.Permissions.csproj | 4 +- .../src/System.Security.Permissions.csproj | 1 + .../System.Security.Principal.Windows.csproj | 3 +- ...em.ServiceProcess.ServiceController.csproj | 9 ++-- ...em.ServiceProcess.ServiceController.csproj | 15 +++--- .../System.Speech/ref/System.Speech.csproj | 9 +++- .../System.Speech/src/System.Speech.csproj | 23 +++++---- .../ref/System.Text.Encoding.CodePages.csproj | 7 ++- .../src/System.Text.Encoding.CodePages.csproj | 2 +- .../src/System.Text.Encodings.Web.csproj | 15 +++--- .../System.Threading.Tasks.Dataflow.csproj | 7 ++- .../System.Threading.Tasks.Dataflow.csproj | 1 + .../net6.0/disableVerifyClosure.targets | 9 ++++ 93 files changed, 459 insertions(+), 224 deletions(-) create mode 100644 src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets 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/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) 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/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..281691f7907f6c 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 @@ -73,7 +75,7 @@ public CodeTypeReference(string typeName, CodeTypeReferenceOptions codeTypeRefer Initialize(typeName, codeTypeReferenceOption); } - public CodeTypeReference(string typeName) + public CodeTypeReference(string? typeName) { Initialize(typeName); } 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 57deb72a24a56d..e7b9034ea81aff 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..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,9 +1,12 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);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.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index e1a3dea400d304..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 @@ -1,11 +1,14 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 true + + + @@ -17,4 +20,11 @@ + + + + + + + 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 0bb4b2903988da..271f495a8dc211 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 @@ -29,7 +29,7 @@ Link="Common\Interop\Windows\Interop.GetStdHandle.cs" /> - + 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 da35db4f3001fa..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,6 +1,6 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -8,7 +8,12 @@ - - + + + + + + + \ 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 b30d83a31cabf5..4c759ebdffaaa7 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -11,7 +11,7 @@ true $(NoWarn);CA1823 - + - + - + 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..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,10 +1,14 @@ - netstandard2.0;net461 + netcoreapp3.1;netstandard2.0;net461 enable + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 90622a10185d78..97d46a0fca441a 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 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 a32fa0a3e062bb..3267a92c1d628a 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj @@ -1,12 +1,12 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);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..a25eb3ed7f4fa3 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..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 - netstandard2.0;net461 + $(NetCoreAppCurrent);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..b70fcca6b235c6 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs @@ -417,7 +417,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 +905,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/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 716b12acaf62a2..c9d746fd13b6b7 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -84,7 +84,10 @@ Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs" /> - + + + + @@ -93,7 +96,6 @@ - @@ -101,7 +103,4 @@ - - - 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/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 b418b345716161..f4171af9de41d2 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 @@ -1381,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; } @@ -1469,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 f1892d24df1750..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,17 +1,20 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);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..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 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 false - true + true @@ -251,13 +251,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 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/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..7f4299b69f76c6 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.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.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 a323120307be3b..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,6 +1,6 @@ - netstandard2.0;net461 + net5.0;netstandard2.0;net461 false enable @@ -11,12 +11,16 @@ - + - + + + + - \ No newline at end of file + 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 43b53ad61f6fd3..6c8fbb0203c4af 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -17,7 +17,7 @@ - + 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.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index 7c18a941872151..685306c24cdc05 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,13 +1,13 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;net461;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 $(NoWarn);CA1838 - true - SR.PlatformNotSupported_EventLog + true + SR.PlatformNotSupported_EventLog @@ -109,6 +109,7 @@ + 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.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 5ec71af7947ed9..3265bc1713e2bb 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -1,14 +1,14 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 true - SR.PlatformNotSupported_PerfCounters + SR.PlatformNotSupported_PerfCounters - + @@ -124,6 +124,7 @@ + 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.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index 7aed57a90fae84..cf546dca3587cb 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -3,14 +3,14 @@ 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 $(NoWarn);CA2249 - SR.DirectoryServicesAccountManagement_PlatformNotSupported + SR.DirectoryServicesAccountManagement_PlatformNotSupported - + @@ -97,6 +97,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 c5b64e36ad9cad..f63b71f0a7c58a 100644 --- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -1,11 +1,18 @@ - netstandard2.0 + netcoreapp3.1;netstandard2.0 - + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index f805636800e744..5a581ceb421c9f 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -2,13 +2,13 @@ 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 - SR.DirectoryServicesProtocols_PlatformNotSupported + SR.DirectoryServicesProtocols_PlatformNotSupported - + 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..05cc27bbd5e896 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,20 @@ - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index 29731cd69752f4..fded0bd60f0481 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -1,17 +1,17 @@ true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 true enable - SR.DirectoryServices_PlatformNotSupported + SR.DirectoryServices_PlatformNotSupported $(NoWarn);CS8600;CS8602;CS8604;CS8605 - + @@ -148,6 +148,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..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,12 +1,16 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 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 afc44a4843a83f..d6ee9507e4d548 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -46,29 +46,23 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + 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 2e9b8acb3e497a..c2f243296b552d 100644 --- a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj @@ -10,7 +10,7 @@ - + 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 f81c0cacfcecef..a79e50ff2c5be0 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 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..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 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -9,7 +9,12 @@ - - + + + + + + + \ 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 fc60ae30592aaa..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;netstandard2.0;netstandard2.0-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows enable @@ -9,12 +9,12 @@ true SR.PlatformNotSupported_AccessControl - + - + - + - + @@ -111,7 +111,7 @@ - + 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..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,19 +1,22 @@ - net5.0;netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 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 adf3f0fa983a54..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 @@ -31,6 +31,7 @@ + diff --git a/src/libraries/System.Management/ref/System.Management.csproj b/src/libraries/System.Management/ref/System.Management.csproj index dad99c2aecffba..18b7fb4064a3cd 100644 --- a/src/libraries/System.Management/ref/System.Management.csproj +++ b/src/libraries/System.Management/ref/System.Management.csproj @@ -1,12 +1,24 @@ - netstandard2.0 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 - + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index e93f063795dbd6..28a2b20c61b3d9 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -3,13 +3,13 @@ true $(NoWarn);0618 true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 - SR.PlatformNotSupported_SystemManagement + SR.PlatformNotSupported_SystemManagement - + + 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 9b80c2f226f5ce..eaae8e5e91e319 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 3d02ee3fd0199a..44a5fd0ae9d97f 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.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/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 { /// 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 49fbcc52589b95..654ed3f9062797 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -14,10 +14,10 @@ + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> 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.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index ec33f379a73db5..2052687cb978e5 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -149,6 +149,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..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,32 +1,9 @@ true - netcoreapp3.1;netcoreapp3.1-windows;netstandard2.0;netstandard2.0-windows + $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0 true - - - - - - - - - - - - - - - - - - - - - - - @@ -82,6 +59,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 93df430202634e..08c4e103327ffe 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -11,7 +11,7 @@ - + \ 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 b3fab96c74e937..6516f5e72a68f6 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 enable @@ -9,7 +9,7 @@ true SR.PlatformNotSupported_AccessControl - + @@ -79,7 +79,7 @@ - + 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 e0b6d61099c0b0..d5bbc116baea78 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 @@ -645,6 +645,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 96113201a7a080..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 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);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..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,16 +1,16 @@ true - netstandard2.0-windows;net461-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows enable true true - SR.PlatformNotSupported_CryptographyProtectedData + SR.PlatformNotSupported_CryptographyProtectedData - + - + - + + + + + + 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..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,7 @@ - + diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index 691bf86a923035..e07439d1445dc0 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -203,6 +203,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 ef84fcf32d8c77..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,9 +1,10 @@ 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 + true 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..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,16 +1,19 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);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 b2ee67b3e0039b..31a228519be6c9 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;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows $(NoWarn);CA2249 enable @@ -9,9 +9,9 @@ true true - SR.PlatformNotSupported_ServiceController + SR.PlatformNotSupported_ServiceController - + - + @@ -90,13 +89,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.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index faee98668a30f1..04079d1bf1b39c 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -1,27 +1,19 @@  true - $(NetCoreAppCurrent)-windows;netcoreapp3.1-windows;netstandard2.0 + $(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 - - @@ -200,6 +192,12 @@ + + + true + ExceptionStringTable + + upstable_chs.upsmap @@ -227,6 +225,7 @@ + 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..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 @@ -1,13 +1,16 @@ enable - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 - + + + + \ No newline at end of file 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 6373ec2bf7a68e..4128a65f4de871 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 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 31c8c610b4e89c..679e381a7eb0c1 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 enable @@ -37,21 +37,23 @@ - + - + - + + + + - @@ -61,9 +63,8 @@ - + - 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'))" /> + + + 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 d322570ef48ec6..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 @@ -57,6 +57,7 @@ + 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..e3d9affc41542a --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/System.Management/net6.0/disableVerifyClosure.targets @@ -0,0 +1,9 @@ + + + + + +