More renames of full framework to .NET Framework (#1900)
authorJan Kotas <jkotas@microsoft.com>
Sat, 18 Jan 2020 19:04:59 +0000 (11:04 -0800)
committerGitHub <noreply@github.com>
Sat, 18 Jan 2020 19:04:59 +0000 (11:04 -0800)
* More renames of full framework to .NET Framework

* Apply suggestions from code review

Co-Authored-By: Stephen Toub <stoub@microsoft.com>
126 files changed:
docs/design/features/PinnedHeap.md
docs/design/features/host-startup-hook.md
src/coreclr/EmptyProps.props
src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/ISymWrapperCore.cs
src/coreclr/src/tools/Common/TypeSystem/Interop/IL/MarshalHelpers.cs
src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cs
src/libraries/Common/src/System/Composition/Diagnostics/DebuggerTraceWriter.cs
src/libraries/Common/tests/CoreFx.Private.TestUtilities/System/AssertExtensions.cs
src/libraries/Common/tests/CoreFx.Private.TestUtilities/System/PlatformDetection.Windows.cs
src/libraries/Common/tests/System/Collections/ISet.Generic.Tests.cs
src/libraries/Common/tests/System/Runtime/Serialization/Formatters/BinaryFormatterHelpers.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/AES/AesContractTests.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/AES/DecryptorReusability.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAXml.cs
src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/TripleDES/TripleDESCipherTests.cs
src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/BinderHelper.cs
src/libraries/Microsoft.VisualBasic.Core/tests/FinancialTests.cs
src/libraries/Microsoft.Win32.Primitives/tests/Win32ExceptionTests.cs
src/libraries/Microsoft.Win32.SystemEvents/tests/SystemEvents.CreateTimer.cs
src/libraries/Microsoft.Win32.SystemEvents/tests/SystemEventsTest.cs
src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/CompilerInfoTests.cs
src/libraries/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs
src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/AssociationAttributeTests.cs
src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/CustomValidationAttributeTests.cs
src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/DataTypeAttributeTests.cs
src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/PhoneAttributeTests.cs
src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/CategoryAttributeTests.cs
src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/DescriptionAttributeTests.cs
src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/DesignerCategoryAttributeTests.cs
src/libraries/System.ComponentModel.Primitives/tests/System/ComponentModel/DisplayNameAttributeTests.cs
src/libraries/System.Composition.Runtime/tests/System/Composition/Hosting/Core/CompositionContractTests.cs
src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientConfigPaths.cs
src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ClientSettingsStore.cs
src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/RsaProtectedConfigurationProvider.cs
src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/ConfigurationPropertyTests.cs
src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/ImplicitMachineConfigTests.cs
src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/SettingElementTests.cs
src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TempConfigurationHost.cs
src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/UriSectionTests.cs
src/libraries/System.Console/src/System/ConsolePal.Windows.cs
src/libraries/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs
src/libraries/System.Data.DataSetExtensions/tests/System/Data/DataRowComparerTests.cs
src/libraries/System.Data.OleDb/tests/OleDbCommandBuilderTests.cs
src/libraries/System.Data.OleDb/tests/OleDbCommandTests.cs
src/libraries/System.Data.SqlClient/tests/FunctionalTests/ExceptionTest.cs
src/libraries/System.Diagnostics.EventLog/tests/EventLogTraceListenerTests.cs
src/libraries/System.Diagnostics.PerformanceCounter/tests/PerformanceDataTests.cs
src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsManifestNegative.cs
src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs
src/libraries/System.DirectoryServices.Protocols/tests/SortRequestControlTests.cs
src/libraries/System.Drawing.Common/tests/CharacterRangeTests.cs
src/libraries/System.Drawing.Common/tests/FontTests.cs
src/libraries/System.Drawing.Common/tests/IconTests.cs
src/libraries/System.Drawing.Common/tests/ImageTests.cs
src/libraries/System.Drawing.Common/tests/Text/PrivateFontCollectionTests.cs
src/libraries/System.Drawing.Common/tests/ToolboxBitmapAttributeTests.cs
src/libraries/System.Globalization/tests/CultureInfo/GetCultureInfo.cs
src/libraries/System.IO.Compression/tests/ZipArchive/zip_InvalidParametersAndStrangeFiles.cs
src/libraries/System.IO.FileSystem.AccessControl/tests/FileSystemAclExtensionsTests.cs
src/libraries/System.IO.FileSystem/tests/DirectoryInfo/ToString.cs
src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/Helper.Win32Unix.cs
src/libraries/System.IO.Packaging/tests/Tests.cs
src/libraries/System.IO.Pipes/tests/PipeTestBase.cs
src/libraries/System.Linq/tests/SelectTests.cs
src/libraries/System.Management/tests/System/Management/ManagementClassTests.cs
src/libraries/System.Memory/src/System/ThrowHelper.cs
src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs
src/libraries/System.Net.Primitives/tests/FunctionalTests/CookieCollectionTest.cs
src/libraries/System.Net.Primitives/tests/FunctionalTests/CookieTest.cs
src/libraries/System.Net.Primitives/tests/FunctionalTests/CredentialCacheTest.cs
src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressParsing.cs
src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressTest.cs
src/libraries/System.Net.Primitives/tests/UnitTests/CookieContainerTest.cs
src/libraries/System.Net.Security/src/System/Security/Authentication/ExtendedProtection/ServiceNameCollection.cs
src/libraries/System.Net.Security/tests/FunctionalTests/ServiceNameCollectionTest.cs
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CollectionDataContract.cs
src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs
src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XsdDataContractExporter.cs
src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderTests.cs
src/libraries/System.Private.Uri/tests/FunctionalTests/UriIpHostTest.cs
src/libraries/System.Private.Xml.Linq/tests/misc/XAttribute.cs
src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_AnyAttribute.cs
src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltArgumentList.cs
src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs
src/libraries/System.Reflection.Extensions/tests/RuntimeReflectionExtensionTestsWithQuirks.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EncodingHelper.cs
src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/CustomAttributeDecoderTests.cs
src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs
src/libraries/System.Resources.Extensions/tests/BinaryResourceWriterUnitTest.cs
src/libraries/System.Runtime.Extensions/tests/System/Convert.ToSByte.cs
src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs
src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs
src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs
src/libraries/System.Runtime.Serialization.Formatters/tests/EqualityExtensions.cs
src/libraries/System.Runtime.Serialization.Formatters/tests/PlatformExtensions.cs
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/DecryptTests.cs
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs
src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignerInfoTests.cs
src/libraries/System.Security.Cryptography.X509Certificates/src/System/Security/Cryptography/X509Certificates/X509Certificate2.cs
src/libraries/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs
src/libraries/System.Security.Cryptography.Xml/tests/RSAKeyValueTest.cs
src/libraries/System.Security.Cryptography.Xml/tests/Samples/SigningVerifyingWithCustomSignatureMethod.cs
src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs
src/libraries/System.ServiceProcess.ServiceController/tests/SafeServiceControllerTests.cs
src/libraries/System.ServiceProcess.ServiceController/tests/ServiceBaseTests.cs
src/libraries/System.ServiceProcess.ServiceController/tests/TestServiceProvider.cs
src/libraries/System.Text.Encoding.CodePages/tests/EncodingCodePages.cs
src/libraries/System.Text.Json/tests/JsonDocumentTests.cs
src/libraries/System.Text.Json/tests/JsonNumberTests.cs
src/libraries/System.Text.Json/tests/Serialization/Value.ReadTests.cs
src/libraries/System.Text.Json/tests/Utf8JsonReaderTests.TryGet.cs
src/libraries/System.Text.RegularExpressions/tests/Regex.Groups.Tests.cs
src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs
src/libraries/System.Text.RegularExpressions/tests/Regex.MultipleMatches.Tests.cs
src/libraries/System.Text.RegularExpressions/tests/RegexParserTests.cs
src/libraries/System.Threading.AccessControl/tests/EventWaitHandleAclTests.cs
src/libraries/System.Threading.AccessControl/tests/MutexAclTests.cs
src/libraries/System.Threading.AccessControl/tests/SemaphoreAclTests.cs
src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs
src/libraries/pkg/test/frameworkSettings/net/settings.targets

index c71f30724149d4892c7e7407ebedae80405b2634..d9d2ffa300472e9283d2c9917cb59fbdd80ca2a4 100644 (file)
@@ -10,7 +10,7 @@ We have done a lot of work to combat pinning in GC such as
 
 *  POPO (Promote Only Pinned Objects) which actually breaks up a plug if it includes both pinned and non pinned objects so we don’t end up pinning the whole plug if survived pinned objects are adjacent to non pinned objects that might occupy large amounts of memory.
 
-We also have provided framework utilities like <span style="color:red">`PinnableBufferCache`</span> (which only exists in the full framework) and modified various framework components to use it.
+We also have provided framework utilities like <span style="color:red">`PinnableBufferCache`</span> (which only exists in .NET Framework) and modified various framework components to use it.
 
 With these efforts we were able to mitigate perf problems caused by pinned by a lot. But at the end of the day, due to the nature of “pinning already allocated objects”, we cannot eliminate the situation of interleaved pinned and non pinned objects and that can still cause perf problems for GC. And the long lived scattered pins are the most problematic. They can be separated into 2 categories –
 
index 40dae4134dd9aa1da8152a537d57253e0fb16296..b5c29871a282a69baa1388d0a4cfaf8c3c11b95b 100644 (file)
@@ -100,7 +100,7 @@ needs to be built against the same or lower version of .NET Core than the app.
 
 This could be used with `AssemblyLoadContext` APIs to resolve
 dependencies not on the TPA list from a shared location, similar to
-the GAC on full framework. It could also be used to forcibly preload
+the GAC on .NET Framework. It could also be used to forcibly preload
 assemblies that are on the TPA list from a different location. Future
 changes to `AssemblyLoadContext` could make this easier to use by
 making the default load context or TPA list modifiable.
index deab359476aa449201e9ee1435634a9e74e73e39..c062d8bc56626c0e3131c3d51e215b4fccf85ff6 100644 (file)
@@ -3,6 +3,6 @@
 <!-- This file is intentionally empty. It is copied by build.cmd into the bin directory as both Directory.Build.props
      and Directory.Build.targets to prevent CMake built projects from dependending on the Directory.Build infrastructure
      in the root of the source tree. In particular this was necessary to compile DacTableGen, which is currently compiled
-     against the desktop framework.
+     against .NET Framework.
      -->
 </Project>
index 5603205841588b684f8f57304c198c809e078f3f..d76d2c89911539f3f18cf92c1090b11b80858a5a 100644 (file)
@@ -77,7 +77,7 @@ namespace System.Reflection.Emit
             //------------------------------------------------------------------------------
             void ISymbolDocumentWriter.SetSource(byte[] source)
             {
-                throw new NotSupportedException();   // Intentionally not supported to match .NET Framework CLR
+                throw new NotSupportedException();   // Intentionally not supported to match .NET Framework
             }
 
             //------------------------------------------------------------------------------
@@ -497,7 +497,7 @@ namespace System.Reflection.Emit
     //
     // ! Because the Release occurs in the finalizer thread, this safehandle really takes
     // ! an ostrich approach to apartment issues. We only tolerate this here because we're emulating
-    // ! the .NET Framework CLR's use of ISymWrapper which also pays lip service to COM apartment rules.
+    // ! the .NET Framework's use of ISymWrapper which also pays lip service to COM apartment rules.
     // !
     // ! However, think twice about pulling this safehandle out for other uses.
     //
index cd04dcdc95d7cac34126543cc641a5f568134429..96543a9e4e9251619d19604001ed7aeeec88b16f 100644 (file)
@@ -195,8 +195,6 @@ namespace Internal.TypeSystem.Interop
             //
             // Determine MarshalerKind
             //
-            // This mostly resembles .NET Framework CLR and .NET Native code as we need to match their behavior
-            // 
             if (type.IsPrimitive)
             {
                 switch (type.Category)
index 26f5e9868ea0583624c168cbbfdde330b4a2673e..29b76c40ed96eff09edb174b15915be995846afb 100644 (file)
@@ -203,7 +203,7 @@ namespace BenchmarkConsoleApplication
         public bool DoListBenchmarkTagSets; // List out the benchmark tag sets from the .XML file
         public bool DoListBenchmarkExecutables; // List out the benchmark exectubles from the .XML file
         public int NumberOfRunsPerBenchmark; // Number of runs/iterations each benchmark should be run
-        public string ComplusVersion; // COMPlus_VERSION for .NET Framework CLR hosted runs (optional).
+        public string ComplusVersion; // COMPlus_VERSION for .NET Framework hosted runs (optional).
         public string BenchmarksRootDirectory; // Root directory for benchmark tree specified in .XML file.
         public string BenchmarkXmlFileName; // Benchmark .XML filename (default coreclr_benchmarks.xml)
         public string BenchmarkCsvFileName; // Benchmark output .CSV filename (default coreclr_benchmarks.csv)
index 2c467d354acef9c2c6541860eba2dc997bd3f342..ad0652e21ac27f00959b34ded05ed2e3471ab071 100644 (file)
@@ -57,7 +57,7 @@ namespace System.Composition.Diagnostics
         {
             StringBuilder messageBuilder = new StringBuilder();
 
-            // Format taken from TraceListener.TraceEvent in full framework
+            // Format taken from TraceListener.TraceEvent in .NET Framework
             messageBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0} {1}: {2} : ",
                 s_sourceName, eventType.ToString(), (int)traceId);
 
index f4955453c22eb995dbafa91dbf0777cec3347afd..99f1093e1833e83faad2a56fa5d2add1d32dfcab 100644 (file)
@@ -13,7 +13,7 @@ namespace System
 {
     public static class AssertExtensions
     {
-        private static bool IsFullFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
+        private static bool IsNetFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework");
 
         public static void Throws<T>(Action action, string expectedMessage)
             where T : Exception
@@ -32,14 +32,14 @@ namespace System
         {
             T exception = Assert.Throws<T>(action);
 
-            if (netFxParamName == null && IsFullFramework)
+            if (netFxParamName == null && IsNetFramework)
             {
                 // Param name varies between .NET Framework versions -- skip checking it
                 return;
             }
 
             string expectedParamName =
-                IsFullFramework ?
+                IsNetFramework ?
                 netFxParamName : netCoreParamName;
 
             Assert.Equal(expectedParamName, exception.ParamName);
@@ -50,14 +50,14 @@ namespace System
         {
             T exception = Assert.Throws<T>(testCode);
 
-            if (netFxParamName == null && IsFullFramework)
+            if (netFxParamName == null && IsNetFramework)
             {
                 // Param name varies between .NET Framework versions -- skip checking it
                 return;
             }
 
             string expectedParamName =
-                IsFullFramework ?
+                IsNetFramework ?
                 netFxParamName : netCoreParamName;
 
             Assert.Equal(expectedParamName, exception.ParamName);
@@ -139,7 +139,7 @@ namespace System
             where TNetCoreExceptionType : ArgumentException
             where TNetFxExceptionType : Exception
         {
-            if (IsFullFramework)
+            if (IsNetFramework)
             {
                 // Support cases where the .NET Core exception derives from ArgumentException
                 // but the .NET Framework exception is not.
@@ -168,7 +168,7 @@ namespace System
 
         public static Exception Throws(Type netCoreExceptionType, Type netFxExceptionType, Action action)
         {
-            if (IsFullFramework)
+            if (IsNetFramework)
             {
                 return Assert.Throws(netFxExceptionType, action);
             }
@@ -182,7 +182,7 @@ namespace System
             where TNetCoreExceptionType : ArgumentException
             where TNetFxExceptionType : ArgumentException
         {
-            if (IsFullFramework)
+            if (IsNetFramework)
             {
                 Throws<TNetFxExceptionType>(netFxParamName, action);
             }
index 2aacadfd8eaef34b5021b8a6adeec55478f9afed..3700fae34c2f2c6aa347bd2572df4b5b72a4f00b 100644 (file)
@@ -19,7 +19,7 @@ namespace System
         //
 
         public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-        public static bool IsFullFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
+        public static bool IsNetFramework => RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
         public static bool HasWindowsShell => IsWindows && IsNotWindowsServerCore && IsNotWindowsNanoServer && IsNotWindowsIoTCore;
         public static bool IsWindows7 => IsWindows && GetWindowsVersion() == 6 && GetWindowsMinorVersion() == 1;
         public static bool IsWindows8x => IsWindows && GetWindowsVersion() == 6 && (GetWindowsMinorVersion() == 2 || GetWindowsMinorVersion() == 3);
index 81efeb27e581c90f7a6409115231861ad027f76f..d5aaeacc8423b13408664dc7b12611a2f50b1df4 100644 (file)
@@ -419,7 +419,7 @@ namespace System.Collections.Tests
 
         [Theory]
         [MemberData(nameof(ValidCollectionSizes))]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework throws InvalidOperationException")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework throws InvalidOperationException")]
         public void ISet_Generic_IntersectWith_Itself(int setLength)
         {
             ISet<T> set = GenericISetFactory(setLength);
index 6249e56ae166f21fa76789cf9cfa1231619a7ffb..0f245d65d33e4b6eed105d84fc61e5f618950830 100644 (file)
@@ -52,7 +52,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
         {
             // .NET Core and .NET Native throw PlatformNotSupportedExceptions when deserializing many exceptions.
             // The .NET Framework supports full deserialization.
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 return;
             }
index 872c18b72bac7c908c27b36f11e5ea1f8ff3152e..08530667a7189ded8720b49ae82e99e02c55401b 100644 (file)
@@ -66,7 +66,7 @@ namespace System.Security.Cryptography.Encryption.Aes.Tests
         [InlineData(536870928, true)] // number of bits overflows and wraps around to a valid size
         public static void InvalidKeySizes(int invalidKeySize, bool skipOnNetfx)
         {
-            if (skipOnNetfx && PlatformDetection.IsFullFramework)
+            if (skipOnNetfx && PlatformDetection.IsNetFramework)
                 return;
 
             using (Aes aes = AesFactory.Create())
@@ -101,7 +101,7 @@ namespace System.Security.Cryptography.Encryption.Aes.Tests
         [InlineData(536870928, true)] // number of bits overflows and wraps around to default BlockSize
         public static void InvalidIVSizes(int invalidIvSize, bool skipOnNetfx)
         {
-            if (skipOnNetfx && PlatformDetection.IsFullFramework)
+            if (skipOnNetfx && PlatformDetection.IsNetFramework)
                 return;
 
             using (Aes aes = AesFactory.Create())
index 0749eacd500ff18f50c1e4c6ce0cac7cf849b56a..9abd3b72079a181a05d0d6ea67285fd01443d4ca 100644 (file)
@@ -70,7 +70,7 @@ namespace System.Security.Cryptography.Encryption.Aes.Tests
 
         private static bool ShouldDecryptorBeReusable()
         {
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
                 return true;
 
             bool doNotResetDecryptor;
index 1a1fec75b08443d2d3816132b4ec7aa199fd4c0d..0f230c93c50c5da084e037d7ffc779975ade026f 100644 (file)
@@ -171,7 +171,7 @@ namespace System.Security.Cryptography.EcDsa.Tests
 
             UseAfterDispose(ecdsa, data, sig);
 
-            if (!(PlatformDetection.IsFullFramework && ecdsa.GetType().Name.EndsWith("Cng")))
+            if (!(PlatformDetection.IsNetFramework && ecdsa.GetType().Name.EndsWith("Cng")))
             {
                 Assert.Throws<ObjectDisposedException>(() => ecdsa.GenerateKey(ECCurve.NamedCurves.nistP256));
 
index 67dacfc521fac98973fe9a8cde2ca1abbb9e0433..db1c1bf7ac52c0dd1daa014bb612cb36f7fdec8d 100644 (file)
@@ -547,7 +547,7 @@ namespace System.Security.Cryptography.Rsa.Tests
                 Array.Resize(ref encrypted, encrypted.Length + 1);
 
                 // Baseline/exempt a .NET Framework difference for RSACng
-                if (!PlatformDetection.IsFullFramework ||
+                if (!PlatformDetection.IsNetFramework ||
                     rsa.GetType().Assembly.GetName().Name != "System.Core")
                 {
                     Assert.ThrowsAny<CryptographicException>(
@@ -571,7 +571,7 @@ namespace System.Security.Cryptography.Rsa.Tests
                 byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA1);
                 Array.Resize(ref encrypted, encrypted.Length + 1);
 
-                if (!PlatformDetection.IsFullFramework)
+                if (!PlatformDetection.IsNetFramework)
                 {
                     Assert.ThrowsAny<CryptographicException>(
                         () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA1));
@@ -587,7 +587,7 @@ namespace System.Security.Cryptography.Rsa.Tests
                     encrypted = Encrypt(rsa, data, RSAEncryptionPadding.OaepSHA256);
                     Array.Resize(ref encrypted, encrypted.Length + 1);
 
-                    if (!PlatformDetection.IsFullFramework)
+                    if (!PlatformDetection.IsNetFramework)
                     {
                         Assert.ThrowsAny<CryptographicException>(
                             () => Decrypt(rsa, encrypted, RSAEncryptionPadding.OaepSHA256));
index b4b67bee4c96319be1401ffef8f3912509667a76..5ec61d09c9ce95d9c24b7e302ec6755c050e9099 100644 (file)
@@ -248,7 +248,7 @@ namespace System.Security.Cryptography.Rsa.Tests
 
             using (RSA rsa = RSAFactory.Create())
             {
-                if (rsa is RSACng && PlatformDetection.IsFullFramework)
+                if (rsa is RSACng && PlatformDetection.IsNetFramework)
                     AssertExtensions.Throws<ArgumentException>(null, () => rsa.ImportParameters(imported));
                 else
                     Assert.ThrowsAny<CryptographicException>(() => rsa.ImportParameters(imported));
@@ -265,7 +265,7 @@ namespace System.Security.Cryptography.Rsa.Tests
 
             using (RSA rsa = RSAFactory.Create())
             {
-                if (rsa is RSACng && PlatformDetection.IsFullFramework)
+                if (rsa is RSACng && PlatformDetection.IsNetFramework)
                     AssertExtensions.Throws<ArgumentException>(null, () => rsa.ImportParameters(imported));
                 else
                     Assert.ThrowsAny<CryptographicException>(() => rsa.ImportParameters(imported));
@@ -305,7 +305,7 @@ namespace System.Security.Cryptography.Rsa.Tests
             Assert.Throws<ObjectDisposedException>(() => rsa.ExportParameters(false));
             Assert.Throws<ObjectDisposedException>(() => rsa.ExportParameters(true));
 
-            if (!(PlatformDetection.IsFullFramework && rsa.GetType().Name.EndsWith("Cng")))
+            if (!(PlatformDetection.IsNetFramework && rsa.GetType().Name.EndsWith("Cng")))
             {
                 Assert.Throws<ObjectDisposedException>(() => rsa.ImportParameters(TestData.RSA1024Params));
             }
index e1cebff2f2e3e7a13aa9e16ef83c8024604e851b..2467fcb9cfacc74a533606fc2abf2727f06c4a33 100644 (file)
@@ -1327,7 +1327,7 @@ zM=
   </Modulus>
 </RSA"));
 
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     Assert.Equal("System.Security.XmlSyntaxException", exception.GetType().FullName);
                 }
index 25d452fc2171f180c36556dcdb1626751d2e5910..438f2576d08198eab3c0b7c9ff3a46ad4c1c4a9c 100644 (file)
@@ -337,7 +337,7 @@ namespace System.Security.Cryptography.Encryption.TripleDes.Tests
 
                 // TripleDESCryptoServiceProvider doesn't throw the ArgumentOutOfRangeException,
                 // giving a CryptographicException when CAPI reports the destination too small.
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     exceptionType = typeof(CryptographicException);
                 }
index 57a33b1515a1cdef0c33b40a70caae362a140e0d..b1e6d0919ad112a7170a966b848b554d90ef2d0a 100644 (file)
@@ -213,16 +213,6 @@ namespace Microsoft.CSharp.RuntimeBinder
 
         /////////////////////////////////////////////////////////////////////////////////
 
-        private static bool IsTransparentProxy(object obj)
-        {
-            // In the full framework, this checks:
-            //     return obj != null && RemotingServices.IsTransparentProxy(obj);
-            // but transparent proxies don't exist in .NET Core.
-            return false;
-        }
-
-        /////////////////////////////////////////////////////////////////////////////////
-
         private static bool IsDynamicallyTypedRuntimeProxy(DynamicMetaObject argument, CSharpArgumentInfo info)
         {
             // This detects situations where, although the argument has a value with
@@ -234,7 +224,7 @@ namespace Microsoft.CSharp.RuntimeBinder
             bool isDynamicObject =
                 info != null &&
                 !info.UseCompileTimeType &&
-                (IsComObject(argument.Value) || IsTransparentProxy(argument.Value));
+                IsComObject(argument.Value);
 
             return isDynamicObject;
         }
index 09cc5b125e67d539aa5670be92852e4a682a80a3..f2271e912ccc27769f5eec2146871601bacdd2da 100644 (file)
@@ -14,7 +14,7 @@ namespace Microsoft.VisualBasic.Tests
 
         // The accuracy to which we can validate some numeric test cases depends on the platform.
         private static readonly int s_precision = IsArmOrArm64OrAlpine ? 12 :
-            PlatformDetection.IsFullFramework ? 14 : 15;
+            PlatformDetection.IsNetFramework ? 14 : 15;
 
         [Theory]
         [InlineData(0, 1.0, 1.0, 1.0, 1.0, 0, 0)]
index d1740a7dc89782e47229f8ab339b497071861b0d..8dae8f296bd1d6780dce69dfe6e5812d79cd6fa5 100644 (file)
@@ -54,7 +54,7 @@ namespace System.ComponentModel.Tests
                 CultureInfo.InvariantCulture,
                 "{0} ({1})",
                 typeof(Win32Exception).ToString(),
-                PlatformDetection.IsFullFramework ? $"0x{E_FAIL:X8}" : error.ToString(CultureInfo.InvariantCulture));
+                PlatformDetection.IsNetFramework ? $"0x{E_FAIL:X8}" : error.ToString(CultureInfo.InvariantCulture));
 
             Exception innerException = new FormatException();
 
index 25f8a4616b49643693dc2fbc86f295d0f0c98500..67bc4136d6bade0eb6103849e32709f0c7334df9 100644 (file)
@@ -50,7 +50,7 @@ namespace Microsoft.Win32.SystemEventsTests
             SystemEvents.TimerElapsed += handler;
             try
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     // .NET Framework has a bug where it will allow EnsureSystemEvents to proceed without actually creating the HWND
                     SystemEventsTest.WaitForSystemEventsWindow();
@@ -100,7 +100,7 @@ namespace Microsoft.Win32.SystemEventsTests
             SystemEvents.TimerElapsed += handler;
             try
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     // .NET Framework has a bug where it will allow EnsureSystemEvents to proceed without actually creating the HWND
                     SystemEventsTest.WaitForSystemEventsWindow();
index 7a63717290dd6558cdea2f94b7f0f37c49a634aa..51da6dc123806227b28d8cf879d14b9542397597 100644 (file)
@@ -27,7 +27,7 @@ namespace Microsoft.Win32.SystemEventsTests
         {
             if (s_hwnd == IntPtr.Zero)
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     // .NET Framework has a bug where it will allow EnsureSystemEvents to proceed without actually creating the HWND
                     WaitForSystemEventsWindow();
index 14ff4790e589b07b6e306aaf56650502ad0b02f8..09e4404fe2dda5b9191f341f5a9186f5406c83a8 100644 (file)
@@ -68,9 +68,9 @@ namespace System.CodeDom.Compiler.Tests
             yield return new object[] { compilerInfo, CodeDomProvider.GetCompilerInfo("cs"), true };
             yield return new object[] { compilerInfo, CodeDomProvider.GetCompilerInfo("vb"), false };
 
-            // .NET Core fixes a typo in .NET Full Framework and validates that the casted object
+            // .NET Core fixes a typo in .NET Framework and validates that the casted object
             // instead of validating the object typed parameter.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { compilerInfo, new object(), false };
             }
index 26de91cbb88e8e4f01f3801d4444c1c69a0ac0a0..fba9b9aea5975e0bb886004f69f4ab5664cd2b83 100644 (file)
@@ -18,9 +18,9 @@ namespace System.Collections.Tests
             return new Dictionary<string, string>();
         }
 
-        protected override ModifyOperation ModifyEnumeratorThrows => PlatformDetection.IsFullFramework ? base.ModifyEnumeratorThrows : ModifyOperation.Add | ModifyOperation.Insert;
+        protected override ModifyOperation ModifyEnumeratorThrows => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorThrows : ModifyOperation.Add | ModifyOperation.Insert;
 
-        protected override ModifyOperation ModifyEnumeratorAllowed => PlatformDetection.IsFullFramework ? base.ModifyEnumeratorAllowed : ModifyOperation.Remove | ModifyOperation.Clear;
+        protected override ModifyOperation ModifyEnumeratorAllowed => PlatformDetection.IsNetFramework ? base.ModifyEnumeratorAllowed : ModifyOperation.Remove | ModifyOperation.Clear;
 
         /// <summary>
         /// Creates an object that is dependent on the seed given. The object may be either
index 71a1c4c4f34258e765734c7503e4ccb8c1629f88..503cad89d57060efba89f75796ad1ba3f7a202fd 100644 (file)
@@ -20,7 +20,7 @@ namespace System.ComponentModel.DataAnnotations.Tests
             Assert.Equal(name, attribute.Name);
             Assert.Equal(thisKey, attribute.ThisKey);
             Assert.Equal(otherKey, attribute.OtherKey);
-            if (PlatformDetection.IsFullFramework && thisKey == null)
+            if (PlatformDetection.IsNetFramework && thisKey == null)
             {
                 Assert.Throws<NullReferenceException>(() => attribute.ThisKeyMembers);
             }
@@ -28,7 +28,7 @@ namespace System.ComponentModel.DataAnnotations.Tests
             {
                 Assert.Equal(expectedThisKeyMembers, attribute.ThisKeyMembers);
             }
-            if (PlatformDetection.IsFullFramework && otherKey == null)
+            if (PlatformDetection.IsNetFramework && otherKey == null)
             {
                 Assert.Throws<NullReferenceException>(() => attribute.OtherKeyMembers);
             }
index c751c3ded142a3cdde3ca744e320f3cf4d7f5b19..3906b128fb22a837c58385237b594e0d1822e537 100644 (file)
@@ -112,7 +112,7 @@ namespace System.ComponentModel.DataAnnotations.Tests
 
             // The .NET Framework has a bug where CustomValidationAttribute doesn't
             // validate the context. See https://github.com/dotnet/corefx/issues/18360.
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.False(attribute.RequiresValidationContext);
             }
index 83c58558976d3199702c562cee99f3abaeb23335..201fd208aebceb8b124a69dc2c17b2864a512cd2 100644 (file)
@@ -73,7 +73,7 @@ namespace System.ComponentModel.DataAnnotations.Tests
 
             // .NET Core fixed a bug where whitespace strings were allowed as CustomDataType.
             // See https://github.com/dotnet/corefx/issues/4465.
-            yield return new object[] { "   ", PlatformDetection.IsFullFramework };
+            yield return new object[] { "   ", PlatformDetection.IsNetFramework };
         }
 
         [Theory]
index 5a36811f261a725ebbd30062e030934bccc6d00f..4d4a4a693fe5ce44d4c3ee8af5b60faf57eab40d 100644 (file)
@@ -45,7 +45,7 @@ namespace System.ComponentModel.DataAnnotations.Tests
             // The .NET Framework considers them invalid. This is likely a bug
             // in .NET core. Seee https://github.com/dotnet/corefx/issues/17873.
             // [ActiveIssue("https://github.com/dotnet/corefx/issues/17873")]
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 yield return new TestCase(new PhoneAttribute(), "+4+2+5+-+5+5+5+-+1+2++1+2++");
                 yield return new TestCase(new PhoneAttribute(), "425-555-1212    ");
index 81e766f4940d7e84b664066cb2012ebf412d1e44..38806694403252ae4838ed3858d8597a53831b7d 100644 (file)
@@ -39,13 +39,13 @@ namespace System.ComponentModel.Tests
             yield return new object[] { attribute, new CategoryAttribute("category2"), false };
             yield return new object[] { attribute, new CategoryAttribute(string.Empty), false };
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { attribute, new CategoryAttribute(null), false };
             }
 
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { new CategoryAttribute(null), new CategoryAttribute(null), true };
                 yield return new object[] { new CategoryAttribute(null), new CategoryAttribute("category"), false };
index c4a0f419ba33914487e598b13669299ea1cd55c3..68d96ca56dd35dc373e0178379651af4e9c9e867 100644 (file)
@@ -56,13 +56,13 @@ namespace System.ComponentModel.Tests
             yield return new object[] { attribute, new DescriptionAttribute("description2"), false };
             yield return new object[] { attribute, new DescriptionAttribute(""), false };
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { attribute, new DescriptionAttribute(null), false };
             }
 
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { new DescriptionAttribute(null), new DescriptionAttribute(null), true };
                 yield return new object[] { new DescriptionAttribute(null), new DescriptionAttribute("description"), false };
index 5c5ec9b5c331d2869a98790f17a45ab122fa8d2d..b8f58225e74817271aa7f57bd56b922a3eeb3abc 100644 (file)
@@ -39,13 +39,13 @@ namespace System.ComponentModel.Tests
             yield return new object[] { attribute, new DesignerCategoryAttribute("category2"), false };
             yield return new object[] { attribute, new DesignerCategoryAttribute(string.Empty), false };
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { attribute, new DesignerCategoryAttribute(null), false };
             }
 
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { new DesignerCategoryAttribute(null), new DesignerCategoryAttribute(null), true };
                 yield return new object[] { new DesignerCategoryAttribute(null), new DesignerCategoryAttribute("category"), false };
index 097b64f9d198ffdbc40a83d109a6d7c8e2bb0f81..40981b5ad32fc80d2d0043a8efa495cd2958086a 100644 (file)
@@ -55,13 +55,13 @@ namespace System.ComponentModel.Tests
             yield return new object[] { attribute, new DisplayNameAttribute("name2"), false };
             yield return new object[] { attribute, new DisplayNameAttribute(""), false };
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { attribute, new DisplayNameAttribute(null), false };
             }
 
             // .NET Framework throws a NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { new DisplayNameAttribute(null), new DisplayNameAttribute(null), true };
                 yield return new object[] { new DisplayNameAttribute(null), new DisplayNameAttribute(""), false };
index f5846df432c010b918904e7b48139866000fb4cf..bd9f374d6191979fb9fba131a9a743a496efaa61 100644 (file)
@@ -173,7 +173,7 @@ namespace System.Composition.Runtime.Tests
                 false
             };
 
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[]
                 {
index 644a40af3b00e5e20b8f435d9c58941ae9c4be0b..41cbde86f94a0ec8ade8f39e142b80111f3a7bd9 100644 (file)
@@ -55,7 +55,7 @@ namespace System.Configuration
 
                 HasEntryAssembly = true;
 
-                // The original .NET Framework (desktop) code tried to get the local path without using Uri.
+                // The original .NET Framework code tried to get the local path without using Uri.
                 // If we ever find a need to do this again be careful with the logic. "file:///" is
                 // used for local paths and "file://" for UNCs. Simply removing the prefix will make
                 // local paths relative on Unix (e.g. "file:///home" will become "home" instead of
index 65d6007e09d5a497731990c0bb4d9ba62241f553..7a07cdbebc7646b955905762903d3fa175ef6d41 100644 (file)
@@ -311,7 +311,7 @@ namespace System.Configuration
 
             public override Stream OpenStreamForWrite(string streamName, string templateStreamName, ref object writeContext)
             {
-                // On .NET Framework (Desktop CLR) we do a bunch of work here around ensuring permissions and quotas
+                // On .NET Framework we do a bunch of work here around ensuring permissions and quotas
                 return Host.OpenStreamForWrite(streamName, templateStreamName, ref writeContext);
             }
 
index 38879d959480e5fa749db18e20ab08c15fff5fe3..33760ba9fb76b5d8b28805b15509497186314ffc 100644 (file)
@@ -221,7 +221,7 @@ namespace System.Configuration
             }
             catch
             {
-                // On .NET Framework (Desktop) we try to P/Invoke directly to Windows to get a "better" exception
+                // On .NET Framework we try to P/Invoke directly to Windows to get a "better" exception
                 // ThrowBetterException(keyMustExist);
                 throw;
             }
index 01adec8b599a753d2b7a3328de69efa68b424ebf..a03429631fbb8ce966c9d83cab87c124df8253b7 100644 (file)
@@ -139,7 +139,7 @@ namespace System.ConfigurationTests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not have the fix https://github.com/dotnet/corefx/issues/41873")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have the fix https://github.com/dotnet/corefx/issues/41873")]
         public void DescriptionValueIsExposed()
         {
             FooFailsValidator validator = new FooFailsValidator();
index f0a286dc9eb059316adee9573b52a73dd866c4ec..dd3f61c9edc4ce2a2093c2d1fd71cb908bf59b45 100644 (file)
@@ -67,7 +67,7 @@ namespace System.ConfigurationTests
         [Fact]
         public void EnsureInitWithDifferentOrderHostParams()
         {
-            string assemblyName = PlatformDetection.IsFullFramework ? "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" : "System.Configuration.ConfigurationManager";
+            string assemblyName = PlatformDetection.IsNetFramework ? "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" : "System.Configuration.ConfigurationManager";
 
             // InternalConfigFactory allows you to specify your own host / hostInitParams
             // Ensure ImplictMachineConfigHost can init within this process and not throw an Invalid cast exception
index 8c30f575919268b77c9c49963e07fd4f2b09f253..d08f8dd95e389d70555ffa8787c781acc6243668 100644 (file)
@@ -53,7 +53,7 @@ namespace System.Configuration.Tests
             Assert.True(ElementOne.Equals(ElementTwo));
         }
 
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not have the fix for https://github.com/dotnet/corefx/issues/27875")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have the fix for https://github.com/dotnet/corefx/issues/27875")]
         [Fact]
         public void DefaultConstructorEqualHashCodes()
         {
index 6fa9fc43e1bf2fc44d2a5fb3a55ae78eb5859834..e88fe303ca7f04eee861d31e9063154df85743ce 100644 (file)
@@ -9,7 +9,7 @@ using System.Reflection;
 
 public class TempConfigurationHost : DelegatingConfigHost
 {
-    private static string s_assemblyName = PlatformDetection.IsFullFramework ? "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" : "System.Configuration.ConfigurationManager";
+    private static string s_assemblyName = PlatformDetection.IsNetFramework ? "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" : "System.Configuration.ConfigurationManager";
     private static IInternalConfigConfigurationFactory s_configurationFactory;
 
     private ConfigurationFileMap _fileMap;
index 82cb1d18e65c1913e294a9622a7f1b2d5bb5d07d..afee5ddecc5e704cc090e0b4edfccf014261515f 100644 (file)
@@ -41,7 +41,7 @@ namespace System.ConfigurationTests
         [Fact]
         public void UriSectionIdnIriParsing()
         {
-            using (var temp = new TempConfig(PlatformDetection.IsFullFramework ? UriSectionConfiguration_NetFX : UriSectionConfiguration_Core))
+            using (var temp = new TempConfig(PlatformDetection.IsNetFramework ? UriSectionConfiguration_NetFX : UriSectionConfiguration_Core))
             {
                 var config = ConfigurationManager.OpenExeConfiguration(temp.ExePath);
                 UriSection uriSection = (UriSection)config.GetSection("uri");
@@ -53,7 +53,7 @@ namespace System.ConfigurationTests
         [Fact]
         public void UriSectionSchemeSettings()
         {
-            using (var temp = new TempConfig(PlatformDetection.IsFullFramework ? UriSectionConfiguration_NetFX : UriSectionConfiguration_Core))
+            using (var temp = new TempConfig(PlatformDetection.IsNetFramework ? UriSectionConfiguration_NetFX : UriSectionConfiguration_Core))
             {
                 var config = ConfigurationManager.OpenExeConfiguration(temp.ExePath);
                 UriSection uriSection = (UriSection)config.GetSection("uri");
index 95a502a4b7c6b32786d14654203ed92bcf91def9..b77ce66db198c42ac18c2614d2e208ee7bf66acb 100644 (file)
@@ -414,7 +414,8 @@ namespace System
                     throw new IOException(SR.IO_NoConsole);
 
                 int mode = 0;
-                Interop.Kernel32.GetConsoleMode(handle, out mode); // failure ignored in full framework
+                if (!Interop.Kernel32.GetConsoleMode(handle, out mode))
+                    throw Win32Marshal.GetExceptionForWin32Error(Marshal.GetLastWin32Error());
 
                 if (value)
                 {
index 06964fbbf4b0b4684afe17f1733173153cdc9fc2..b6ae2303d076273f74b3a11eeb8e375f2d60baae 100644 (file)
@@ -476,7 +476,7 @@ namespace System.Data.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not yet have the fix for this bug")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have the fix for this bug")]
         public void XsdSchemaDeserializationIgnoresLocale()
         {
             var serializer = new BinaryFormatter();
@@ -574,74 +574,5 @@ namespace System.Data.Tests
             Assert.Equal(-1, rowIDColumn.AutoIncrementSeed);
             Assert.Equal(-2, rowIDColumn.AutoIncrementStep);
         }
-
-        [Fact]
-        [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework, "Exists to provide notification of when the full framework gets the bug fix, at which point the preceding test can be re-enabled")]
-        public void XsdSchemaDeserializationOnFullFrameworkStillHasBug()
-        {
-            var serializer = new BinaryFormatter();
-            var buffer = new MemoryStream(new byte[]
-                {
-                    0,1,0,0,0,255,255,255,255,1,0,0,0,0,0,0,0,12,2,0,0,0,78,83,121,115,116,101,109,46,68,97,116,97,44,32,86,101,114,115,105,111,110,61,52,46,48,46,48,46,48,44,32,67,117,
-                    108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,98,55,55,97,53,99,53,54,49,57,51,52,101,48,56,57,5,1,0,
-                    0,0,21,83,121,115,116,101,109,46,68,97,116,97,46,68,97,116,97,84,97,98,108,101,3,0,0,0,25,68,97,116,97,84,97,98,108,101,46,82,101,109,111,116,105,110,103,86,101,114,
-                    115,105,111,110,9,88,109,108,83,99,104,101,109,97,11,88,109,108,68,105,102,102,71,114,97,109,3,1,1,14,83,121,115,116,101,109,46,86,101,114,115,105,111,110,2,0,0,0,9,
-                    3,0,0,0,6,4,0,0,0,177,6,60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,110,99,111,100,105,110,103,61,34,117,116,102,45,49,54,34,63,62,13,
-                    10,60,120,115,58,115,99,104,101,109,97,32,120,109,108,110,115,61,34,34,32,120,109,108,110,115,58,120,115,61,34,104,116,116,112,58,47,47,119,119,119,46,119,51,46,111,
-                    114,103,47,50,48,48,49,47,88,77,76,83,99,104,101,109,97,34,32,120,109,108,110,115,58,109,115,100,97,116,97,61,34,117,114,110,58,115,99,104,101,109,97,115,45,109,105,
-                    99,114,111,115,111,102,116,45,99,111,109,58,120,109,108,45,109,115,100,97,116,97,34,62,13,10,32,32,60,120,115,58,101,108,101,109,101,110,116,32,110,97,109,101,61,34,
-                    84,97,98,108,101,49,34,62,13,10,32,32,32,32,60,120,115,58,99,111,109,112,108,101,120,84,121,112,101,62,13,10,32,32,32,32,32,32,60,120,115,58,115,101,113,117,101,110,
-                    99,101,62,13,10,32,32,32,32,32,32,32,32,60,120,115,58,101,108,101,109,101,110,116,32,110,97,109,101,61,34,82,111,119,73,68,34,32,109,115,100,97,116,97,58,65,117,116,
-                    111,73,110,99,114,101,109,101,110,116,61,34,116,114,117,101,34,32,109,115,100,97,116,97,58,65,117,116,111,73,110,99,114,101,109,101,110,116,83,101,101,100,61,34,45,
-                    49,34,32,109,115,100,97,116,97,58,65,117,116,111,73,110,99,114,101,109,101,110,116,83,116,101,112,61,34,45,50,34,32,116,121,112,101,61,34,120,115,58,105,110,116,34,
-                    32,109,115,100,97,116,97,58,116,97,114,103,101,116,78,97,109,101,115,112,97,99,101,61,34,34,32,109,105,110,79,99,99,117,114,115,61,34,48,34,32,47,62,13,10,32,32,32,
-                    32,32,32,32,32,60,120,115,58,101,108,101,109,101,110,116,32,110,97,109,101,61,34,86,97,108,117,101,34,32,116,121,112,101,61,34,120,115,58,115,116,114,105,110,103,34,
-                    32,109,115,100,97,116,97,58,116,97,114,103,101,116,78,97,109,101,115,112,97,99,101,61,34,34,32,109,105,110,79,99,99,117,114,115,61,34,48,34,32,47,62,13,10,32,32,32,
-                    32,32,32,60,47,120,115,58,115,101,113,117,101,110,99,101,62,13,10,32,32,32,32,60,47,120,115,58,99,111,109,112,108,101,120,84,121,112,101,62,13,10,32,32,60,47,120,115,
-                    58,101,108,101,109,101,110,116,62,13,10,32,32,60,120,115,58,101,108,101,109,101,110,116,32,110,97,109,101,61,34,116,109,112,68,97,116,97,83,101,116,34,32,109,115,100,
-                    97,116,97,58,73,115,68,97,116,97,83,101,116,61,34,116,114,117,101,34,32,109,115,100,97,116,97,58,77,97,105,110,68,97,116,97,84,97,98,108,101,61,34,84,97,98,108,101,
-                    49,34,32,109,115,100,97,116,97,58,85,115,101,67,117,114,114,101,110,116,76,111,99,97,108,101,61,34,116,114,117,101,34,62,13,10,32,32,32,32,60,120,115,58,99,111,109,
-                    112,108,101,120,84,121,112,101,62,13,10,32,32,32,32,32,32,60,120,115,58,99,104,111,105,99,101,32,109,105,110,79,99,99,117,114,115,61,34,48,34,32,109,97,120,79,99,99,
-                    117,114,115,61,34,117,110,98,111,117,110,100,101,100,34,32,47,62,13,10,32,32,32,32,60,47,120,115,58,99,111,109,112,108,101,120,84,121,112,101,62,13,10,32,32,60,47,
-                    120,115,58,101,108,101,109,101,110,116,62,13,10,60,47,120,115,58,115,99,104,101,109,97,62,6,5,0,0,0,221,3,60,100,105,102,102,103,114,58,100,105,102,102,103,114,97,
-                    109,32,120,109,108,110,115,58,109,115,100,97,116,97,61,34,117,114,110,58,115,99,104,101,109,97,115,45,109,105,99,114,111,115,111,102,116,45,99,111,109,58,120,109,108,
-                    45,109,115,100,97,116,97,34,32,120,109,108,110,115,58,100,105,102,102,103,114,61,34,117,114,110,58,115,99,104,101,109,97,115,45,109,105,99,114,111,115,111,102,116,45,
-                    99,111,109,58,120,109,108,45,100,105,102,102,103,114,97,109,45,118,49,34,62,13,10,32,32,60,116,109,112,68,97,116,97,83,101,116,62,13,10,32,32,32,32,60,84,97,98,108,
-                    101,49,32,100,105,102,102,103,114,58,105,100,61,34,84,97,98,108,101,49,49,34,32,109,115,100,97,116,97,58,114,111,119,79,114,100,101,114,61,34,48,34,32,100,105,102,
-                    102,103,114,58,104,97,115,67,104,97,110,103,101,115,61,34,105,110,115,101,114,116,101,100,34,62,13,10,32,32,32,32,32,32,60,82,111,119,73,68,62,49,60,47,82,111,119,73,
-                    68,62,13,10,32,32,32,32,32,32,60,86,97,108,117,101,62,84,101,115,116,60,47,86,97,108,117,101,62,13,10,32,32,32,32,60,47,84,97,98,108,101,49,62,13,10,32,32,32,32,60,
-                    84,97,98,108,101,49,32,100,105,102,102,103,114,58,105,100,61,34,84,97,98,108,101,49,50,34,32,109,115,100,97,116,97,58,114,111,119,79,114,100,101,114,61,34,49,34,32,
-                    100,105,102,102,103,114,58,104,97,115,67,104,97,110,103,101,115,61,34,105,110,115,101,114,116,101,100,34,62,13,10,32,32,32,32,32,32,60,82,111,119,73,68,62,50,60,47,
-                    82,111,119,73,68,62,13,10,32,32,32,32,32,32,60,86,97,108,117,101,62,68,97,116,97,60,47,86,97,108,117,101,62,13,10,32,32,32,32,60,47,84,97,98,108,101,49,62,13,10,32,
-                    32,60,47,116,109,112,68,97,116,97,83,101,116,62,13,10,60,47,100,105,102,102,103,114,58,100,105,102,102,103,114,97,109,62,4,3,0,0,0,14,83,121,115,116,101,109,46,86,
-                    101,114,115,105,111,110,4,0,0,0,6,95,77,97,106,111,114,6,95,77,105,110,111,114,6,95,66,117,105,108,100,9,95,82,101,118,105,115,105,111,110,0,0,0,0,8,8,8,8,2,0,0,0,0,
-                    0,0,0,255,255,255,255,255,255,255,255,11
-                });
-
-            Exception exception;
-            CultureInfo savedCulture = CultureInfo.CurrentCulture;
-            try
-            {
-                exception = Assert.Throws<TargetInvocationException>(() =>
-                    {
-                        // Before deserializing, update the culture to use a weird negative number format. The bug this test is testing causes "-1" to no
-                        // longer be treated as a valid representation of the value -1, instead only accepting the string "()1".
-                        CultureInfo.CurrentCulture = new CultureInfo("en-US")
-                            {
-                                NumberFormat = new NumberFormatInfo()
-                                    {
-                                        NegativeSign = "()"
-                                    }
-                            };
-                        serializer.Deserialize(buffer); // BUG: System.Exception: "-1 is not a valid value for Int64."
-                    });
-            }
-            finally
-            {
-                CultureInfo.CurrentCulture = savedCulture;
-            }
-
-            Assert.IsAssignableFrom<FormatException>(exception.InnerException.InnerException);
-        }
     }
 }
index 9752ca202ed3c0fb20c4d6ac41636014cfcebbdd..afe56413ea72ddabad48103b99b184d8bf1a66ea 100644 (file)
@@ -288,7 +288,7 @@ namespace System.Data.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix applied only for dotnet Core, full framework throws NullReferenceException")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix applied only for .NET Core, .NET Framework throws NullReferenceException")]
         public void Equals_NullStringValueInStringArray_CanBeCompared()
         {
             var table = new DataTable("Table");
@@ -395,4 +395,4 @@ namespace System.Data.Tests
         }
 
     }
-}
\ No newline at end of file
+}
index 2827e4a4acdcd714a8cf78efa49ee6d296a6a91f..ff72ff85639cca02d5689e56b477e7d8169498fe 100644 (file)
@@ -92,7 +92,7 @@ namespace System.Data.OleDb.Tests
                 command.CommandText = @"SELECT * FROM " + tableName;
                 using (var builder = (OleDbCommandBuilder)OleDbFactory.Instance.CreateCommandBuilder())
                 {
-                    if (PlatformDetection.IsFullFramework)
+                    if (PlatformDetection.IsNetFramework)
                     {
                         AssertExtensions.Throws<ArgumentNullException>(
                             () => builder.QuoteIdentifier(null, command.Connection),
index 0f01b33c5f3f1838c701d784fc50551a316a3252..1de1e1cf3dc6605b90d20dadbc347e24d1ee4856 100644 (file)
@@ -21,7 +21,7 @@ namespace System.Data.OleDb.Tests
                 Assert.Equal(UpdateRowSource.Both, cmd.UpdatedRowSource);
                 cmd.UpdatedRowSource = UpdateRowSource.FirstReturnedRecord;
                 Assert.Equal(UpdateRowSource.FirstReturnedRecord, cmd.UpdatedRowSource);
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     AssertExtensions.Throws<ArgumentOutOfRangeException>(
                         () => cmd.UpdatedRowSource = (UpdateRowSource)InvalidValue,
@@ -44,7 +44,7 @@ namespace System.Data.OleDb.Tests
             const int InvalidValue = -1;
             using (var cmd = new OleDbCommand(default, connection, transaction))
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     AssertExtensions.Throws<ArgumentException>(
                         () => cmd.CommandTimeout = InvalidValue,
@@ -81,7 +81,7 @@ namespace System.Data.OleDb.Tests
             const int InvalidValue = 0;
             using (var cmd = (OleDbCommand)OleDbFactory.Instance.CreateCommand())
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     AssertExtensions.Throws<ArgumentOutOfRangeException>(
                         () => cmd.CommandType = (CommandType)InvalidValue,
@@ -179,7 +179,7 @@ namespace System.Data.OleDb.Tests
         public void Parameters_AddNullParameter_Throws()
         {
             RunTest((command, tableName) => {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     AssertExtensions.Throws<ArgumentNullException>(
                         () => command.Parameters.Add(null),
index 4885dfff706db9fd226589658ef477964f310597..86d52fdcd4557bef308a80608ca880ac79486a32 100644 (file)
@@ -157,7 +157,7 @@ namespace System.Data.SqlClient.Tests
             TException ex = Assert.Throws<TException>(connectAction);
 
             // Some exception messages are different between Framework and Core
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Assert.Contains(expectedExceptionMessage, ex.Message);
             }
index 72528409630fc68e55fe7426b424f7dd3fe79967..c5b32f2ae7261ce32dc5e6d7744364e3c53bd178 100644 (file)
@@ -183,9 +183,9 @@ namespace System.Diagnostics.Tests
             yield return new object[] { "This is a format with 1 object {0}", new object[] { 123 } };
             yield return new object[] { "This is a weird {0}{1}{2} format that has multiple inputs {3}", new object[] { 0, 1, "two", "." } };
             yield return new object[] { "This is a weird {0}{1}{2} format that but args are null", null };
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
-                // Full framework doesn't check for args.Length == 0 and if format is not null or empty, it calls string.Format
+                // .NET Framework doesn't check for args.Length == 0 and if format is not null or empty, it calls string.Format
                 yield return new object[] { "This is a weird {0}{1}{2} format that but args length is 0", new object[] { } };
             }
 
index 21ee9687b9370d2888465787945a0c63321788b9..9840da61e4e2db6086ad6248ff46b853a9332781 100644 (file)
@@ -154,7 +154,7 @@ namespace System.Diagnostics.Tests
             using (CounterSet typingCounterSet = new CounterSet(_fixture._providerId, _fixture._typingCounterSetId, CounterSetInstanceType.Single))
             {
                 ArgumentException argumentException = (ArgumentException)Assert.Throws(exceptionType, () => typingCounterSet.AddCounter(8, CounterType.SampleBase, counterName));
-                Assert.Equal(PlatformDetection.IsFullFramework ? netfxParameterName : netCoreParameterName, argumentException.ParamName);
+                Assert.Equal(PlatformDetection.IsNetFramework ? netfxParameterName : netCoreParameterName, argumentException.ParamName);
             }
         }
 
index b2ff46731a3d59b8226c789a0fb7ddb7fc710e32..acc4efb3263e3d7336ead340ae99f2b6179314b5 100644 (file)
@@ -41,7 +41,7 @@ namespace BasicEventSourceTests
         private static string GetResourceStringFromReflection(string key)
         {
             BindingFlags flags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Type sr = typeof(EventSource).Assembly.GetType("System.SR", throwOnError: true, ignoreCase: false);
                 PropertyInfo resourceProp = sr.GetProperty(key, flags);
index 6da6342adf94ed4c20bd52071efcec813223b513..a4a11392bf5cd117b7c72a7462788641c481e402 100644 (file)
@@ -125,7 +125,7 @@ namespace BasicEventSourceTests
             string message = _event.PayloadString(0, "message");
             Debug.WriteLine(string.Format("Message=\"{0}\"", message));
             // expected message: "ERROR: Exception in Command Processing for EventSource BadEventSource_MismatchedIds: Event Event2 was assigned event ID 2 but 1 was passed to WriteEvent. "
-            if (!PlatformDetection.IsFullFramework) // Full framework has typo
+            if (!PlatformDetection.IsNetFramework) // .NET Framework has typo
                 Assert.Matches("Event Event2 was assigned event ID 2 but 1 was passed to WriteEvent", message);
         }
 
index 7136ffbd59cf5dea1df67fd1e95e46bf01e0fab8..5b611adb66191ca5f48ff4659a8ffbb2d4d6c423 100644 (file)
@@ -91,7 +91,7 @@ namespace System.DirectoryServices.Protocols.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The field _keys in full framework is called keys, so GetField returns null and ends up in a NRE")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "The field _keys in .NET Framework is called keys, so GetField returns null and ends up in a NRE")]
         public void SortKeys_GetNull_ReturnsEmptyArray()
         {
             var control = new SortRequestControl();
index 45d578ad4814f46bc23cd7dc4902b6b56313615e..a0c13f42c0178459c257147357c715d803d13cea 100644 (file)
@@ -72,7 +72,7 @@ namespace System.Drawing.Tests
             yield return new object[] { new CharacterRange(1, 2), new object(), false };
 
             // .NET Framework throws NullReferenceException.
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[] { new CharacterRange(1, 2), null, false };
             }
index 94e11209ce7703d43b5ea4d3bd6a5dbec3577b49..85ea3656faaf3c8baec39c2c07ac9b6c95ad1a14 100644 (file)
@@ -672,7 +672,7 @@ namespace System.Drawing.Tests
                 IntPtr hdc = graphics.GetHdc();
                 try
                 {
-                    if (PlatformDetection.IsFullFramework)
+                    if (PlatformDetection.IsNetFramework)
                     {
                         AssertExtensions.Throws<ArgumentException>(null, () => Font.FromLogFont(null));
                         AssertExtensions.Throws<ArgumentException>(null, () => Font.FromLogFont(null, hdc));
index 91662c7a6c7fafb1156c13f0d800f0bdb60d1caf..33c97f38fe2fca7be7d94bdad26b636178e28cd7 100644 (file)
@@ -187,7 +187,7 @@ namespace System.Drawing.Tests
 
                 // There is no such thing as a negative number in the native struct, we're throwing ArgumentException
                 // here now as the data size doesn't match what is expected (as other inputs above).
-                PlatformDetection.IsFullFramework ? typeof(Win32Exception) : typeof(ArgumentException)
+                PlatformDetection.IsNetFramework ? typeof(Win32Exception) : typeof(ArgumentException)
             };
 
             // The size of an entry is negative.
@@ -205,7 +205,7 @@ namespace System.Drawing.Tests
                 new byte[] { 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 127, 255, 255, 255, 127 },
 
                 // Another case where we weren't checking data integrity before invoking.
-                PlatformDetection.IsFullFramework ? typeof(Win32Exception) : typeof(ArgumentException)
+                PlatformDetection.IsNetFramework ? typeof(Win32Exception) : typeof(ArgumentException)
             };
 
             // The offset and the size of the list of entries overflows.
@@ -439,7 +439,7 @@ namespace System.Drawing.Tests
         public void ExtractAssociatedIcon_NonFilePath_ThrowsFileNotFound()
         {
             // Used to return null at the expense of creating a URI
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Null(Icon.ExtractAssociatedIcon("http://microsoft.com"));
             }
@@ -849,7 +849,7 @@ namespace System.Drawing.Tests
                         }
                         else
                         {
-                            string fieldName = PlatformDetection.IsFullFramework ? "bitDepth" : "s_bitDepth";
+                            string fieldName = PlatformDetection.IsNetFramework ? "bitDepth" : "s_bitDepth";
                             FieldInfo fi = typeof(Icon).GetField(fieldName, BindingFlags.Static | BindingFlags.NonPublic);
                             expectedBitDepth = (int)fi.GetValue(null);
                         }
index f7e57ea3c21dcddc66e8779927898f2151ecb2c3..bde2a5bad55b0f439802d18ddbdcef0696787f28 100644 (file)
@@ -52,7 +52,7 @@ namespace System.Drawing.Tests
         public void FromFile_LongSegment_ThrowsException()
         {
             // Throws PathTooLongException on Desktop and FileNotFoundException elsewhere.
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 string fileName = new string('a', 261);
 
@@ -164,7 +164,7 @@ namespace System.Drawing.Tests
         [MemberData(nameof(GetEncoderParameterList_ReturnsExpected_TestData))]
         public void GetEncoderParameterList_ReturnsExpected(ImageFormat format, Guid[] expectedParameters)
         {
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 throw new SkipTestException("This is a known bug for .NET Framework");
             }
index bd525493fa5f315e85b02c7d4d9293e87700c0d0..38637b06e159d32a14f53d61bc8aa6e88e50cd7b 100644 (file)
@@ -136,7 +136,7 @@ namespace System.Drawing.Text.Tests
             using (var fontCollection = new PrivateFontCollection())
             {
                 // Throws PathTooLongException on Desktop and FileNotFoundException elsewhere.
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     Assert.Throws<PathTooLongException>(
                         () => fontCollection.AddFontFile(new string('a', 261)));
index 285e883b7ea774f0a2a137e00f7add7f3138f43c..c92e23f2cd3815f6fdd670fafc73ae714bb74a69 100644 (file)
@@ -27,7 +27,7 @@ namespace System.Drawing.Tests
                 // On .NET Framework sometimes the size might be default or it might
                 // be disposed in which case Size property throws an ArgumentException
                 // so allow both cases see https://github.com/dotnet/corefx/issues/27361.
-                if (PlatformDetection.IsFullFramework && ex is ArgumentException)
+                if (PlatformDetection.IsNetFramework && ex is ArgumentException)
                 {
                     return;
                 }
index 985e03f7bab1865278a05d9a211490ada34c87b4..b4a18494bfa4f819751c907cd778c2a97a7ba55a 100644 (file)
@@ -9,7 +9,7 @@ namespace System.Globalization.Tests
 {
     public class GetCultureInfoTests
     {
-        public static bool PlatformSupportsFakeCulture => !PlatformDetection.IsWindows || (PlatformDetection.WindowsVersion >= 10 && !PlatformDetection.IsFullFramework);
+        public static bool PlatformSupportsFakeCulture => !PlatformDetection.IsWindows || (PlatformDetection.WindowsVersion >= 10 && !PlatformDetection.IsNetFramework);
 
         [ConditionalTheory(nameof(PlatformSupportsFakeCulture))]
         [InlineData("en")]
index b08064f4925632206e887713ff4ae1c764b0119f..d910a62e0da79e807d86747c7d5d2db6a9b9b11f 100644 (file)
@@ -129,7 +129,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for .NET Framework.")]
         public static async Task ZipArchiveEntry_CorruptedStream_ReadMode_CopyTo_UpToUncompressedSize()
         {
             MemoryStream stream = await LocalMemoryStream.readAppFileAsync(zfile("normal.zip"));
@@ -158,7 +158,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for .NET Framework.")]
         public static async Task ZipArchiveEntry_CorruptedStream_ReadMode_Read_UpToUncompressedSize()
         {
             MemoryStream stream = await LocalMemoryStream.readAppFileAsync(zfile("normal.zip"));
@@ -228,7 +228,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Deflate64 zip support is a netcore feature not available on full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Deflate64 zip support is not available on .NET Framework.")]
         public static async Task Zip64ArchiveEntry_CorruptedStream_CopyTo_UpToUncompressedSize()
         {
             MemoryStream stream = await LocalMemoryStream.readAppFileAsync(compat("deflate64.zip"));
@@ -277,7 +277,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Deflate64 zip support is a netcore feature not available on full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Deflate64 zip support is not available on .NET Framework.")]
         public static async Task Zip64ArchiveEntry_CorruptedFile_Read_UpToUncompressedSize()
         {
             MemoryStream stream = await LocalMemoryStream.readAppFileAsync(compat("deflate64.zip"));
@@ -327,7 +327,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for .NET Framework.")]
         public static async Task ZipArchive_CorruptedLocalHeader_UncompressedSize_NotMatchWithCentralDirectory()
         {
             MemoryStream stream = await LocalMemoryStream.readAppFileAsync(zfile("normal.zip"));
@@ -342,7 +342,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Fix not shipped for .NET Framework.")]
         public static async Task ZipArchive_CorruptedLocalHeader_CompressedSize_NotMatchWithCentralDirectory()
         {
             MemoryStream stream = await LocalMemoryStream.readAppFileAsync(zfile("normal.zip"));
@@ -357,7 +357,7 @@ namespace System.IO.Compression.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full Framework does not allow unseekable streams.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not allow unseekable streams.")]
         public static async Task ZipArchive_Unseekable_Corrupted_FileDescriptor_NotMatchWithCentralDirectory()
         {
             using (var s = new MemoryStream())
index e99f67a56d9770d5ed1824235b862d989978dcb9..46ff021d417d7d274902d1926adb540fd9594acc 100644 (file)
@@ -181,7 +181,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentNullException>("directoryInfo", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, security);
                 }
@@ -199,7 +199,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentNullException>("directorySecurity", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, null);
                 }
@@ -220,7 +220,7 @@ namespace System.IO
 
             Assert.Throws<UnauthorizedAccessException>(() =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, security);
                 }
@@ -265,7 +265,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentNullException>("fileInfo", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, FileMode.Create, FileSystemRights.WriteData, FileShare.Read, DefaultBufferSize, FileOptions.None, security);
                 }
@@ -283,7 +283,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentNullException>("fileSecurity", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, FileMode.Create, FileSystemRights.WriteData, FileShare.Read, DefaultBufferSize, FileOptions.None, null);
                 }
@@ -304,7 +304,7 @@ namespace System.IO
 
             Assert.Throws<DirectoryNotFoundException>(() =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, FileMode.Create, FileSystemRights.WriteData, FileShare.Read, DefaultBufferSize, FileOptions.None, security);
                 }
@@ -326,7 +326,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentOutOfRangeException>("mode", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, invalidMode, FileSystemRights.WriteData, FileShare.Read, DefaultBufferSize, FileOptions.None, security); ;
                 }
@@ -347,7 +347,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentOutOfRangeException>("share", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, FileMode.Create, FileSystemRights.WriteData, invalidFileShare, DefaultBufferSize, FileOptions.None, security);
                 }
@@ -368,7 +368,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentOutOfRangeException>("bufferSize", () =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, FileMode.Create, FileSystemRights.WriteData, FileShare.Read, invalidBufferSize, FileOptions.None, security);
                 }
@@ -395,7 +395,7 @@ namespace System.IO
 
             Assert.Throws<ArgumentException>(() =>
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     FileSystemAclExtensions.Create(info, mode, rights, FileShare.Read, DefaultBufferSize, FileOptions.None, security);
                 }
index b8d2565fbfb509ccc3d097f03bbac9566ed9b18d..bce8b5f5fbca67c8945db7656a50b58fa9df9707 100644 (file)
@@ -46,7 +46,7 @@ namespace System.IO.Tests
             Assert.Equal(path, info.ToString());
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsFullFramework))]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNetFramework))]
         public void ParentToString_Framework()
         {
             ParentToString(false);
index a47b06fb56a26a0525077eff4f2d285243d42c9e..54be6440d0ff50fc2b51ca2b149617c836dfb102 100644 (file)
@@ -30,7 +30,7 @@ namespace System.IO.IsolatedStorage
 
         internal static void GetDefaultIdentityAndHash(out object identity, out string hash, char separator)
         {
-            // .NET Framework (desktop CLR) IsolatedStorage uses identity from System.Security.Policy.Evidence to build
+            // .NET Framework IsolatedStorage uses identity from System.Security.Policy.Evidence to build
             // the folder structure on disk. It would use the "best" available evidence in this order:
             //
             //  1. Publisher (Authenticode)
@@ -39,12 +39,12 @@ namespace System.IO.IsolatedStorage
             //  4. Site
             //  5. Zone
             //
-            // For CoreFX StrongName and Url are the only relevant types. By default evidence for the Domain comes
+            // For .NET Core StrongName and Url are the only relevant types. By default evidence for the Domain comes
             // from the Assembly which comes from the EntryAssembly(). We'll emulate the legacy default behavior
             // by pulling directly from EntryAssembly.
             //
             // Note that it is possible that there won't be an EntryAssembly, which is something .NET Framework doesn't
-            // have to deal with and shouldn't be likely on CoreFX due to a single AppDomain. Without Evidence
+            // have to deal with and shouldn't be likely on .NET Core due to a single AppDomain. Without Evidence
             // to pull from we'd have to dig into the use case to try and find a reasonable solution should we
             // run into this in the wild.
 
index 82d257cfbd8c3f97abe38edfd73b2b7d4190cce5..d01f48d2ed0faf0f3b6117ac6eeb1cb4cb61f2f2 100644 (file)
@@ -3777,7 +3777,7 @@ namespace System.IO.Packaging.Tests
                 long totalLength = SizeInMb * buffer.Length;
 
                 // issue on .NET Framework we cannot use FileAccess.Write on a ZipArchive
-                using (Package package = Package.Open(stream, FileMode.Create, PlatformDetection.IsFullFramework ? FileAccess.ReadWrite : FileAccess.Write))
+                using (Package package = Package.Open(stream, FileMode.Create, PlatformDetection.IsNetFramework ? FileAccess.ReadWrite : FileAccess.Write))
                 {
                     PackagePart part = package.CreatePart(partUri,
                                                           System.Net.Mime.MediaTypeNames.Application.Octet,
index b24cc543bfdce92846df79e1e491b1e9121c5f6b..775de5abf57410069582493351ffab8b7a5fdf76 100644 (file)
@@ -30,7 +30,7 @@ namespace System.IO.Pipes.Tests
 
         protected static void SuppressClientHandleFinalizationIfNetFramework(AnonymousPipeServerStream serverStream)
         {
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 // See https://github.com/dotnet/corefx/pull/1871.  When AnonymousPipeServerStream.GetClientHandleAsString()
                 // is called, the assumption is that this string is going to be passed to another process, rather than wrapped
index a7abf146c1f4d0ec312ab5b5d7b9fd1a758f152d..f168252039a3635457fd02b0994fc5a8009054f3 100644 (file)
@@ -739,8 +739,6 @@ namespace System.Linq.Tests
             IEnumerable<int> result = source.Select(selector);
             IEnumerator<int> enumerator = result.GetEnumerator();
 
-            // The.NET full framework throws a NotImplementedException.
-            // See https://github.com/dotnet/corefx/pull/2959.
             Assert.Throws<NotSupportedException>(() => enumerator.Reset());
         }
 
index e9e565dbd471b88455686a05565716c4b0ad258c..413e6bbcbddf66260d6ef907e5ce094f0ca665fd 100644 (file)
@@ -52,8 +52,8 @@ namespace System.Management.Tests
         [InlineData(CodeLanguage.VJSharp)]
         public void Throw_On_Unsupported_Languages(CodeLanguage lang)
         {
-            // On full framework JScript is supported and no exception raised
-            if (lang == CodeLanguage.JScript && PlatformDetection.IsFullFramework)
+            // On .NET Framework JScript is supported and no exception raised
+            if (lang == CodeLanguage.JScript && PlatformDetection.IsNetFramework)
                 return;
 
             var tempFilePath = Path.GetTempFileName();
index d6d9ff91c13a1f50ec91fd5da5ec90b9e9b05bd2..9c6c973a20fbc12f2d16985b38df12c497e7756a 100644 (file)
@@ -9,7 +9,7 @@ namespace System
 {
     //
     // This pattern of easily inlinable "void Throw" routines that stack on top of NoInlining factory methods
-    // is a compromise between older JITs and newer JITs (RyuJIT in Core CLR 1.1.0+ and .NET Framework CLR in 4.6.3+).
+    // is a compromise between older JITs and newer JITs (RyuJIT in .NET Core 1.1.0+ and .NET Framework in 4.6.3+).
     // This package is explicitly targeted at older JITs as newer runtimes expect to implement Span intrinsically for
     // best performance.
     //
index 0d6496b793bbe8019c0d1294e7113b7264252247..35b8720206e56ab233c1b11c11dc5170df116099 100644 (file)
@@ -78,7 +78,6 @@ namespace System.Net.Http.Functional.Tests
         {
             using (HttpClientHandler handler = CreateHttpClientHandler())
             {
-                // Same as .NET Framework (Desktop).
                 Assert.Equal(DecompressionMethods.None, handler.AutomaticDecompression);
                 Assert.True(handler.AllowAutoRedirect);
                 Assert.Equal(ClientCertificateOption.Manual, handler.ClientCertificateOptions);
@@ -101,13 +100,12 @@ namespace System.Net.Http.Functional.Tests
         {
             using (HttpClientHandler handler = CreateHttpClientHandler())
             {
-                // Same as .NET Framework (Desktop).
                 Assert.Equal(64, handler.MaxResponseHeadersLength);
                 Assert.False(handler.PreAuthenticate);
                 Assert.True(handler.SupportsProxy);
                 Assert.True(handler.SupportsRedirectConfiguration);
 
-                // Changes from .NET Framework (Desktop).
+                // Changes from .NET Framework.
                 Assert.False(handler.CheckCertificateRevocationList);
                 Assert.Equal(0, handler.MaxRequestContentBufferSize);
                 Assert.Equal(SslProtocols.None, handler.SslProtocols);
index 5b6b34c3a748488792f4db7886ad40edcf64f22d..8ed49f9922d6c6797a460bfa6095903ffc14576b 100644 (file)
@@ -160,7 +160,7 @@ namespace System.Net.Primitives.Functional.Tests
             object current = null;
             var exception = Record.Exception(() => current = enumerator.Current);
 
-            // On full framework, enumerator.Current throws an exception because the collection has been modified after
+            // On .NET Framework, enumerator.Current throws an exception because the collection has been modified after
             // creating the enumerator.
             if (exception == null)
             {
index a84c3e8727622af238ca4a88965199ab4db660fe..6c2b2da1b5cfa66ff11b128e24467f97a019fa40 100644 (file)
@@ -150,7 +150,7 @@ namespace System.Net.Primitives.Functional.Tests
             c1.Name = "hello";
             Assert.Equal("hello", c1.Name);
 
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Cookie c2 = new Cookie();
                 c2.Name = "hello world";
index 5b54ee079e09624b14be68c9f9068a0a6a6377e6..185ccecb9531c32fd57fb6e1da4f7f88d69cfb29 100644 (file)
@@ -203,7 +203,7 @@ namespace System.Net.Primitives.Functional.Tests
             AssertExtensions.Throws<ArgumentNullException>("authenticationType", () => cc.Add("host", 500, null, new NetworkCredential())); //Null authenticationType
 
             var exception = Record.Exception(() => cc.Add("", 500, "authenticationType", new NetworkCredential()));
-            // On full framework we get exception.ParamName as null while it is "host" on netcore
+            // On .NET Framework we get exception.ParamName as null while it is "host" on netcore
             Assert.NotNull(exception);
             Assert.True(exception is ArgumentException);
             ArgumentException ae = exception as ArgumentException;
@@ -291,7 +291,7 @@ namespace System.Net.Primitives.Functional.Tests
             AssertExtensions.Throws<ArgumentNullException>("authenticationType", () => cc.GetCredential("host", 500, null)); //Null authenticationType
 
             var exception = Record.Exception(() => cc.GetCredential("", 500, "authenticationType")); //Empty host
-            // On full framework we get exception.ParamName as null while it is "host" on netcore
+            // On .NET Framework we get exception.ParamName as null while it is "host" on netcore
             Assert.NotNull(exception);
             Assert.True(exception is ArgumentException);
             ArgumentException ae = exception as ArgumentException;
@@ -449,7 +449,7 @@ namespace System.Net.Primitives.Functional.Tests
             // .NET Framework and .NET Core have different behaviors for Digest when default NetworkCredential is used.
             if (string.Equals(authType, authenticationTypeDigest, StringComparison.OrdinalIgnoreCase) && (nc == CredentialCache.DefaultNetworkCredentials))
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     // In .NET Framework, when authType == Digest, if WDigestAvailable == true, it will pass the validation.
                     // if WDigestAvailable == false, it will throw ArgumentException.
@@ -493,7 +493,7 @@ namespace System.Net.Primitives.Functional.Tests
             // .NET Framework and .NET Core have different behaviors for Digest when default NetworkCredential is used.
             if (string.Equals(authType, authenticationTypeDigest, StringComparison.OrdinalIgnoreCase) && (nc == CredentialCache.DefaultNetworkCredentials))
             {
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     // In .NET Framework, when authType == Digest, if WDigestAvailable == true, it will pass the validation.
                     // if WDigestAvailable == false, it will throw ArgumentException.
index fe8720e7aef9171ed48f9f51f84c41414319ba6c..f3028b7d49b6703880657f7d2aabb24efeba8a84 100644 (file)
@@ -137,7 +137,7 @@ namespace System.Net.Primitives.Functional.Tests
         [MemberData(nameof(InvalidIpv4AddressesStandalone))]
         public void ParseIPv4_InvalidAddress_Failure(string address)
         {
-            ParseInvalidAddress(address, hasInnerSocketException: !PlatformDetection.IsFullFramework);
+            ParseInvalidAddress(address, hasInnerSocketException: !PlatformDetection.IsNetFramework);
         }
 
 
@@ -468,7 +468,7 @@ namespace System.Net.Primitives.Functional.Tests
         [MemberData(nameof(InvalidIpv6AddressesNoInner))]
         public void ParseIPv6_InvalidAddress_ThrowsFormatExceptionWithNoInnerExceptionInNetfx(string invalidAddress)
         {
-            ParseInvalidAddress(invalidAddress, hasInnerSocketException: !PlatformDetection.IsFullFramework);
+            ParseInvalidAddress(invalidAddress, hasInnerSocketException: !PlatformDetection.IsNetFramework);
         }
 
         private void ParseInvalidAddress(string invalidAddress, bool hasInnerSocketException)
index 2876e1508a1fec7ada538a72a6ced3c25ca74859..676b9b236e53b18cad160a1ec0cc81ff2e31a245 100644 (file)
@@ -193,7 +193,7 @@ namespace System.Net.Primitives.Functional.Tests
             Assert.True(IPAddress.IsLoopback(ip));
 
             ip = new IPAddress(IPAddress.Loopback.MapToIPv6().GetAddressBytes()); // IPv4 loopback mapped to IPv6
-            Assert.Equal(!PlatformDetection.IsFullFramework, IPAddress.IsLoopback(ip)); // https://github.com/dotnet/corefx/issues/35454
+            Assert.Equal(!PlatformDetection.IsNetFramework, IPAddress.IsLoopback(ip)); // https://github.com/dotnet/corefx/issues/35454
         }
 
         [Fact]
index 26de90e6f6d08758070a671d01767aa0c49f8a99..d3ce1f523d0ecc43ccc82dd991984c0a7e7828e2 100644 (file)
@@ -332,7 +332,7 @@ namespace System.Net.Primitives.Unit.Tests
                 }
             }; // Empty header followed by another empty header at the end
 
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 yield return new object[]
                 {
index 3931389d73e92263ad72d5ca6d6cbe3dc8a79b44..51b4d9c08740128444c3f73716036a69dce76d77 100644 (file)
@@ -93,10 +93,10 @@ namespace System.Security.Authentication.ExtendedProtection
             }
 
             // NullReferenceException is thrown when serviceNames is null,
-            // which is consistent with the behavior of the full framework.
+            // which is consistent with the behavior of the .NET Framework.
             foreach (object item in serviceNames)
             {
-                // To match the behavior of the full framework, when an item
+                // To match the behavior of the .NET Framework, when an item
                 // in the collection is not a string:
                 //  - Throw InvalidCastException when expectStrings is true.
                 //  - Throw ArgumentException when expectStrings is false.
index dbf37bb617f23fddbea712a44cfd13e4f7ac352d..a7bbf6c033fd8f7403e7d767583dcd3e9b565003 100644 (file)
@@ -216,7 +216,7 @@ namespace System.Security.Authentication.ExtendedProtection.Tests
         {
             var collection = new ServiceNameCollection(new[] { "first", "second" });
 
-            // This really should be ArgumentNullException, but the full framework does not
+            // This really should be ArgumentNullException, but the .NET Framework does not
             // guard against null, so NullReferenceException ends up being thrown instead.
             Assert.Throws<NullReferenceException>(() => collection.Merge((IEnumerable)null));
         }
index bf0a738b7e12cf41b87c28dda139e1aab4a162e2..93baf83fd156fed2884ebd1cfacef4a6b759fb2d 100644 (file)
@@ -525,7 +525,7 @@ namespace System.Net.Security.Tests
                 // We're inconsistent as to whether the ObjectDisposedException is thrown directly
                 // or wrapped in an IOException.  For Begin/End, it's always wrapped; for Async,
                 // it's only wrapped on .NET Framework.
-                if (this is SslStreamStreamToStreamTest_BeginEnd || PlatformDetection.IsFullFramework)
+                if (this is SslStreamStreamToStreamTest_BeginEnd || PlatformDetection.IsNetFramework)
                 {
                     await Assert.ThrowsAsync<ObjectDisposedException>(() => serverReadTask);
                 }
index 7efbbc60749cb7fd05c87ce90145a9b9a93d928a..f82d05268fe4afda581cb5e9677bd87bf71cc717 100644 (file)
@@ -1268,7 +1268,7 @@ namespace System.Runtime.Serialization
                     {
                         Type[] parentInterfaceTypes = interfaceType.GetInterfaces();
                         // The for loop below depeneds on the order for the items in parentInterfaceTypes, which
-                        // doesnt' seem right. But it's the behavior of DCS on the full framework.
+                        // doesn't seem right. But it's the behavior of DCS on the .NET Framework.
                         // Sorting the array to make sure the behavior is consistent with Desktop's.
                         Array.Sort(parentInterfaceTypes, (x, y) => string.Compare(x.FullName, y.FullName));
                         foreach (Type parentInterfaceType in parentInterfaceTypes)
index db095d7b11c799df340ef783213c02024f12cc5b..8eb7f8ee8f6f3db5bbed697c54c2ae281f0fb01d 100644 (file)
@@ -414,7 +414,7 @@ namespace System.Runtime.Serialization
                     }
 
 #if FEATURE_LEGACYNETCF
-                    // The DataContractSerializer in the full framework doesn't support unordered elements:
+                    // The DataContractSerializer in the .NET Framework doesn't support unordered elements:
                     // deserialization will fail if the data members in the XML are not sorted alphabetically.
                     // But the NetCF DataContractSerializer does support unordered element. To maintain compatibility
                     // with Mango we always search for the member from the beginning of the member list.
index a91e373332b28a6531fcf48e29470c19018783fa..c815aee780fb17d855350f31abc5cfb6fc766b03 100644 (file)
@@ -54,7 +54,7 @@ namespace System.Runtime.Serialization
         {
             get
             {
-                // On full framework , we set _dataContractSet = Options.GetSurrogate());
+                // On .NET Framework , we set _dataContractSet = Options.GetSurrogate());
                 // But Options.GetSurrogate() is not available on NetCore because IDataContractSurrogate
                 // is not in NetStandard.
                 throw new PlatformNotSupportedException(SR.PlatformNotSupported_IDataContractSurrogate);
index b6921be705dbbeaad3f82ad3b46946aca760e8c3..f4cacd1e372d3b825b32e8947d8eb477055e56eb 100644 (file)
@@ -11,7 +11,7 @@ namespace System.PrivateUri.Tests
 {
     public class UriBuilderTests
     {
-        //This test tests a case where the Core implementation of UriBuilder differs from Desktop Framework UriBuilder.
+        //This test tests a case where the .NET Core implementation of UriBuilder differs from .NET Framework UriBuilder.
         //The Query property will not longer prepend a ? character if the string being assigned is already prepended.
         [Fact]
         public static void TestQuery()
index a8cf2c08e9237e9abb827944dbe3aee0b1266905..fccb19f16c2cd64439e405951f1e3c9034a0ec80 100644 (file)
@@ -355,7 +355,7 @@ namespace System.PrivateUri.Tests
 
         [Theory]
         [InlineData(":1:2:3:4:5:6:7:8")] // leading single colon
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework machines are not yet patched with the fix for this")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework machines are not yet patched with the fix for this")]
         public void UriIPv6Host_BadAddress_SkipOnFramework(string address)
         {
             ParseBadIPv6Address(address);
index 5bb72329eb7742b0947ce40f126a74f99ea43242..9fa690bddbdbe21c5e5d8832d4c33abf8fb8e785 100644 (file)
@@ -15,7 +15,7 @@ namespace System.Xml.Linq.Tests
         [Fact]
         public void FormattedDate()
         {
-            // Ensure we are compatible with the full framework
+            // Ensure we are compatible with the .NET Framework
             Assert.Equal("CreatedTime=\"2018-01-01T12:13:14Z\"", new XAttribute("CreatedTime", new DateTime(2018, 1, 1, 12, 13, 14, DateTimeKind.Utc)).ToString());
         }
     }
index 4ae4e3ec9c5fd4e108ba4658b4a2acf6a04c1cb7..495535bf6631bf6ad046c9432876264322e54d07 100644 (file)
@@ -176,8 +176,8 @@ namespace System.Xml.Tests
 
             Assert.Equal(expectedError, _errorCount);
 
-            // Full framework does not set the namespace property for intersections and unions
-            if (!PlatformDetection.IsFullFramework && expectedNs != null)
+            // .NET Framework does not set the namespace property for intersections and unions
+            if (!PlatformDetection.IsNetFramework && expectedNs != null)
             {
                 XmlSchemaAnyAttribute attributeWildcard = ((XmlSchemaComplexType)xss.GlobalTypes[new XmlQualifiedName("t", attrNs)]).AttributeWildcard;
                 CompareWildcardNamespaces(expectedNs, attributeWildcard.Namespace);
@@ -211,8 +211,8 @@ namespace System.Xml.Tests
 
             Assert.Equal(expectedError, _errorCount);
 
-            // Full framework does not set the namespace property for intersections and unions
-            if (!PlatformDetection.IsFullFramework && expectedNs != null)
+            // .NET Framework does not set the namespace property for intersections and unions
+            if (!PlatformDetection.IsNetFramework && expectedNs != null)
             {
                 XmlSchemaAnyAttribute attributeWildcard = ((XmlSchemaComplexType)xss.GlobalTypes[new XmlQualifiedName("t1", attrNs)]).AttributeWildcard;
                 CompareWildcardNamespaces(expectedNs, attributeWildcard.Namespace);
index f347a33a08ecb8c7747000bbd21800be90a0ae02..e5007d79bdbb1c8b33d724b2ed30606b31ccd572 100644 (file)
@@ -2987,7 +2987,7 @@ namespace System.Xml.Tests
             m_xsltArg.AddExtensionObject(szDefaultNS, obj);
             LoadXSL("MyObject_CaseSensitive.xsl", xslInputType, readerType);
             var e = Assert.ThrowsAny<XsltException>(() => Transform_ArgList("fruits.xml", outputType, navType));
-            var exceptionSourceAssembly = PlatformDetection.IsFullFramework ? "System.Data.SqlXml" : "System.Xml";
+            var exceptionSourceAssembly = PlatformDetection.IsNetFramework ? "System.Data.SqlXml" : "System.Xml";
             CheckExpectedError(e, exceptionSourceAssembly, "XmlIl_NoExtensionMethod", new[] { "urn:my-object", "FN3", "0" });
         }
 
index 12abf7d22d6b3d51332363cf8059c7227c9ca7e5..e2caa25117accfd97ba54a89d1109b7686194682 100644 (file)
@@ -125,7 +125,7 @@ namespace System.Reflection.Emit.Tests
             Assert.Equal("<In Memory Module>", module.Name);
 
             // The coreclr ignores the name passed to AssemblyBuilder.DefineDynamicModule
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Equal(name, module.FullyQualifiedName);
             }
index a2300827792a4c9d82f98eed2ac9fff3ece782c8..a8f7e4175ec77ea19647aced2f58cca5595a54c6 100644 (file)
@@ -8,7 +8,7 @@ using Xunit;
 //
 // About the "desktopQuirk"
 //
-//   On the .NET Framework CLR, GetRuntimeProperties() and GetRuntimeEvents() behave inconsistently from the other
+//   On the .NET Framework, GetRuntimeProperties() and GetRuntimeEvents() behave inconsistently from the other
 //   GetRuntime*() apis in that they suppress hidden instance properties and events from base classes.
 //
 //   On .NET Native, the GetRuntime*() apis all behave consistently (i.e. the results include hidden instance
index 20a51d7d47601c9e948c7320008cea41efdc47e9..3f324bbe2c908f754c297d41ec22c8c80f3555c5 100644 (file)
@@ -33,10 +33,10 @@ namespace System.Reflection.Internal
     ///
     ///   (3) Deal with platforms that don't yet have Encoding.GetString(byte*, int).
     ///
-    ///      If we're running on a full framework earlier than 4.6, we will bind to the internal
+    ///      If we're running on a .NET Framework earlier than 4.6, we will bind to the internal
     ///      String.CreateStringFromEncoding which is equivalent and Encoding.GetString is just a trivial
     ///      wrapper around it in .NET 4.6. This means that we always have the fast path on every
-    ///      full framework version we support.
+    ///      .NET Framework version we support.
     ///
     ///      If we can't bind to it via reflection, then we emulate it using what is effectively (2) and
     ///      with an empty prefix.
index a7bf89e68dda7701cfec56e638e010063e4f70fc..835e6c945ee50e3bc66cab50db6f41f2ddc20ee5 100644 (file)
@@ -13,7 +13,7 @@ namespace System.Reflection.Metadata.Decoding.Tests
     public class CustomAttributeDecoderTests
     {
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Type assembly name is different on full framework.")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Type assembly name is different on .NET Framework.")]
         public void TestCustomAttributeDecoder()
         {
             using (FileStream stream = File.OpenRead(typeof(HasAttributes).GetTypeInfo().Assembly.Location))
index 609058c1c20ca3e2169770b9d83f47d07fdc75b3..8e21b90943ea46df52aa3a3b1b6152c433b46c7d 100644 (file)
@@ -15,8 +15,8 @@ namespace System.Reflection.Metadata.Decoding.Tests
 {
     public partial class SignatureDecoderTests
     {
-        private static readonly string RuntimeAssemblyName = PlatformDetection.IsFullFramework ? "mscorlib" : "System.Runtime";
-        private static readonly string CollectionsAssemblyName = PlatformDetection.IsFullFramework ? "mscorlib" : "System.Collections";
+        private static readonly string RuntimeAssemblyName = PlatformDetection.IsNetFramework ? "mscorlib" : "System.Runtime";
+        private static readonly string CollectionsAssemblyName = PlatformDetection.IsNetFramework ? "mscorlib" : "System.Collections";
 
         [Fact]
         public unsafe void VerifyMultipleOptionalModifiers()
index 6e9fa1e6a76df8e9b1bc065a9ad059137daf92fb..085ee9be2ad180708122cdbd6ee747d863b5e5d9 100644 (file)
@@ -479,7 +479,7 @@ namespace System.Resources.Extensions.Tests
                 TestData.WriteResourcesStream(actualData);
                 resourcesStream.CopyTo(expectedData);
 
-                if (!PlatformDetection.IsFullFramework)
+                if (!PlatformDetection.IsNetFramework)
                 {
                     // Some types rely on SerializationInfo.SetType on .NETCore
                     // which result in a different binary format
index defa7069d2cd0d424df44b763d7a6bd00d77fb2c..9bd1940cdefb92767bebe4ca57071080099b37db 100644 (file)
@@ -135,7 +135,7 @@ namespace System.Tests
 
             // Note: Only the Convert.ToSByte(String, IFormatProvider) overload throws an ArgumentNullException.
             // This is inconsistent with the other numeric conversions, but fixing this behavior is not worth making
-            // a breaking change which will affect the .NET Framework CLR.
+            // a breaking change.
             Assert.Throws<ArgumentNullException>(() => Convert.ToSByte((string)null, TestFormatProvider.s_instance));
         }
 
index 9e00bd89b903a51b44ef41a7f5a30128de7d6390..c1cbbd497d4119ddae41e3f0afb4c907c24d4608 100644 (file)
@@ -32,9 +32,8 @@ namespace System.Tests
         [Fact]
         public static void Ctor_InvalidArgs_Throws()
         {
-            // ArgumentException on full framework
-            AssertExtensions.Throws<ArgumentOutOfRangeException, ArgumentException>("platform", "platform", () => new OperatingSystem((PlatformID)(-1), new Version(1, 2)));
-            AssertExtensions.Throws<ArgumentOutOfRangeException, ArgumentException>("platform", "platform", () => new OperatingSystem((PlatformID)42, new Version(1, 2)));
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("platform", () => new OperatingSystem((PlatformID)(-1), new Version(1, 2)));
+            AssertExtensions.Throws<ArgumentOutOfRangeException>("platform", () => new OperatingSystem((PlatformID)42, new Version(1, 2)));
             AssertExtensions.Throws<ArgumentNullException>("version", () => new OperatingSystem(PlatformID.Unix, null));
         }
 
index 6f18266d87cf19d90a5c56b6335f13dd7a810d0e..0f463daa3aaf6cb4cf228e3956d003dd9d8a37fa 100644 (file)
@@ -629,7 +629,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
             yield return new object[] { PopulateException(runtimeBinderInternalCompilerException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAFNNaWNyb3NvZnQuQ1NoYXJwLCBWZXJzaW9uPTQuMC40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49YjAzZjVmN2YxMWQ1MGEzYQUBAAAARU1pY3Jvc29mdC5DU2hhcnAuUnVudGltZUJpbmRlci5SdW50aW1lQmluZGVySW50ZXJuYWxDb21waWxlckV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAICAAAABgMAAABFTWljcm9zb2Z0LkNTaGFycC5SdW50aW1lQmluZGVyLlJ1bnRpbWVCaW5kZXJJbnRlcm5hbENvbXBpbGVyRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAFNNaWNyb3NvZnQuQ1NoYXJwLCBWZXJzaW9uPTQuMC40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49YjAzZjVmN2YxMWQ1MGEzYQUBAAAARU1pY3Jvc29mdC5DU2hhcnAuUnVudGltZUJpbmRlci5SdW50aW1lQmluZGVySW50ZXJuYWxDb21waWxlckV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAICAAAABgMAAABFTWljcm9zb2Z0LkNTaGFycC5SdW50aW1lQmluZGVyLlJ1bnRpbWVCaW5kZXJJbnRlcm5hbENvbXBpbGVyRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netfx461) } };
 
             RuntimeWrappedException runtimeWrappedException = (RuntimeWrappedException)typeof(RuntimeWrappedException)
-                .GetConstructor((PlatformDetection.IsFullFramework ? BindingFlags.NonPublic : BindingFlags.Public) | BindingFlags.Instance, null, new Type[] { typeof(object) }, null)
+                .GetConstructor((PlatformDetection.IsNetFramework ? BindingFlags.NonPublic : BindingFlags.Public) | BindingFlags.Instance, null, new Type[] { typeof(object) }, null)
                 .Invoke(new object[] { exception });
             yield return new object[] { PopulateException(runtimeWrappedException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAADdTeXN0ZW0uUnVudGltZS5Db21waWxlclNlcnZpY2VzLlJ1bnRpbWVXcmFwcGVkRXhjZXB0aW9uDQAAAAlDbGFzc05hbWUHTWVzc2FnZQREYXRhDklubmVyRXhjZXB0aW9uB0hlbHBVUkwQU3RhY2tUcmFjZVN0cmluZxZSZW1vdGVTdGFja1RyYWNlU3RyaW5nEFJlbW90ZVN0YWNrSW5kZXgPRXhjZXB0aW9uTWV0aG9kB0hSZXN1bHQGU291cmNlDVdhdHNvbkJ1Y2tldHMQV3JhcHBlZEV4Y2VwdGlvbgEBAwMBAQEAAQABBwMpU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwQU3lzdGVtLkV4Y2VwdGlvbggIAhBTeXN0ZW0uRXhjZXB0aW9uBgIAAAA3U3lzdGVtLlJ1bnRpbWUuQ29tcGlsZXJTZXJ2aWNlcy5SdW50aW1lV3JhcHBlZEV4Y2VwdGlvbgYDAAAAY0FuIG9iamVjdCB0aGF0IGRvZXMgbm90IGRlcml2ZSBmcm9tIFN5c3RlbS5FeGNlcHRpb24gaGFzIGJlZW4gd3JhcHBlZCBpbiBhIFJ1bnRpbWVXcmFwcGVkRXhjZXB0aW9uLgkEAAAACgYFAAAAGWh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20GBgAAABRTdGFja1RyYWNlIHN0cmluZy4uLgYHAAAAG1JlbW90ZSBTdGFja1RyYWNlIHN0cmluZy4uLgAAAAAK6AMAAAYIAAAAF0V4Y2VwdGlvbl9DbGFzc19TYW1wbGVzCgkJAAAABAQAAAApU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwDAAAABGhlYWQHdmVyc2lvbgVjb3VudAMAADhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQgICQoAAAACAAAAAgAAAAQJAAAAEFN5c3RlbS5FeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCBgsAAAAQU3lzdGVtLkV4Y2VwdGlvbgYMAAAAB21lc3NhZ2UJDQAAAAkOAAAACQUAAAAJBgAAAAkHAAAAAAAAAAroAwAACQgAAAAKBAoAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhMAAAAGc2VjcmV0CAEBCRQAAAABDQAAAAQAAAAJFQAAAAIAAAACAAAAAQ4AAAAJAAAACQsAAAAGFwAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFAAAAAoAAAAICAEAAAAGGAAAAANvbmUKARUAAAAKAAAACRMAAAAIAQEJGgAAAAEaAAAACgAAAAgIAQAAAAkYAAAACgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAADdTeXN0ZW0uUnVudGltZS5Db21waWxlclNlcnZpY2VzLlJ1bnRpbWVXcmFwcGVkRXhjZXB0aW9uDQAAAAlDbGFzc05hbWUHTWVzc2FnZQREYXRhDklubmVyRXhjZXB0aW9uB0hlbHBVUkwQU3RhY2tUcmFjZVN0cmluZxZSZW1vdGVTdGFja1RyYWNlU3RyaW5nEFJlbW90ZVN0YWNrSW5kZXgPRXhjZXB0aW9uTWV0aG9kB0hSZXN1bHQGU291cmNlDVdhdHNvbkJ1Y2tldHMQV3JhcHBlZEV4Y2VwdGlvbgEBAwMBAQEAAQABBwMpU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwQU3lzdGVtLkV4Y2VwdGlvbggIAhBTeXN0ZW0uRXhjZXB0aW9uBgIAAAA3U3lzdGVtLlJ1bnRpbWUuQ29tcGlsZXJTZXJ2aWNlcy5SdW50aW1lV3JhcHBlZEV4Y2VwdGlvbgYDAAAAY0FuIG9iamVjdCB0aGF0IGRvZXMgbm90IGRlcml2ZSBmcm9tIFN5c3RlbS5FeGNlcHRpb24gaGFzIGJlZW4gd3JhcHBlZCBpbiBhIFJ1bnRpbWVXcmFwcGVkRXhjZXB0aW9uLgkEAAAACgYFAAAAGWh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20GBgAAABRTdGFja1RyYWNlIHN0cmluZy4uLgYHAAAAG1JlbW90ZSBTdGFja1RyYWNlIHN0cmluZy4uLgAAAAAK6AMAAAYIAAAAF0V4Y2VwdGlvbl9DbGFzc19TYW1wbGVzCgkJAAAABAQAAAApU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwDAAAABGhlYWQHdmVyc2lvbgVjb3VudAMAADhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQgICQoAAAACAAAAAgAAAAQJAAAAEFN5c3RlbS5FeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCBgsAAAAQU3lzdGVtLkV4Y2VwdGlvbgYMAAAAB21lc3NhZ2UJDQAAAAkOAAAACQUAAAAJBgAAAAkHAAAAAAAAAAroAwAACQgAAAAKBAoAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhMAAAAGc2VjcmV0CAEBCRQAAAABDQAAAAQAAAAJFQAAAAIAAAACAAAAAQ4AAAAJAAAACQsAAAAGFwAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFAAAAAoAAAAICAEAAAAGGAAAAANvbmUKARUAAAAKAAAACRMAAAAIAQEJGgAAAAEaAAAACgAAAAgIAQAAAAkYAAAACgs=", TargetFrameworkMoniker.netfx461) } };
 
@@ -683,8 +683,8 @@ namespace System.Runtime.Serialization.Formatters.Tests
             yield return new object[] { PopulateException(sqlAlreadyFilledException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAAC5TeXN0ZW0uRGF0YS5TcWxUeXBlcy5TcWxBbHJlYWR5RmlsbGVkRXhjZXB0aW9uDAAAAAlDbGFzc05hbWUHTWVzc2FnZQREYXRhDklubmVyRXhjZXB0aW9uB0hlbHBVUkwQU3RhY2tUcmFjZVN0cmluZxZSZW1vdGVTdGFja1RyYWNlU3RyaW5nEFJlbW90ZVN0YWNrSW5kZXgPRXhjZXB0aW9uTWV0aG9kB0hSZXN1bHQGU291cmNlDVdhdHNvbkJ1Y2tldHMBAQMDAQEBAAEAAQcpU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwQU3lzdGVtLkV4Y2VwdGlvbggIAgIAAAAGAwAAAC5TeXN0ZW0uRGF0YS5TcWxUeXBlcy5TcWxBbHJlYWR5RmlsbGVkRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAAC5TeXN0ZW0uRGF0YS5TcWxUeXBlcy5TcWxBbHJlYWR5RmlsbGVkRXhjZXB0aW9uDAAAAAlDbGFzc05hbWUHTWVzc2FnZQREYXRhDklubmVyRXhjZXB0aW9uB0hlbHBVUkwQU3RhY2tUcmFjZVN0cmluZxZSZW1vdGVTdGFja1RyYWNlU3RyaW5nEFJlbW90ZVN0YWNrSW5kZXgPRXhjZXB0aW9uTWV0aG9kB0hSZXN1bHQGU291cmNlDVdhdHNvbkJ1Y2tldHMBAQMDAQEBAAEAAQcpU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwQU3lzdGVtLkV4Y2VwdGlvbggIAgIAAAAGAwAAAC5TeXN0ZW0uRGF0YS5TcWxUeXBlcy5TcWxBbHJlYWR5RmlsbGVkRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netfx461) } };
 
             SqlError sqlError = null;
-            // Full framework has no constructor overload for passing an exception
-            if (PlatformDetection.IsFullFramework)
+            // .NET Framework has no constructor overload for passing an exception
+            if (PlatformDetection.IsNetFramework)
             {
                 sqlError = (SqlError)typeof(SqlError)
                     .GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(int), typeof(byte), typeof(byte), typeof(string), typeof(string), typeof(string), typeof(int), typeof(uint) }, null)
@@ -1421,9 +1421,9 @@ namespace System.Runtime.Serialization.Formatters.Tests
                 var privilegeNotHeldException = new PrivilegeNotHeldException("privilege", exception);
                 yield return new object[] { PopulateException(privilegeNotHeldException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAADdTeXN0ZW0uU2VjdXJpdHkuQWNjZXNzQ29udHJvbC5Qcml2aWxlZ2VOb3RIZWxkRXhjZXB0aW9uDQAAAAlDbGFzc05hbWUHTWVzc2FnZQREYXRhDklubmVyRXhjZXB0aW9uB0hlbHBVUkwQU3RhY2tUcmFjZVN0cmluZxZSZW1vdGVTdGFja1RyYWNlU3RyaW5nEFJlbW90ZVN0YWNrSW5kZXgPRXhjZXB0aW9uTWV0aG9kB0hSZXN1bHQGU291cmNlDVdhdHNvbkJ1Y2tldHMNUHJpdmlsZWdlTmFtZQEBAwMBAQEAAQABBwEpU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwQU3lzdGVtLkV4Y2VwdGlvbggIAgYCAAAAN1N5c3RlbS5TZWN1cml0eS5BY2Nlc3NDb250cm9sLlByaXZpbGVnZU5vdEhlbGRFeGNlcHRpb24GAwAAAFxUaGUgcHJvY2VzcyBkb2VzIG5vdCBwb3NzZXNzIHRoZSAncHJpdmlsZWdlJyBwcml2aWxlZ2Ugd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgb3BlcmF0aW9uLgkEAAAACQUAAAAGBgAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBgcAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCAAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCQAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoGCgAAAAlwcml2aWxlZ2UEBAAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAUAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uBg0AAAAHbWVzc2FnZQkOAAAACQ8AAAAJBgAAAAkHAAAACQgAAAAAAAAACugDAAAJCQAAAAoECwAAADhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQMAAAADa2V5BXZhbHVlBG5leHQCAgM4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUGFAAAAAZzZWNyZXQIAQEJFQAAAAEOAAAABAAAAAkWAAAAAgAAAAIAAAABDwAAAAUAAAAJDAAAAAYYAAAAF0lubmVyIGV4Y2VwdGlvbiBtZXNzYWdlCgoKCgoAAAAACgAVE4AKCgEVAAAACwAAAAgIAQAAAAYZAAAAA29uZQoBFgAAAAsAAAAJFAAAAAgBAQkbAAAAARsAAAALAAAACAgBAAAACRkAAAAKCw==", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAADdTeXN0ZW0uU2VjdXJpdHkuQWNjZXNzQ29udHJvbC5Qcml2aWxlZ2VOb3RIZWxkRXhjZXB0aW9uDQAAAAlDbGFzc05hbWUHTWVzc2FnZQREYXRhDklubmVyRXhjZXB0aW9uB0hlbHBVUkwQU3RhY2tUcmFjZVN0cmluZxZSZW1vdGVTdGFja1RyYWNlU3RyaW5nEFJlbW90ZVN0YWNrSW5kZXgPRXhjZXB0aW9uTWV0aG9kB0hSZXN1bHQGU291cmNlDVdhdHNvbkJ1Y2tldHMNUHJpdmlsZWdlTmFtZQEBAwMBAQEAAQABBwEpU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwQU3lzdGVtLkV4Y2VwdGlvbggIAgYCAAAAN1N5c3RlbS5TZWN1cml0eS5BY2Nlc3NDb250cm9sLlByaXZpbGVnZU5vdEhlbGRFeGNlcHRpb24GAwAAAFxUaGUgcHJvY2VzcyBkb2VzIG5vdCBwb3NzZXNzIHRoZSAncHJpdmlsZWdlJyBwcml2aWxlZ2Ugd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgb3BlcmF0aW9uLgkEAAAACQUAAAAGBgAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBgcAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCAAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCQAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoGCgAAAAlwcml2aWxlZ2UEBAAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAUAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uBg0AAAAHbWVzc2FnZQkOAAAACQ8AAAAJBgAAAAkHAAAACQgAAAAAAAAACugDAAAJCQAAAAoECwAAADhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQMAAAADa2V5BXZhbHVlBG5leHQCAgM4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUGFAAAAAZzZWNyZXQIAQEJFQAAAAEOAAAABAAAAAkWAAAAAgAAAAIAAAABDwAAAAUAAAAJDAAAAAYYAAAAF0lubmVyIGV4Y2VwdGlvbiBtZXNzYWdlCgoKCgoAAAAACgAVE4AKCgEVAAAACwAAAAgIAQAAAAYZAAAAA29uZQoBFgAAAAsAAAAJFAAAAAgBAQkbAAAAARsAAAALAAAACAgBAAAACRkAAAAKCw==", TargetFrameworkMoniker.netfx461) } };
 
-                // Infrastructure issue where the netstandard dll is PNSE assembly but in full framework DirectoryServices should use the inbox assembly since they have the same identity.
+                // Infrastructure issue where the netstandard dll is PNSE assembly but in .NET Framework DirectoryServices should use the inbox assembly since they have the same identity.
                 // See: https://github.com/dotnet/corefx/issues/24903
-                if (!PlatformDetection.IsFullFramework)
+                if (!PlatformDetection.IsNetFramework)
                 {
                     var activeDirectoryOperationException = new ActiveDirectoryOperationException("message", exception, 0);
                     yield return new object[] { PopulateException(activeDirectoryOperationException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAFtTeXN0ZW0uRGlyZWN0b3J5U2VydmljZXMsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQEAAABKU3lzdGVtLkRpcmVjdG9yeVNlcnZpY2VzLkFjdGl2ZURpcmVjdG9yeS5BY3RpdmVEaXJlY3RvcnlPcGVyYXRpb25FeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCAgAAAAYDAAAASlN5c3RlbS5EaXJlY3RvcnlTZXJ2aWNlcy5BY3RpdmVEaXJlY3RvcnkuQWN0aXZlRGlyZWN0b3J5T3BlcmF0aW9uRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAFtTeXN0ZW0uRGlyZWN0b3J5U2VydmljZXMsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQEAAABKU3lzdGVtLkRpcmVjdG9yeVNlcnZpY2VzLkFjdGl2ZURpcmVjdG9yeS5BY3RpdmVEaXJlY3RvcnlPcGVyYXRpb25FeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCAgAAAAYDAAAASlN5c3RlbS5EaXJlY3RvcnlTZXJ2aWNlcy5BY3RpdmVEaXJlY3RvcnkuQWN0aXZlRGlyZWN0b3J5T3BlcmF0aW9uRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netfx461) } };
@@ -1470,7 +1470,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
             }
 
             // TODO: Inbox framework assemblies with same identity aren't currently used for running tests. https://github.com/dotnet/corefx/issues/24903
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 var compositionContractMismatchException = new CompositionContractMismatchException("message", exception);
                 yield return new object[] { PopulateException(compositionContractMismatchException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAGRTeXN0ZW0uQ29tcG9uZW50TW9kZWwuQ29tcG9zaXRpb24sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQEAAABGU3lzdGVtLkNvbXBvbmVudE1vZGVsLkNvbXBvc2l0aW9uLkNvbXBvc2l0aW9uQ29udHJhY3RNaXNtYXRjaEV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAICAAAABgMAAABGU3lzdGVtLkNvbXBvbmVudE1vZGVsLkNvbXBvc2l0aW9uLkNvbXBvc2l0aW9uQ29udHJhY3RNaXNtYXRjaEV4Y2VwdGlvbgYEAAAAB21lc3NhZ2UJBQAAAAkGAAAABgcAAAAZaHR0cDovL21zZG4ubWljcm9zb2Z0LmNvbQYIAAAAFFN0YWNrVHJhY2Ugc3RyaW5nLi4uBgkAAAAbUmVtb3RlIFN0YWNrVHJhY2Ugc3RyaW5nLi4uAAAAAAroAwAABgoAAAAXRXhjZXB0aW9uX0NsYXNzX1NhbXBsZXMKBAUAAAApU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwDAAAABGhlYWQHdmVyc2lvbgVjb3VudAMAADhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQgICQsAAAACAAAAAgAAAAQGAAAAEFN5c3RlbS5FeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCBgwAAAAQU3lzdGVtLkV4Y2VwdGlvbgkEAAAACQ4AAAAJDwAAAAkHAAAACQgAAAAJCQAAAAAAAAAK6AMAAAkKAAAACgQLAAAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlAwAAAANrZXkFdmFsdWUEbmV4dAICAzhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQYUAAAABnNlY3JldAgBAQkVAAAAAQ4AAAAFAAAACRYAAAACAAAAAgAAAAEPAAAABgAAAAkMAAAABhgAAAAXSW5uZXIgZXhjZXB0aW9uIG1lc3NhZ2UKCgoKCgAAAAAKABUTgAoKARUAAAALAAAACAgBAAAABhkAAAADb25lCgEWAAAACwAAAAkUAAAACAEBCRsAAAABGwAAAAsAAAAICAEAAAAJGQAAAAoL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAGRTeXN0ZW0uQ29tcG9uZW50TW9kZWwuQ29tcG9zaXRpb24sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAABGU3lzdGVtLkNvbXBvbmVudE1vZGVsLkNvbXBvc2l0aW9uLkNvbXBvc2l0aW9uQ29udHJhY3RNaXNtYXRjaEV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAICAAAABgMAAABGU3lzdGVtLkNvbXBvbmVudE1vZGVsLkNvbXBvc2l0aW9uLkNvbXBvc2l0aW9uQ29udHJhY3RNaXNtYXRjaEV4Y2VwdGlvbgYEAAAAB21lc3NhZ2UJBQAAAAkGAAAABgcAAAAZaHR0cDovL21zZG4ubWljcm9zb2Z0LmNvbQYIAAAAFFN0YWNrVHJhY2Ugc3RyaW5nLi4uBgkAAAAbUmVtb3RlIFN0YWNrVHJhY2Ugc3RyaW5nLi4uAAAAAAroAwAABgoAAAAXRXhjZXB0aW9uX0NsYXNzX1NhbXBsZXMKBAUAAAApU3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwDAAAABGhlYWQHdmVyc2lvbgVjb3VudAMAADhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQgICQsAAAACAAAAAgAAAAQGAAAAEFN5c3RlbS5FeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCBgwAAAAQU3lzdGVtLkV4Y2VwdGlvbgkEAAAACQ4AAAAJDwAAAAkHAAAACQgAAAAJCQAAAAAAAAAK6AMAAAkKAAAACgQLAAAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlAwAAAANrZXkFdmFsdWUEbmV4dAICAzhTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbCtEaWN0aW9uYXJ5Tm9kZQYUAAAABnNlY3JldAgBAQkVAAAAAQ4AAAAFAAAACRYAAAACAAAAAgAAAAEPAAAABgAAAAkMAAAABhgAAAAXSW5uZXIgZXhjZXB0aW9uIG1lc3NhZ2UKCgoKCgAAAAAKABUTgAoKARUAAAALAAAACAgBAAAABhkAAAADb25lCgEWAAAACwAAAAkUAAAACAEBCRsAAAABGwAAAAsAAAAICAEAAAAJGQAAAAoL", TargetFrameworkMoniker.netfx461) } };
@@ -1479,21 +1479,15 @@ namespace System.Runtime.Serialization.Formatters.Tests
                 yield return new object[] { PopulateException(importCardinalityMismatchException), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAGRTeXN0ZW0uQ29tcG9uZW50TW9kZWwuQ29tcG9zaXRpb24sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQEAAABEU3lzdGVtLkNvbXBvbmVudE1vZGVsLkNvbXBvc2l0aW9uLkltcG9ydENhcmRpbmFsaXR5TWlzbWF0Y2hFeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCAgAAAAYDAAAARFN5c3RlbS5Db21wb25lbnRNb2RlbC5Db21wb3NpdGlvbi5JbXBvcnRDYXJkaW5hbGl0eU1pc21hdGNoRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAMAgAAAGRTeXN0ZW0uQ29tcG9uZW50TW9kZWwuQ29tcG9zaXRpb24sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAABEU3lzdGVtLkNvbXBvbmVudE1vZGVsLkNvbXBvc2l0aW9uLkltcG9ydENhcmRpbmFsaXR5TWlzbWF0Y2hFeGNlcHRpb24MAAAACUNsYXNzTmFtZQdNZXNzYWdlBERhdGEOSW5uZXJFeGNlcHRpb24HSGVscFVSTBBTdGFja1RyYWNlU3RyaW5nFlJlbW90ZVN0YWNrVHJhY2VTdHJpbmcQUmVtb3RlU3RhY2tJbmRleA9FeGNlcHRpb25NZXRob2QHSFJlc3VsdAZTb3VyY2UNV2F0c29uQnVja2V0cwEBAwMBAQEAAQABBylTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbBBTeXN0ZW0uRXhjZXB0aW9uCAgCAgAAAAYDAAAARFN5c3RlbS5Db21wb25lbnRNb2RlbC5Db21wb3NpdGlvbi5JbXBvcnRDYXJkaW5hbGl0eU1pc21hdGNoRXhjZXB0aW9uBgQAAAAHbWVzc2FnZQkFAAAACQYAAAAGBwAAABlodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tBggAAAAUU3RhY2tUcmFjZSBzdHJpbmcuLi4GCQAAABtSZW1vdGUgU3RhY2tUcmFjZSBzdHJpbmcuLi4AAAAACugDAAAGCgAAABdFeGNlcHRpb25fQ2xhc3NfU2FtcGxlcwoEBQAAAClTeXN0ZW0uQ29sbGVjdGlvbnMuTGlzdERpY3Rpb25hcnlJbnRlcm5hbAMAAAAEaGVhZAd2ZXJzaW9uBWNvdW50AwAAOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlCAgJCwAAAAIAAAACAAAABAYAAAAQU3lzdGVtLkV4Y2VwdGlvbgwAAAAJQ2xhc3NOYW1lB01lc3NhZ2UERGF0YQ5Jbm5lckV4Y2VwdGlvbgdIZWxwVVJMEFN0YWNrVHJhY2VTdHJpbmcWUmVtb3RlU3RhY2tUcmFjZVN0cmluZxBSZW1vdGVTdGFja0luZGV4D0V4Y2VwdGlvbk1ldGhvZAdIUmVzdWx0BlNvdXJjZQ1XYXRzb25CdWNrZXRzAQEDAwEBAQABAAEHKVN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsEFN5c3RlbS5FeGNlcHRpb24ICAIGDAAAABBTeXN0ZW0uRXhjZXB0aW9uCQQAAAAJDgAAAAkPAAAACQcAAAAJCAAAAAkJAAAAAAAAAAroAwAACQoAAAAKBAsAAAA4U3lzdGVtLkNvbGxlY3Rpb25zLkxpc3REaWN0aW9uYXJ5SW50ZXJuYWwrRGljdGlvbmFyeU5vZGUDAAAAA2tleQV2YWx1ZQRuZXh0AgIDOFN5c3RlbS5Db2xsZWN0aW9ucy5MaXN0RGljdGlvbmFyeUludGVybmFsK0RpY3Rpb25hcnlOb2RlBhQAAAAGc2VjcmV0CAEBCRUAAAABDgAAAAUAAAAJFgAAAAIAAAACAAAAAQ8AAAAGAAAACQwAAAAGGAAAABdJbm5lciBleGNlcHRpb24gbWVzc2FnZQoKCgoKAAAAAAoAFROACgoBFQAAAAsAAAAICAEAAAAGGQAAAANvbmUKARYAAAALAAAACRQAAAAIAQEJGwAAAAEbAAAACwAAAAgIAQAAAAkZAAAACgs=", TargetFrameworkMoniker.netfx461) } };
             }
 
-            // Extension of core serializable types
-            // Disabling on full framework until we compile against >=net471
-            if (!PlatformDetection.IsFullFramework/* ? PlatformDetection.IsNetfx471OrNewer : true*/)
-            {
-                // ValueType isn't serializable before net471.
-                yield return new object[] { new ValueTuple(), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAABFTeXN0ZW0uVmFsdWVUdXBsZQAAAAAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAABFTeXN0ZW0uVmFsdWVUdXBsZQAAAAAL", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAHBTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQAIAQAAAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAHBTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQAIAQAAAAs=", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2"), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAM0BU3lzdGVtLlZhbHVlVHVwbGVgMltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQIAAAAFSXRlbTEFSXRlbTIAAQgBAAAABgIAAAABMgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAM0BU3lzdGVtLlZhbHVlVHVwbGVgMltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQIAAAAFSXRlbTEFSXRlbTIAAQgBAAAABgIAAAABMgs=", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2", 3u), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAKoCU3lzdGVtLlZhbHVlVHVwbGVgM1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQMAAAAFSXRlbTEFSXRlbTIFSXRlbTMAAQAIDwEAAAAGAgAAAAEyAwAAAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAKoCU3lzdGVtLlZhbHVlVHVwbGVgM1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQMAAAAFSXRlbTEFSXRlbTIFSXRlbTMAAQAIDwEAAAAGAgAAAAEyAwAAAAs=", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAIYDU3lzdGVtLlZhbHVlVHVwbGVgNFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAABAAAIDwkBAAAABgIAAAABMgMAAAAEAAAAAAAAAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAIYDU3lzdGVtLlZhbHVlVHVwbGVgNFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAABAAAIDwkBAAAABgIAAAABMgMAAAAEAAAAAAAAAAs=", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAOMDU3lzdGVtLlZhbHVlVHVwbGVgNVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBQAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQABAAAACA8JBgEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAOMDU3lzdGVtLlZhbHVlVHVwbGVgNVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBQAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQABAAAACA8JBgEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkAL", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6, 7.8f), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAMAEU3lzdGVtLlZhbHVlVHVwbGVgNltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBgAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgABAAAAAAgPCQYLAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAMAEU3lzdGVtLlZhbHVlVHVwbGVgNltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBgAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgABAAAAAAgPCQYLAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UAL", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6, 7.8f, 9m), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAJ4FU3lzdGVtLlZhbHVlVHVwbGVgN1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQcAAAAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUFSXRlbTYFSXRlbTcAAQAAAAAACA8JBgsFAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UABOQs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAJ4FU3lzdGVtLlZhbHVlVHVwbGVgN1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQcAAAAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUFSXRlbTYFSXRlbTcAAQAAAAAACA8JBgsFAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UABOQs=", TargetFrameworkMoniker.netfx471) } };
-                yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6, 7.8f, 9m, Tuple.Create(10)), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAL0HU3lzdGVtLlZhbHVlVHVwbGVgOFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uVHVwbGVgMVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dCAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgVJdGVtNwRSZXN0AAEAAAAAAAMIDwkGCwXPAVN5c3RlbS5WYWx1ZVR1cGxlYDFbW1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkCamflAATkE/f///88BU3lzdGVtLlZhbHVlVHVwbGVgMVtbU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQNrU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0JBAAAAAQEAAAAa1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAdtX0l0ZW0xAAgKAAAACw==", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAL0HU3lzdGVtLlZhbHVlVHVwbGVgOFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uVHVwbGVgMVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dCAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgVJdGVtNwRSZXN0AAEAAAAAAAMIDwkGCwXPAVN5c3RlbS5WYWx1ZVR1cGxlYDFbW1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkCamflAATkE/f///88BU3lzdGVtLlZhbHVlVHVwbGVgMVtbU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQNrU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0JBAAAAAQEAAAAa1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAdtX0l0ZW0xAAgKAAAACw==", TargetFrameworkMoniker.netfx471) } };
-            }
+            yield return new object[] { new ValueTuple(), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAABFTeXN0ZW0uVmFsdWVUdXBsZQAAAAAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAABFTeXN0ZW0uVmFsdWVUdXBsZQAAAAAL", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAHBTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQAIAQAAAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAHBTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQAIAQAAAAs=", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2"), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAM0BU3lzdGVtLlZhbHVlVHVwbGVgMltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQIAAAAFSXRlbTEFSXRlbTIAAQgBAAAABgIAAAABMgs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAM0BU3lzdGVtLlZhbHVlVHVwbGVgMltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQIAAAAFSXRlbTEFSXRlbTIAAQgBAAAABgIAAAABMgs=", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2", 3u), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAKoCU3lzdGVtLlZhbHVlVHVwbGVgM1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQMAAAAFSXRlbTEFSXRlbTIFSXRlbTMAAQAIDwEAAAAGAgAAAAEyAwAAAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAKoCU3lzdGVtLlZhbHVlVHVwbGVgM1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQMAAAAFSXRlbTEFSXRlbTIFSXRlbTMAAQAIDwEAAAAGAgAAAAEyAwAAAAs=", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAIYDU3lzdGVtLlZhbHVlVHVwbGVgNFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAABAAAIDwkBAAAABgIAAAABMgMAAAAEAAAAAAAAAAs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAIYDU3lzdGVtLlZhbHVlVHVwbGVgNFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAABAAAIDwkBAAAABgIAAAABMgMAAAAEAAAAAAAAAAs=", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAOMDU3lzdGVtLlZhbHVlVHVwbGVgNVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBQAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQABAAAACA8JBgEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAOMDU3lzdGVtLlZhbHVlVHVwbGVgNVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBQAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQABAAAACA8JBgEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkAL", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6, 7.8f), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAMAEU3lzdGVtLlZhbHVlVHVwbGVgNltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBgAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgABAAAAAAgPCQYLAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UAL", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAMAEU3lzdGVtLlZhbHVlVHVwbGVgNltbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dBgAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgABAAAAAAgPCQYLAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UAL", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6, 7.8f, 9m), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAJ4FU3lzdGVtLlZhbHVlVHVwbGVgN1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQcAAAAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUFSXRlbTYFSXRlbTcAAQAAAAAACA8JBgsFAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UABOQs=", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAJ4FU3lzdGVtLlZhbHVlVHVwbGVgN1tbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQcAAAAFSXRlbTEFSXRlbTIFSXRlbTMFSXRlbTQFSXRlbTUFSXRlbTYFSXRlbTcAAQAAAAAACA8JBgsFAQAAAAYCAAAAATIDAAAABAAAAAAAAABmZmZmZmYWQJqZ+UABOQs=", TargetFrameworkMoniker.netfx471) } };
+            yield return new object[] { ValueTuple.Create(1, "2", 3u, 4L, 5.6, 7.8f, 9m, Tuple.Create(10)), new TypeSerializableValue[] { new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAL0HU3lzdGVtLlZhbHVlVHVwbGVgOFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uVHVwbGVgMVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dCAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgVJdGVtNwRSZXN0AAEAAAAAAAMIDwkGCwXPAVN5c3RlbS5WYWx1ZVR1cGxlYDFbW1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkCamflAATkE/f///88BU3lzdGVtLlZhbHVlVHVwbGVgMVtbU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQNrU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0JBAAAAAQEAAAAa1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAdtX0l0ZW0xAAgKAAAACw==", TargetFrameworkMoniker.netcoreapp20), new TypeSerializableValue("AAEAAAD/////AQAAAAAAAAAEAQAAAL0HU3lzdGVtLlZhbHVlVHVwbGVgOFtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uU3RyaW5nLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVUludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uSW50NjQsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5Eb3VibGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5TaW5nbGUsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV0sW1N5c3RlbS5EZWNpbWFsLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldLFtTeXN0ZW0uVmFsdWVUdXBsZWAxW1tTeXN0ZW0uVHVwbGVgMVtbU3lzdGVtLkludDMyLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXSwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dCAAAAAVJdGVtMQVJdGVtMgVJdGVtMwVJdGVtNAVJdGVtNQVJdGVtNgVJdGVtNwRSZXN0AAEAAAAAAAMIDwkGCwXPAVN5c3RlbS5WYWx1ZVR1cGxlYDFbW1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dLCBtc2NvcmxpYiwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODldXQEAAAAGAgAAAAEyAwAAAAQAAAAAAAAAZmZmZmZmFkCamflAATkE/f///88BU3lzdGVtLlZhbHVlVHVwbGVgMVtbU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAVJdGVtMQNrU3lzdGVtLlR1cGxlYDFbW1N5c3RlbS5JbnQzMiwgbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0JBAAAAAQEAAAAa1N5c3RlbS5UdXBsZWAxW1tTeXN0ZW0uSW50MzIsIG1zY29ybGliLCBWZXJzaW9uPTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OV1dAQAAAAdtX0l0ZW0xAAgKAAAACw==", TargetFrameworkMoniker.netfx471) } };
         }
 
         // *** NON AUTO UPDATED DATA ***
index b9b07725698f5bd53f1fa7a70591b041d33f2dae..52460eca4c7d2e6ae0ecfc898d4822d2f37d25bd 100644 (file)
@@ -36,7 +36,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
             // Instead of round tripping we only serialize to minimize test time.
             // This will throw on .NET Framework as the artificial limit is still enabled.
             var bf = new BinaryFormatter();
-            AssertExtensions.ThrowsIf<SerializationException>(PlatformDetection.IsFullFramework, () =>
+            AssertExtensions.ThrowsIf<SerializationException>(PlatformDetection.IsNetFramework, () =>
             {
                 using (MemoryStream ms = new MemoryStream())
                 {
@@ -92,7 +92,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
 
             // SqlException, ReflectionTypeLoadException and LicenseException aren't deserializable from Desktop --> Core.
             // Therefore we remove the second blob which is the one from Desktop.
-            if (!PlatformDetection.IsFullFramework && (obj is SqlException || obj is ReflectionTypeLoadException || obj is LicenseException))
+            if (!PlatformDetection.IsNetFramework && (obj is SqlException || obj is ReflectionTypeLoadException || obj is LicenseException))
             {
                 var tmpList = new List<TypeSerializableValue>(blobs);
                 tmpList.RemoveAt(1);
@@ -523,7 +523,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
 
         private static bool HasObjectTypeIntegrity(ISerializable serializable)
         {
-            return !PlatformDetection.IsFullFramework ||
+            return !PlatformDetection.IsNetFramework ||
                 !(serializable is NotFiniteNumberException);
         }
 
@@ -653,7 +653,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
 
                 string pattern = null;
                 string replacement = null;
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     pattern = ", \"AAEAAAD[^\"]+\"(?!,)";
                     replacement = ", \"" + blobs[numberOfBlobs] + "\"";
index a555658d56e7edd55646764a7e03da02d5463c06..98528bcf84526aecb9c7d603394fe95e402392b3 100644 (file)
@@ -1162,7 +1162,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
                 CheckEquals(@this.InnerException, other.InnerException, isSamePlatform);
             }
 
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 // Different by design for those exceptions
                 if (!((@this is NetworkInformationException || @this is SocketException) && !isSamePlatform))
index 907d421dbaac8b914a9067a42495a981bd1511f9..3209b424e929481e81146c6a3347d0e653ce0535 100644 (file)
@@ -28,7 +28,7 @@ namespace System.Runtime.Serialization.Formatters.Tests
             int index;
 
             // .NET Framework
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 // Check if a specialized blob for >=netfx472 build 3260 is present and return if found.
                 if (IsNetFxPatchedVersion(3260))
index be4fa56d4882a032a1b101d2812b8d14cee766f2..4911848bf2055e835887e9bd5b3b3d8e25fb2b27 100644 (file)
@@ -15,7 +15,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests
     public abstract partial class DecryptTests
     {
         private bool _useExplicitPrivateKey;
-        public static bool SupportsIndefiniteLengthEncoding { get; } = !PlatformDetection.IsFullFramework;
+        public static bool SupportsIndefiniteLengthEncoding { get; } = !PlatformDetection.IsNetFramework;
 
         public DecryptTests(bool useExplicitPrivateKey)
         {
@@ -116,7 +116,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests
                 "650304012A0410280AC7A629BFC9FD6FB24F8A42F094B4"
             ).HexToByteArray();
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 // On .NET Framework when Array.Empty should be returned an array of 6 zeros is
                 // returned instead.
index 311a931cfbfc467f8c6f8e2c5fb0c1b979411565..67797e906d5bb9c31b9cb3c101601e13df86e67f 100644 (file)
@@ -107,7 +107,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests
             EnvelopedCms ecms = new EnvelopedCms();
             ecms.Decode(content);
 
-            int expected = PlatformDetection.IsFullFramework ? 6 : 0; // Desktop bug gives 6
+            int expected = PlatformDetection.IsNetFramework ? 6 : 0; // Desktop bug gives 6
             Assert.Equal(expected, ecms.ContentInfo.Content.Length);
             Assert.Equal(Oids.Pkcs7Data, ecms.ContentInfo.ContentType.Value);
         }
@@ -192,7 +192,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests
                 ContentInfo contentInfo = ecms.ContentInfo;
                 byte[] content = contentInfo.Content;
 
-                int expected = PlatformDetection.IsFullFramework ? 6 : 0; // Desktop bug gives 6
+                int expected = PlatformDetection.IsNetFramework ? 6 : 0; // Desktop bug gives 6
                 Assert.Equal(expected, content.Length);
             }
         }
index 44ad2e30d978f35e6d66a98e463eb3914066adc6..984fa4e3d4489e7797b142fd9af4254fba755a1f 100644 (file)
@@ -28,7 +28,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests
 
             // net48 changes the default to AES-256-CBC, older versions (and quirk) are
             // DES3-EDE-CBC
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 supportedAlgorithms = new[] { Oids.TripleDesCbc, Oids.Aes256 };
             }
@@ -165,7 +165,7 @@ KoZIhvcNAwcECJ01qtX2EKx6oIAEEM7op+R2U3GQbYwlEj5X+h0AAAAAAAAAAAAA
 
             string expectedContentHex = "CEE8A7E4765371906D8C25123E57FA1D";
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 // .NET Framework over-counts encrypted content.
                 expectedContentHex += "000000000000";
@@ -239,7 +239,7 @@ KoZIhvcNAwcECJ01qtX2EKx6oIAEEM7op+R2U3GQbYwlEj5X+h0AAAAAAAAAAAAA
 
             string expectedHex = "BCEA3A10D0737EB9";
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 expectedHex = "BCEA3A10D0737EB9000000000000";
             }
@@ -361,7 +361,7 @@ KoZIhvcNAwcECJ01qtX2EKx6oIAEEM7op+R2U3GQbYwlEj5X+h0AAAAAAAAAAAAA
             byte[] encoded = ecms.Encode();
             EnvelopedCms reDecoded = new EnvelopedCms();
             reDecoded.Decode(encoded);
-            int expectedSize = PlatformDetection.IsFullFramework ? 22 : 16; //NetFx compat.
+            int expectedSize = PlatformDetection.IsNetFramework ? 22 : 16; //NetFx compat.
             Assert.Equal(expectedSize, reDecoded.ContentInfo.Content.Length);
         }
 
index 5b0d463dd118d9a20da163d09aa4a033e1b0a357..efd1c16c9eeebdb2644d36685f268490ddaf863b 100644 (file)
@@ -402,7 +402,7 @@ namespace System.Security.Cryptography.Pkcs.Tests
             ContentInfo contentInfo = new ContentInfo(new byte[] { 9, 8, 7, 6, 5 });
             SignedCms cms = new SignedCms(SubjectIdentifierType.NoSignature, contentInfo, detached);
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<NullReferenceException>(() => cms.ComputeSignature());
             }
@@ -761,7 +761,7 @@ namespace System.Security.Cryptography.Pkcs.Tests
                         IncludeOption = X509IncludeOption.None,
                     });
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<NullReferenceException>(sign);
             }
index 92c60e533bab296f12491adfd0328f1f53998826..34a48544a868b903ebd2a57dac45dce0b3a0f576 100644 (file)
@@ -846,7 +846,7 @@ namespace System.Security.Cryptography.Pkcs.Tests
                             IncludeOption = X509IncludeOption.None,
                         });
 
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     Assert.ThrowsAny<CryptographicException>(sign);
                 }
@@ -898,7 +898,7 @@ namespace System.Security.Cryptography.Pkcs.Tests
             SignerInfo firstCounterSigner = firstSigner.CounterSignerInfos[0];
             Assert.ThrowsAny<CryptographicException>(() => firstCounterSigner.CheckSignature(true));
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 // NetFX's CheckHash only looks at top-level SignerInfos to find the
                 // crypt32 CMS signer ID, so it fails on any check from a countersigner.
@@ -997,7 +997,7 @@ namespace System.Security.Cryptography.Pkcs.Tests
             Assert.Equal(SubjectIdentifierType.NoSignature, firstCounterSigner.SignerIdentifier.Type);
             Assert.ThrowsAny<CryptographicException>(() => firstCounterSigner.CheckSignature(true));
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 // NetFX's CheckHash only looks at top-level SignerInfos to find the
                 // crypt32 CMS signer ID, so it fails on any check from a countersigner.
index b17ef5c19a47b0cc8f5a542df5de1c10bebe397e..9287dd59ab0612e80a37b238d4f5d943a02f4e43 100644 (file)
@@ -352,7 +352,7 @@ namespace System.Security.Cryptography.X509Certificates
             if (fileName == null)
                 throw new ArgumentNullException(nameof(fileName));
 
-            // .NET Framework compat: The .NET Framework CLR expands the filename to a full path for the purpose of performing a CAS permission check. While CAS is not present here,
+            // .NET Framework compat: The .NET Framework expands the filename to a full path for the purpose of performing a CAS permission check. While CAS is not present here,
             // we still need to call GetFullPath() so we get the same exception behavior if the fileName is bad.
             string fullPath = Path.GetFullPath(fileName);
 
index 9bd54a7f9ed4b9ad8d20427f39a49594ea6a43f1..2708f7f0e4317ba22f21c2abc92595148348107b 100644 (file)
@@ -654,7 +654,7 @@ namespace System.Security.Cryptography.Xml.Tests
 
                 // https://github.com/dotnet/corefx/issues/19272
                 Action decrypt = () => exml.DecryptData(ed, aes);
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                     Assert.Throws<ArgumentNullException>(decrypt);
                 else
                     Assert.Throws<CryptographicException>(decrypt);
index 26e05a8ee719a780e1bb29fc9d3b44baf4419835..bf51f1c92209432e47b20dd688ba657224e77203 100644 (file)
@@ -123,7 +123,7 @@ namespace System.Security.Cryptography.Xml.Tests
                 rsa.LoadXml(xmlDocument.DocumentElement);
             }
             catch (CryptographicException) { }
-            catch (FormatException) when (PlatformDetection.IsFullFramework) { }
+            catch (FormatException) when (PlatformDetection.IsNetFramework) { }
         }
 
         public static object[][] LoadXml_InvalidXml_Source()
index 37db00a09a1e4b4681e9eea974c796b1acf4d517..e429294542df4b5be2ef4eecc936f3baba074e27 100644 (file)
@@ -23,7 +23,7 @@ namespace System.Security.Cryptography.Xml.Tests
 </example>";
 
         private static bool SupportsSha2Algorithms =>
-            !PlatformDetection.IsFullFramework ||
+            !PlatformDetection.IsNetFramework ||
             CryptoConfig.CreateFromName("http://www.w3.org/2001/04/xmldsig-more#rsa-sha384") as SignatureDescription != null;
 
         private static void SignXml(XmlDocument doc, RSA key, string signatureMethod, string digestMethod)
index b1e2645d0287cca6a8e1cbd5e3c6137dd90efc19..2d75b3628e3dd25411129205f0226363e8179bb5 100644 (file)
@@ -1261,7 +1261,7 @@ namespace System.Security.Cryptography.Xml.Tests
             sign.LoadXml(doc.DocumentElement["Signature"]);
 
             // https://github.com/dotnet/corefx/issues/18690
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Assert.False(sign.CheckSignature(new HMACSHA256(badKey)));
             }
