Sync JsonCodeGen branch with runtime-master

.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\""
+            ]
+        }
+    ]
 }

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.20352.2",
+      "version": "1.0.0-prerelease.20530.4",
       "commands": [
         "xharness"
       ]

.editorconfig

@@ -15,6 +15,10 @@ trim_trailing_whitespace = true
 [project.json]
 indent_size = 2
 
+# Generated code
+[*{_AssemblyInfo.cs,.notsupported.cs}]
+generated_code = true
+
 # C# files
 [*.cs]
 # New line preferences
@@ -155,10 +159,11 @@ csharp_space_between_square_brackets = false
 
 # Analyzers
 dotnet_code_quality.ca1802.api_surface = private, internal
+dotnet_code_quality.ca1822.api_surface = private, internal
 dotnet_code_quality.ca2208.api_surface = public
 
 # License header
-file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\n
+file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
 
 # C++ Files
 [*.{cpp,h,in}]

.github/CODEOWNERS

@@ -0,0 +1,62 @@
+# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
+# See https://help.github.com/articles/about-code-owners/
+
+/src/libraries/Common/src/System/Net/Http/aspnetcore/               @dotnet/http
+/src/libraries/Common/tests/Tests/System/Net/aspnetcore/            @dotnet/http
+/src/libraries/System.Text.Json/                                    @ahsonkhan @steveharter @layomia @Jozkee
+/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
+
+/src/mono/llvm @vargaz @SamMonoRT @imhameed @EgorBo
+
+/src/mono/mono/arch @vargaz
+/src/mono/mono/benchmark @SamMonoRT @naricc
+/src/mono/mono/dis @lambdageek @vargaz
+/src/mono/mono/eglib @vargaz @lambdageek @CoffeeFlux
+
+/src/mono/mono/metadata @vargaz @lambdageek @thaystg @CoffeeFlux
+/src/mono/mono/metadata/*-win* @lateralusX @lambdageek @CoffeeFlux
+/src/mono/mono/metadata/handle* @lambdageek @vargaz
+/src/mono/mono/metadata/monitor* @brzvlad @vargaz
+/src/mono/mono/metadata/sgen* @brzvlad @vargaz @naricc
+/src/mono/mono/metadata/thread* @lateralusX @lambdageek
+/src/mono/mono/metadata/w32* @lateralusX @lambdageek @CoffeeFlux
+
+/src/mono/mono/mini @vargaz @lambdageek @SamMonoRT @CoffeeFlux
+/src/mono/mono/mini/*cfgdump* @vargaz
+/src/mono/mono/mini/*exceptions* @vargaz @BrzVlad
+/src/mono/mono/mini/*llvm* @vargaz @imhameed @EgorBo
+/src/mono/mono/mini/*ppc* @vargaz
+/src/mono/mono/mini/*profiler* @BrzVlad @lambdageek
+/src/mono/mono/mini/*riscv* @alexrp
+/src/mono/mono/mini/*type-check* @lambdageek
+/src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @DavidKarlas @lambdageek
+/src/mono/mono/mini/interp/* @BrzVlad @vargaz
+
+/src/mono/mono/native @egorbo @marek-safar
+/src/mono/mono/profiler @BrzVlad @lambdageek
+/src/mono/mono/sgen @BrzVlad @lambdageek @naricc
+
+/src/mono/mono/utils @vargaz @lambdageek @CoffeeFlux
+/src/mono/mono/utils/*-win* @lateralusX @lambdageek @CoffeeFlux
+/src/mono/mono/utils/atomic* @vargaz
+/src/mono/mono/utils/mono-hwcap* @vargaz
+/src/mono/mono/utils/mono-mem* @vargaz
+/src/mono/mono/utils/mono-merp* @lambdageek @naricc @imhameed
+/src/mono/mono/utils/mono-state* @lambdageek
+/src/mono/mono/utils/mono-threads* @lambdageek @vargaz
+
+/src/mono/msvc @lateralusX @kg @akoeplinger
+/src/mono/msvc/scripts @akoeplinger @kg
+
+/src/mono/netcore @marek-safar @akoeplinger @egorbo @vargaz @steveisok

.github/ISSUE_TEMPLATE/01_bug_report.md

@@ -24,6 +24,7 @@ assignees: ''
 * What OS and version, and what distro if applicable?
 * What is the architecture (x64, x86, ARM, ARM64)?
 * Do you know whether it is specific to that configuration?
+* If you're using Blazor, which web browser(s) do you see this issue in?
   -->
 
 ### Regression?

.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md

@@ -0,0 +1,23 @@
+Fixes Issue <!-- Issue Number -->
+
+Master PR <!-- Link to PR if any that fixed this in the master branch. -->
+
+# Description
+
+<!-- Give a brief summary of the issue and how the pull request is fixing it. -->
+
+# Customer Impact
+
+<!-- What is the impact to customers of not taking this fix? -->
+
+# Regression
+
+<!-- Is this fixing a problem that was introduced in the most recent release, ie., fixing a regression? -->
+
+# Testing
+
+<!-- What kind of testing has been done with the fix. -->
+
+# Risk
+
+<!-- Please assess the risk of taking this fix. Provide details backing up your assessment. -->

.github/move.yml

@@ -0,0 +1,27 @@
+# Configuration for Move Issues - https://github.com/dessant/move-issues
+
+# Delete the command comment when it contains no other content
+deleteCommand: true
+
+# Close the source issue after moving
+closeSourceIssue: true
+
+# Lock the source issue after moving
+lockSourceIssue: false
+
+# Mention issue and comment authors
+mentionAuthors: true
+
+# Preserve mentions in the issue content
+keepContentMentions: false
+
+# Move labels that also exist on the target repository
+moveLabels: false
+
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo
+
+# Repository to extend settings from
+# _extends: repo

.github/workflows/backport.yml

@@ -0,0 +1,26 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  backport:
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to')
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Run backport
+      uses: ./eng/actions/backport
+      with:
+        auth_token: ${{ secrets.GITHUB_TOKEN }}
+        pr_description_template: |
+          Backport of #%source_pr_number% to %target_branch%
+
+          /cc %cc_users%
+
+          ## Customer Impact
+
+          ## Testing
+
+          ## Risk

.gitignore

@@ -319,7 +319,6 @@ Vagrantfile
 CMakeFiles/
 cmake_install.cmake
 CMakeCache.txt
-Makefile
 
 # Cross compilation
 cross/rootfs/*
@@ -353,3 +352,7 @@ src/coreclr/src/System.Private.CoreLib/common
 
 # The debug directory should not be ignored
 !src/coreclr/src/debug
+
+# Mono Wasm-specific excludes
+src/mono/wasm/emsdk/
+src/mono/wasm/.stamp-wasm-install-and-select*

Build.proj

@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.Build.Traversal">
 
+  <PropertyGroup>
+    <TraversalGlobalProperties Condition="'$(BuildAllConfigurations)' != 'true'">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>

CONTRIBUTING.md

@@ -67,10 +67,6 @@ We use and recommend the following workflow:
     - The next official build will automatically include your change.
     - You can delete the branch you used for making the change.
 
-Note: It is OK for your PR to include a large number of commits. Once your change is accepted, you will be asked to squash your commits into one or some appropriately small number of commits before your PR is merged.
-
-Note: It is OK to create your PR as "[WIP]" on the upstream repo before the implementation is done. This can be useful if you'd like to start the feedback process concurrent with your implementation. State that this is the case in the initial PR comment.
-
 ## Up for Grabs
 
 The team marks the most straightforward issues as [up for grabs](https://github.com/dotnet/runtime/labels/up-for-grabs). This set of issues is the place to start if you are interested in contributing but new to the codebase.