From b0c7171813c6c1ab88f059dbc51817ab1fdc0502 Mon Sep 17 00:00:00 2001
From: Matt Connew <mconnew@users.noreply.github.com>
Date: Thu, 20 Apr 2023 15:42:07 -0700
Subject: [PATCH] Fix some dependencies and added TargetFrameworkAttribute
 Fixes #5091

---
 eng/Versioning.props                          |   3 +-
 eng/Versions.props                            |   4 +-
 .../System.ServiceModel.NetFramingBase.csproj |   1 -
 .../System.ServiceModel.Primitives.Ref.csproj |  24 +-
 ...em.ServiceModel.Primitives.netframework.cs | 244 ------------------
 .../src/System.ServiceModel.Primitives.csproj |   5 +-
 .../src/System.ServiceModel.Security.csproj   |  10 +-
 7 files changed, 7 insertions(+), 284 deletions(-)
 delete mode 100644 src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.netframework.cs

diff --git a/eng/Versioning.props b/eng/Versioning.props
index b3bf79144e7..1e47d9f7f39 100644
--- a/eng/Versioning.props
+++ b/eng/Versioning.props
@@ -12,8 +12,7 @@
 
   <PropertyGroup>
     <!-- Disable some standard properties for building our projects -->
-    <!-- [todo:arcade] Disabling these because our shipped assemblies didn't include these attributes, not sure if we care or not. -->
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+    <GenerateTargetFrameworkAttribute>true</GenerateTargetFrameworkAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <!-- [todo:arcade] This attribute exists in our previously shipped S.P.SM assembly but not in all the Facade assemblies. For now removing accross all assemblies. -->
     <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
diff --git a/eng/Versions.props b/eng/Versions.props
index 807190aa564..8cdbd540e1a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,12 +31,10 @@
   </PropertyGroup>
   <!-- CoreFx dependencies -->
   <PropertyGroup>
-    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-rtm</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
     <SystemReflectionDispatchProxyPackageVersion>4.7.1</SystemReflectionDispatchProxyPackageVersion>
     <SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
     <SystemSecurityCryptographyXmlPackageVersion>6.0.1</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
-    <MicrosoftPrivateCoreFxUAPPackageVersion>4.7.0-preview4.19164.7</MicrosoftPrivateCoreFxUAPPackageVersion>
+    <MicrosoftExtensionsObjectPoolVersion>6.0.16</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!-- Additional dependencies -->
   <PropertyGroup>
diff --git a/src/System.ServiceModel.NetFramingBase/src/System.ServiceModel.NetFramingBase.csproj b/src/System.ServiceModel.NetFramingBase/src/System.ServiceModel.NetFramingBase.csproj
index 1e0ad0de8dc..8469d6632fd 100644
--- a/src/System.ServiceModel.NetFramingBase/src/System.ServiceModel.NetFramingBase.csproj
+++ b/src/System.ServiceModel.NetFramingBase/src/System.ServiceModel.NetFramingBase.csproj
@@ -20,7 +20,6 @@
 
   <ItemGroup>
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> <!-- TODO: Parameterize version of Tasks.Extensions, nb, not needed if dropping netstandard2.0 -->
   </ItemGroup>
 
   <!--The default source produced by the Arcade SDK does not work with the checked-in source file SR.cs (class/namespace/filename)-->
diff --git a/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.Ref.csproj b/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.Ref.csproj
index 71c6f3a7477..86ed09b3b17 100644
--- a/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.Ref.csproj
+++ b/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.Ref.csproj
@@ -2,38 +2,18 @@
   <PropertyGroup>
     <AssemblyVersion>$(WcfAssemblyVersion)</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
-    <TargetFrameworks>net6.0;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AssemblyName>System.ServiceModel.Primitives</AssemblyName>
     <RootNamespace>System.ServiceModel</RootNamespace>
     <CLSCompliant>true</CLSCompliant>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <!--<IsPartialFacadeAssembly Condition="'$(TargetFramework)' == 'net461'">true</IsPartialFacadeAssembly>-->
   </PropertyGroup>
 
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <Reference Include="System" />
-    <Reference Include="System.IdentityModel" />
-    <Reference Include="System.ServiceModel" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
+  <ItemGroup>
     <Compile Include="System.ServiceModel.Primitives.cs" />
     <Compile Include="System.ServiceModel.Security.cs" />
     <Compile Include="System.ServiceModel.Primitives.Netcoreapp.cs" />
     <Compile Include="System.ServiceModel.Duplex.cs" />
     <None Include="System.ServiceModel.Primitives.netframework.cs" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <None Include="System.ServiceModel.Primitives.cs" />
