[release/10.0-preview5] Source code updates from dotnet/dotnet (#62081)

[release/10.0-preview5] Source code updates from dotnet/dotnet


 - Align M.CA package versions

(cherry picked from commit ce921d3)

 - Add System.Threading.AccessControl to expected assemblies

It was added in dotnet/runtime#110416

(cherry picked from commit 1d3d3de)

 - React to dotnet/runtime#115494

(cherry picked from commit 97ebf48)

Author: dotnet-maestro[bot]

Directory.Build.props

@@ -133,9 +133,6 @@
 
     <!-- // Temporary diagnostic code from https://github.com/dotnet/extensions/pull/4130 for metrics APIs used in test. -->
     <NoWarn>$(NoWarn);TBD</NoWarn>
-
-    <!-- In Preview5 only, NoWarn this signing error about mismatched 1st/3rd party .dll/signatures. SignTool mistakenly sees R2R images as 3rd-party -->
-    <NoWarn>$(NoWarn);SIGN004</NoWarn>
   </PropertyGroup>
 
   <!-- Source code settings -->

eng/Build.props

@@ -56,14 +56,14 @@
                       $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
                       " />
 
-    <!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
+    <!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Installers\**\*.vcxproj;
                       "
                       Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
 
 
-    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
+    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
                       "
@@ -83,7 +83,7 @@
         </ProjectToBuild>
       </ItemGroup>
     </When>
-    <!-- Projects to build in VMR build pass 2 -->
+    <!-- Projects to build in .NET product build pass 2 -->
     <When Condition="'$(DotNetBuildPass)' == '2'">
       <ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
         <!-- Build Hosting Bundle -->
@@ -264,7 +264,7 @@
         <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
       </PropertyGroup>
 
-      <!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
+      <!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
       <ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
         <!-- Build the ANCM custom action -->
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />

eng/Common.props

@@ -11,7 +11,7 @@
 
     <TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
     <PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
-    <DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
+    <DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
 
     <BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
     <BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>

eng/Dependencies.props

@@ -258,4 +258,23 @@ and are generated based on the last package release.
           Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion)</Version>
     </LatestPackageReference>
   </ItemGroup>
+
+  <!-- Replicates the same overriding of versions that occurs on Roslyn package versions for source only builds -->
+  <ItemGroup Label="Source only build overrides" Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Common">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Razor">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+  </ItemGroup>
 </Project>

eng/Publishing.props

@@ -1,15 +1,14 @@
 <Project>
+
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
 
-    <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-         Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-         the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-         to be published. Use DotNetBuildRepo is only set in the internal source build,
-         and Build.proj is invoked from the wrapper build. -->
+    <!-- Don't sign and publish rid agnostic nuget packages from other builds than windows when not building
+         inside the VMR. Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+         the nupkgs pushed. -->
     <EnableDefaultArtifacts Condition="'$(OS)' != 'Windows_NT' and
                                        '$(PostBuildSign)' != 'true' and
-                                       '$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
+                                       '$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>
 
     <!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
     <AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>

eng/SharedFramework.External.props

@@ -43,6 +43,7 @@
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options"                                 Version="$(MicrosoftExtensionsOptionsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives"                              Version="$(MicrosoftExtensionsPrimitivesVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml"                             Version="$(SystemSecurityCryptographyXmlVersion)" />
+    <ExternalAspNetCoreAppReference Include="System.Threading.AccessControl"                               Version="$(SystemThreadingAccessControlVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Threading.RateLimiting"                                Version="$(SystemThreadingRateLimitingVersion)" />
 
     <!--

eng/Signing.props

@@ -7,6 +7,11 @@
     <UseDotNetCertificate>true</UseDotNetCertificate>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- In Preview5 only, NoWarn this signing error about mismatched 1st/3rd party .dll/signatures. SignTool mistakenly sees R2R images as 3rd-party -->
+    <NoWarn>$(NoWarn);SIGN004</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup Label="File signing information">
     <!-- Third-party components which should be signed.  -->
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />