[VMR] Codeflow f2353d2-f2353d2

dotnet-maestro[bot] · dotnet-maestro[bot] · commit 8b9dbe81961a · 2025-06-26T02:02:29.000Z
[[ commit created by automation ]]
diff --git a/eng/SharedFramework.External.props b/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)" />
 
     <!--
diff --git a/src/Framework/test/TestData.cs b/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",
             };
 
@@ -309,7 +308,6 @@ static TestData()
                 { "Microsoft.Net.Http.Headers" },
                 { "System.Diagnostics.EventLog" },
                 { "System.Security.Cryptography.Xml" },
-                { "System.Threading.AccessControl" },
                 { "System.Threading.RateLimiting" },
             };
 
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1OutputProducer.cs b/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)
             {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2OutputProducer.cs b/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)
             {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3OutputProducer.cs b/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);
diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/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>
 
diff --git a/src/Tools/LinkabilityChecker/LinkabilityChecker.csproj b/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>

Original file line number	Diff line number	Diff line change
`@@ -419,11 +419,8 @@ public void Dispose()`
`419`	`419`	`{`
`420`	`420`	`_pipeWriter.Abort();`
`421`	`421`
`422`		`- if (_fakeMemoryOwner != null)`
`423`		`- {`
`424`		`- _fakeMemoryOwner.Dispose();`
`425`		`- _fakeMemoryOwner = null;`
`426`		`- }`
	`422`	`+ _fakeMemoryOwner?.Dispose();`
	`423`	`+ _fakeMemoryOwner = null;`
`427`	`424`
`428`	`425`	`if (_fakeMemory != null)`
`429`	`426`	`{`
Original file line number	Diff line number	Diff line change
`@@ -232,11 +232,8 @@ public void Complete()`
`232`	`232`	`_pipeWriter.Complete();`
`233`	`233`	`}`
`234`	`234`
`235`		`- if (_fakeMemoryOwner != null)`
`236`		`- {`
`237`		`- _fakeMemoryOwner.Dispose();`
`238`		`- _fakeMemoryOwner = null;`
`239`		`- }`
	`235`	`+ _fakeMemoryOwner?.Dispose();`
	`236`	`+ _fakeMemoryOwner = null;`
`240`	`237`
`241`	`238`	`if (_fakeMemory != null)`
`242`	`239`	`{`