Skip to content

Commit ab10059

Browse files
ViktorHoferViktorHofer
committed
1 parent a9a88d5 commit ab10059

File tree

10 files changed

+29
-13
lines changed

10 files changed

+29
-13
lines changed

‎src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
2323
<Reference Include="System.Security" />
24+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
25+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
2426
</ItemGroup>
2527

2628
</Project>

‎src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@
2222
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Xml\src\Microsoft.Extensions.Configuration.Xml.csproj" />
2323
</ItemGroup>
2424

25+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
26+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
27+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
28+
</ItemGroup>
29+
2530
</Project>

‎src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1717
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
1818
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
19-
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project. -->
20-
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
21-
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
19+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
20+
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
21+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
2222
</ItemGroup>
2323
</Project>

‎src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
</ItemGroup>
88
<ItemGroup>
99
<ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
10+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
11+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
1012
</ItemGroup>
1113
</Project>

‎src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@
102102
<ItemGroup>
103103
<ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
104104
</ItemGroup>
105-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
105+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
106106
<Reference Include="System.Configuration" />
107+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
108+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
107109
</ItemGroup>
108110
</Project>

‎src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2323
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" />
2424
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
25-
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
26-
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
27-
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
28-
<PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
25+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
26+
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" PrivateAssets="all" />
27+
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
28+
<PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" />
2929
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" />
3030
</ItemGroup>
3131
</Project>

‎src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
<Reference Include="System.Runtime" />
2020
<Reference Include="System.Runtime.InteropServices" />
2121
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
23+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
24+
</ItemGroup>
2225
</Project>

‎src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3434
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
35-
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
36-
<PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
35+
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
36+
<PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" />
3737
</ItemGroup>
3838
</Project>

‎src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@
6969
<ItemGroup>
7070
<ProjectReference Include="..\src\System.Security.Cryptography.Xml.csproj" />
7171
</ItemGroup>
72-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
72+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
7373
<Reference Include="System.Security" />
74+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
75+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
7476
</ItemGroup>
7577
</Project>

‎src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</ItemGroup>
2222
<ItemGroup Condition="'$(TargetFramework)' != 'net461' and !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
2323
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
24-
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project. -->
25-
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
24+
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
25+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
2626
</ItemGroup>
2727
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
2828
<ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\ref\System.Windows.Extensions.csproj" />

0 commit comments

Comments
 (0)