Skip to content

Commit 12cf8b0

Browse files
[release/7.0] Fix netfx build for S.S.C.Xml nuget package (#78734)
* Fix netfx build for S.S.C.Xml nuget package * Also fix System.Threading.AccessControl * Add nuget servicing properties Co-authored-by: Jeremy Barton <[email protected]>
1 parent e92b494 commit 12cf8b0

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<Compile Include="System.Security.Cryptography.Xml.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" />
9-
<Compile Include="System.Security.Cryptography.Xml.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == 'NETFramework'" />
9+
<Compile Include="System.Security.Cryptography.Xml.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
1010
</ItemGroup>
1111

1212
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<NoWarn>$(NoWarn);nullable</NoWarn>
77
<NoWarn>$(NoWarn);CA1850</NoWarn> <!-- CA1850 suppressed due to multitargeting -->
88
<IsPackable>true</IsPackable>
9+
<ServicingVersion>1</ServicingVersion>
10+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
911
<PackageDescription>Provides classes to support the creation and validation of XML digital signatures. The classes in this namespace implement the World Wide Web Consortium Recommendation, "XML-Signature Syntax and Processing", described at http://www.w3.org/TR/xmldsig-core/.
1012

1113
Commonly Used Types:

src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<ItemGroup>
77
<Compile Include="System.Threading.AccessControl.Extensions.cs" />
88
<Compile Include="System.Threading.AccessControl.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" />
9-
<Compile Include="System.Threading.AccessControl.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == 'NETFramework'" />
9+
<Compile Include="System.Threading.AccessControl.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
1010
</ItemGroup>
1111

1212
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1313
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
1414
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
1515
</ItemGroup>
16-
</Project>
16+
</Project>

src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IsPackable>true</IsPackable>
6+
<ServicingVersion>1</ServicingVersion>
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
68
<PackageDescription>Provides support for managing access and audit control lists for synchronization primitives.
79

810
Commonly Used Types:

0 commit comments

Comments
 (0)