radical · radical · Jul 28, 2020 · Jul 29, 2020 · Jul 29, 2020 · Jul 29, 2020
diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json
@@ -1,49 +1,70 @@
 {
- "tool": "Credential Scanner",
- "suppressions": [
-  {
-    "file": [
-      "/eng/common/internal-feed-operations.ps1",
-      "/eng/common/internal-feed-operations.sh",
-      "/src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs",
-      "/src/libraries/Common/src/System/Security/Cryptography/EccSecurityTransforms.cs",
-      "/src/libraries/Common/tests/System/Net/Configuration.Certificates.cs",
-      "/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs",
-      "/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs",
-      "/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.DefaultProxyCredentials.cs",
-      "/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Proxy.cs",
-      "/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.ServerCertificates.cs",
-      "/src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs",
-      "/src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1",
-      "/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.cs",
-      "/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyFileTests.LimitedPrivate.cs",
-      "/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs",
-      "/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
-      "/src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs",
-      "/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs",
-      "/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs",
-      "/src/libraries/System.DirectoryServices.AccountManagement/tests/PrincipalTest.cs",
-      "/src/libraries/System.DirectoryServices.AccountManagement/tests/UserPrincipalTest.cs",
-      "/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs",
-      "/src/libraries/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs",
-      "/src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
-      "/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs",
-      "/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs",
-      "/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs",
-      "/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs",
-      "/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriRelativeResolutionTest.cs",
-      "/src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderRefreshTest.cs",
-      "/src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderTests.cs",
-      "/src/libraries/System.Private.Uri/tests/FunctionalTests/UriRelativeResolutionTest.cs",
-      "/src/libraries/System.Runtime/tests/System/Uri.CreateStringTests.cs",
-      "/src/libraries/System.Security.Cryptography.Algorithms/tests/Rfc2898Tests.cs",
-      "/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/Pkcs12Documents.cs",
-      "/src/libraries/System.Security.Cryptography.X509Certificates/tests/ExportTests.cs",
-      "/src/libraries/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs",
-      "/src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs",
-      "/src/libraries/System.Security.Cryptography.Xml/tests/TestHelpers.cs"
-    ],
-    "_justification": "Mostly test files. Other files contain harmless examples or constants."
-  },
- ]
+    "tool": "Credential Scanner",
+    "suppressions": [
+        {
+            "_justification": "Unit test containing connection strings under the test.",
+            "file": [
+                "src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs"
+            ]
+        },
+        {
+            "_justification": "Private key for testing purpose.",
+            "file": [
+                "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
+                "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
+                "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
+                "src/libraries/System.Security.Cryptography.X509Certificates/tests/TestData.cs"
+            ],
+            "placeholder": [
+                "-----BEGIN PRIVATE KEY-----",
+                "-----BEGIN * PRIVATE KEY-----"
+            ]
+        },
+        {
+            "_justification": "Test credential for Uri testing",
+            "file": [
+                "src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
+                "src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriRelativeResolutionTest.cs",
+                "src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderRefreshTest.cs",
+                "src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderTests.cs",
+                "src/libraries/System.Private.Uri/tests/FunctionalTests/UriRelativeResolutionTest.cs",
+                "src/libraries/System.Runtime/tests/System/Uri.CreateStringTests.cs"
+            ],
+            "placeholder": [
+                "//*:;&$=123USERINFO@",
+                "//*:bar@",
+                "//*:bar1@",
+                "//*:password1@",
+                "//*:psw@",
+                "//*:userinfo2@"
+            ]
+        },
+        {
+            "_justification": "Generic test password.",
+            "file": [
+                "src/libraries/Common/tests/System/Net/Configuration.Certificates.cs",
+                "src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs",
+                "src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs",
+                "src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.DefaultProxyCredentials.cs",
+                "src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs",
+                "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1",
+                "src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs",
+                "src/libraries/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs",
+                "src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
+                "src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs",
+                "src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs",
+                "src/libraries/System.Security.Cryptography.Xml/tests/TestHelpers.cs"
+            ],
+            "placeholder": [
+                "\"anotherpassword\"",
+                "\"bar\"",
+                "\"mono\"",
+                "\"password1\"",
+                "\"rightpassword\"",
+                "\"testcertificate\"",
+                "\"unused\"",
+                "\"wrongpassword\""
+            ]
+        }
+    ]
 }
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.20352.2",
+      "version": "1.0.0-prerelease.20403.2",
       "commands": [
         "xharness"
       ]

diff --git a/.editorconfig b/.editorconfig
@@ -184,6 +184,10 @@ indent_size = 2
 [*.{props,targets,config,nuspec}]
 indent_size = 2
 
+# YAML config files
+[*.{yml,yaml}]
+indent_size = 2
+
 # Shell scripts
 [*.sh]
 end_of_line = lf

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,6 +7,12 @@
 /src/libraries/System.Buffers/                                      @ahsonkhan
 /src/libraries/System.Memory/                                       @ahsonkhan
 
+# CoreCLR Code Owners
+
+/src/coreclr/src/inc/corinfo.h @dotnet/jit-contrib
+/src/coreclr/src/inc/corjit.h @dotnet/jit-contrib
+/src/coreclr/src/jit/ @dotnet/jit-contrib
+
 # Mono Code Owners
 
 /src/mono @marek-safar

diff --git a/Build.proj b/Build.proj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.Build.Traversal">
 
+  <PropertyGroup>
+    <TraversalGlobalProperties>BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</TraversalGlobalProperties>
+  </PropertyGroup>
+
   <!--
     Subsets are already imported by Directory.Build.props.
     Reference the projects for traversal build. Ordering matters here.
