[VMR] Codeflow f905beb-f905beb

[[ commit created by automation ]]

Author: dotnet-maestro[bot]

src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj

@@ -38,6 +38,7 @@
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
     <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
+    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>
 

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj

@@ -101,7 +101,8 @@
 
     <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
         Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
-    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
+    <!-- Always explicitly include the .pdb -->
+    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
         Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
   </ItemGroup>
 
@@ -118,6 +119,14 @@
       <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
           Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
 
+      <!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
+      <!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' == 'win'" />
+
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' != 'win'" />
+
       <_SymbolFilesToPackage Include="@(_TransportPdbs)"
           Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
     </ItemGroup>

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

@@ -46,6 +46,7 @@
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
     <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
+    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>
 
@@ -97,7 +98,8 @@
 
     <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
         Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.dll" />
-    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) "
+    <!-- Always explicitly include the .pdb -->
+    <NativeRuntimeAsset Condition=" '$(UseIisNativeAssets)' == 'true' "
         Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
   </ItemGroup>
 
@@ -114,6 +116,14 @@
       <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
           Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
 
+      <!-- Dedupe System.Security.Cryptography.Pkcs.pdb based on RID -->
+      <!-- If we get rid of our custom reference resolution here, we can let nuget handle this -->
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\lib\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' == 'win'" />
+
+      <_TransportPdbs Remove="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\runtimes\win\**\System.Security.Cryptography.Pkcs.pdb"
+          Condition="'$(TargetOsName)' != 'win'" />
+
       <_SymbolFilesToPackage Include="@(_TransportPdbs)"
           Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
     </ItemGroup>