Skip to content

Commit 5eea920

Browse files
mmitcheryalanms
mmitche
and
ryalanms
authored
Remove references now included in the Microsoft.NETCore.App.Ref targeting pack + update SDK (#4706) (#4713)
* Remove references now included in the runtime + update SDK * Revert SDK version to Preview 4 Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
1 parent 5bee0ff commit 5eea920

File tree

11 files changed

+48
-67
lines changed

11 files changed

+48
-67
lines changed

‎eng/Version.Details.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<Uri>https://github.com/dotnet/winforms</Uri>
1010
<Sha>ce7170424b8e46ca2941c82a259fd7edced0ebcb</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
13-
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
15-
</Dependency>
1612
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Private.Winforms">
1713
<Uri>https://github.com/dotnet/runtime</Uri>
1814
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
@@ -37,10 +33,6 @@
3733
<Uri>https://github.com/dotnet/runtime</Uri>
3834
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
3935
</Dependency>
40-
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
41-
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
43-
</Dependency>
4436
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Private.Winforms">
4537
<Uri>https://github.com/dotnet/runtime</Uri>
4638
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
@@ -49,10 +41,6 @@
4941
<Uri>https://github.com/dotnet/runtime</Uri>
5042
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
5143
</Dependency>
52-
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
53-
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
55-
</Dependency>
5644
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Private.Winforms">
5745
<Uri>https://github.com/dotnet/runtime</Uri>
5846
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>

‎eng/Versions.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,12 @@
2929
</PropertyGroup>
3030
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
3131
<PropertyGroup>
32-
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.6.21314.2</MicrosoftWin32RegistryPackageVersion>
3332
<SystemCodeDomPackageVersion>6.0.0-preview.6.21317.12</SystemCodeDomPackageVersion>
3433
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.6.21317.12</SystemConfigurationConfigurationManagerPackageVersion>
3534
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.6.21317.12</SystemDiagnosticsEventLogPackageVersion>
3635
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
37-
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityAccessControlPackageVersion>
3836
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.6.21317.12</SystemSecurityCryptographyXmlPackageVersion>
3937
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.6.21317.12</SystemSecurityPermissionsPackageVersion>
40-
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityPrincipalWindowsPackageVersion>
4138
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.6.21317.12</SystemWindowsExtensionsPackageVersion>
4239
</PropertyGroup>
4340
<!-- Packages that come from https://github.com/dotnet/arcade -->

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,7 @@
13641364

13651365
<ItemGroup>
13661366
<NetCoreReference Include="Microsoft.Win32.Primitives" />
1367-
<NetCoreReference Include="netstandard" />
1367+
<NetCoreReference Include="Microsoft.Win32.Registry" />
13681368
<NetCoreReference Include="System" />
13691369
<NetCoreReference Include="System.Collections" />
13701370
<NetCoreReference Include="System.Collections.NonGeneric" />
@@ -1375,38 +1375,38 @@
13751375
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
13761376
<NetCoreReference Include="System.Console" />
13771377
<NetCoreReference Include="System.Diagnostics.Contracts" />
1378-
<NetCoreReference Include="System.Diagnostics.Tools" />
1379-
<NetCoreReference Include="System.Diagnostics.Tracing" />
1380-
<NetCoreReference Include="System.Diagnostics.TraceSource" />
1381-
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
1382-
<NetCoreReference Include="System.Diagnostics.StackTrace" />
13831378
<NetCoreReference Include="System.Diagnostics.Debug" />
13841379
<NetCoreReference Include="System.Diagnostics.Process" />
1380+
<NetCoreReference Include="System.Diagnostics.StackTrace" />
1381+
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
1382+
<NetCoreReference Include="System.Diagnostics.Tools" />
1383+
<NetCoreReference Include="System.Diagnostics.TraceSource" />
1384+
<NetCoreReference Include="System.Diagnostics.Tracing" />
13851385
<NetCoreReference Include="System.IO.FileSystem" />
13861386
<NetCoreReference Include="System.Net.Primitives" />
13871387
<NetCoreReference Include="System.Net.Requests" />
13881388
<NetCoreReference Include="System.Net.WebHeaderCollection" />
13891389
<NetCoreReference Include="System.ObjectModel" />
1390-
<NetCoreReference Include="System.Runtime" />
13911390
<NetCoreReference Include="System.Resources.ResourceManager" />
1391+
<NetCoreReference Include="System.Runtime" />
13921392
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
13931393
<NetCoreReference Include="System.Runtime.Extensions" />
13941394
<NetCoreReference Include="System.Runtime.InteropServices" />
13951395
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
1396+
<NetCoreReference Include="System.Text.Encoding.Extensions" />
1397+
<NetCoreReference Include="System.Text.RegularExpressions" />
13961398
<NetCoreReference Include="System.Threading" />
13971399
<NetCoreReference Include="System.Threading.Tasks" />
13981400
<NetCoreReference Include="System.Threading.Thread" />
13991401
<NetCoreReference Include="System.Threading.ThreadPool" />
14001402
<NetCoreReference Include="System.Threading.Timer" />
1401-
<NetCoreReference Include="System.Text.Encoding.Extensions" />
1402-
<NetCoreReference Include="System.Text.RegularExpressions" />
14031403
<NetCoreReference Include="System.Xml.ReaderWriter" />
1404+
<NetCoreReference Include="netstandard" />
14041405
</ItemGroup>
14051406

14061407
<ItemGroup>
14071408
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
14081409
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
1409-
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
14101410
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
14111411
</ItemGroup>
14121412

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup>
2424
<NetCoreReference Include="Microsoft.Win32.Primitives" />
25-
<NetCoreReference Include="netstandard" />
25+
<NetCoreReference Include="Microsoft.Win32.Registry" />
2626
<NetCoreReference Include="System" />
2727
<NetCoreReference Include="System.Collections" />
2828
<NetCoreReference Include="System.Collections.NonGeneric" />
@@ -33,37 +33,37 @@
3333
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
3434
<NetCoreReference Include="System.Console" />
3535
<NetCoreReference Include="System.Diagnostics.Contracts" />
36-
<NetCoreReference Include="System.Diagnostics.Tools" />
37-
<NetCoreReference Include="System.Diagnostics.Tracing" />
38-
<NetCoreReference Include="System.Diagnostics.TraceSource" />
39-
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
40-
<NetCoreReference Include="System.Diagnostics.StackTrace" />
4136
<NetCoreReference Include="System.Diagnostics.Debug" />
4237
<NetCoreReference Include="System.Diagnostics.Process" />
38+
<NetCoreReference Include="System.Diagnostics.StackTrace" />
39+
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
40+
<NetCoreReference Include="System.Diagnostics.Tools" />
41+
<NetCoreReference Include="System.Diagnostics.TraceSource" />
42+
<NetCoreReference Include="System.Diagnostics.Tracing" />
4343
<NetCoreReference Include="System.IO.FileSystem" />
4444
<NetCoreReference Include="System.Net.Primitives" />
4545
<NetCoreReference Include="System.Net.Requests" />
4646
<NetCoreReference Include="System.Net.WebHeaderCollection" />
4747
<NetCoreReference Include="System.ObjectModel" />
48-
<NetCoreReference Include="System.Runtime" />
4948
<NetCoreReference Include="System.Resources.ResourceManager" />
49+
<NetCoreReference Include="System.Runtime" />
5050
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
5151
<NetCoreReference Include="System.Runtime.Extensions" />
5252
<NetCoreReference Include="System.Runtime.InteropServices" />
5353
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
54+
<NetCoreReference Include="System.Text.Encoding.Extensions" />
55+
<NetCoreReference Include="System.Text.RegularExpressions" />
5456
<NetCoreReference Include="System.Threading" />
5557
<NetCoreReference Include="System.Threading.Tasks" />
5658
<NetCoreReference Include="System.Threading.Thread" />
5759
<NetCoreReference Include="System.Threading.ThreadPool" />
5860
<NetCoreReference Include="System.Threading.Timer" />
59-
<NetCoreReference Include="System.Text.Encoding.Extensions" />
60-
<NetCoreReference Include="System.Text.RegularExpressions" />
6161
<NetCoreReference Include="System.Xml.ReaderWriter" />
62+
<NetCoreReference Include="netstandard" />
6263
</ItemGroup>
6364
<ItemGroup>
6465
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
6566
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
66-
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
6767
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
6868
</ItemGroup>
6969
<ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,7 @@
13741374
<ItemGroup>
13751375
<NetCoreReference Include="netstandard" />
13761376
<NetCoreReference Include="Microsoft.Win32.Primitives" />
1377+
<NetCoreReference Include="Microsoft.Win32.Registry" />
13771378
<NetCoreReference Include="System" />
13781379
<NetCoreReference Include="System.Console" />
13791380
<NetCoreReference Include="System.Collections" />
@@ -1449,7 +1450,6 @@
14491450

14501451
<ItemGroup>
14511452
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
1452-
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
14531453
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
14541454
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
14551455
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<ItemGroup>
2727
<NetCoreReference Include="netstandard" />
2828
<NetCoreReference Include="Microsoft.Win32.Primitives" />
29+
<NetCoreReference Include="Microsoft.Win32.Registry" />
2930
<NetCoreReference Include="System" />
3031
<NetCoreReference Include="System.Console" />
3132
<NetCoreReference Include="System.Collections" />
@@ -89,7 +90,6 @@
8990
</ItemGroup>
9091
<ItemGroup>
9192
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
92-
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
9393
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
9494
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
9595
</ItemGroup>

‎src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@
218218
<ItemGroup>
219219
<PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" />
220220
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
221-
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
222221
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
223222
<PackageReference Include="$(SystemDirectoryServicesPackage)" Version="$(SystemDirectoryServicesVersion)" />
224223
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
@@ -230,6 +229,7 @@
230229
-->
231230
<ItemGroup>
232231
<NetCoreReference Include="netstandard" />
232+
<NetCoreReference Include="Microsoft.Win32.Registry" />
233233
<NetCoreReference Include="System.Collections" />
234234
<NetCoreReference Include="System.Collections.Generic" />
235235
<NetCoreReference Include="System.Collections.NonGeneric" />
@@ -249,6 +249,7 @@
249249
<NetCoreReference Include="System.Runtime.Extensions" />
250250
<NetCoreReference Include="System.Runtime.InteropServices" />
251251
<NetCoreReference Include="System.Runtime.Loader" />
252+
<NetCoreReference Include="System.Security.AccessControl" />
252253
<NetCoreReference Include="System.Security.Cryptography.Algorithms" />
253254
<NetCoreReference Include="System.Security.Cryptography.Primitives" />
254255
<NetCoreReference Include="System.Security.Cryptography.X509Certificates" />

‎src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
PackageReferences to pass to CppCliHelper target
155155
-->
156156
<ItemGroup>
157-
<AdditionalPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
158157
<AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
159158
</ItemGroup>
160159
<!--

‎src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -379,37 +379,40 @@
379379
<ItemGroup>
380380
<NetCoreReference Include="netstandard" />
381381
<NetCoreReference Include="Microsoft.Win32.Primitives" />
382+
<NetCoreReference Include="Microsoft.Win32.Registry" />
382383
<NetCoreReference Include="System" />
383384
<NetCoreReference Include="System.Collections" />
384385
<NetCoreReference Include="System.Collections.NonGeneric" />
385386
<NetCoreReference Include="System.Collections.Specialized" />
386387
<NetCoreReference Include="System.ComponentModel" />
387388
<NetCoreReference Include="System.ComponentModel.Primitives" />
388389
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
390+
<NetCoreReference Include="System.Diagnostics.Debug" />
389391
<NetCoreReference Include="System.Diagnostics.Process" />
390392
<NetCoreReference Include="System.Diagnostics.Tools" />
391393
<NetCoreReference Include="System.Diagnostics.TraceSource" />
392-
<NetCoreReference Include="System.Diagnostics.Debug" />
393-
<NetCoreReference Include="System.IO.FileSystem" />
394394
<NetCoreReference Include="System.IO.Compression" />
395+
<NetCoreReference Include="System.IO.FileSystem" />
395396
<NetCoreReference Include="System.IO.IsolatedStorage" />
396397
<NetCoreReference Include="System.Linq" />
397398
<NetCoreReference Include="System.ObjectModel" />
398-
<NetCoreReference Include="System.Runtime" />
399399
<NetCoreReference Include="System.Resources.ResourceManager" />
400-
<NetCoreReference Include="System.Runtime.InteropServices" />
401-
<NetCoreReference Include="System.Threading" />
402-
<NetCoreReference Include="System.Threading.Tasks" />
403-
<NetCoreReference Include="System.Threading.Thread" />
404-
<NetCoreReference Include="System.Threading.ThreadPool" />
405-
<NetCoreReference Include="System.Threading.Timer" />
400+
<NetCoreReference Include="System.Runtime" />
406401
<NetCoreReference Include="System.Runtime.Extensions" />
402+
<NetCoreReference Include="System.Runtime.InteropServices" />
403+
<NetCoreReference Include="System.Security.AccessControl" />
407404
<NetCoreReference Include="System.Security.Claims" />
408405
<NetCoreReference Include="System.Security.Cryptography" />
409406
<NetCoreReference Include="System.Security.Cryptography.Algorithms" />
410407
<NetCoreReference Include="System.Security.Cryptography.Primitives" />
411408
<NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
409+
<NetCoreReference Include="System.Security.Principal.Windows" />
412410
<NetCoreReference Include="System.Text.Encoding.Extensions" />
411+
<NetCoreReference Include="System.Threading" />
412+
<NetCoreReference Include="System.Threading.Tasks" />
413+
<NetCoreReference Include="System.Threading.Thread" />
414+
<NetCoreReference Include="System.Threading.ThreadPool" />
415+
<NetCoreReference Include="System.Threading.Timer" />
413416
<NetCoreReference Include="System.Xml" />
414417
<NetCoreReference Include="System.Xml.Document" />
415418
<NetCoreReference Include="System.Xml.ReaderWriter" />
@@ -419,10 +422,7 @@
419422
<ItemGroup>
420423
<PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
421424
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
422-
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
423425
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
424-
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" />
425-
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
426426
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
427427
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
428428
</ItemGroup>

0 commit comments

Comments
 (0)