@@ -35,7 +39,7 @@
 
   <Target Name="RestoreWithoutStaticGraph"
           BeforeTargets="Restore">
-    <MSBuild Projects="@(LibrariesRestoreProject);@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)"
+    <MSBuild Projects="@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)"
              Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestoreUseStaticGraphEvaluation=false"
              Targets="Restore" />
   </Target>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -40,7 +40,7 @@
     <!-- Installer specific, required during restore. -->
     <InstallerTasksOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'installer.tasks'))</InstallerTasksOutputPath>
     <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'netstandard2.0', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
-    <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net46', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
+    <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net461', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
 
     <DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir>
     <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>

diff --git a/docs/area-owners.md b/docs/area-owners.md
@@ -1,4 +1,10 @@
-If you need to tag folks on an issue or PR, you will generally want to tag the owners (not the lead)
+# Pull Requests Tagging
+
+If you need to tag folks on an issue or PR, you will generally want to tag the owners (not the lead) for [area](#areas) to which the change or issue is closest to. For areas which are large and can be operating system or architecture specific it's better to tag owners of [OS](#operating-systems) or [Architecture](#architectures).
+
+## Areas
+
+Note: Editing this file doesn't update the mapping used by the `@msftbot` issue notification bot to tag owners. Some area owners prefer not to get those notifications. To update those notifications, contact any one of `@danmosemsft`, `@jeffschw`, `@marek-safar`, `@ericstj`, or `@karelz`. If you're a community member interested in these notifications, you won't appear in this table but we can add you to notifications - just let us know.
 
 | Area                                           | Lead          | Owners (area experts to tag in PR's and issues)     | Description                                                                                                                                                                                                                                                                               |
 |------------------------------------------------|---------------|-----------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -118,4 +124,21 @@ If you need to tag folks on an issue or PR, you will generally want to tag the o
 | area-TypeSystem-coreclr                        | @mangod9      | @davidwrighton @MichalStrehovsky @janvorli @mangod9 |                                                                                                                                                                                                                                                                                           |
 | area-UWP                                       | @tommcdon     | @jashook                                            | UWP-specific issues including Microsoft.NETCore.UniversalWindowsPlatform and Microsoft.Net.UWPCoreRuntimeSdk                                                                                                                                                                              |
 | area-VM-coreclr                                | @mangod9      | @mangod9                                            |                                                                                                                                                                                                                                                                                           |
-| area-VM-meta-mono                              | @SamMonoRT    | @lambdageek                                         |                                                                                                                                                                                                                                                                                           |
+| area-VM-meta-mono                              | @SamMonoRT    | @lambdageek @CoffeeFlux                             |                                                                                                                                                                                                                                                                                           |
+## Operating Systems
+
+| Operating System | Lead          | Owners (area experts to tag in PR's and issues)     | Description  |
+|------------------|---------------|-----------------------------------------------------|--------------|
+| os-alpine        |               |                                                     |              |
+| os-android       | @steveisok    | @akoeplinger                                        |              |
+| os-freebsd       |               |                                                     |              |
+| os-mac-os-x      | @steveisok    |                                                     |              |
+| os-ios           | @steveisok    | @vargaz                                             |              |
+| os-tvos          | @steveisok    | @vargaz                                             |              |
+
+## Architectures
+
+| Architecture    | Lead          | Owners (area experts to tag in PR's and issues)     | Description  |
+|-----------------|---------------|-----------------------------------------------------|--------------|
+| arch-wasm       | @lewing       | @lewing @BrzVlad                                    |              |
+
diff --git a/docs/coding-guidelines/api-guidelines/nullability.md b/docs/coding-guidelines/api-guidelines/nullability.md
@@ -99,6 +99,7 @@ The C# compiler respects a set of attributes that impact its flow analysis.  We
 - **DO** add `[NotNullIfNotNull(string)]` if nullable ref argument will be non-`null` upon exit, when an other argument passed evaluated to non-`null`, pass that argument name as string. Example: `public void Exchange([NotNullIfNotNull("value")] ref object? location, object? value);`.
 - **DO** add `[return: NotNullIfNotNull(string)]` if a method would not return `null` in case an argument passed evaluated to non-`null`, pass that argument name as string. Example: `[return: NotNullIfNotNull("name")] public string? FormatName(string? name);`
 - **DO** add `[MemberNotNull(string fieldName)]` to a helper method which initializes member field(s), passing in the field name. Example: `[MemberNotNull("_buffer")] private void InitializeBuffer()`.  This will help to avoid spurious warnings at call sites that call the initialization method and then proceed to use the specified field.  Note that there are two constructors to `MemberNotNull`; one that takes a single `string`, and one that takes a `params string[]`.  When the number of fields initialized is small (e.g. <= 3), it's preferable to use multiple `[MemberNotNull(string)]` attributes on the method rather than one `[MemberNotNull(string, string, string, ...)]` attribute, as the latter is not CLS compliant and will likely require `#pragma warning disable` and `#pragma warning restore` around the line to suppress warnings.
+- **AVOID** using `[MaybeNull]`, not because it's problematic, but because there's almost always a better option, such as `T?` (as of this writing, in all of the dotnet/runtime there are only 7 occurrences of `[MaybeNull]`).  One example of where it's applicable is `AsyncLocal<T>.Value`; `[DisallowNull]` can't be used here, because `null` is valid if `T` is nullable, and `T?` shouldn't be used because `Value` shouldn't be set to `null` if `T` isn't nullable.  Another is in the relatively rare case where a public or protected field is exposed, may begin life as null, but shouldn't be explicitly set to null.
 
 ## Code Review Guidance