[main] Source code updates from dotnet/dotnet

eng/SharedFramework.External.props

@@ -43,7 +43,6 @@
     <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/common/core-templates/steps/install-microbuild.yml

@@ -30,6 +30,10 @@ steps:
         ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
           azureSubscription: 'MicroBuild Signing Task (DevDiv)'
           useEsrpCli: true
+        ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
+          ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+        ${{ else }}:
+          ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
       env:
         TeamName: $(_TeamName)
         MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

eng/common/core-templates/steps/source-build.yml

@@ -38,11 +38,6 @@ steps:
       targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
     fi
 
-    baseRidArgs=
-    if [ '${{ parameters.platform.baseRID }}' != '' ]; then
-      baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
-    fi
-
     portableBuildArgs=
     if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
       portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
       ${{ parameters.platform.buildArguments }} \
       $internalRuntimeDownloadArgs \
       $targetRidArgs \
-      $baseRidArgs \
       $portableBuildArgs \
   displayName: Build
 

eng/common/templates/vmr-build-pr.yml

@@ -1,3 +1,21 @@
+# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
+#
+# It will run a full set of verification jobs defined in:
+# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
+#
+# For repos that do not need to run the full set, you would do the following:
+#
+# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
+#
+# 2. Add `verifications` parameter to VMR template reference
+#
+#    Examples:
+#    - For source-build stage 1 verification, add the following:
+#        verifications: [ "source-build-stage1" ]
+#
+#    - For Windows only verifications, add the following:
+#        verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
+
 trigger: none
 pr: none
 

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.6.25302.104"
+    "version": "10.0.100-preview.6.25315.102"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.6.25302.104",
+    "dotnet": "10.0.100-preview.6.25315.102",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25314.101",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25314.101",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25314.101",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25324.103",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25324.103",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25324.103",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

src/Framework/test/TestData.cs

@@ -158,7 +158,6 @@ static TestData()
                 "System.Diagnostics.EventLog.Messages",
                 "System.Security.Cryptography.Pkcs",
                 "System.Security.Cryptography.Xml",
-                "System.Threading.AccessControl",
                 "System.Threading.RateLimiting",
             };
 
@@ -308,8 +307,8 @@ static TestData()
                 { "Microsoft.JSInterop" },
                 { "Microsoft.Net.Http.Headers" },
                 { "System.Diagnostics.EventLog" },
+                { "System.Formats.Cbor" },
                 { "System.Security.Cryptography.Xml" },
-                { "System.Threading.AccessControl" },
                 { "System.Threading.RateLimiting" },
             };
 

src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs

@@ -419,11 +419,8 @@ public void Dispose()
         {
             _pipeWriter.Abort();
 
-            if (_fakeMemoryOwner != null)
-            {
-                _fakeMemoryOwner.Dispose();
-                _fakeMemoryOwner = null;
-            }
+            _fakeMemoryOwner?.Dispose();
+            _fakeMemoryOwner = null;
 
             if (_fakeMemory != null)
             {

src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs

@@ -232,11 +232,8 @@ public void Complete()
                 _pipeWriter.Complete();
             }
 
-            if (_fakeMemoryOwner != null)
-            {
-                _fakeMemoryOwner.Dispose();
-                _fakeMemoryOwner = null;
-            }
+            _fakeMemoryOwner?.Dispose();
+            _fakeMemoryOwner = null;
 
             if (_fakeMemory != null)
             {

src/Servers/Kestrel/Core/src/Internal/Http3/Http3OutputProducer.cs

@@ -78,11 +78,9 @@ public void Complete()
 
             _pipeWriter.Complete();
 
-            if (_fakeMemoryOwner != null)
-            {
-                _fakeMemoryOwner.Dispose();
-                _fakeMemoryOwner = null;
-            }
+            _fakeMemoryOwner?.Dispose();
+            _fakeMemoryOwner = null;
+
             if (_fakeMemory != null)
             {
                 ArrayPool<byte>.Shared.Return(_fakeMemory);

src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

@@ -65,15 +65,15 @@
         Targets="_VmrBuild" />
     <MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
         BuildInParallel="false"
-        Properties="Platform=x86;TargetRid=win-x86;BaseRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
+        Properties="Platform=x86;TargetRid=win-x86;PortableTargetRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
         Targets="_VmrBuild" />
     <MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
         BuildInParallel="false"
         Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
         Targets="_VmrBuild" />
     <MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
         BuildInParallel="false"
-        Properties="Platform=x86;TargetRid=win-x86;BaseRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
+        Properties="Platform=x86;TargetRid=win-x86;PortableTargetRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
         Targets="_VmrBuild" />
   </Target>
 

src/Tools/LinkabilityChecker/LinkabilityChecker.csproj

@@ -16,7 +16,6 @@
     <!-- Packages required to produce a complete dependency graph for the trimmer -->
     <Reference Include="System.Configuration.ConfigurationManager" />
     <Reference Include="System.Security.Permissions" />
-    <Reference Include="System.Threading.AccessControl" />
   </ItemGroup>
   <Target Name="ILLinkTrimProjects" DependsOnTargets="ResolveReferences" AfterTargets="Build" Condition="'$(DotNetBuildSourceOnly)' != 'true' AND '$(SkipTestBuild)' != 'true'">
     <PropertyGroup>