Merge branch 'master' into release/stable

diff --cc eng/Versions.props
index 8f28eb611769353b7d06d396c6012093e4ab7ed3,e6da2c09bbb9c384692466cb0877b13c43e9af08..4d7bc3d05dde86ef8c1ea368c06ebbe84d682812
--- 1/eng/Versions.props
--- 2/eng/Versions.props
+++ b/eng/Versions.props
@@@ -2,18 -2,30 +2,30 @@@
  <Project>
    <PropertyGroup>
      <RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
 -    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
 -    <VersionPrefix>5.0.0</VersionPrefix>
 +    <PreReleaseVersionLabel></PreReleaseVersionLabel>
 +    <VersionPrefix>3.1.0</VersionPrefix>
      <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
      <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
-     <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19564.1</MicrosoftNETCoreAppVersion>
-     <MicrosoftAspNetCoreAppRefVersion>5.0.0-alpha1.19572.4</MicrosoftAspNetCoreAppRefVersion>
    </PropertyGroup>
    <PropertyGroup>
-     <!-- Opt-out repo features -->
+     <!-- Latest symstore version updated by darc -->
+     <MicrosoftSymbolStoreVersion>1.0.120301</MicrosoftSymbolStoreVersion>
+     <!-- Runtime versions to test -->
+     <MicrosoftNETCoreApp21Version>2.1.16</MicrosoftNETCoreApp21Version>
+     <MicrosoftAspNetCoreApp21Version>$(MicrosoftNETCoreApp21Version)</MicrosoftAspNetCoreApp21Version>
+     <MicrosoftNETCoreApp30Version>3.0.3</MicrosoftNETCoreApp30Version>
+     <MicrosoftAspNetCoreApp30Version>$(MicrosoftNETCoreApp30Version)</MicrosoftAspNetCoreApp30Version>
+     <MicrosoftNETCoreApp31Version>3.1.2</MicrosoftNETCoreApp31Version>
+     <MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
+     <!-- Latest shared runtime version updated by darc -->
+     <MicrosoftNETCoreAppVersion>5.0.0-preview.4.20205.13</MicrosoftNETCoreAppVersion>
+     <!-- Latest shared aspnetcore version updated by darc -->
+     <MicrosoftAspNetCoreAppRefVersion>5.0.0-preview.4.20203.11</MicrosoftAspNetCoreAppRefVersion>
+   </PropertyGroup>
+   <PropertyGroup>
+     <!-- Opt-in/out repo features -->
      <UsingToolXliff>false</UsingToolXliff>
      <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
-     <UsingToolSymbolUploader>true</UsingToolSymbolUploader>
      <!-- Build tools -->
      <MicrosoftNetCompilersVersion>3.0.0</MicrosoftNetCompilersVersion>
      <!-- CoreFX -->

diff --cc src/tests/Microsoft.Diagnostics.NETCore.Client/CommonHelper.cs
index d1109110fb86eada0f57fa736c13e6977ce686d8,86f0ec197d3dd95233af588b7b365be4975ff383..53c9af0761e2e9dc198db0b73bde919558779945
--- 1/src/tests/Microsoft.Diagnostics.NETCore.Client/CommonHelper.cs
--- 2/src/tests/Microsoft.Diagnostics.NETCore.Client/CommonHelper.cs
+++ b/src/tests/Microsoft.Diagnostics.NETCore.Client/CommonHelper.cs
@@@ -25,4 -24,4 +24,4 @@@ namespace Microsoft.Diagnostics.NETCore
              return Path.Combine(traceePath, "Tracee.dll");
          }
      }
--}
++}