@@ -1297,7 +1297,7 @@ namespace System.Security.Cryptography.Xml.Tests
             sign.LoadXml(doc.DocumentElement["Signature"]);
 
             // https://github.com/dotnet/corefx/issues/18690
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Assert.False(sign.CheckSignature(new HMACSHA512(badKey)));
             }
@@ -1336,7 +1336,7 @@ namespace System.Security.Cryptography.Xml.Tests
             sign.LoadXml(doc.DocumentElement["Signature"]);
 
             // https://github.com/dotnet/corefx/issues/18690
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Assert.False(sign.CheckSignature(new HMACSHA384(badKey)));
             }
@@ -1375,7 +1375,7 @@ namespace System.Security.Cryptography.Xml.Tests
             sign.LoadXml(doc.DocumentElement["Signature"]);
 
             // https://github.com/dotnet/corefx/issues/18690
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 Assert.False(sign.CheckSignature(new HMACMD5(badKey)));
             }
index 8a7a98615ad68915e99c892849719e664c6916fc..343b8db8fd4a5e6fb2e8046d585419f3893cb57a 100644 (file)
@@ -69,7 +69,7 @@ namespace System.ServiceProcess.Tests
         }
 
         [Fact]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework does not throw")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not throw")]
         public static void Initialize_GetNames()
         {
             Assert.Throws<InvalidOperationException>(() => new ServiceController().ServiceName);
index 2dd7ddba87aa5bb56d6b4ecba919b5ca250f7cea..282d54b421b4ea18b13c6ec5d402f170ba9e4578 100644 (file)
@@ -30,7 +30,7 @@ namespace System.ServiceProcess.Tests
 
         private void AssertExpectedProperties(ServiceController testServiceController)
         {
-            var comparer = PlatformDetection.IsFullFramework ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; // Full framework upper cases the name
+            var comparer = PlatformDetection.IsNetFramework ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; // .NET Framework upper cases the name
             Assert.Equal(_testService.TestServiceName, testServiceController.ServiceName, comparer);
             Assert.Equal(_testService.TestServiceDisplayName, testServiceController.DisplayName);
             Assert.Equal(_testService.TestMachineName, testServiceController.MachineName);
@@ -193,7 +193,7 @@ namespace System.ServiceProcess.Tests
         }
 
         [ConditionalFact(nameof(IsProcessElevated))]
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full Framework receives the Connected Byte Code after the Exception Thrown Byte Code")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework receives the Connected Byte Code after the Exception Thrown Byte Code")]
         public void PropagateExceptionFromOnStart()
         {
             string serviceName = nameof(PropagateExceptionFromOnStart) + Guid.NewGuid().ToString();
index 61bcede66ce55dcd11c56c7c4ccbc7e7e74e8401..02bdceaba6b590f54b42a9784bee1cb44e2ba5bd 100644 (file)
@@ -102,14 +102,14 @@ namespace System.ServiceProcess.Tests
                 testServiceInstaller.ServicesDependedOn = new string[] { _dependentServices.TestServiceName };
             }
 
