Skip to content

[release/6.0-preview6] port: Remove references now included in the Microsoft.NETCore.App.Ref targeting pack + update SDK (#4706) #4713

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 2 commits into from
Jun 22, 2021
Merged

[release/6.0-preview6] port: Remove references now included in the Microsoft.NETCore.App.Ref targeting pack + update SDK (#4706) #4713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d2008b
Remove references now included in the Microsoft.NETCore.App.Ref targe…
ryalanms Jun 22, 2021
cfe5656
Merge branch 'release/6.0-preview6' into port-4706-to-p6
mmitche Jun 22, 2021
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
12 changes: 0 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ce7170424b8e46ca2941c82a259fd7edced0ebcb</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
Expand All @@ -37,10 +33,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
Expand All @@ -49,10 +41,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8bb087d5f77f133d74797b91bb539ec0e2eb3910</Sha>
Expand Down
3 changes: 0 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,12 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.6.21314.2</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.6.21317.12</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.6.21317.12</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.6.21317.12</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.6.21317.12</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.6.21317.12</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.6.21317.12</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
Expand Down
20 changes: 10 additions & 10 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@

<ItemGroup>
<NetCoreReference Include="Microsoft.Win32.Primitives" />
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="Microsoft.Win32.Registry" />
<NetCoreReference Include="System" />
<NetCoreReference Include="System.Collections" />
<NetCoreReference Include="System.Collections.NonGeneric" />
Expand All @@ -1375,38 +1375,38 @@
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
<NetCoreReference Include="System.Console" />
<NetCoreReference Include="System.Diagnostics.Contracts" />
<NetCoreReference Include="System.Diagnostics.Tools" />
<NetCoreReference Include="System.Diagnostics.Tracing" />
<NetCoreReference Include="System.Diagnostics.TraceSource" />
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
<NetCoreReference Include="System.Diagnostics.StackTrace" />
<NetCoreReference Include="System.Diagnostics.Debug" />
<NetCoreReference Include="System.Diagnostics.Process" />
<NetCoreReference Include="System.Diagnostics.StackTrace" />
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
<NetCoreReference Include="System.Diagnostics.Tools" />
<NetCoreReference Include="System.Diagnostics.TraceSource" />
<NetCoreReference Include="System.Diagnostics.Tracing" />
<NetCoreReference Include="System.IO.FileSystem" />
<NetCoreReference Include="System.Net.Primitives" />
<NetCoreReference Include="System.Net.Requests" />
<NetCoreReference Include="System.Net.WebHeaderCollection" />
<NetCoreReference Include="System.ObjectModel" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Threading.Timer" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Xml.ReaderWriter" />
<NetCoreReference Include="netstandard" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>

Expand Down
20 changes: 10 additions & 10 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ItemGroup>
<NetCoreReference Include="Microsoft.Win32.Primitives" />
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="Microsoft.Win32.Registry" />
<NetCoreReference Include="System" />
<NetCoreReference Include="System.Collections" />
<NetCoreReference Include="System.Collections.NonGeneric" />
Expand All @@ -33,37 +33,37 @@
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
<NetCoreReference Include="System.Console" />
<NetCoreReference Include="System.Diagnostics.Contracts" />
<NetCoreReference Include="System.Diagnostics.Tools" />
<NetCoreReference Include="System.Diagnostics.Tracing" />
<NetCoreReference Include="System.Diagnostics.TraceSource" />
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
<NetCoreReference Include="System.Diagnostics.StackTrace" />
<NetCoreReference Include="System.Diagnostics.Debug" />
<NetCoreReference Include="System.Diagnostics.Process" />
<NetCoreReference Include="System.Diagnostics.StackTrace" />
<NetCoreReference Include="System.Diagnostics.TextWriterTraceListener" />
<NetCoreReference Include="System.Diagnostics.Tools" />
<NetCoreReference Include="System.Diagnostics.TraceSource" />
<NetCoreReference Include="System.Diagnostics.Tracing" />
<NetCoreReference Include="System.IO.FileSystem" />
<NetCoreReference Include="System.Net.Primitives" />
<NetCoreReference Include="System.Net.Requests" />
<NetCoreReference Include="System.Net.WebHeaderCollection" />
<NetCoreReference Include="System.ObjectModel" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Runtime.CompilerServices.VisualC" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Serialization.Formatters" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Threading.Timer" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Text.RegularExpressions" />
<NetCoreReference Include="System.Xml.ReaderWriter" />
<NetCoreReference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,7 @@
<ItemGroup>
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="Microsoft.Win32.Primitives" />
<NetCoreReference Include="Microsoft.Win32.Registry" />
<NetCoreReference Include="System" />
<NetCoreReference Include="System.Console" />
<NetCoreReference Include="System.Collections" />
Expand Down Expand Up @@ -1449,7 +1450,6 @@

<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<ItemGroup>
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="Microsoft.Win32.Primitives" />
<NetCoreReference Include="Microsoft.Win32.Registry" />
<NetCoreReference Include="System" />
<NetCoreReference Include="System.Console" />
<NetCoreReference Include="System.Collections" />
Expand Down Expand Up @@ -89,7 +90,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
<PackageReference Include="$(SystemDirectoryServicesPackage)" Version="$(SystemDirectoryServicesVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
Expand All @@ -230,6 +229,7 @@
-->
<ItemGroup>
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="Microsoft.Win32.Registry" />
<NetCoreReference Include="System.Collections" />
<NetCoreReference Include="System.Collections.Generic" />
<NetCoreReference Include="System.Collections.NonGeneric" />
Expand All @@ -249,6 +249,7 @@
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Runtime.Loader" />
<NetCoreReference Include="System.Security.AccessControl" />
<NetCoreReference Include="System.Security.Cryptography.Algorithms" />
<NetCoreReference Include="System.Security.Cryptography.Primitives" />
<NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
PackageReferences to pass to CppCliHelper target
-->
<ItemGroup>
<AdditionalPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
<!--
Expand Down
24 changes: 12 additions & 12 deletions src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,37 +379,40 @@
<ItemGroup>
<NetCoreReference Include="netstandard" />
<NetCoreReference Include="Microsoft.Win32.Primitives" />
<NetCoreReference Include="Microsoft.Win32.Registry" />
<NetCoreReference Include="System" />
<NetCoreReference Include="System.Collections" />
<NetCoreReference Include="System.Collections.NonGeneric" />
<NetCoreReference Include="System.Collections.Specialized" />
<NetCoreReference Include="System.ComponentModel" />
<NetCoreReference Include="System.ComponentModel.Primitives" />
<NetCoreReference Include="System.ComponentModel.TypeConverter" />
<NetCoreReference Include="System.Diagnostics.Debug" />
<NetCoreReference Include="System.Diagnostics.Process" />
<NetCoreReference Include="System.Diagnostics.Tools" />
<NetCoreReference Include="System.Diagnostics.TraceSource" />
<NetCoreReference Include="System.Diagnostics.Debug" />
<NetCoreReference Include="System.IO.FileSystem" />
<NetCoreReference Include="System.IO.Compression" />
<NetCoreReference Include="System.IO.FileSystem" />
<NetCoreReference Include="System.IO.IsolatedStorage" />
<NetCoreReference Include="System.Linq" />
<NetCoreReference Include="System.ObjectModel" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Threading.Timer" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
<NetCoreReference Include="System.Security.AccessControl" />
<NetCoreReference Include="System.Security.Claims" />
<NetCoreReference Include="System.Security.Cryptography" />
<NetCoreReference Include="System.Security.Cryptography.Algorithms" />
<NetCoreReference Include="System.Security.Cryptography.Primitives" />
<NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
<NetCoreReference Include="System.Security.Principal.Windows" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Threading.Timer" />
<NetCoreReference Include="System.Xml" />
<NetCoreReference Include="System.Xml.Document" />
<NetCoreReference Include="System.Xml.ReaderWriter" />
Expand All @@ -419,10 +422,7 @@
<ItemGroup>
<PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
<PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
</ItemGroup>
Expand Down
Loading