Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[master] Update dependencies from dotnet/corefx #6817

Merged
dotnet-maestro merged 26 commits into from
Jun 18, 2019
Merged

[master] Update dependencies from dotnet/corefx #6817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e04ca2e
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 13, 2019
f4f6297
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 13, 2019
57a91f7
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 14, 2019
303e901
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 14, 2019
ba931d6
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 14, 2019
aaf8291
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 14, 2019
e95911e
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 14, 2019
4362476
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 14, 2019
1f066d8
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 15, 2019
3d7e806
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 15, 2019
8a743cd
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 15, 2019
afe03f2
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 15, 2019
f6105ab
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 15, 2019
f915aae
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 15, 2019
d1bb443
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 16, 2019
9fc3b3d
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 16, 2019
9c052e7
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 16, 2019
d33a247
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 16, 2019
4fbc742
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 17, 2019
e92e63b
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 17, 2019
9abc7e6
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 17, 2019
5ed970f
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 17, 2019
3f7c30e
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 17, 2019
f40e2ca
Add IgnoredDuplicateType for WD: unblock update PR
dagood Jun 17, 2019
10d8a56
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 17, 2019
a7d7ed2
Update dependencies from https://github.com/dotnet/corefx build 20190…
Jun 18, 2019
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
92 changes: 46 additions & 46 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19313.2">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Targets" Version="3.0.0-preview7.19313.2">
<Dependency Name="Microsoft.NETCore.Targets" Version="3.0.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19313.2">
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19313.2">
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview7.19313.2">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="Microsoft.Windows.Compatibility" Version="3.0.0-preview7.19313.2">
<Dependency Name="Microsoft.Windows.Compatibility" Version="3.0.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.IO.FileSystem.AccessControl" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.IO.FileSystem.AccessControl" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Resources.Extensions" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Threading.AccessControl" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19313.2">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19317.11">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>422e295955841aa2d87d41812e7eef1a755f1e0e</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19313.2">
<Uri>https://github.com/dotnet/standard</Uri>
Expand Down
46 changes: 23 additions & 23 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@
<!--Package versions-->
<PropertyGroup>
<!-- corefx -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview7.19313.2</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>3.0.0-preview7.19313.2</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview7.19313.2</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftWin32RegistryVersion>4.6.0-preview7.19313.2</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>4.6.0-preview7.19313.2</MicrosoftWin32SystemEventsVersion>
<MicrosoftWindowsCompatibilityPackageVersion>3.0.0-preview7.19313.2</MicrosoftWindowsCompatibilityPackageVersion>
<SystemCodeDomVersion>4.6.0-preview7.19313.2</SystemCodeDomVersion>
<SystemConfigurationConfigurationManagerVersion>4.6.0-preview7.19313.2</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>4.6.0-preview7.19313.2</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesVersion>4.6.0-preview7.19313.2</SystemDirectoryServicesVersion>
<SystemDrawingCommonVersion>4.6.0-preview7.19313.2</SystemDrawingCommonVersion>
<SystemIOFileSystemAccessControlVersion>4.6.0-preview7.19313.2</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>4.6.0-preview7.19313.2</SystemIOPackagingVersion>
<SystemResourcesExtensionsPackageVersion>4.6.0-preview7.19313.2</SystemResourcesExtensionsPackageVersion>
<SystemSecurityAccessControlVersion>4.6.0-preview7.19313.2</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>4.6.0-preview7.19313.2</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>4.6.0-preview7.19313.2</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyProtectedDataVersion>4.6.0-preview7.19313.2</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityCryptographyXmlVersion>4.6.0-preview7.19313.2</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>4.6.0-preview7.19313.2</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>4.6.0-preview7.19313.2</SystemSecurityPrincipalWindowsVersion>
<SystemThreadingAccessControlVersion>4.6.0-preview7.19313.2</SystemThreadingAccessControlVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19313.2</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview7.19317.11</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>3.0.0-preview7.19317.11</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview7.19317.11</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftWin32RegistryVersion>4.6.0-preview7.19317.11</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>4.6.0-preview7.19317.11</MicrosoftWin32SystemEventsVersion>
<MicrosoftWindowsCompatibilityPackageVersion>3.0.0-preview7.19317.11</MicrosoftWindowsCompatibilityPackageVersion>
<SystemCodeDomVersion>4.6.0-preview7.19317.11</SystemCodeDomVersion>
<SystemConfigurationConfigurationManagerVersion>4.6.0-preview7.19317.11</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>4.6.0-preview7.19317.11</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesVersion>4.6.0-preview7.19317.11</SystemDirectoryServicesVersion>
<SystemDrawingCommonVersion>4.6.0-preview7.19317.11</SystemDrawingCommonVersion>
<SystemIOFileSystemAccessControlVersion>4.6.0-preview7.19317.11</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>4.6.0-preview7.19317.11</SystemIOPackagingVersion>
<SystemResourcesExtensionsPackageVersion>4.6.0-preview7.19317.11</SystemResourcesExtensionsPackageVersion>
<SystemSecurityAccessControlVersion>4.6.0-preview7.19317.11</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>4.6.0-preview7.19317.11</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>4.6.0-preview7.19317.11</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyProtectedDataVersion>4.6.0-preview7.19317.11</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityCryptographyXmlVersion>4.6.0-preview7.19317.11</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>4.6.0-preview7.19317.11</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>4.6.0-preview7.19317.11</SystemSecurityPrincipalWindowsVersion>
<SystemThreadingAccessControlVersion>4.6.0-preview7.19317.11</SystemThreadingAccessControlVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19317.11</SystemWindowsExtensionsPackageVersion>
<!-- standard -->
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19313.2</NETStandardLibraryPackageVersion>
<!-- coreclr -->
Expand Down
15 changes: 15 additions & 0 deletions src/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,21 @@
<SkipValidatePackage>false</SkipValidatePackage>
</PropertyGroup>

<!-- Temporarily ignore duplicate types until WPF updates. https://github.com/dotnet/core-setup/issues/6838 -->
<ItemGroup>
<IgnoredDuplicateType Include="
System.Xaml.Permissions.XamlAccessLevel;
System.Xaml.Permissions.XamlLoadPermission;
System.Security.Permissions.MediaPermissionAudio;
System.Security.Permissions.MediaPermissionVideo;
System.Security.Permissions.MediaPermissionImage;
System.Security.Permissions.MediaPermission;
System.Security.Permissions.MediaPermissionAttribute;
System.Security.Permissions.WebBrowserPermissionLevel;
System.Security.Permissions.WebBrowserPermission;
System.Security.Permissions.WebBrowserPermissionAttribute" />
</ItemGroup>

<ItemGroup>
<ExcludeFromDuplicateTypes Include="PresentationFramework.Aero" />
<ExcludeFromDuplicateTypes Include="PresentationFramework.Aero2" />
Expand Down