Skip to content

Fix some dependencies and added TargetFrameworkAttribute #5111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2023
Merged

Fix some dependencies and added TargetFrameworkAttribute #5111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions eng/Versioning.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/System.ServiceModel.NetFramingBase/src/System.ServiceModel.NetFramingBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)-->
Expand Down
24 changes: 2 additions & 22 deletions src/System.ServiceModel.Primitives/ref/System.ServiceModel.Primitives.Ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading