From d6362fc468ad7054fa84622db28d023ff34b026e Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Tue, 18 Jun 2019 12:43:49 +0000 Subject: [PATCH 1/2] 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) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++++----------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e152fa4ca82..072abc0f285 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,61 +7,61 @@ - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 - + https://github.com/dotnet/core-setup - 499b95322ae3a8e29af2a2aacdfb332c4e25dfcf + 00df5c6b304566a04d15dcdadfda710d73dd950b https://github.com/dotnet/arcade @@ -71,17 +71,17 @@ https://github.com/dotnet/arcade dc538a29793fd56618d0fa3186e2388d47d00c19 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int eecfd6f18f1520445f625591a7106c273cd28454 - + https://github.com/dotnet/corefx - 5955ee2583d4509d37ecf55243e9e3c9af128487 + 1fca079ddec2aabf56e256dab03e39b31b5036c7 https://github.com/dotnet/coreclr diff --git a/eng/Versions.props b/eng/Versions.props index 3adbd8a50cf..419b49519f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ 4.8.0 preview7 4.0.0.0 - 4.6.0-preview7.19313.2 + 4.6.0-preview7.19318.1 @@ -18,25 +18,25 @@ - 3.0.0-preview7-27817-03 - 3.0.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 + 3.0.0-preview7-27818-02 + 3.0.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 4.6.0-preview4.19176.11 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 - 4.6.0-preview7.19313.2 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 + 4.6.0-preview7.19318.1 From f5f2484dd0d7cd25281b53322913e5f026d05ae7 Mon Sep 17 00:00:00 2001 From: Dilip Ojha Date: Tue, 18 Jun 2019 11:41:56 -0700 Subject: [PATCH 2/2] added typeforwarding of moved types --- .../Xaml/Permissions/XamlAccessLevel.cs | 52 ---------------- .../Xaml/Permissions/XamlLoadPermission.cs | 33 ----------- .../src/System.Xaml/otherassemblyattrs.cs | 3 + .../src/WindowsBase/OtherAssemblyAttrs.cs | 11 +++- .../Security/Permissions/MediaPermission.cs | 59 ------------------- .../Permissions/WebBrowserPermission.cs | 36 ----------- .../src/WindowsBase/WindowsBase.csproj | 2 - 7 files changed, 13 insertions(+), 183 deletions(-) delete mode 100644 src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlAccessLevel.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlLoadPermission.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/MediaPermission.cs delete mode 100644 src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/WebBrowserPermission.cs diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlAccessLevel.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlAccessLevel.cs deleted file mode 100644 index f7320d39129..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlAccessLevel.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Reflection; -using System.Security; - -namespace System.Xaml.Permissions -{ - [Serializable] - public class XamlAccessLevel - { - private XamlAccessLevel(string assemblyName, string typeName) - { - AssemblyNameString = assemblyName; - PrivateAccessToTypeName = typeName; - } - - public static XamlAccessLevel AssemblyAccessTo(Assembly assembly) - { - return new XamlAccessLevel(assembly.FullName, null); - } - - public static XamlAccessLevel AssemblyAccessTo(AssemblyName assemblyName) - { - return new XamlAccessLevel(assemblyName.FullName, null); - } - - public static XamlAccessLevel PrivateAccessTo(Type type) - { - return new XamlAccessLevel(type.Assembly.FullName, type.FullName); - } - - public static XamlAccessLevel PrivateAccessTo(string assemblyQualifiedTypeName) - { - int nameBoundary = assemblyQualifiedTypeName.IndexOf(','); - string typeName = assemblyQualifiedTypeName.Substring(0, nameBoundary).Trim(); - string assemblyFullName = assemblyQualifiedTypeName.Substring(nameBoundary + 1).Trim(); - AssemblyName assemblyName = new AssemblyName(assemblyFullName); - return new XamlAccessLevel(assemblyName.FullName, typeName); - } - - public AssemblyName AssemblyAccessToAssemblyName - { - get { return new AssemblyName(AssemblyNameString); } - } - - public string PrivateAccessToTypeName { get; private set; } - - internal string AssemblyNameString { get; private set; } - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlLoadPermission.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlLoadPermission.cs deleted file mode 100644 index 7b1597ba86e..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Permissions/XamlLoadPermission.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Runtime.InteropServices; -using System.Security; -using System.Security.Permissions; - -namespace System.Xaml.Permissions -{ - [Serializable] - public sealed class XamlLoadPermission : CodeAccessPermission, IUnrestrictedPermission - { - public XamlLoadPermission(PermissionState state) { } - public XamlLoadPermission(XamlAccessLevel allowedAccess) { } - public XamlLoadPermission(IEnumerable allowedAccess) { } - [ComVisible(false)] - public override bool Equals(object obj) { return false; } - [ComVisible(false)] - public override int GetHashCode() { return base.GetHashCode(); } - public IList AllowedAccess {get; private set;} = new ReadOnlyCollection(Array.Empty()); - public override IPermission Copy() { return new XamlLoadPermission(PermissionState.Unrestricted); } - public override void FromXml(SecurityElement elem) { } - public bool Includes(XamlAccessLevel requestedAccess) { return true; } - public override IPermission Intersect(IPermission target) { return new XamlLoadPermission(PermissionState.Unrestricted); } - public override bool IsSubsetOf(IPermission target) { return true; } - public override SecurityElement ToXml() { return default(SecurityElement); } - public override IPermission Union(IPermission other) { return new XamlLoadPermission(PermissionState.Unrestricted); } - public bool IsUnrestricted() { return true; } - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/otherassemblyattrs.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/otherassemblyattrs.cs index 77b400e2293..b636b687e38 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/otherassemblyattrs.cs +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/otherassemblyattrs.cs @@ -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")] diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs index 9506e60e642..cf36a4fca65 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/OtherAssemblyAttrs.cs @@ -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")] diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/MediaPermission.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/MediaPermission.cs deleted file mode 100644 index cdb17e33fd4..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/MediaPermission.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -namespace System.Security.Permissions -{ - public enum MediaPermissionAudio - { - NoAudio, - SiteOfOriginAudio, - SafeAudio, - AllAudio - } - public enum MediaPermissionVideo - { - NoVideo, - SiteOfOriginVideo, - SafeVideo, - AllVideo, - } - public enum MediaPermissionImage - { - NoImage, - SiteOfOriginImage, - SafeImage, - AllImage, - } - [Serializable()] - sealed public class MediaPermission : CodeAccessPermission, IUnrestrictedPermission - { - public MediaPermission() { } - public MediaPermission(PermissionState state) { } - public MediaPermission(MediaPermissionAudio permissionAudio) { } - public MediaPermission(MediaPermissionVideo permissionVideo) { } - public MediaPermission(MediaPermissionImage permissionImage) { } - public MediaPermission(MediaPermissionAudio permissionAudio, - MediaPermissionVideo permissionVideo, - MediaPermissionImage permissionImage) - { } - public bool IsUnrestricted() { return true; } - public override bool IsSubsetOf(IPermission target) { return true; } - public override IPermission Intersect(IPermission target) { return new MediaPermission(); } - public override IPermission Union(IPermission target) { return new MediaPermission(); } - public override IPermission Copy() { return new MediaPermission(); } - public override SecurityElement ToXml() { return default(SecurityElement); } - public override void FromXml(SecurityElement securityElement) { } - public MediaPermissionAudio Audio { get { return MediaPermissionAudio.AllAudio; } } - public MediaPermissionVideo Video { get { return MediaPermissionVideo.AllVideo; } } - public MediaPermissionImage Image { get { return MediaPermissionImage.AllImage; } } - } - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)] - sealed public class MediaPermissionAttribute : CodeAccessSecurityAttribute - { - public MediaPermissionAttribute(SecurityAction action) : base(action) { } - public override IPermission CreatePermission() { return new MediaPermission(); } - public MediaPermissionAudio Audio { get { return MediaPermissionAudio.AllAudio; } set { } } - public MediaPermissionVideo Video { get { return MediaPermissionVideo.AllVideo; } set { } } - public MediaPermissionImage Image { get { return MediaPermissionImage.AllImage; } set { } } - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/WebBrowserPermission.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/WebBrowserPermission.cs deleted file mode 100644 index 6cc77c81b20..00000000000 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Security/Permissions/WebBrowserPermission.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -namespace System.Security.Permissions -{ - public enum WebBrowserPermissionLevel - { - None, - Safe, - Unrestricted - } - - [Serializable()] - sealed public class WebBrowserPermission : CodeAccessPermission, IUnrestrictedPermission - { - public WebBrowserPermission() { } - public WebBrowserPermission(PermissionState state) { } - public WebBrowserPermission(WebBrowserPermissionLevel webBrowserPermissionLevel) { } - public bool IsUnrestricted() { return true; } - public override bool IsSubsetOf(IPermission target) { return true; } - public override IPermission Intersect(IPermission target) { return new WebBrowserPermission(); } - public override IPermission Union(IPermission target) { return new WebBrowserPermission(); } - public override IPermission Copy() { return new WebBrowserPermission(); } - public override SecurityElement ToXml() { return default(SecurityElement); } - public override void FromXml(SecurityElement securityElement) { } - public WebBrowserPermissionLevel Level { get { return WebBrowserPermissionLevel.Unrestricted; } set { } } - } - - [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Assembly, AllowMultiple = true, Inherited = false )] - sealed public class WebBrowserPermissionAttribute : CodeAccessSecurityAttribute - { - public WebBrowserPermissionAttribute(SecurityAction action) : base(action) { } - public override IPermission CreatePermission() { return new WebBrowserPermission(); } - public WebBrowserPermissionLevel Level { get { return WebBrowserPermissionLevel.Unrestricted; } set { } } - } -} diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj index 75dbfc85575..b35ba34cc3a 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj @@ -194,8 +194,6 @@ - -