-    <None Include="System.ServiceModel.Security.cs" />
-    <None Include="System.ServiceModel.Primitives.Netcoreapp.cs" />
-    <None Include="System.ServiceModel.Duplex.cs" />
-    <Compile Include="System.ServiceModel.Primitives.netframework.cs" />
-  </ItemGroup>
 </Project>
diff --git a/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.netframework.cs b/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.netframework.cs
deleted file mode 100644
index 32b9d825092..00000000000
--- a/src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.netframework.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-// ------------------------------------------------------------------------------
-
-using System.Runtime.CompilerServices;
-
-[assembly: TypeForwardedTo(typeof(System.Collections.Generic.KeyedByTypeCollection<>))]
-[assembly: TypeForwardedTo(typeof(System.Collections.Generic.SynchronizedCollection<>))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.Claim))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.ClaimSet))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.ClaimTypes))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.DefaultClaimSet))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.WindowsClaimSet))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Claims.X509CertificateClaimSet))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.AuthorizationContext))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.EvaluationContext))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.IAuthorizationComponent))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Policy.IAuthorizationPolicy))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenAuthenticator))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenManager))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenProvider))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenRequirement))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenResolver))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenSerializer))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.SecurityTokenVersion))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.X509CertificateValidator))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Selectors.X509SecurityTokenAuthenticator))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.GenericXmlSecurityToken))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityKey))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityKeyIdentifier))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityKeyIdentifierClause))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityKeyType))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityKeyUsage))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityToken))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityTokenException))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SecurityTokenValidationException))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.SymmetricSecurityKey))]
-[assembly: TypeForwardedTo(typeof(System.IdentityModel.Tokens.X509SecurityToken))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ActionNotSupportedException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.CacheSetting))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ChannelFactory))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ChannelFactory<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ChannelTerminatedException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.AddressHeader))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.AddressHeaderCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.AddressingVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BinaryMessageEncodingBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.Binding))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BindingContext))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BindingElementCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BindingParameterCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BodyWriter))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.BufferManager))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ChannelBase))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ChannelFactoryBase))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ChannelFactoryBase<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ChannelManagerBase))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ChannelParameterCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.CommunicationObject))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.CompressionFormat))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.CustomBinding))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.FaultConverter))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IBindingDeliveryCapabilities))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IChannelFactory))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IChannelFactory<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IDuplexChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IDuplexSession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IDuplexSessionChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IInputChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IInputSession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IInputSessionChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IMessageProperty))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IOutputChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IOutputSession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IOutputSessionChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IRequestChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.IRequestSessionChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ISecurityCapabilities))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ISession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ISessionChannel<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.LocalClientSecuritySettings))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.Message))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageBuffer))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageEncoder))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageEncoderFactory))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageEncodingBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageFault))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageHeader))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageHeaderInfo))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageHeaders))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageProperties))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageState))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MessageVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.MtomMessageEncodingBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.ReliableSessionBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.RequestContext))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.SecurityBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.SecurityHeaderLayout))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.TextMessageEncodingBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.TransportBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.TransportSecurityBindingElement))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.UnderstoodHeaders))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ClientBase<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ClientCredentialsSecurityTokenManager))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.CommunicationException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.CommunicationObjectAbortedException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.CommunicationObjectFaultedException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.CommunicationState))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.DataContractFormatAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.DeliveryRequirementsAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.CallbackDebugBehavior))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.ClientCredentials))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.ContractDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.DataContractSerializerOperationBehavior))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.FaultDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.FaultDescriptionCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.IContractBehavior))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.IEndpointBehavior))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.IOperationBehavior))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessageBodyDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessageDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessageDescriptionCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessageDirection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessageHeaderDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessageHeaderDescriptionCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessagePartDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessagePartDescriptionCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessagePropertyDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.MessagePropertyDescriptionCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.OperationDescription))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.OperationDescriptionCollection))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.ServiceEndpoint))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.TypedMessageConverter))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Description.XmlSerializerOperationBehavior))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.ChannelDispatcher))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.ClientOperation))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.ClientRuntime))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.DispatchOperation))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.DispatchRuntime))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.EndpointDispatcher))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.FaultContractInfo))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IChannelInitializer))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IClientMessageFormatter))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IClientMessageInspector))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IClientOperationSelector))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IDispatchMessageInspector))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IInteractiveChannelInitializer))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Dispatcher.IParameterInspector))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.DnsEndpointIdentity))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.EndpointAddress))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.EndpointAddressBuilder))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.EndpointIdentity))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.EndpointNotFoundException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.EnvelopeVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ExceptionDetail))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ExtensionCollection<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.FaultCode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.FaultContractAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.FaultException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.FaultException<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.FaultReason))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.FaultReasonText))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.IClientChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ICommunicationObject))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.IContextChannel))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.IDefaultCommunicationTimeouts))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.IExtensibleObject<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.IExtension<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.IExtensionCollection<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.InstanceContext))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.InvalidMessageContractException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageBodyMemberAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageContractAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageContractMemberAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageCredentialType))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageHeader<>))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageHeaderArrayAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageHeaderAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageHeaderException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageParameterAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessagePropertyAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.MessageSecurityVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.OperationContext))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.OperationContextScope))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.OperationContractAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.OperationFormatStyle))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.OperationFormatUse))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.OptionalReliableSession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ProtocolException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.QueuedDeliveryRequirementsMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.QuotaExceededException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ReliableMessagingVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ReliableSession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.BasicSecurityProfileVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.HttpDigestClientCredential))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.ISecuritySession))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.IdentityVerifier))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.MessageSecurityException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecureConversationVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityAccessDeniedException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityAlgorithmSuite))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityCredentialsManager))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityKeyEntropyMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityMessageProperty))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityNegotiationException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityPolicyVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityTokenAttachmentMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityTokenSpecification))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SecurityVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.SupportingTokenSpecification))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.BinarySecretSecurityToken))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.InitiatorServiceModelSecurityTokenRequirement))]
-[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.SspiSecurityToken))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.SupportingTokenParameters))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.TrustVersion))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.UserNamePasswordClientCredential))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.WindowsClientCredential))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509CertificateInitiatorClientCredential))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509CertificateRecipientClientCredential))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509CertificateValidationMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.Security.X509ServiceCertificateAuthentication))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.SecurityMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ServerTooBusyException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ServiceActivationException))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ServiceContractAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ServiceKnownTypeAttribute))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.ServiceSecurityContext))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.SessionMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.SpnEndpointIdentity))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.TransferMode))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.UnknownMessageReceivedEventArgs))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.UpnEndpointIdentity))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.X509CertificateEndpointIdentity))]
-[assembly: TypeForwardedTo(typeof(System.ServiceModel.XmlSerializerFormatAttribute))]
-
-
diff --git a/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj b/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj
index cbc141e0520..9fe595b1cee 100644
--- a/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj
+++ b/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj
@@ -28,11 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="System.Reflection.DispatchProxy" Version="$(SystemReflectionDispatchProxyPackageVersion)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="5.0.10" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj b/src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj
index 763f140b849..e79f16362b8 100644
--- a/src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj
+++ b/src/System.ServiceModel.Security/src/System.ServiceModel.Security.csproj
@@ -7,18 +7,12 @@
     <IsPackable>true</IsPackable>
     <!-- Workaround for https://github.com/NuGet/NuGet.Client/pull/3016 -->
     <NoWarn>$(NoWarn);NU5131</NoWarn>
-    <TargetFrameworks>net6.0;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsShipping>$(Ship_WcfPackages)</IsShipping>
     <PackageDescription>Provides the types that support additional security features.</PackageDescription>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
+  <ItemGroup>
     <ProjectReference Include="..\..\System.ServiceModel.Primitives\ref\System.ServiceModel.Primitives.Ref.csproj" />
   </ItemGroup>
-
-  <!-- the following represent dependencies copied from the old package -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <Reference Include="System.IdentityModel" />
-    <Reference Include="System.ServiceModel" />
-  </ItemGroup>
 </Project>