dotnet · joperezr · Aug 28, 2020 · Aug 14, 2020 · Aug 14, 2020 · Aug 14, 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/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/workflows/backport.yml b/.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
diff --git a/.gitignore b/.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*
diff --git a/Build.proj b/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>

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>
@@ -51,11 +51,13 @@
     <AppleAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))</AppleAppBuilderDir>
     <AndroidAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))</AndroidAppBuilderDir>
     <WasmAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</WasmAppBuilderDir>
+    <CreateWasmBundleDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'CreateWasmBundle', 'Debug', '$(NetCoreAppCurrent)', 'publish'))</CreateWasmBundleDir>
     <MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppCurrent)'))</MonoAOTCompilerDir>
 
     <AppleAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll'))</AppleAppBuilderTasksAssemblyPath>
     <AndroidAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll'))</AndroidAppBuilderTasksAssemblyPath>
     <WasmAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WasmAppBuilderDir)', 'WasmAppBuilder.dll'))</WasmAppBuilderTasksAssemblyPath>
+    <CreateCreateWasmBundlesAssemblyPath>$([MSBuild]::NormalizePath('$(CreateWasmBundleDir)', 'CreateWasmBundle.dll'))</CreateCreateWasmBundlesAssemblyPath>
     <MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
   </PropertyGroup>
 
@@ -84,6 +86,9 @@
 
     <!-- We don't want Private packages to be shipped to NuGet.org -->
     <IsShippingPackage Condition="($(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
+
+    <!-- By default the SDK produces ref assembly for 5.0 or later -->
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
   <!-- Language configuration -->
@@ -101,6 +106,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <!-- Determine what architecture we are building on. -->
     <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
+
+    <!-- Turn off end of life target framework check as we still build for nca2.0 and nca3.0 some OOB libraries -->
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)Analyzers.props" />

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -6,6 +6,8 @@
     tell Microsoft.Common.targets not to import Directory.Build.targets again
     -->
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+
+    <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers>
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />

diff --git a/NuGet.config b/NuGet.config
@@ -16,6 +16,8 @@
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+    <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

diff --git a/SECURITY.md b/SECURITY.md
@@ -6,8 +6,8 @@ The .NET Core and ASP.NET Core support policy, including supported versions can
 
 ## Reporting a Vulnerability
 
-Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing [email protected] or via the portal at https://msrc.microsoft.com. 
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your 
+Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing [email protected] or via the portal at https://msrc.microsoft.com.
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your
 original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue).
 
 Reports via MSRC may qualify for the .NET Core Bug Bounty. Details of the .NET Core Bug Bounty including terms and conditions are at [https://aka.ms/corebounty](https://aka.ms/corebounty).