Fix some dependencies and added TargetFrameworkAttribute (#5111)

Fixes #5091
dotnet · Apr 21, 2023 · 175dcb9 · 175dcb9
1 parent 04ee51e
commit 175dcb9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 284 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>