Merge branch 'main' into feature/use-dllimport-generator

diff --cc eng/Versions.props
index 2649b69,7d03021..c33e0d6
--- 1/eng/Versions.props
--- 2/eng/Versions.props
+++ b/eng/Versions.props
@@@ -48,10 -48,9 +48,10 @@@
    </PropertyGroup>
    <PropertyGroup>
      <!-- Code analysis dependencies -->
 +    <MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
      <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.0.0-4.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
      <MicrosoftCodeAnalysisCSharpVersion>4.0.0-4.final</MicrosoftCodeAnalysisCSharpVersion>
-     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.21502.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+     <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.21513.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
      <!-- Pin compiler version to workaround issue: https://github.com/dotnet/runtime/issues/59908 -->
      <MicrosoftNetCompilersToolsetVersion>4.0.0-5.21453.15</MicrosoftNetCompilersToolsetVersion>
      <!-- SDK dependencies -->
@@@ -146,17 -145,10 +146,11 @@@
      <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
      <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
      <MicrosoftDiagnosticsNETCoreClientVersion>0.2.61701</MicrosoftDiagnosticsNETCoreClientVersion>
-     <!--
-       These are used as reference assemblies only, so they must not take a ProdCon/source-build
-       version. Insert "RefOnly" to avoid assignment via PVP.
-     -->
-     <RefOnlyMicrosoftBuildVersion>16.10.0</RefOnlyMicrosoftBuildVersion>
-     <RefOnlyMicrosoftBuildFrameworkVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildFrameworkVersion>
-     <RefOnlyMicrosoftBuildTasksCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildTasksCoreVersion>
-     <RefOnlyMicrosoftBuildUtilitiesCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildUtilitiesCoreVersion>
-     <RefOnlyNugetProjectModelVersion>5.8.0</RefOnlyNugetProjectModelVersion>
-     <RefOnlyNugetPackagingVersion>5.8.0</RefOnlyNugetPackagingVersion>
 +    <DNNEVersion>1.0.26</DNNEVersion>
+     <MicrosoftBuildVersion>16.10.0</MicrosoftBuildVersion>
+     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
+     <NugetProjectModelVersion>5.8.0</NugetProjectModelVersion>
+     <NugetPackagingVersion>5.8.0</NugetPackagingVersion>
      <!-- Testing -->
      <MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
      <MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>

diff --cc src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.EVP.Cipher.cs
Simple merge

diff --cc src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
Simple merge

diff --cc src/libraries/tests.proj
Simple merge