Skip to content

Commit 4a19a49

Browse files
ViktorHoferViktorHofer
authored
Use Reference items instead of P2Ps for inbox libs (dotnet#64508)
Some libraries still had ProjectReferences to libraries which refs were added to the targeting pack with the last release. Therefore these references can just be normal "Reference" items instead of P2Ps.
1 parent 9821c6d commit 4a19a49

File tree

13 files changed

+21
-26
lines changed

13 files changed

+21
-26
lines changed

‎src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
<Compile Include="Microsoft\VisualBasic\VBMath.vb" />
9898
</ItemGroup>
9999
<ItemGroup>
100-
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" />
101100
<Reference Include="Microsoft.Win32.Primitives" />
101+
<Reference Include="Microsoft.Win32.Registry" />
102102
<Reference Include="System.Collections" />
103103
<Reference Include="System.Collections.NonGeneric" />
104104
<Reference Include="System.Collections.Specialized" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
<Compile Include="System\Security\AccessControl\RegistrySecurity.FileSystem.cs" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
76-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
7775
<Reference Include="System.Buffers" />
7876
<Reference Include="System.Collections" />
7977
<Reference Include="System.Diagnostics.Debug" />
@@ -84,5 +82,7 @@
8482
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
8583
<Reference Include="System.Runtime.Extensions" />
8684
<Reference Include="System.Runtime.InteropServices" />
85+
<Reference Include="System.Security.AccessControl" />
86+
<Reference Include="System.Security.Principal.Windows" />
8787
</ItemGroup>
8888
</Project>

‎src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@
353353
<Compile Include="System\Diagnostics\ProcessThread.UnknownUnix.cs" />
354354
</ItemGroup>
355355
<ItemGroup>
356-
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" />
357356
<Reference Include="Microsoft.Win32.Primitives" />
357+
<Reference Include="Microsoft.Win32.Registry" />
358358
<Reference Include="System.Collections" />
359359
<Reference Include="System.Collections.Concurrent" />
360360
<Reference Include="System.Collections.NonGeneric" />

‎src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
8686
Link="Common\System\IO\FileSystem.DirectoryCreation.Windows.cs" />
8787
</ItemGroup>
8888
<ItemGroup>
89-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
90-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
9189
<Reference Include="System.Buffers" Condition="'$(TargetsWindows)' == 'true'" />
9290
<Reference Include="System.Collections" Condition="'$(TargetsWindows)' == 'true'" />
9391
<Reference Include="System.Collections.NonGeneric" />
@@ -100,6 +98,8 @@
10098
<Reference Include="System.Runtime.Extensions" />
10199
<Reference Include="System.Runtime.Handles" />
102100
<Reference Include="System.Runtime.InteropServices" Condition="'$(TargetsWindows)' == 'true'" />
101+
<Reference Include="System.Security.AccessControl" />
102+
<Reference Include="System.Security.Principal.Windows" />
103103
<Reference Include="System.Threading.Tasks" Condition="'$(TargetsWindows)' == 'true'" />
104104
</ItemGroup>
105105
</Project>

‎src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@
3333
<Reference Include="System.Threading" />
3434
</ItemGroup>
3535
<ItemGroup>
36+
<Reference Include="System.IO.FileSystem.AccessControl" />
3637
<Reference Include="System.Runtime" />
37-
</ItemGroup>
38-
<ItemGroup>
39-
<ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj" />
40-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
41-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
38+
<Reference Include="System.Security.AccessControl" />
39+
<Reference Include="System.Security.Principal.Windows" />
4240
</ItemGroup>
4341
</Project>

‎src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<ProjectReference Include="$(LibrariesProjectRoot)System.IO.Pipes\src\System.IO.Pipes.csproj">
1616
<SkipUseReferenceAssembly Condition="'$(TargetsWindows)' == 'true'">true</SkipUseReferenceAssembly>
1717
</ProjectReference>
18-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
1918
<Reference Include="System.Runtime" />
19+
<Reference Include="System.Security.AccessControl" />
20+
<Reference Include="System.Security.Principal.Windows" />
2021
</ItemGroup>
2122
</Project>

‎src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,16 @@
162162
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetEUid.cs"
163163
Link="Common\Interop\Unix\Interop.SetEUid.cs" />
164164
</ItemGroup>
165-
<ItemGroup>
166-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" />
167-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
168-
</ItemGroup>
169165
<ItemGroup>
170166
<Reference Include="System.Collections" />
171167
<Reference Include="System.Memory" />
172168
<Reference Include="System.Runtime" />
173169
<Reference Include="System.Runtime.Extensions" />
174170
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
175171
<Reference Include="System.Runtime.InteropServices" />
172+
<Reference Include="System.Security.AccessControl" />
176173
<Reference Include="System.Security.Principal" />
174+
<Reference Include="System.Security.Principal.Windows" />
177175
<Reference Include="System.Threading" />
178176
<Reference Include="System.Threading.Overlapped" />
179177
</ItemGroup>

‎src/libraries/System.Net.Http/src/System.Net.Http.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@
649649
</ItemGroup>
650650
<ItemGroup>
651651
<ProjectReference Include="$(LibrariesProjectRoot)System.Net.Quic\src\System.Net.Quic.csproj" />
652-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
653652
<Reference Include="Microsoft.Win32.Primitives" />
654653
<Reference Include="System.Collections" />
655654
<Reference Include="System.Collections.Concurrent" />
@@ -673,8 +672,10 @@
673672
<Reference Include="System.Security.Cryptography.Algorithms" />
674673
<Reference Include="System.Security.Cryptography.Csp" />
675674
<Reference Include="System.Security.Cryptography.Encoding" />
675+
<Reference Include="System.Security.Cryptography.OpenSsl" />
676676
<Reference Include="System.Security.Cryptography.X509Certificates" />
677677
<Reference Include="System.Security.Principal" Condition="'$(TargetsWindows)' == 'true'" />
678+
<Reference Include="System.Security.Principal.Windows" />
678679
<Reference Include="System.Threading" />
679680
<Reference Include="System.Threading.Channels" />
680681
<Reference Include="System.IO.Compression.Brotli" />
@@ -692,7 +693,4 @@
692693
<ItemGroup>
693694
<None Include="Resources\SR.resx" />
694695
</ItemGroup>
695-
<ItemGroup>
696-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj" />
697-
</ItemGroup>
698696
</Project>

‎src/libraries/System.Net.Mail/src/System.Net.Mail.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@
252252
Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs" />
253253
</ItemGroup>
254254
<ItemGroup>
255-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
256255
<Reference Include="Microsoft.Win32.Primitives" />
257256
<Reference Include="System.Collections" />
258257
<Reference Include="System.Collections.NonGeneric" />
@@ -273,6 +272,7 @@
273272
<Reference Include="System.Runtime.InteropServices" />
274273
<Reference Include="System.Security.Claims" />
275274
<Reference Include="System.Security.Cryptography" />
275+
<Reference Include="System.Security.Principal.Windows" />
276276
<Reference Include="System.Threading" />
277277
</ItemGroup>
278278
</Project>

‎src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
<Compile Include="System\Net\Dns.Browser.cs" />
112112
</ItemGroup>
113113
<ItemGroup>
114-
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
115114
<Reference Include="Microsoft.Win32.Primitives" />
116115
<Reference Include="System.Collections" />
117116
<Reference Include="System.Diagnostics.Tracing" />
@@ -123,6 +122,7 @@
123122
<Reference Include="System.Runtime.Handles" />
124123
<Reference Include="System.Runtime.InteropServices" />
125124
<Reference Include="System.Security.Claims" />
125+
<Reference Include="System.Security.Principal.Windows" />
126126
<Reference Include="System.Threading" />
127127
<Reference Include="System.Threading.Overlapped" />
128128
<Reference Include="System.Threading.ThreadPool" />

0 commit comments

Comments
 (0)