-            var comparer = PlatformDetection.IsFullFramework ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; // Full framework upper cases the name
+            var comparer = PlatformDetection.IsNetFramework ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; // .NET Framework upper cases the name
             string processName = Process.GetCurrentProcess().MainModule.FileName;
             string entryPointName = typeof(TestService).Assembly.Location;
             string arguments = TestServiceName;
 
             // if process and entry point aren't the same then we are running hosted so pass
             // in the entrypoint as the first argument
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 arguments = $"\"{entryPointName}\" {arguments}";
             }
index 728e419e92c76cd2e7cbda2e2b44e5e7d9c1a539..285a5591b42ccd5acd7956700d4cff7b1cd7c0ca 100644 (file)
@@ -468,7 +468,7 @@ namespace System.Text.Tests
 
             if (defaultEncoding.CodePage == Encoding.UTF8.CodePage)
             {
-                // if the default encoding is not UTF8 that means either we are running on the full framework
+                // if the default encoding is not UTF8 that means either we are running on the .NET Framework
                 // or the encoding provider is registered throw the call Encoding.RegisterProvider.
                 // at that time we shouldn't expect exceptions when creating the following encodings.
                 foreach (object[] mapping in CodePageInfo())
index a0b2bc03efc4b213c70eb3a151adc10889508137..1af8f593ed003b13516f064da7ba13639c56455f 100644 (file)
@@ -1581,7 +1581,7 @@ namespace System.Text.Json.Tests
 
                 Assert.Equal(JsonValueKind.Number, root.ValueKind);
 
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     Assert.False(root.TryGetSingle(out float floatVal));
                     Assert.Equal(0f, floatVal);
@@ -1625,7 +1625,7 @@ namespace System.Text.Json.Tests
                 Assert.False(root.TryGetUInt64(out ulong ulongVal));
                 Assert.Equal(0UL, ulongVal);
 
-                if (PlatformDetection.IsFullFramework)
+                if (PlatformDetection.IsNetFramework)
                 {
                     Assert.Throws<FormatException>(() => root.GetSingle());
                     Assert.Throws<FormatException>(() => root.GetDouble());
index 5db03295f9a33ce5698a3801fbe73c159b85f6b4..cad8d74cc7aa756701186f9135cbc7a296a84b63 100644 (file)
@@ -489,9 +489,9 @@ namespace System.Text.Json.Tests
 
             jsonNumber = new JsonNumber(double.MaxValue);
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
-                // Full framework throws for overflow rather than returning Infinity 
+                // .NET Framework throws for overflow rather than returning Infinity 
                 // This was fixed for .NET Core 3.0 in order to be IEEE 754 compliant 
                 Assert.Throws<OverflowException>(() => jsonNumber.GetSingle());
                 // Getting double fails as well
@@ -505,7 +505,7 @@ namespace System.Text.Json.Tests
 
             jsonNumber = new JsonNumber("5e500");
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<OverflowException>(() => jsonNumber.GetSingle());
                 Assert.Throws<OverflowException>(() => jsonNumber.GetDouble());
index d7661f12b096d823f821cfe5a87db4fcc4b4426a..030c464e42b92abcbf994b4341576f10d7637942 100644 (file)
@@ -343,7 +343,7 @@ namespace System.Text.Json.Serialization.Tests
 
         private static void AssertFloatingPointBehavior<T>(T netcoreExpectedValue, Func<T> testCode)
         {
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<JsonException>(() => testCode());
             }
@@ -355,7 +355,7 @@ namespace System.Text.Json.Serialization.Tests
 
         private static void AssertFloatingPointBehavior<T>(T netfxExpectedValue, T netcoreExpectedValue, Func<T> testCode)
         {
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Equal(netfxExpectedValue, testCode());
             }
index 66f4e7ceaa7d5fa8c2cb1c415a0b3d803544d03c..663054befd34cd00e04d25df9b0e995c8740db07 100644 (file)
@@ -609,9 +609,9 @@ namespace System.Text.Json.Tests
             {
                 if (json.TokenType == JsonTokenType.Number)
                 {
-                    if (PlatformDetection.IsFullFramework)
+                    if (PlatformDetection.IsNetFramework)
                     {
-                        // Full framework throws for overflow rather than returning Infinity
+                        // .NET Framework throws for overflow rather than returning Infinity
                         // This was fixed for .NET Core 3.0 in order to be IEEE 754 compliant
 
                         Assert.False(json.TryGetSingle(out float _));
@@ -655,9 +655,9 @@ namespace System.Text.Json.Tests
             {
                 if (json.TokenType == JsonTokenType.Number)
                 {
-                    if (PlatformDetection.IsFullFramework)
+                    if (PlatformDetection.IsNetFramework)
                     {
-                        // Full framework throws for overflow rather than returning Infinity
+                        // .NET Framework throws for overflow rather than returning Infinity
                         // This was fixed for .NET Core 3.0 in order to be IEEE 754 compliant
 
                         Assert.False(json.TryGetDouble(out double _));
index 2c9c343b53bf2dde005dbbb7615505106b1e2258..fb18924d0fa7a872c743b5c830cca4013c4c7e90 100644 (file)
@@ -396,7 +396,7 @@ namespace System.Text.RegularExpressions.Tests
             yield return new object[] { null, @"(cat)(\cZ*)(dog)", "asdlkcat\u001adogiwod", RegexOptions.None, new string[] { "cat\u001adog", "cat", "\u001a", "dog" } };
             yield return new object[] { null, @"(cat)(\cz*)(dog)", "asdlkcat\u001adogiwod", RegexOptions.None, new string[] { "cat\u001adog", "cat", "\u001a", "dog" } };
 
-            if (!PlatformDetection.IsFullFramework) // missing fix for https://github.com/dotnet/corefx/issues/26501
+            if (!PlatformDetection.IsNetFramework) // missing fix for https://github.com/dotnet/corefx/issues/26501
             {
                 yield return new object[] { null, @"(cat)(\c[*)(dog)", "asdlkcat\u001bdogiwod", RegexOptions.None, new string[] { "cat\u001bdog", "cat", "\u001b", "dog" } };
                 yield return new object[] { null, @"(cat)(\c[*)(dog)", "asdlkcat\u001Bdogiwod", RegexOptions.None, new string[] { "cat\u001Bdog", "cat", "\u001B", "dog" } };
index a9f86a4a5c42cfe16cd5b61313541f064658db3c..7aef3f1139db608c1d453f29f67768a5d9a68097 100644 (file)
@@ -323,7 +323,7 @@ namespace System.Text.RegularExpressions.Tests
             yield return new object[] { @"[a-[a-f]]", "abcdefghijklmnopqrstuvwxyz", RegexOptions.None, 0, 26, false, string.Empty };
 
             // \c
-            if (!PlatformDetection.IsFullFramework) // missing fix for https://github.com/dotnet/corefx/issues/26501
+            if (!PlatformDetection.IsNetFramework) // missing fix for https://github.com/dotnet/corefx/issues/26501
             {
                 yield return new object[] { @"(cat)(\c[*)(dog)", "asdlkcat\u00FFdogiwod", RegexOptions.None, 0, 15, false, string.Empty };
             }
@@ -884,7 +884,7 @@ namespace System.Text.RegularExpressions.Tests
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotArmProcess))] // times out on ARM
-        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Full framework needs fix for https://github.com/dotnet/corefx/issues/26484")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have fix for https://github.com/dotnet/corefx/issues/26484")]
         [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeStressTestModes.JitMinOpts)]
         public void Match_ExcessPrefix()
         {
index 783c149e6acd41a70b863eff83fe4c297c451a9f..90c422506065a8d49cbeda9aadf2299455502610 100644 (file)
@@ -179,7 +179,7 @@ namespace System.Text.RegularExpressions.Tests
                 }
             };
 
-            if (!PlatformDetection.IsFullFramework) // missing fix in https://github.com/dotnet/runtime/pull/993
+            if (!PlatformDetection.IsNetFramework) // missing fix in https://github.com/dotnet/runtime/pull/993
             {
                 yield return new object[]
                 {
index b40e5496d7bbc89c42d4859440daf4a6bf8c0574..6c1f4c53691223b134d85016ddf36187eb3769e3 100644 (file)
@@ -17,7 +17,7 @@ namespace System.Text.RegularExpressions.Tests
 
         static RegexParserTests()
         {
-            if (!PlatformDetection.IsFullFramework)
+            if (!PlatformDetection.IsNetFramework)
             {
                 s_parseExceptionType = typeof(Regex).Assembly.GetType("System.Text.RegularExpressions.RegexParseException", true);
                 s_parseErrorField = s_parseExceptionType.GetField("_error", BindingFlags.NonPublic | BindingFlags.Instance);
@@ -879,9 +879,9 @@ namespace System.Text.RegularExpressions.Tests
         /// <param name="action">The action to invoke.</param>
         private static void Throws(RegexParseError error, Action action)
         {
-            // If no specific error is supplied, or we are running on full framework where RegexParseException
+            // If no specific error is supplied, or we are running on .NET Framework where RegexParseException doesn't exist
             // we expect an ArgumentException.
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.ThrowsAny<ArgumentException>(action);
                 return;
index 810c14c523a4cb145b5f5569a97fe3161467c1f9..278b445241b1e0befbba3307cfe99f3de9e54b94 100644 (file)
@@ -98,7 +98,7 @@ namespace System.Threading.Tests
             EventWaitHandleSecurity security = GetBasicEventWaitHandleSecurity();
             EventResetMode mode = EventResetMode.AutoReset;
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<ArgumentException>(() =>
                 {
@@ -131,7 +131,7 @@ namespace System.Threading.Tests
         [InlineData((EventResetMode)int.MaxValue)]
         public void EventWaitHandle_Create_InvalidMode(EventResetMode mode)
         {
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<ArgumentException>(() =>
                 {
index c1f9c429039b9a5f686afc75c993f9fac80963c4..281fe57dcbb36790b051085fddcfe34a25e4546d 100644 (file)
@@ -45,7 +45,7 @@ namespace System.Threading.Tests
             // GetRandomName prevents name collision when two tests run at the same time
             string name = GetRandomName() + new string('x', Interop.Kernel32.MAX_PATH);
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<ArgumentException>(() =>
                 {
index 5959353b2e12c1d8e2b7cbad804ef265a5bd7e63..f86a6830476401c3f16910387b2fc4cc9a97a6f1 100644 (file)
@@ -93,7 +93,7 @@ namespace System.Threading.Tests
             // GetRandomName prevents name collision when two tests run at the same time
             string name = GetRandomName() + new string('x', Interop.Kernel32.MAX_PATH);
 
-            if (PlatformDetection.IsFullFramework)
+            if (PlatformDetection.IsNetFramework)
             {
                 Assert.Throws<ArgumentException>(() =>
                 {
index d0d0ec58cea5cde7033f5f0419f18e51b62fd26f..5a16ca25169852fe97bedc14cfeb014de1a9ca2b 100644 (file)
@@ -121,7 +121,7 @@ namespace System.Threading.ThreadPools.Tests
                 VerifyMaxThreads(MaxPossibleThreadCount, MaxPossibleThreadCount);
                 Assert.True(ThreadPool.SetMaxThreads(MaxPossibleThreadCount + 1, MaxPossibleThreadCount + 1));
                 VerifyMaxThreads(MaxPossibleThreadCount, MaxPossibleThreadCount);
-                Assert.Equal(PlatformDetection.IsFullFramework, ThreadPool.SetMaxThreads(-1, -1));
+                Assert.Equal(PlatformDetection.IsNetFramework, ThreadPool.SetMaxThreads(-1, -1));
                 VerifyMaxThreads(MaxPossibleThreadCount, MaxPossibleThreadCount);
 
                 Assert.True(ThreadPool.SetMinThreads(MaxPossibleThreadCount, MaxPossibleThreadCount));
@@ -149,7 +149,6 @@ namespace System.Threading.ThreadPools.Tests
         }
 
         [Fact]
-        // Desktop framework doesn't check for this and instead, hits an assertion failure
         [SkipOnTargetFramework(TargetFrameworkMonikers.Mono)]
         public static void SetMinMaxThreadsTest_ChangedInDotNetCore()
         {
@@ -353,7 +352,7 @@ namespace System.Threading.ThreadPools.Tests
                 ThreadPool.RegisterWaitForSingleObject(waitHandle, callback, null, -2, true));
             AssertExtensions.Throws<ArgumentOutOfRangeException>("millisecondsTimeOutInterval", () =>
                 ThreadPool.RegisterWaitForSingleObject(waitHandle, callback, null, (long)-2, true));
-            if (!PlatformDetection.IsFullFramework) // .NET Framework silently overflows the timeout
+            if (!PlatformDetection.IsNetFramework) // .NET Framework silently overflows the timeout
             {
                 AssertExtensions.Throws<ArgumentOutOfRangeException>("millisecondsTimeOutInterval", () =>
                     ThreadPool.RegisterWaitForSingleObject(waitHandle, callback, null, (long)int.MaxValue + 1, true));
@@ -374,7 +373,7 @@ namespace System.Threading.ThreadPools.Tests
                 ThreadPool.UnsafeRegisterWaitForSingleObject(waitHandle, callback, null, -2, true));
             AssertExtensions.Throws<ArgumentOutOfRangeException>("millisecondsTimeOutInterval", () =>
                 ThreadPool.UnsafeRegisterWaitForSingleObject(waitHandle, callback, null, (long)-2, true));
-            if (!PlatformDetection.IsFullFramework) // .NET Framework silently overflows the timeout
+            if (!PlatformDetection.IsNetFramework) // .NET Framework silently overflows the timeout
             {
                 AssertExtensions.Throws<ArgumentOutOfRangeException>("millisecondsTimeOutInterval", () =>
                     ThreadPool.UnsafeRegisterWaitForSingleObject(waitHandle, callback, null, (long)int.MaxValue + 1, true));
index b7ee4126aa5d077323928e6bd6a0aa2d4ce67888..7c3d7c543e835aa07378ec1671e0f53051c964b3 100644 (file)
@@ -6,8 +6,8 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <!-- For full framework we reference these package which has the same layout as the SDK, with this package,
-    tests can run in any machine without having to install full framework. -->
+    <!-- For .NET Framework we reference this package which has the same layout as the SDK, with this package,
+    tests can run in any machine without having to install .NET Framework. -->
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" />
 
     <!-- these are part of the targeting pack but not actual assemblies -->
@@ -39,4 +39,4 @@
       <Reference Include="@(_allFrameworkReferences->'%(FileName)')" Exclude="@(ExcludeReference)" />
     </ItemGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>