Skip to content

Commit a49d50f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/core-setup (dotnet#1000)
* Update dependencies from https://github.com/dotnet/core-setup build 20190618.02 - Microsoft.NETCore.App - 3.0.0-preview7-27818-02 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.CodeDom - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-preview7.19318.1 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-preview7.19318.1 (parent: Microsoft.NETCore.App) * added typeforwarding of moved types
1 parent 9a10af9 commit a49d50f

File tree

9 files changed

+61
-231
lines changed

9 files changed

+61
-231
lines changed

‎eng/Version.Details.xml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,61 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
10+
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
1111
<Uri>https://github.com/dotnet/corefx</Uri>
12-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
12+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
1313
</Dependency>
14-
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
14+
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
1515
<Uri>https://github.com/dotnet/corefx</Uri>
16-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
16+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
1717
</Dependency>
18-
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
18+
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
1919
<Uri>https://github.com/dotnet/corefx</Uri>
20-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
20+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
2121
</Dependency>
22-
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
22+
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
2323
<Uri>https://github.com/dotnet/corefx</Uri>
24-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
24+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
2525
</Dependency>
26-
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
26+
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
2727
<Uri>https://github.com/dotnet/corefx</Uri>
28-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
28+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
2929
</Dependency>
30-
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
30+
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
3131
<Uri>https://github.com/dotnet/corefx</Uri>
32-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
32+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
3333
</Dependency>
34-
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
34+
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
3535
<Uri>https://github.com/dotnet/corefx</Uri>
36-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
36+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
40+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
4141
</Dependency>
42-
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
42+
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
4343
<Uri>https://github.com/dotnet/corefx</Uri>
44-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
44+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
4545
</Dependency>
46-
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
46+
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
4747
<Uri>https://github.com/dotnet/corefx</Uri>
48-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
48+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
4949
</Dependency>
50-
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
50+
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
5151
<Uri>https://github.com/dotnet/corefx</Uri>
52-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
52+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
5353
</Dependency>
54-
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
54+
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
5555
<Uri>https://github.com/dotnet/corefx</Uri>
56-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
56+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
5757
</Dependency>
58-
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
58+
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
5959
<Uri>https://github.com/dotnet/corefx</Uri>
60-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
60+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27817-03">
62+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27818-02">
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
64-
<Sha>499b95322ae3a8e29af2a2aacdfb332c4e25dfcf</Sha>
64+
<Sha>00df5c6b304566a04d15dcdadfda710d73dd950b</Sha>
6565
</Dependency>
6666
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19318.2">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -71,17 +71,17 @@
7171
<Uri>https://github.com/dotnet/arcade</Uri>
7272
<Sha>dc538a29793fd56618d0fa3186e2388d47d00c19</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
74+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
76-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
76+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
7777
</Dependency>
7878
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19317.15">
7979
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
8080
<Sha>6a1b846653e9a595eed706f0dbf19d0f5e63570f</Sha>
8181
</Dependency>
82-
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App">
82+
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19318.1" CoherentParentDependency="Microsoft.NETCore.App">
8383
<Uri>https://github.com/dotnet/corefx</Uri>
84-
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
84+
<Sha>1fca079ddec2aabf56e256dab03e39b31b5036c7</Sha>
8585
</Dependency>
8686
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19313.1" CoherentParentDependency="Microsoft.NETCore.App">
8787
<Uri>https://github.com/dotnet/coreclr</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionPrefix>4.8.0</VersionPrefix>
55
<PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
66
<AssemblyVersion>4.0.0.0</AssemblyVersion>
7-
<SystemIOPackagingVersion>4.6.0-preview7.19313.2</SystemIOPackagingVersion>
7+
<SystemIOPackagingVersion>4.6.0-preview7.19318.1</SystemIOPackagingVersion>
88
</PropertyGroup>
99
<!-- NuGet Package Versions -->
1010
<PropertyGroup>
@@ -18,25 +18,25 @@
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27817-03</MicrosoftNETCoreAppVersion>
22-
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19313.2</MicrosoftNETCorePlatformsVersion>
23-
<SystemDrawingCommonVersion>4.6.0-preview7.19313.2</SystemDrawingCommonVersion>
24-
<SystemDirectoryServicesVersion>4.6.0-preview7.19313.2</SystemDirectoryServicesVersion>
25-
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19313.2</SystemReflectionMetadataLoadContextVersion>
21+
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27818-02</MicrosoftNETCoreAppVersion>
22+
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19318.1</MicrosoftNETCorePlatformsVersion>
23+
<SystemDrawingCommonVersion>4.6.0-preview7.19318.1</SystemDrawingCommonVersion>
24+
<SystemDirectoryServicesVersion>4.6.0-preview7.19318.1</SystemDirectoryServicesVersion>
25+
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19318.1</SystemReflectionMetadataLoadContextVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
2828
<PropertyGroup>
29-
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19313.2</MicrosoftWin32RegistryPackageVersion>
30-
<SystemCodeDomPackageVersion>4.6.0-preview7.19313.2</SystemCodeDomPackageVersion>
31-
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19313.2</SystemConfigurationConfigurationManagerPackageVersion>
32-
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19313.2</SystemDiagnosticsEventLogPackageVersion>
33-
<SystemReflectionEmitPackageVersion>4.6.0-preview7.19313.2</SystemReflectionEmitPackageVersion>
29+
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19318.1</MicrosoftWin32RegistryPackageVersion>
30+
<SystemCodeDomPackageVersion>4.6.0-preview7.19318.1</SystemCodeDomPackageVersion>
31+
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19318.1</SystemConfigurationConfigurationManagerPackageVersion>
32+
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19318.1</SystemDiagnosticsEventLogPackageVersion>
33+
<SystemReflectionEmitPackageVersion>4.6.0-preview7.19318.1</SystemReflectionEmitPackageVersion>
3434
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
35-
<SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19313.2</SystemSecurityAccessControlPackageVersion>
36-
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19313.2</SystemSecurityCryptographyXmlPackageVersion>
37-
<SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19313.2</SystemSecurityPermissionsPackageVersion>
38-
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19313.2</SystemSecurityPrincipalWindowsPackageVersion>
39-
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19313.2</SystemWindowsExtensionsPackageVersion>
35+
<SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19318.1</SystemSecurityAccessControlPackageVersion>
36+
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19318.1</SystemSecurityCryptographyXmlPackageVersion>
37+
<SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19318.1</SystemSecurityPermissionsPackageVersion>
38+
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19318.1</SystemSecurityPrincipalWindowsPackageVersion>
39+
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19318.1</SystemWindowsExtensionsPackageVersion>
4040
</PropertyGroup>
4141
<!-- Packages that come from https://github.com/dotnet/arcade -->
4242
<PropertyGroup>

‎src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlAccessLevel.cs

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlLoadPermission.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/Microsoft.DotNet.Wpf/src/System.Xaml/otherassemblyattrs.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@
1313
[assembly:Dependency("System,", LoadHint.Always)]
1414
[assembly:Dependency("System.Xml,", LoadHint.Sometimes)]
1515

16+
[assembly: TypeForwardedTo(typeof(System.Xaml.Permissions.XamlAccessLevel))]
17+
[assembly: TypeForwardedTo(typeof(System.Xaml.Permissions.XamlLoadPermission))]
18+
1619
[assembly:XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System.Windows.Markup")]

‎src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,16 @@
8484
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.CompressionOption))]
8585
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.EncryptionOption))]
8686
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.PackageRelationshipSelector))]
87-
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.PackageRelationshipSelectorType))]
87+
[assembly:TypeForwardedTo(typeof(System.IO.Packaging.PackageRelationshipSelectorType))]
88+
89+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionAudio))]
90+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionVideo))]
91+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionImage))]
92+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermission))]
93+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.MediaPermissionAttribute))]
94+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermissionLevel))]
95+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermission))]
96+
[assembly: TypeForwardedTo(typeof(System.Security.Permissions.WebBrowserPermissionAttribute))]
8897

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

0 commit comments

Comments
 (0)