Rebased version of CoreFX renames (#1941)
authorErhan Atesoglu <47518605+eanova@users.noreply.github.com>
Wed, 22 Jan 2020 04:05:51 +0000 (20:05 -0800)
committerJan Kotas <jkotas@microsoft.com>
Wed, 22 Jan 2020 04:05:51 +0000 (20:05 -0800)
* FinalCoreFXRenames

The last of the CoreFX renames.

* Update DirectorySearcher.cs

Fixed typo in DirectorySearcher.cs

* Update TestClasses.SimpleTestClassWithObjectArrays.cs

This fixes the expected value of the tests to runtime, instead of corefx.

* Update PersistedFiles.Names.Unix.cs

Adds a note to not update the corefx reference.

43 files changed:
src/libraries/Common/tests/StaticTestGenerator/Program.cs
src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/ApplicationSettingsBase.cs
src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/Internal/WriteFileContext.cs
src/libraries/System.Configuration.ConfigurationManager/src/System/Configuration/TypeUtil.cs
src/libraries/System.Data.Odbc/src/DatabaseSetupInstructions.md
src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectoryEntry.cs
src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
src/libraries/System.Drawing.Primitives/tests/ColorTests.cs
src/libraries/System.IO.FileSystem/tests/Directory/CreateDirectory.cs
src/libraries/System.IO.FileSystem/tests/File/Exists.cs
src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/Helper.Win32Unix.cs
src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFile.cs
src/libraries/System.IO.IsolatedStorage/src/System/IO/IsolatedStorage/IsolatedStorageFileStream.cs
src/libraries/System.IO.IsolatedStorage/tests/System/IO/IsolatedStorage/TestHelper.cs
src/libraries/System.IO.Packaging/src/System/IO/Packaging/PackagingUtilities.cs
src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/ExpressionStringBuilder.cs
src/libraries/System.Management/src/System/Management/WMIGenerator.cs
src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs
src/libraries/System.Net.Security/src/System/Net/Security/NegotiateStreamPal.Windows.cs
src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Windows.cs
src/libraries/System.Net.Security/src/System/Security/Authentication/ExtendedProtection/ExtendedProtectionPolicy.cs
src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketFlags.cs
src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/WebSocket.cs
src/libraries/System.Private.CoreLib/src/System/IO/PersistedFiles.Names.Unix.cs
src/libraries/System.Private.CoreLib/src/System/Number.BigInteger.cs
src/libraries/System.Private.CoreLib/src/System/Reflection/AssemblyName.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/Encoding/BlobEncoders.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataBuilder.Tables.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/Document.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/ImportScope.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/LocalConstant.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/LocalScope.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/LocalVariable.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PortablePdb/MethodDebugInformation.cs
src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/DebugDirectory/DebugDirectoryEntryType.cs
src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs
src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs
src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/HandleCollectorTests.cs
src/libraries/System.Runtime/tests/System/HashCodeTests.cs
src/libraries/System.Text.Encoding.CodePages/tests/EncodingCodePages.cs
src/libraries/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClass.cs
src/libraries/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClassWithObjectArrays.cs
src/libraries/System.Utf8String.Experimental/README.md

index a3d6b723615e91737b4d31075de8034bd7036b39..6ab713b8c62b92eb0266ed80ce9be4df6c3fab4c 100644 (file)
@@ -33,7 +33,7 @@ namespace StaticTestGenerator
             }
 
             // Set up an assembly resolving event handler to help locate helper assemblies that are needed
