Skip to content

[master] Update dependencies from dotnet/core-setup #1000

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 18, 2019
Merged

[master] Update dependencies from dotnet/core-setup #1000

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
d6362fc
Update dependencies from https://github.com/dotnet/core-setup build 2…
Jun 18, 2019
f5f2484
added typeforwarding of moved types
ojhad 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
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27817-03">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27818-02">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>499b95322ae3a8e29af2a2aacdfb332c4e25dfcf</Sha>
<Sha>00df5c6b304566a04d15dcdadfda710d73dd950b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19318.2">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -71,17 +71,17 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>dc538a29793fd56618d0fa3186e2388d47d00c19</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19317.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>eecfd6f18f1520445f625591a7106c273cd28454</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19313.1" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<VersionPrefix>4.8.0</VersionPrefix>
<PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<SystemIOPackagingVersion>4.6.0-preview7.19313.2</SystemIOPackagingVersion>
<SystemIOPackagingVersion>4.6.0-preview7.19318.1</SystemIOPackagingVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
Expand All @@ -18,25 +18,25 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27817-03</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19313.2</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview7.19313.2</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview7.19313.2</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19313.2</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27818-02</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19318.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview7.19318.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview7.19318.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19318.1</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19313.2</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview7.19313.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19313.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19313.2</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview7.19313.2</SystemReflectionEmitPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19318.1</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview7.19318.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19318.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19318.1</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview7.19318.1</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19313.2</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19313.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19313.2</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19313.2</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19313.2</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19318.1</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19318.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19318.1</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19318.1</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19318.1</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down
52 changes: 0 additions & 52 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlAccessLevel.cs
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlLoadPermission.cs
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/System.Xaml/otherassemblyattrs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@
[assembly:Dependency("System,", LoadHint.Always)]
[assembly:Dependency("System.Xml,", LoadHint.Sometimes)]

[assembly: TypeForwardedTo(typeof(System.Xaml.Permissions.XamlAccessLevel))]
[assembly: TypeForwardedTo(typeof(System.Xaml.Permissions.XamlLoadPermission))]

[assembly:XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System.Windows.Markup")]
11 changes: 10 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,16 @@
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.CompressionOption))]
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.EncryptionOption))]
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.PackageRelationshipSelector))]
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.PackageRelationshipSelectorType))]
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.PackageRelationshipSelectorType))]

[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionAudio))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionVideo))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionImage))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermission))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionAttribute))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermissionLevel))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermission))]
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermissionAttribute))]

// XAML namespace definitions
[assembly:System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "System.Windows")]
Expand Down
Loading