Include all pdb's for S.SM.Primitives so that package is deterministic and has compiler flags (#5683)

* Include all pdb's for S.SM.Primitives so that package is deterministic and has compiler flags

* Add missing old Duplex and Security package types being type forwarded by Primitives to System.ServiceModel

Author: mconnew

eng/RuntimePackages.props

@@ -39,10 +39,12 @@
     <None Condition="Exists('netstandard.cs')" Include="netstandard.cs" />
     <None Condition="Exists('NetFxTypeForwards.cs')" Include="NetFxTypeForwards.cs" />
   </ItemGroup>
-  
+
   <PropertyGroup>
     <!-- Placeholders don't need a dependency group. -->
     <NoWarn>$(NoWarn);NU5128;NU5131</NoWarn>
+    <Deterministic>true</Deterministic>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(PlaceholderFile)"

eng/RuntimePackages.targets

@@ -9,6 +9,7 @@
     <IsShipping>$(Ship_WcfPackages)</IsShipping>
     <IsShippingPackage>false</IsShippingPackage>
     <IncludeSRCommonCode>false</IncludeSRCommonCode>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != '$(NetFrameworkVersion)'">

src/System.ServiceModel.Duplex/src/System.ServiceModel.Duplex.csproj

@@ -193,3 +193,43 @@
 [assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509CertificateInitiatorClientCredential))]
 [assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509CertificateRecipientClientCredential))]
 [assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509ServiceCertificateAuthentication))]
+
+// From old Duplex package
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.CallbackBehaviorAttribute))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.ConcurrencyMode))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.DuplexChannelFactory<>))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.DuplexClientBase<>))]
+
+// From old Security package
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.DnsEndpointIdentity))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageSecurityVersion))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.SpnEndpointIdentity))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.UpnEndpointIdentity))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.X509CertificateEndpointIdentity))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ISecurityCapabilities))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.LocalClientSecuritySettings))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.SecurityBindingElement))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.SecurityHeaderLayout))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.TransportSecurityBindingElement))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityKeyEntropyMode))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.BasicSecurityProfileVersion))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.IdentityVerifier))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecureConversationVersion))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityAlgorithmSuite))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityPolicyVersion))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityVersion))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.TrustVersion))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.BinarySecretSecurityToken))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.SecurityTokenParameters))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.SupportingTokenParameters))]
+[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.ClaimSet))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.Claim))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.IAuthorizationPolicy))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.IAuthorizationComponent))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.AuthorizationContext))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.GenericXmlSecurityToken))]
+[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause))]

src/System.ServiceModel.Primitives/src/NetFxTypeForwards.cs

@@ -75,8 +75,14 @@
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificBuildOutput);AddRetiredPackageAssembliesToPackage</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
   <Target Name="AddRetiredPackageAssembliesToPackage" AfterTargets="AssignTargetPaths">
+    <ItemGroup>
+      <RetiredPackagesAssemblies Update="@(RetiredPackagesAssemblies)">
+        <PdbFilePath>%(RetiredPackagesAssemblies.RootDir)%(RetiredPackagesAssemblies.Directory)%(RetiredPackagesAssemblies.Filename).pdb</PdbFilePath>  
+      </RetiredPackagesAssemblies>
+    </ItemGroup>
     <ItemGroup>
       <TfmSpecificPackageFile Include="@(RetiredPackagesAssemblies)" PackagePath="lib/$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="%(RetiredPackagesAssemblies.PdbFilePath)" PackagePath="lib/$(TargetFramework)" Condition="Exists('%(RetiredPackagesAssemblies.PdbFilePath)')" />
     </ItemGroup>
   </Target>
 </Project>

src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj

@@ -9,6 +9,7 @@
     <IsShipping>$(Ship_WcfPackages)</IsShipping>
     <IsShippingPackage>false</IsShippingPackage>
     <IncludeSRCommonCode>false</IncludeSRCommonCode>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != '$(NetFrameworkVersion)'">

src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj

@@ -15,6 +15,7 @@
     <!-- The partial facade assembly's public key token must exactly match the contract to be filled. -->
     <StrongNameKeyId>ECMA</StrongNameKeyId>
     <MicrosoftTargetingPackNETFrameworkv472Package>Microsoft.TargetingPack.NETFramework.v4.7.2</MicrosoftTargetingPackNETFrameworkv472Package>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <PackageDownload Include="$(MicrosoftTargetingPackNETFrameworkv472Package)" Version="[$(MicrosoftTargetingPackNETFrameworkv472PackageVersion)]" />