-            // to process the test assembly, such as xunit assemblies and corefx test helpers.
+            // to process the test assembly, such as xunit assemblies and .NET Core test helpers.
             string[] probingPaths = new[] { Path.GetDirectoryName(testAssemblyPath), runtimeAssembliesPath, outputPath, AppContext.BaseDirectory };
             AppDomain.CurrentDomain.AssemblyResolve += (object sender, ResolveEventArgs args) =>
             {
@@ -212,7 +212,7 @@ namespace StaticTestGenerator
         /// <summary>Parse the command-line.</summary>
         /// <param name="args">The arguments passed to Main.</param>
         /// <param name="testAssemblyPath">The location of the xunit test assembly to be analyzed. The resulting .cs file will call into this assembly.</param>
-        /// <param name="runtimeAssembliesPath">The directory containing all of the helper assemblies needed, e.g. xunit's assemblies, corefx utility assemblies, etc.</param>
+        /// <param name="runtimeAssembliesPath">The directory containing all of the helper assemblies needed, e.g. xunit's assemblies, .NET Core utility assemblies, etc.</param>
         /// <param name="outputPath">The directory into which the resulting project should be written.</param>
         /// <param name="xunitCommandLine">The xunit command-line object to pass to xunit test discovery.</param>
         /// <returns></returns>
@@ -274,7 +274,7 @@ namespace StaticTestGenerator
             // Invalid command line arguments.
             Console.WriteLine("Usage: <output_directory> <helper_assemblies_directory> <test_assembly_path> <xunit_console_options>");
             Console.WriteLine("    Example:");
-            Console.WriteLine(@"   dotnet run d:\tmpoutput d:\repos\corefx\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\$(ProductVersion) d:\repos\corefx\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll");
+            Console.WriteLine(@"   dotnet run d:\tmpoutput d:\repos\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\$(ProductVersion) d:\repos\runtime\artifacts\bin\System.Runtime.Tests\netcoreapp5.0-Windows_NT-Debug\System.Runtime.Tests.dll");
             testAssemblyPath = string.Empty;
             runtimeAssembliesPath = string.Empty;
             outputPath = string.Empty;
index 376482ca501d7d85a7b42397ceeffe16a60c8bc1..64b519b7d5503bb6f98e9a2689f709ac61e5c6bc 100644 (file)
@@ -751,7 +751,7 @@ namespace System.Configuration
         /// </summary>
         private bool IsFirstRunOfClickOnceApp()
         {
-            // Never ClickOnce app in CoreFX
+            // Always false for .NET Core
             return false;
         }
 
@@ -760,7 +760,7 @@ namespace System.Configuration
         /// </summary>
         internal static bool IsClickOnceDeployed(AppDomain appDomain)
         {
-            // Never ClickOnce app in CoreFX
+            // Always false for .NET Core
             return false;
         }
 
index 04996bb7d439f56d67115ae90fda9613bcd51c81..74436f5ec835743fbbe83fff5486c4f0bbec514d 100644 (file)
@@ -5,9 +5,9 @@
 using System.IO;
 using System.Threading;
 
-// The CODEDOM check is here to support frameworks that may not have fully
-// incorporated all of corefx, but want to use System.Configuration.ConfigurationManager.
-// TempFileCollection was moved in corefx.
+// The CODEDOM check is here to support versions of the framework that may not have fully
+// incorporated all of .NET Core, but want to use System.Configuration.ConfigurationManager.
+// TempFileCollection was moved around in .NET Core.
 #if CODEDOM
 using System.CodeDom.Compiler;
 #else
index 6a24a6edcf9623576a2b000e3215a3c7f4851f52..08fb527ff840363930519d0b0d5231e3b98fd84a 100644 (file)
@@ -45,7 +45,7 @@ namespace System.Configuration
             // they lived in System.dll.
             //
             // On .NET Framework we would try to emulate that behavior by looking in
-            // System. As types have moved around in CoreFX- we'll try to load
+            // System. As types have moved around in .NET Core, we'll try to load
             // from the a variety of assemblies to mimick the old behavior.
 
             // Don't bother to look around if we've already got something that
index bed49dbea92ffc8e600ec0673dc068774c1fe7f5..72a2dc7a503ba41b253e4f1d36bcedd35c0e18f8 100644 (file)
@@ -3,7 +3,7 @@
 ## In Fedora 24 container:
 - `docker ps` shows _id of existing Fedora 24 container
 - `docker exec -it _id /bin/sh`
-- `dnf install findutils` need to install findutils for building corefx to add missing xargs
+- `dnf install findutils` need to install findutils for building libraries to add missing xargs
 - `find / -name libsqlite3odbc.so` to be used in odbcinst.ini
 - `odbcinst -j` to show version and location of ini files
 - `ldconfig -p | grep sqlite`
index f1af856aa7916ffa6533f395eed6011352fdf001..af515111e827d07eea739e446d2b096a6c9b339d 100644 (file)
@@ -332,11 +332,7 @@ namespace System.DirectoryServices
         /// <devdoc>
         /// Gets or sets the path for this <see cref='System.DirectoryServices.DirectoryEntry'/>.
         /// </devdoc>
-        [
-            DefaultValue(""),
-            // CoreFXPort - Remove design support
-            // TypeConverter("System.Diagnostics.Design.StringValueConverter, " + AssemblyRef.SystemDesign)
-        ]
+        [DefaultValue("")]
         public string Path
         {
             get => _path;
@@ -427,11 +423,7 @@ namespace System.DirectoryServices
         /// <devdoc>
         /// Gets or sets the username to use when authenticating the client.
         /// </devdoc>
-        [
-            DefaultValue(null),
-            // CoreFXPort - Remove design support
-            // TypeConverter("System.Diagnostics.Design.StringValueConverter, " + AssemblyRef.SystemDesign)
-        ]
+        [DefaultValue(null)]
         public string Username
         {
             get
index 117aab649d0936582342f03a19d8bd60fb900208..e8cb80aae59894e56eef241d821409edcd06b2cb 100644 (file)
@@ -195,11 +195,7 @@ namespace System.DirectoryServices
         /// <devdoc>
         /// Gets or sets the Lightweight Directory Access Protocol (LDAP) filter string format.
         /// </devdoc>
-        [
-            DefaultValue(defaultFilter),
-            // CoreFXPort - Remove design support
-            // TypeConverter("System.Diagnostics.Design.StringValueConverter, " + AssemblyRef.SystemDesign)
-        ]
+        [DefaultValue(defaultFilter)]
         public string Filter
         {
             get => _filter;
@@ -408,11 +404,7 @@ namespace System.DirectoryServices
         /// Gets or sets an attribute name to indicate that an attribute-scoped query search should be
         /// performed.
         /// </devdoc>
-        [
-            DefaultValue(""),
-            // CoreFXPort - Remove design support
-            // TypeConverter("System.Diagnostics.Design.StringValueConverter, " + AssemblyRef.SystemDesign)
-        ]
+        [DefaultValue("")]
         public string AttributeScopeQuery
         {
             get => _attributeScopeQuery;
index 7c05311d426b49b8c35eff3844a9464c0aa831af..989a09c77ca0d093087014bec927511c74261fa9 100644 (file)
@@ -623,7 +623,8 @@ namespace System.Drawing.Primitives.Tests
         [Fact]
         public void GetHashCodeForUnknownNamed()
         {
-            // .NET Framework gives all such colors the same hash code. CoreFX makes more effort with them.
+            // The .NET Framework gives all unknown colors the same hashcode,
+            // .NET Core will provide a unique hashcode.
             Color c1 = Color.FromName("SomeUnknownColorName");
             Color c2 = Color.FromName("AnotherUnknownColorName");
             Assert.NotEqual(c2.GetHashCode(), c1.GetHashCode());
index 8a37b2a10c36e1710d3128ff8cb20b792a1a1df1..a7b9c5c8e0e67be5035023d8e1a27e6332364efd 100644 (file)
@@ -343,7 +343,7 @@ namespace System.IO.Tests
         [PlatformSpecific(TestPlatforms.Windows)]  // trailing whitespace in path is removed on Windows
         public void TrailingWhiteSpace_NotTrimmed(string component)
         {
-            // In CoreFX we don't trim anything other than space (' ')
+            // In .NET Core we don't trim anything other than space (' ')
             DirectoryInfo testDir = Create(GetTestFilePath() + component);
             string path = IOServices.RemoveTrailingSlash(testDir.FullName);
             DirectoryInfo result = Create(path);
index 6eb45ad2db3b4368a82ba01d5e67f96d7d5fb424..c1e4a0d414265ac9da9c48de009e6a8e2db342be 100644 (file)
@@ -194,7 +194,7 @@ namespace System.IO.Tests
         [PlatformSpecific(TestPlatforms.Windows)]
         public void TrailingWhiteSpace_NotTrimmed(string component)
         {
-            // In CoreFX we don't trim anything other than space (' ')
+            // In .NET Core we don't trim anything other than space (' ')
             string path = GetTestFilePath() + component;
             FileInfo testFile = new FileInfo(path);
             testFile.Create().Dispose();
index 54be6440d0ff50fc2b51ca2b149617c836dfb102..15e0e913a96f8c6eb5aed3a6091598b1946fcdff 100644 (file)
@@ -30,7 +30,7 @@ namespace System.IO.IsolatedStorage
 
         internal static void GetDefaultIdentityAndHash(out object identity, out string hash, char separator)
         {
-            // .NET Framework IsolatedStorage uses identity from System.Security.Policy.Evidence to build
+            // In .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)
@@ -43,7 +43,7 @@ namespace System.IO.IsolatedStorage
             // 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
+            // Note that it is possible that there won't be an EntryAssembly, which is something the .NET Framework doesn't
             // 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 fa13df9c1b78f9861fbcb710b2ba182f8c70acd5..3bef2d8824bdac7ae9ee73dfcbff7c92965ca26f 100644 (file)
@@ -30,7 +30,7 @@ namespace System.IO.IsolatedStorage
         // private const string IDFile = "identity.dat";
 
         // "info.dat" is used to track disk space usage (against quota). The accounting file for Silverlight
-        // stores is "appInfo.dat". CoreFX is always in full trust so we can safely ignore these.
+        // stores is "appInfo.dat". .NET Core is always in full trust so we can safely ignore these.
         //
         // private const string InfoFile = "info.dat";
         // private const string AppInfoFile = "appInfo.dat";
@@ -472,12 +472,12 @@ namespace System.IO.IsolatedStorage
             // Not currently supported: https://github.com/dotnet/corefx/issues/10936
 
             // Implementing this would require serializing/deserializing identity objects which is particularly
-            // complicated given the normal identity objects used by .NET Framework aren't available on CoreFX.
+            // complicated given the normal identity objects used by .NET Framework aren't available on .NET Core.
             //
             // Starting expectation is that a given store's location would be identical between implementations
-            // (say, for a particular StrongName). You could iterate any store opened at least once by .NET Framework on
-            // .NET Framework as it would create the needed identity file. You wouldn't be able to iterate if it was only
-            // ever opened by CoreFX, as the needed file isn't there yet.
+            // (say, for a particular StrongName). You could iterate any store opened at least once by the .NET Framework
+            // at run time as it would create the needed identity file. You wouldn't be able to iterate if it was only
+            // ever opened by .NET Core, as the needed file isn't there yet.
             return new IsolatedStorageFileEnumerator();
         }
 
@@ -827,9 +827,8 @@ namespace System.IO.IsolatedStorage
                 return false;
 
             // Check if we have unknown files
-
-            // Note that we don't generate these files in CoreFX, but we want to match
-            // .NET Framework removal semantics as .NET Framework will generate these.
+            // Note that we don't generate these files in .NET Core, but we want to match
+            // the removal semantics generated by the .NET Framework.
 
             if (Helper.IsRoaming(Scope))
                 return ((files.Length > 1) || !IsIdFile(files[0]));
index ffdddc81f7b01c598e5e4c7ae7796a1f336edcc8..829c32d9bde1a47de07d68263d476cd06a25cd43 100644 (file)
@@ -59,7 +59,7 @@ namespace System.IO.IsolatedStorage
         }
 
         // On .NET Framework FileStream has an internal no arg constructor that we utilize to provide the facade. We don't have access
-        // to internals in CoreFX so we'll do the next best thing and contort ourselves into the SafeFileHandle constructor.
+        // to internals in .NET Core so we'll do the next best thing and contort ourselves into the SafeFileHandle constructor.
         // (A path constructor would try and create the requested file and give us two open handles.)
         //
         // We only expose our own nested FileStream so the base class having a handle doesn't matter. Passing a new SafeFileHandle
index 103c4ab468602ffcbc22e3a57c3e4ae14bc64f37..78ac0acdf9e4a3ec7574b1fcf31f15f13992bc11 100644 (file)
@@ -49,7 +49,7 @@ namespace System.IO.IsolatedStorage
         /// </summary>
         public static string GetUserRootDirectory(this IsolatedStorageFile isf)
         {
-            // CoreFX and .NET Framework use the same internal property
+            // .NET Core and .NET Framework use the same internal property
             return (string)s_rootDirectoryProperty.GetValue(isf);
         }
 
index 5782d73371523b7ddfe7e0a80f2ad93e57162b35..4215445a9f6dd56cbc1aa9208a8ba3de9fa453f7 100644 (file)
@@ -60,7 +60,7 @@ namespace System.IO.Packaging
             //is not present, we base our decision on byte order marking. Previously, reader was an XmlTextReader, which would
             //take that into account and return the correct value.
 
-            //However, we can't use XmlTextReader, as it is not in COREFX.  Therefore, if there is no XmlDeclaration, or the encoding
+            //However, we can't use XmlTextReader, as it is not in the libraries.  Therefore, if there is no XmlDeclaration, or the encoding
             //attribute is not set, then we will throw now exception, and UTF-8 will be assumed.
 
             //TODO: in the future, we can do the work to detect the BOM, and throw an exception if the file is in an invalid encoding.
index f11748cc8ee4449674c31de70f994439f33f23eb..6abb20cd619578abf96958a60d06f16ec63c8dcb 100644 (file)
@@ -257,7 +257,7 @@ namespace System.Linq.Expressions
                         break;
                     case ExpressionType.Power:
                         op = "**";
-                        break; // This was changed in CoreFx from ^ to **
+                        break; // This was changed in .NET Core from ^ to **
                     case ExpressionType.PowerAssign:
                         op = "**=";
                         break;
@@ -660,7 +660,7 @@ namespace System.Linq.Expressions
                 case ExpressionType.ConvertChecked:
                     Out(", ");
                     Out(node.Type.Name);
-                    Out(')'); break; // These were changed in CoreFx to add the type name
+                    Out(')'); break; // These were changed in .NET Core to add the type name
                 case ExpressionType.PostIncrementAssign: Out("++"); break;
                 case ExpressionType.PostDecrementAssign: Out("--"); break;
                 default: Out(')'); break;
index 480215281145ec2cd7b6b19219082a636527a4a0..b9527392d5ab8a9d63ae8be71dbd30a146291411 100644 (file)
@@ -4837,7 +4837,7 @@ namespace System.Management
 
                     case CodeLanguage.JScript:
                         strProvider = "JScript.NET.";
-                        bSucceeded = false; // JScriptCodeProvider does not exist on CoreFx
+                        bSucceeded = false; // JScriptCodeProvider does not exist on .NET Core
                         break;
 
                     case CodeLanguage.CSharp:
index 8a5963790152e2a7ef9d43a598e6a3c5beb885a9..dcef588f4df0b375814d90a58cc9d532e918e5d1 100644 (file)
@@ -713,7 +713,7 @@ namespace System.Net.Tests
         [Fact]
         public void ConnectionGroupName_SetAndGetGroup_ValuesMatch()
         {
-            // Note: In CoreFX changing this value will not have any effect on HTTP stack's behavior.
+            // Note: In .NET Core changing this value will not have any effect on HTTP stack's behavior.
             //       For app-compat reasons we allow applications to alter and read the property.
             HttpWebRequest request = WebRequest.CreateHttp("http://test");
             Assert.Null(request.ConnectionGroupName);
@@ -1029,7 +1029,7 @@ namespace System.Net.Tests
         [Fact]
         public void ReadWriteTimeout_SetThenGet_ValuesMatch()
         {
-            // Note: In CoreFX changing this value will not have any effect on HTTP stack's behavior.
+            // Note: In .NET Core changing this value will not have any effect on HTTP stack's behavior.
             //       For app-compat reasons we allow applications to alter and read the property.
             HttpWebRequest request = WebRequest.CreateHttp("http://test");
             request.ReadWriteTimeout = 5;
index e53f0fb43d19459dcc287e5f11116dc4d9489c92..5a7023a3607f74513d2ed4f0b9b0ae8caf619ff3 100644 (file)
@@ -49,7 +49,7 @@ namespace System.Net.Security
                     string authtype = context.ProtocolName;
 
                     // The following call was also specifying WindowsAccountType.Normal, true.
-                    // WindowsIdentity.IsAuthenticated is no longer supported in CoreFX.
+                    // WindowsIdentity.IsAuthenticated is no longer supported in .NET Core
                     result = new WindowsIdentity(token.DangerousGetHandle(), authtype);
                     return result;
                 }
index 2e4b77c0786c0a37a0a35920a00960ed2d9a9813..607836d38297b0d523dd001628cad05ca135ce45 100644 (file)
@@ -156,7 +156,7 @@ namespace System.Net.Security
                     Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_CRED_NO_DEFAULT_CREDS |
                     Interop.SspiCli.SCHANNEL_CRED.Flags.SCH_SEND_AUX_RECORD;
 
-                // CoreFX: always opt-in SCH_USE_STRONG_CRYPTO for TLS.
+                // .NET Core: always opt-in SCH_USE_STRONG_CRYPTO for TLS.
                 if (((protocolFlags == 0) ||
                         (protocolFlags & ~(Interop.SChannel.SP_PROT_SSL2 | Interop.SChannel.SP_PROT_SSL3)) != 0)
                      && (policy != EncryptionPolicy.AllowNoEncryption) && (policy != EncryptionPolicy.NoEncryption))
index fc93358936eb547d602baf38961109bfe29f58cf..e3f3019fe43cf211e634abb23182f27873f1aea2 100644 (file)
@@ -150,7 +150,7 @@ namespace System.Security.Authentication.ExtendedProtection
         {
             get
             {
-                // CoreFX is supported only on Win7+ where ExtendedProtection is supported.
+                // .NET Core is supported only on Win7+ where ExtendedProtection is supported.
                 return true;
             }
         }
index 213f9d832666940943aa7a4b5f93f5b462963880..16ab9a1b2c3aefd79420eb6f492554e3b0c9c359 100644 (file)
@@ -21,7 +21,7 @@ namespace System.Net.Sockets
         // Send without using routing tables.
         DontRoute = 0x0004,
 
-        // This is defined in the .NET Framework and isn't being ported to CoreFx
+        // This is defined in the .NET Framework and isn't being ported to .NET Core
         // since it is Windows specific. However, leave this enum value reserved
         // to prevent future numbering conflicts.
         // MaxIOVectorLength = 0x0010
index 0dc6f282d7626fe4f4c5d8dc87e495e645dca26d..16bcbca728e34cd711f7c94821768b5e8f442d76 100644 (file)
@@ -168,7 +168,7 @@ namespace System.Net.WebSockets
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static void RegisterPrefixes()
         {
-            // The current WebRequest implementation in corefx does not support upgrading
+            // The current WebRequest implementation in the libraries does not support upgrading
             // web socket connections.  For now, we throw.
             throw new PlatformNotSupportedException();
         }
index 8984f1aee32b7c850d26d4480a0fffdfd08978da..5d32c213fc87730bde51419d7501fd93daeab02d 100644 (file)
@@ -12,6 +12,8 @@ namespace System.IO
 
         internal const string TopLevelDirectory = "dotnet";
         internal const string TopLevelHiddenDirectory = "." + TopLevelDirectory;
+        // Do not update this corefx reference to libraries
+        // as we need to keep the original directory structure.
         internal const string SecondLevelDirectory = "corefx";
     }
 }
index 726973bbd9efc1dce7d056c2e0128fbd67fc01fe..185d386b1899110af3e0f6b0638f1f5e9a3545ca 100644 (file)
@@ -427,8 +427,8 @@ namespace System
 
             public static void DivRem(ref BigInteger lhs, ref BigInteger rhs, out BigInteger quo, out BigInteger rem)
             {
-                // This is modified from the CoreFX BigIntegerCalculator.DivRem.cs implementation:
-                // https://github.com/dotnet/corefx/blob/0bb106232745aedfc0d0c5a84ff2b244bf190317/src/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.DivRem.cs
+                // This is modified from the libraries BigIntegerCalculator.DivRem.cs implementation:
+                // https://github.com/dotnet/runtime/blob/master/src/libraries/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.DivRem.cs
 
                 Debug.Assert(!rhs.IsZero());
 
index 7b5f6f15222ba2dcabdb117a7db282d7a7368411..f1550fb43d52b9a73a511bd4acb6ff3ce6b235d9 100644 (file)
@@ -272,7 +272,7 @@ namespace System.Reflection
             return new string(dest, 0, position);
         }
 
-        // This implementation of EscapeString has been copied from System.Private.Uri from corefx repo
+        // This implementation of EscapeString has been copied from System.Private.Uri from the runtime repo
         // - forceX characters are always escaped if found
         // - rsvd character will remain unescaped
         //
index 17603431a8298ec087c3f81276ea1344a6488946..b04cf3f3e55588d29022ce5109d524857b184cfc 100644 (file)
@@ -916,7 +916,7 @@ namespace System.Reflection.Metadata.Ecma335
         public void Type(EntityHandle type, bool isValueType)
         {
             // Get the coded index before we start writing anything (might throw argument exception):
-            // Note: We don't allow TypeSpec as per https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/Ecma-335-Issues.md#proposed-specification-change
+            // Note: We don't allow TypeSpec as per https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/Ecma-335-Issues.md#proposed-specification-change
             int codedIndex = CodedIndex.TypeDefOrRef(type);
 
             ClassOrValue(isValueType);
@@ -979,7 +979,7 @@ namespace System.Reflection.Metadata.Ecma335
             }
 
             // Get the coded index before we start writing anything (might throw argument exception):
-            // Note: We don't allow TypeSpec as per https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/Ecma-335-Issues.md#proposed-specification-change
+            // Note: We don't allow TypeSpec as per https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/Ecma-335-Issues.md#proposed-specification-change
             int codedIndex = CodedIndex.TypeDefOrRef(genericType);
 
             Builder.WriteByte((byte)SignatureTypeCode.GenericTypeInstance);
index f19ccd90372421ec43ea1beb69e0002559c118f5..ce8084ae3b23bf81bed8bdac9161802d8ee792dc 100644 (file)
@@ -1208,19 +1208,17 @@ namespace System.Reflection.Metadata.Ecma335
         /// </summary>
         /// <param name="name">
         /// Document Name blob.
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#document-name-blob
         /// </param>
         /// <param name="hashAlgorithm">
         /// GUID of the hash algorithm used to calculate the value of <paramref name="hash"/>.
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#document-table-0x30 for common values.
         /// </param>
         /// <param name="hash">
         /// The hash of the document content.
         /// </param>
         /// <param name="language">
         /// GUID of the language.
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#document-table-0x30 for common values.
         /// </param>
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md
         public DocumentHandle AddDocument(BlobHandle name, GuidHandle hashAlgorithm, BlobHandle hash, GuidHandle language)
         {
             _documentTable.Add(new DocumentRow
@@ -1242,7 +1240,7 @@ namespace System.Reflection.Metadata.Ecma335
         /// </param>
         /// <param name="sequencePoints">
         /// Sequence Points blob, or nil if the method doesn't have sequence points.
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#sequence-points-blob.
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#sequence-points-blob.
         /// </param>
         public MethodDebugInformationHandle AddMethodDebugInformation(DocumentHandle document, BlobHandle sequencePoints)
         {
@@ -1318,7 +1316,7 @@ namespace System.Reflection.Metadata.Ecma335
         /// </summary>
         /// <param name="name">Name of the variable.</param>
         /// <param name="signature">
-        /// LocalConstantSig blob, see https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localconstantsig-blob.
+        /// LocalConstantSig blob, see https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localconstantsig-blob.
         /// </param>
         public LocalConstantHandle AddLocalConstant(StringHandle name, BlobHandle signature)
         {
@@ -1336,7 +1334,7 @@ namespace System.Reflection.Metadata.Ecma335
         /// </summary>
         /// <param name="parentScope">Parent scope handle.</param>
         /// <param name="imports">
-        /// Imports blob, see https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#imports-blob.
+        /// Imports blob, see https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#imports-blob.
         /// </param>
         public ImportScopeHandle AddImportScope(ImportScopeHandle parentScope, BlobHandle imports)
         {
index 5744a86706aea0d65f6c1d8a0d1f087bd284c4d3..4ed57d86087683545679305385e4429c39fb8c10 100644 (file)
@@ -10,7 +10,7 @@ namespace System.Reflection.Metadata
     /// Source document in debug metadata.
     /// </summary>
     /// <remarks>
-    /// See also https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#document-table-0x30.
+    /// See also https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#document-table-0x30.
     /// </remarks>
     public readonly struct Document
     {
index bafb119490d6b65f29a3b921083235819e386158..5072b6d570ea6a2741ea66ceb4ce03f5dcdc79ca 100644 (file)
@@ -10,7 +10,7 @@ namespace System.Reflection.Metadata
     /// Lexical scope within which a group of imports are available. Stored in debug metadata.
     /// </summary>
     /// <remarks>
-    /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#importscope-table-0x35
+    /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#importscope-table-0x35
     /// </remarks>
     public readonly struct ImportScope
     {
index d989d84e17f933da1b925e868465eaab39572c32..c94b4bc3433d427cf3772a6d63dc32e384d5217f 100644 (file)
@@ -10,7 +10,7 @@ namespace System.Reflection.Metadata
     /// Local constant. Stored in debug metadata.
     /// </summary>
     /// <remarks>
-    /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localconstant-table-0x34.
+    /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localconstant-table-0x34.
     /// </remarks>
     public readonly struct LocalConstant
     {
index d9294ce51c94c5d331231c99f00f0ce3d47e524f..697a5c04497fe27f591559a247d3267a72530951 100644 (file)
@@ -10,7 +10,7 @@ namespace System.Reflection.Metadata
     /// Scope of local variables and constants. Stored in debug metadata.
     /// </summary>
     /// <remarks>
-    /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localscope-table-0x32.
+    /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localscope-table-0x32.
     /// </remarks>
     public readonly struct LocalScope
     {
index 0c96e8dd412da961b90187dd7280bb9b2ee27bfe..9b018d848b09e37ad980ce78f70f5d78fc5a42e5 100644 (file)
@@ -10,7 +10,7 @@ namespace System.Reflection.Metadata
     /// Local variable. Stored in debug metadata.
     /// </summary>
     /// <remarks>
-    /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localvariable-table-0x33.
+    /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#localvariable-table-0x33.
     /// </remarks>
     public readonly struct LocalVariable
     {
index 5adf6ce50ca1073314ba67245433ced35c4cd162..565f4519817441459397fb90a0b0557b4e6886f0 100644 (file)
@@ -10,7 +10,7 @@ namespace System.Reflection.Metadata
     /// Debug information associated with a method definition. Stored in debug metadata.
     /// </summary>
     /// <remarks>
-    /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#methoddebuginformation-table-0x31.
+    /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PortablePdb-Metadata.md#methoddebuginformation-table-0x31.
     /// </remarks>
     public readonly struct MethodDebugInformation
     {
index 80c6db2f7ae4d83f803cc021e08c1d756bb7d542..f0b2d0bef114d42b81cb1ad5db95d64fb56d897d 100644 (file)
@@ -21,7 +21,7 @@ namespace System.Reflection.PortableExecutable
         /// Associated PDB file description.
         /// </summary>
         /// <remarks>
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PE-COFF.md#codeview-debug-directory-entry-type-2 for specification.
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PE-COFF.md#codeview-debug-directory-entry-type-2 for specification.
         /// </remarks>
         CodeView = 2,
 
@@ -45,7 +45,7 @@ namespace System.Reflection.PortableExecutable
         /// The debug directory entry of type <see cref="Reproducible"/> must have all fields, except for Type zeroed.
         /// </para>
         /// <para>
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PE-COFF.md#deterministic-debug-directory-entry-type-16 for specification.
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PE-COFF.md#deterministic-debug-directory-entry-type-16 for specification.
         /// </para>
         /// </remarks>
         Reproducible = 16,
@@ -60,7 +60,7 @@ namespace System.Reflection.PortableExecutable
         ///
         /// Data spans the remainder of the blob and contains a Deflate-compressed Portable PDB.
         ///
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PE-COFF.md#embedded-portable-pdb-debug-directory-entry-type-17 for specification.
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PE-COFF.md#embedded-portable-pdb-debug-directory-entry-type-17 for specification.
         /// </remarks>
         EmbeddedPortablePdb = 17,
 
@@ -71,7 +71,7 @@ namespace System.Reflection.PortableExecutable
         /// The hash can be used to validate that a given PDB file was built with the PE/COFF file and not altered in any way.
         /// More than one entry can be present, in case multiple PDBs were produced during the build of the PE/COFF file (e.g. private and public symbols).
         ///
-        /// See https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Metadata/specs/PE-COFF.md#pdb-checksum-debug-directory-entry-type-19 for specification.
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Reflection.Metadata/specs/PE-COFF.md#pdb-checksum-debug-directory-entry-type-19 for specification.
         /// </remarks>
         PdbChecksum = 19,
     }
index e7db909cd9dc6e64473e77ae05e09f90cc4c89d1..987bda55a9664cd822c431dfac7afd776607b069 100644 (file)
@@ -147,7 +147,7 @@ namespace System.Reflection.TypeLoading
         {
             // @TODO - https://github.com/dotnet/corefxlab/issues/2447 - This is not the best way to compute the PKT as AssemblyName
             // throws if the PK isn't a valid PK blob. That's not something we should block a metadata inspection tool for so we
-            // should compute the PKT ourselves as soon as we can convince the CoreFx analyzers to let us use SHA1.
+            // should compute the PKT ourselves as soon as we can convince the libraries analyzers to let us use SHA1.
             AssemblyName an = new AssemblyName();
             an.SetPublicKey(pkt);
             return an.GetPublicKeyToken();
index 368caefc4e6a3312bfcd804591ee06dc83be2465..cad18255746cdbd9ebc099ef0c4830e2ccd3186f 100644 (file)
@@ -392,18 +392,18 @@ namespace System.IO.Tests
 
         public static TheoryData<string, string, string> GetFullPath_Windows_FullyQualified => new TheoryData<string, string, string>
         {
-            { @"C:\git\corefx", @"C:\git\corefx", @"C:\git\corefx" },
-            { @"C:\git\corefx.\.\.\.\.\.", @"C:\git\corefx", @"C:\git\corefx" },
-            { @"C:\git\corefx\\\.", @"C:\git\corefx", @"C:\git\corefx" },
-            { @"C:\git\corefx\..\corefx\.\..\corefx", @"C:\git\corefx", @"C:\git\corefx" },
-            { @"C:\somedir\..", @"C:\git\corefx", @"C:\" },
-            { @"C:\", @"C:\git\corefx", @"C:\" },
-            { @"..\..\..\..", @"C:\git\corefx", @"C:\" },
-            { @"C:\\\", @"C:\git\corefx", @"C:\" },
-            { @"C:\..\..\", @"C:\git\corefx", @"C:\" },
-            { @"C:\..\git\..\.\", @"C:\git\corefx", @"C:\" },
-            { @"C:\git\corefx\..\..\..\", @"C:\git\corefx", @"C:\" },
-            { @"C:\.\corefx\", @"C:\git\corefx", @"C:\corefx\" },
+            { @"C:\git\runtime", @"C:\git\runtime", @"C:\git\runtime" },
+            { @"C:\git\runtime.\.\.\.\.\.", @"C:\git\runtime", @"C:\git\runtime" },
+            { @"C:\git\runtime\\\.", @"C:\git\runtime", @"C:\git\runtime" },
+            { @"C:\git\runtime\..\runtime\.\..\runtime", @"C:\git\runtime", @"C:\git\runtime" },
+            { @"C:\somedir\..", @"C:\git\runtime", @"C:\" },
+            { @"C:\", @"C:\git\runtime", @"C:\" },
+            { @"..\..\..\..", @"C:\git\runtime", @"C:\" },
+            { @"C:\\\", @"C:\git\runtime", @"C:\" },
+            { @"C:\..\..\", @"C:\git\runtime", @"C:\" },
+            { @"C:\..\git\..\.\", @"C:\git\runtime", @"C:\" },
+            { @"C:\git\runtime\..\..\..\", @"C:\git\runtime", @"C:\" },
+            { @"C:\.\runtime\", @"C:\git\runtime", @"C:\runtime\" },
         };
 
         [Theory,
@@ -416,25 +416,25 @@ namespace System.IO.Tests
         public static TheoryData<string, string, string> GetFullPath_Windows_PathIsDevicePath => new TheoryData<string, string, string>
         {
             // Device Paths with \\?\ wont get normalized i.e. relative segments wont get removed.
-            { @"\\?\C:\git\corefx.\.\.\.\.\.", @"C:\git\corefx", @"\\?\C:\git\corefx.\.\.\.\.\." },
-            { @"\\?\C:\git\corefx\\\.", @"C:\git\corefx", @"\\?\C:\git\corefx\\\." },
-            { @"\\?\C:\git\corefx\..\corefx\.\..\corefx", @"C:\git\corefx", @"\\?\C:\git\corefx\..\corefx\.\..\corefx" },
-            { @"\\?\\somedir\..", @"C:\git\corefx", @"\\?\\somedir\.." },
-            { @"\\?\", @"C:\git\corefx", @"\\?\" },
-            { @"\\?\..\..\..\..", @"C:\git\corefx", @"\\?\..\..\..\.." },
-            { @"\\?\\\\" , @"C:\git\corefx", @"\\?\\\\" },
-            { @"\\?\C:\Foo." , @"C:\git\corefx", @"\\?\C:\Foo." },
-            { @"\\?\C:\Foo " , @"C:\git\corefx", @"\\?\C:\Foo " },
-
-            { @"\\.\C:\git\corefx.\.\.\.\.\.", @"C:\git\corefx", @"\\.\C:\git\corefx" },
-            { @"\\.\C:\git\corefx\\\.", @"C:\git\corefx", @"\\.\C:\git\corefx" },
-            { @"\\.\C:\git\corefx\..\corefx\.\..\corefx", @"C:\git\corefx", @"\\.\C:\git\corefx" },
-            { @"\\.\\somedir\..", @"C:\git\corefx", @"\\.\" },
-            { @"\\.\", @"C:\git\corefx", @"\\.\" },
-            { @"\\.\..\..\..\..", @"C:\git\corefx", @"\\.\" },
-            { @"\\.\", @"C:\git\corefx", @"\\.\" },
-            { @"\\.\C:\Foo." , @"C:\git\corefx", @"\\.\C:\Foo" },
-            { @"\\.\C:\Foo " , @"C:\git\corefx", @"\\.\C:\Foo" },
+            { @"\\?\C:\git\runtime.\.\.\.\.\.", @"C:\git\runtime", @"\\?\C:\git\runtime.\.\.\.\.\." },
+            { @"\\?\C:\git\runtime\\\.", @"C:\git\runtime", @"\\?\C:\git\runtime\\\." },
+            { @"\\?\C:\git\runtime\..\runtime\.\..\runtime", @"C:\git\runtime", @"\\?\C:\git\runtime\..\runtime\.\..\runtime" },
+            { @"\\?\\somedir\..", @"C:\git\runtime", @"\\?\\somedir\.." },
+            { @"\\?\", @"C:\git\runtime", @"\\?\" },
+            { @"\\?\..\..\..\..", @"C:\git\runtime", @"\\?\..\..\..\.." },
+            { @"\\?\\\\" , @"C:\git\runtime", @"\\?\\\\" },
+            { @"\\?\C:\Foo." , @"C:\git\runtime", @"\\?\C:\Foo." },
+            { @"\\?\C:\Foo " , @"C:\git\runtime", @"\\?\C:\Foo " },
+
+            { @"\\.\C:\git\runtime.\.\.\.\.\.", @"C:\git\runtime", @"\\.\C:\git\runtime" },
+            { @"\\.\C:\git\runtime\\\.", @"C:\git\runtime", @"\\.\C:\git\runtime" },
+            { @"\\.\C:\git\runtime\..\runtime\.\..\runtime", @"C:\git\runtime", @"\\.\C:\git\runtime" },
+            { @"\\.\\somedir\..", @"C:\git\runtime", @"\\.\" },
+            { @"\\.\", @"C:\git\runtime", @"\\.\" },
+            { @"\\.\..\..\..\..", @"C:\git\runtime", @"\\.\" },
+            { @"\\.\", @"C:\git\runtime", @"\\.\" },
+            { @"\\.\C:\Foo." , @"C:\git\runtime", @"\\.\C:\Foo" },
+            { @"\\.\C:\Foo " , @"C:\git\runtime", @"\\.\C:\Foo" },
         };
 
         [Theory,
@@ -540,67 +540,67 @@ namespace System.IO.Tests
 
         public static TheoryData<string, string, string> GetFullPath_CommonRootedWindowsData => new TheoryData<string, string, string>
         {
-            { "", @"C:\git\corefx", @"C:\git\corefx" },
-            { "..", @"C:\git\corefx", @"C:\git" },
+            { "", @"C:\git\runtime", @"C:\git\runtime" },
+            { "..", @"C:\git\runtime", @"C:\git" },
 
             // Current drive rooted
-            { @"\tmp\bar", @"C:\git\corefx", @"C:\tmp\bar" },
-            { @"\.\bar", @"C:\git\corefx", @"C:\bar" },
-            { @"\tmp\..", @"C:\git\corefx", @"C:\" },
-            { @"\tmp\bar\..", @"C:\git\corefx", @"C:\tmp" },
-            { @"\tmp\bar\..", @"C:\git\corefx", @"C:\tmp" },
-            { @"\", @"C:\git\corefx", @"C:\" },
-
-            { @"..\..\tmp\bar", @"C:\git\corefx", @"C:\tmp\bar" },
-            { @"..\..\.\bar", @"C:\git\corefx", @"C:\bar" },
-            { @"..\..\..\..\tmp\..", @"C:\git\corefx", @"C:\" },
-            { @"\tmp\..\bar..\..\..", @"C:\git\corefx", @"C:\" },
-            { @"\tmp\..\bar\..", @"C:\git\corefx", @"C:\" },
-            { @"\.\.\..\..\", @"C:\git\corefx", @"C:\" },
+            { @"\tmp\bar", @"C:\git\runtime", @"C:\tmp\bar" },
+            { @"\.\bar", @"C:\git\runtime", @"C:\bar" },
+            { @"\tmp\..", @"C:\git\runtime", @"C:\" },
+            { @"\tmp\bar\..", @"C:\git\runtime", @"C:\tmp" },
+            { @"\tmp\bar\..", @"C:\git\runtime", @"C:\tmp" },
+            { @"\", @"C:\git\runtime", @"C:\" },
+
+            { @"..\..\tmp\bar", @"C:\git\runtime", @"C:\tmp\bar" },
+            { @"..\..\.\bar", @"C:\git\runtime", @"C:\bar" },
+            { @"..\..\..\..\tmp\..", @"C:\git\runtime", @"C:\" },
+            { @"\tmp\..\bar..\..\..", @"C:\git\runtime", @"C:\" },
+            { @"\tmp\..\bar\..", @"C:\git\runtime", @"C:\" },
+            { @"\.\.\..\..\", @"C:\git\runtime", @"C:\" },
 
             // Specific drive rooted
-            { @"C:tmp\foo\..", @"C:\git\corefx", @"C:\git\corefx\tmp" },
-            { @"C:tmp\foo\.", @"C:\git\corefx", @"C:\git\corefx\tmp\foo" },
-            { @"C:tmp\foo\..", @"C:\git\corefx", @"C:\git\corefx\tmp" },
-            { @"C:tmp", @"C:\git\corefx", @"C:\git\corefx\tmp" },
-            { @"C:", @"C:\git\corefx", @"C:\git\corefx" },
-            { @"C", @"C:\git\corefx", @"C:\git\corefx\C" },
-
-            { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:tmp\foo\.", @"C:\git\corefx", @"Z:\tmp\foo" },
-            { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:tmp", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:", @"C:\git\corefx", @"Z:\" },
-            { @"Z", @"C:\git\corefx", @"C:\git\corefx\Z" },
+            { @"C:tmp\foo\..", @"C:\git\runtime", @"C:\git\runtime\tmp" },
+            { @"C:tmp\foo\.", @"C:\git\runtime", @"C:\git\runtime\tmp\foo" },
+            { @"C:tmp\foo\..", @"C:\git\runtime", @"C:\git\runtime\tmp" },
+            { @"C:tmp", @"C:\git\runtime", @"C:\git\runtime\tmp" },
+            { @"C:", @"C:\git\runtime", @"C:\git\runtime" },
+            { @"C", @"C:\git\runtime", @"C:\git\runtime\C" },
+
+            { @"Z:tmp\foo\..", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:tmp\foo\.", @"C:\git\runtime", @"Z:\tmp\foo" },
+            { @"Z:tmp\foo\..", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:tmp", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:", @"C:\git\runtime", @"Z:\" },
+            { @"Z", @"C:\git\runtime", @"C:\git\runtime\Z" },
 
             // Relative segments eating into the root
-            { @"C:..\..\..\tmp\foo\..", @"C:\git\corefx", @"C:\tmp" },
-            { @"C:tmp\..\..\foo\.", @"C:\git\corefx", @"C:\git\foo" },
-            { @"C:..\..\tmp\foo\..", @"C:\git\corefx", @"C:\tmp" },
-            { @"C:tmp\..\", @"C:\git\corefx", @"C:\git\corefx\" },
-            { @"C:", @"C:\git\corefx", @"C:\git\corefx" },
-            { @"C", @"C:\git\corefx", @"C:\git\corefx\C" },
-
-            { @"C:tmp\..\..\..\..\foo\..", @"C:\git\corefx", @"C:\" },
+            { @"C:..\..\..\tmp\foo\..", @"C:\git\runtime", @"C:\tmp" },
+            { @"C:tmp\..\..\foo\.", @"C:\git\runtime", @"C:\git\foo" },
+            { @"C:..\..\tmp\foo\..", @"C:\git\runtime", @"C:\tmp" },
+            { @"C:tmp\..\", @"C:\git\runtime", @"C:\git\runtime\" },
+            { @"C:", @"C:\git\runtime", @"C:\git\runtime" },
+            { @"C", @"C:\git\runtime", @"C:\git\runtime\C" },
+
+            { @"C:tmp\..\..\..\..\foo\..", @"C:\git\runtime", @"C:\" },
             { @"C:tmp\..\..\foo\.", @"C:\", @"C:\foo" },
             { @"C:..\..\tmp\..\foo\..", @"C:\", @"C:\" },
             { @"C:tmp\..\", @"C:\", @"C:\" },
 
-            { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:tmp\foo\.", @"C:\git\corefx", @"Z:\tmp\foo" },
-            { @"Z:tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:tmp", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:", @"C:\git\corefx", @"Z:\" },
-            { @"Z", @"C:\git\corefx", @"C:\git\corefx\Z" },
-
-            { @"Z:..\..\..\tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:tmp\..\..\foo\.", @"C:\git\corefx", @"Z:\foo" },
-            { @"Z:..\..\tmp\foo\..", @"C:\git\corefx", @"Z:\tmp" },
-            { @"Z:tmp\..\", @"C:\git\corefx", @"Z:\" },
-            { @"Z:", @"C:\git\corefx", @"Z:\" },
-            { @"Z", @"C:\git\corefx", @"C:\git\corefx\Z" },
-
-            { @"Z:tmp\..\..\..\..\foo\..", @"C:\git\corefx", @"Z:\" },
+            { @"Z:tmp\foo\..", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:tmp\foo\.", @"C:\git\runtime", @"Z:\tmp\foo" },
+            { @"Z:tmp\foo\..", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:tmp", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:", @"C:\git\runtime", @"Z:\" },
+            { @"Z", @"C:\git\runtime", @"C:\git\runtime\Z" },
+
+            { @"Z:..\..\..\tmp\foo\..", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:tmp\..\..\foo\.", @"C:\git\runtime", @"Z:\foo" },
+            { @"Z:..\..\tmp\foo\..", @"C:\git\runtime", @"Z:\tmp" },
+            { @"Z:tmp\..\", @"C:\git\runtime", @"Z:\" },
+            { @"Z:", @"C:\git\runtime", @"Z:\" },
+            { @"Z", @"C:\git\runtime", @"C:\git\runtime\Z" },
+
+            { @"Z:tmp\..\..\..\..\foo\..", @"C:\git\runtime", @"Z:\" },
             { @"Z:tmp\..\..\foo\.", @"C:\", @"Z:\foo" },
             { @"Z:..\..\tmp\..\foo\..", @"C:\", @"Z:\" },
             { @"Z:tmp\..\", @"C:\", @"Z:\" },
index 40c639fd77c4d9c9b57c79433d300fe8ae23768c..b119a763f284184ec72376b30b85dcf255481b4d 100644 (file)
@@ -105,8 +105,8 @@ namespace System.Runtime.InteropServices
                 // Jump HandleCollector instance forward until it almost overflows
                 TypeInfo type = typeof(HandleCollector).GetTypeInfo();
                 FieldInfo handleCount =
-                    type.GetDeclaredField("_handleCount") ?? // corefx
-                    type.GetDeclaredField("handleCount");    // desktop
+                    type.GetDeclaredField("_handleCount") ?? // .NET Core
+                    type.GetDeclaredField("handleCount");    // .NET Framework
                 Assert.NotNull(handleCount);
                 handleCount.SetValue(collector, int.MaxValue - ToAdd);
             }
index 8564559be77a11331571f31f4c8b595eed372ba0..912f103f6d3b7aee12ff8a08fa178d7dfa9fa1cf 100644 (file)
@@ -11,7 +11,7 @@ public static class HashCodeTests
     [Fact]
     public static void HashCode_Add()
     {
-        // The version of xUnit used by corefx does not support params theories.
+        // The version of xUnit used by .NET Core does not support params theories.
         void Theory(uint expected, params uint[] vector)
         {
             var hc = new HashCode();
index 285a5591b42ccd5acd7956700d4cff7b1cd7c0ca..edd6e158fdfc7dbadb43500eb783cf895eeece54 100644 (file)
@@ -477,7 +477,7 @@ namespace System.Text.Tests
                     AssertExtensions.Throws<ArgumentException>("name", () => Encoding.GetEncoding((string)mapping[2]));
                 }
 
-                // Currently the class EncodingInfo isn't present in corefx, so this checks none of the code pages are present.
+                // Currently the class EncodingInfo isn't present in .NET Core, so this checks none of the code pages are present.
                 // When it is, comment out this line and remove the previous foreach/assert.
                 // Assert.Equal(CrossplatformDefaultEncodings, Encoding.GetEncodings().OrderBy(i => i.CodePage).Select(i => Map(i.CodePage, i.WebName)));
 
@@ -502,7 +502,7 @@ namespace System.Text.Tests
             }
             // Adding the code page provider should keep the originals, too.
             ValidateDefaultEncodings();
-            // Currently the class EncodingInfo isn't present in corefx, so this checks the complete list
+            // Currently the class EncodingInfo isn't present in .NET Core, so this checks the complete list
             // When it is, comment out this line and remove the previous foreach/assert.
             // Assert.Equal(CrossplatformDefaultEncodings().Union(CodePageInfo().Select(i => Map((int)i[0], (string)i[1])).OrderBy(i => i.Key)),
             //               Encoding.GetEncodings().OrderBy(i => i.CodePage).Select(i => Map(i.CodePage, i.WebName)));
index 5416ec2c441fb94689c4802d3b37dfbee4744879..6933cd9bb1f78550cf87f0cb56273b8cee5e4053 100644 (file)
@@ -122,7 +122,7 @@ namespace System.Text.Json.Serialization.Tests
                 @"""MyDateTime"" : ""2019-01-30T12:01:02.0000000Z""," +
                 @"""MyDateTimeOffset"" : ""2019-01-30T12:01:02.0000000+01:00""," +
                 @"""MyGuid"" : ""1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6""," +
-                @"""MyUri"" : ""https://github.com/dotnet/corefx""," +
+                @"""MyUri"" : ""https://github.com/dotnet/runtime""," +
                 @"""MyEnum"" : 2," + // int by default
                 @"""MyInt64Enum"" : -9223372036854775808," +
                 @"""MyUInt64Enum"" : 18446744073709551615," +
@@ -156,7 +156,7 @@ namespace System.Text.Json.Serialization.Tests
                 @"""MyDateTimeArray"" : [""2019-01-30T12:01:02.0000000Z""]," +
                 @"""MyDateTimeOffsetArray"" : [""2019-01-30T12:01:02.0000000+01:00""]," +
                 @"""MyGuidArray"" : [""1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6""]," +
-                @"""MyUriArray"" : [""https://github.com/dotnet/corefx""]," +
+                @"""MyUriArray"" : [""https://github.com/dotnet/runtime""]," +
                 @"""MyEnumArray"" : [2]," + // int by default
                 @"""MyInt16TwoDimensionArray"" : [[10, 11],[20, 21]]," +
                 @"""MyInt16TwoDimensionList"" : [[10, 11],[20, 21]]," +
@@ -210,7 +210,7 @@ namespace System.Text.Json.Serialization.Tests
             MyDateTime = new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc);
             MyDateTimeOffset = new DateTimeOffset(2019, 1, 30, 12, 1, 2, new TimeSpan(1, 0, 0));
             MyGuid = new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6");
-            MyUri = new Uri("https://github.com/dotnet/corefx");
+            MyUri = new Uri("https://github.com/dotnet/runtime");
             MyEnum = SampleEnum.Two;
             MyInt64Enum = SampleEnumInt64.MinNegative;
             MyUInt64Enum = SampleEnumUInt64.Max;
@@ -232,7 +232,7 @@ namespace System.Text.Json.Serialization.Tests
             MyDateTimeArray = new DateTime[] { new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc) };
             MyDateTimeOffsetArray = new DateTimeOffset[] { new DateTimeOffset(2019, 1, 30, 12, 1, 2, new TimeSpan(1, 0, 0)) };
             MyGuidArray = new Guid[] { new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6") };
-            MyUriArray = new Uri[] { new Uri("https://github.com/dotnet/corefx") };
+            MyUriArray = new Uri[] { new Uri("https://github.com/dotnet/runtime") };
             MyEnumArray = new SampleEnum[] { SampleEnum.Two };
             MySimpleStruct = new SimpleStruct { One = 11, Two = 1.9999 };
             MySimpleTestStruct = new SimpleTestStruct { MyInt64 = 64, MyString = "Hello", MyInt32Array = new int[] { 32 } };
@@ -326,7 +326,7 @@ namespace System.Text.Json.Serialization.Tests
             Assert.Equal(new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc), MyDateTime);
             Assert.Equal(new DateTimeOffset(2019, 1, 30, 12, 1, 2, new TimeSpan(1, 0, 0)), MyDateTimeOffset);
             Assert.Equal(new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6"), MyGuid);
-            Assert.Equal(new Uri("https://github.com/dotnet/corefx"), MyUri);
+            Assert.Equal(new Uri("https://github.com/dotnet/runtime"), MyUri);
             Assert.Equal(SampleEnum.Two, MyEnum);
             Assert.Equal(SampleEnumInt64.MinNegative, MyInt64Enum);
             Assert.Equal(SampleEnumUInt64.Max, MyUInt64Enum);
@@ -354,7 +354,7 @@ namespace System.Text.Json.Serialization.Tests
             Assert.Equal(new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc), MyDateTimeArray[0]);
             Assert.Equal(new DateTimeOffset(2019, 1, 30, 12, 1, 2, new TimeSpan(1, 0, 0)), MyDateTimeOffsetArray[0]);
             Assert.Equal(new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6"), MyGuidArray[0]);
-            Assert.Equal(new Uri("https://github.com/dotnet/corefx"), MyUriArray[0]);
+            Assert.Equal(new Uri("https://github.com/dotnet/runtime"), MyUriArray[0]);
             Assert.Equal(SampleEnum.Two, MyEnumArray[0]);
 
             Assert.Equal(10, MyInt16TwoDimensionArray[0][0]);
index 5d82f390557da1f73b73524190879e56284cbe5c..f1557120872cdc420716d5afa9365b2eb81a9ce9 100644 (file)
@@ -47,7 +47,7 @@ namespace System.Text.Json.Serialization.Tests
                 @"""MyDecimal"" : [3.3]," +
                 @"""MyDateTime"" : [""2019-01-30T12:01:02.0000000Z""]," +
                 @"""MyGuid"" : [""97E9F02C-337E-4615-B26C-0020F5DC28C9""]," +
-                @"""MyUri"" : [""https://github.com/dotnet/corefx""]," +
+                @"""MyUri"" : [""https://github.com/dotnet/runtime""]," +
                 @"""MyEnum"" : [2]" + // int by default
             @"}";
 
@@ -76,7 +76,7 @@ namespace System.Text.Json.Serialization.Tests
             MyDecimal = new object[] { 3.3m };
             MyDateTime = new object[] { new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc) };
             MyGuid = new object[] { new Guid("97E9F02C-337E-4615-B26C-0020F5DC28C9") };
-            MyUri = new object[] { new Uri("https://github.com/dotnet/corefx") };
+            MyUri = new object[] { new Uri("https://github.com/dotnet/runtime") };
             MyEnum = new object[] { SampleEnum.Two };
         }
 
@@ -142,8 +142,7 @@ namespace System.Text.Json.Serialization.Tests
             Assert.Equal(new Guid("97E9F02C-337E-4615-B26C-0020F5DC28C9"), ((JsonElement)MyGuid[0]).GetGuid());
             Assert.IsType<JsonElement>(MyUri[0]);
             Assert.Equal(JsonValueKind.String, ((JsonElement)MyUri[0]).ValueKind);
-            // TODO: Use JsonElement.GetUri() when https://github.com/dotnet/corefx/issues/38647 is implemented.
-            Assert.Equal(new Uri("https://github.com/dotnet/corefx"), new Uri(((JsonElement)MyUri[0]).GetString()));
+            Assert.Equal(new Uri("https://github.com/dotnet/runtime"), new Uri(((JsonElement)MyUri[0]).GetString()));
             Assert.IsType<JsonElement>(MyEnum[0]);
             Assert.Equal(JsonValueKind.Number, ((JsonElement)MyEnum[0]).ValueKind);
             Assert.Equal(SampleEnum.Two, (SampleEnum)((JsonElement)MyEnum[0]).GetUInt32());
index 5be839bdbdfe3e48068cc8ddd647d0ac29a8e732..226fea3881a9705c5a715041e4a70500ecf6ea38 100644 (file)
@@ -6,7 +6,7 @@ To install:
 install-package System.Utf8String.Experimental -prerelease -source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
 ```
 
-This package can only be installed into a project targeting a __nightly__ build of coreclr or corefx. Anything under the _master_ column of https://github.com/dotnet/core-sdk would work, as would any coreclr + corefx built from your own dev box (as long as you're building from _master_ instead of _release/..._). Installing this onto a project targeting an official Preview build would not work, as official Preview builds come from the _release_ branch.
+This package can only be installed into a project targeting a __nightly__ build of coreclr or libraries. Anything under the _master_ column of https://github.com/dotnet/core-sdk would work, as would any coreclr + libraries built from your own dev box (as long as you're building from _master_ instead of _release/..._). Installing this onto a project targeting an official Preview build would not work, as official Preview builds come from the _release_ branch.
 
 It's possible that installing the package might fail with an error similar to that seen below.
 
@@ -14,7 +14,7 @@ It's possible that installing the package might fail with an error similar to th
 install-package : NU1605: Detected package downgrade: Microsoft.NETCore.Platforms from 3.0.0-preview6.19251.6 to 3.0.0-preview6.19223.2. Reference the package directly from the project to select a different version.
 ```
 
-This can occur if the NuGet client attempts to install a newer version of the package than allowed by the coreclr / corefx your application is targeting. For now you can work around this error by specifying the explicit package version in the install command. Match the version passed to the NuGet client (shown below) to the version specified in the error message (shown above).
+This can occur if the NuGet client attempts to install a newer version of the package than allowed by the .NET Core version your application is targeting. For now you can work around this error by specifying the explicit package version in the install command. Match the version passed to the NuGet client (shown below) to the version specified in the error message (shown above).
 
 ```ps
 install-package System.Utf8String.Experimental -prerelease -source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json -version 3.0.0-preview6.19223.2