From a1bb317faa837cc54cc1f021559371f66bf03c5b Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Tue, 25 Jun 2019 22:38:58 -0700 Subject: [PATCH 1/8] Move XamlAccessLevel to System.Windows.Extensions WPF needs continued access to XamlAccessLevel type. System.Xaml.Permissions.XamlLoadPermission also needs to use XamlAccessLevel. WPF is trying to remove its references to System.Security.Permissions. In order to complete this work, XamlAccessLevel is being moved to System.Windows.Extensions.dll (while leaving XamlLoadPermission in System.Permission.dll as-is). This will allow WindowsDesktop.App to bundle System.Windows.Extensions.dll (but not carry System.Security.Permissions.dll). --- .../ref/System.Security.Permissions.Forwards.cs | 3 +++ .../ref/System.Security.Permissions.cs | 14 ++++---------- .../ref/System.Security.Permissions.csproj | 5 ++++- .../src/System.Security.Permissions.csproj | 4 ++-- .../tests/System.Security.Permissions.Tests.csproj | 1 - .../ref/System.Windows.Extensions.cs | 13 +++++++++++++ .../src/System.Windows.Extensions.csproj | 1 + .../src/System/Xaml/Permissions/XamlAccessLevel.cs | 2 +- .../tests/System.Windows.Extensions.Tests.csproj | 1 + .../tests/XamlAccessLevelTests.cs | 2 +- 10 files changed, 30 insertions(+), 16 deletions(-) rename src/{System.Security.Permissions => System.Windows.Extensions}/src/System/Xaml/Permissions/XamlAccessLevel.cs (96%) rename src/{System.Security.Permissions => System.Windows.Extensions}/tests/XamlAccessLevelTests.cs (93%) diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs b/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs index 6b9b7f457fe1..40ea704661af 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs @@ -18,3 +18,6 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.PermissionSet))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Permissions.PermissionState))] #endif +#if netcoreapp +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xaml.Permissions.XamlAccessLevel))] +#endif diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.cs b/src/System.Security.Permissions/ref/System.Security.Permissions.cs index f38b82cfeb01..b6ce1e3c18e6 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.cs +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.cs @@ -2091,18 +2091,11 @@ public enum AspNetHostingPermissionLevel Unrestricted = 600, } } + +#if netcoreapp + namespace System.Xaml.Permissions { - public partial class XamlAccessLevel - { - internal XamlAccessLevel() { } - public System.Reflection.AssemblyName AssemblyAccessToAssemblyName { get { throw null; } } - public string PrivateAccessToTypeName { get { throw null; } } - public static System.Xaml.Permissions.XamlAccessLevel AssemblyAccessTo(System.Reflection.Assembly assembly) { throw null; } - public static System.Xaml.Permissions.XamlAccessLevel AssemblyAccessTo(System.Reflection.AssemblyName assemblyName) { throw null; } - public static System.Xaml.Permissions.XamlAccessLevel PrivateAccessTo(string assemblyQualifiedTypeName) { throw null; } - public static System.Xaml.Permissions.XamlAccessLevel PrivateAccessTo(System.Type type) { throw null; } - } public sealed partial class XamlLoadPermission : System.Security.CodeAccessPermission, System.Security.Permissions.IUnrestrictedPermission { public XamlLoadPermission(System.Collections.Generic.IEnumerable allowedAccess) { } @@ -2121,3 +2114,4 @@ public override void FromXml(System.Security.SecurityElement elem) { } public override System.Security.IPermission Union(System.Security.IPermission other) { throw null; } } } +#endif diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index d2b4c998d46c..cfef4938a5e3 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,4 +1,4 @@ - + {07CAF142-B259-418E-86EF-C4BD8B50253E} true @@ -39,4 +39,7 @@ + + + diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index 9d3ca6e39fb0..7024b33def9c 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,4 +1,4 @@ - + {07390899-C8F6-4E83-A3A9-6867B8CB46A0} System.Security.Permissions @@ -178,7 +178,6 @@ - @@ -227,5 +226,6 @@ + diff --git a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index 402e93a13761..46bccec5568d 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -18,6 +18,5 @@ - diff --git a/src/System.Windows.Extensions/ref/System.Windows.Extensions.cs b/src/System.Windows.Extensions/ref/System.Windows.Extensions.cs index 581a77931128..41ebd7db878e 100644 --- a/src/System.Windows.Extensions/ref/System.Windows.Extensions.cs +++ b/src/System.Windows.Extensions/ref/System.Windows.Extensions.cs @@ -133,3 +133,16 @@ public enum X509SelectionFlag MultiSelection = 1, } } +namespace System.Xaml.Permissions +{ + public partial class XamlAccessLevel + { + internal XamlAccessLevel() { } + public System.Reflection.AssemblyName AssemblyAccessToAssemblyName { get { throw null; } } + public string PrivateAccessToTypeName { get { throw null; } } + public static System.Xaml.Permissions.XamlAccessLevel AssemblyAccessTo(System.Reflection.Assembly assembly) { throw null; } + public static System.Xaml.Permissions.XamlAccessLevel AssemblyAccessTo(System.Reflection.AssemblyName assemblyName) { throw null; } + public static System.Xaml.Permissions.XamlAccessLevel PrivateAccessTo(string assemblyQualifiedTypeName) { throw null; } + public static System.Xaml.Permissions.XamlAccessLevel PrivateAccessTo(System.Type type) { throw null; } + } +} diff --git a/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj index fc4a9bf2f39e..c45d8a141716 100644 --- a/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -71,6 +71,7 @@ + diff --git a/src/System.Security.Permissions/src/System/Xaml/Permissions/XamlAccessLevel.cs b/src/System.Windows.Extensions/src/System/Xaml/Permissions/XamlAccessLevel.cs similarity index 96% rename from src/System.Security.Permissions/src/System/Xaml/Permissions/XamlAccessLevel.cs rename to src/System.Windows.Extensions/src/System/Xaml/Permissions/XamlAccessLevel.cs index 7bea5cf0a9bc..80b5fef5f7f4 100644 --- a/src/System.Security.Permissions/src/System/Xaml/Permissions/XamlAccessLevel.cs +++ b/src/System.Windows.Extensions/src/System/Xaml/Permissions/XamlAccessLevel.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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. diff --git a/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj index b0836e434797..1adf6a933f58 100644 --- a/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj +++ b/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj @@ -21,6 +21,7 @@ + diff --git a/src/System.Security.Permissions/tests/XamlAccessLevelTests.cs b/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs similarity index 93% rename from src/System.Security.Permissions/tests/XamlAccessLevelTests.cs rename to src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs index a1488ee20835..d321b85ec87d 100644 --- a/src/System.Security.Permissions/tests/XamlAccessLevelTests.cs +++ b/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// 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. From 1ed17d7c049792686ffa653831ae3766d99bf491 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Wed, 26 Jun 2019 01:09:51 -0700 Subject: [PATCH 2/8] Limit to netcoreapp/windows --- .../src/System.Security.Permissions.csproj | 4 ++++ .../tests/System.Windows.Extensions.Tests.csproj | 2 +- src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/System.Security.Permissions/src/System.Security.Permissions.csproj index 7024b33def9c..7498d5970e94 100644 --- a/src/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -178,6 +178,8 @@ + + @@ -226,6 +228,8 @@ + + diff --git a/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj index 1adf6a933f58..a7eeb64c180a 100644 --- a/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj +++ b/src/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj @@ -6,6 +6,7 @@ + @@ -21,7 +22,6 @@ - diff --git a/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs b/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs index d321b85ec87d..8ebc834c80ed 100644 --- a/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs +++ b/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using System.Xaml.Permissions; using Xunit; namespace System.Security.Permissions.Tests From b16c62a00860236e2a3a67a8881c50c963280764 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Wed, 26 Jun 2019 10:33:17 -0700 Subject: [PATCH 3/8] Conditioning XamlLoadPermission tests to run only under netcoreapp --- .../tests/PermissionTests.cs | 21 ----------- .../System.Security.Permissions.Tests.csproj | 3 ++ .../tests/XamlLoadPermissionTests.cs | 36 +++++++++++++++++++ 3 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs diff --git a/src/System.Security.Permissions/tests/PermissionTests.cs b/src/System.Security.Permissions/tests/PermissionTests.cs index e1cf80ff586d..8494d5c2328d 100644 --- a/src/System.Security.Permissions/tests/PermissionTests.cs +++ b/src/System.Security.Permissions/tests/PermissionTests.cs @@ -7,7 +7,6 @@ using System.DirectoryServices; using System.Reflection; using System.Web; -using System.Xaml.Permissions; namespace System.Security.Permissions.Tests { @@ -444,26 +443,6 @@ public static void WebBrowserPermissionAttributeCallMethods() IPermission ip = wpa.CreatePermission(); } - [Fact] - public static void XamlLoadPermissionCallMethods() - { - XamlAccessLevel accessLevel = XamlAccessLevel.AssemblyAccessTo(Assembly.GetExecutingAssembly().GetName()); - XamlLoadPermission xp = new XamlLoadPermission(accessLevel); - XamlLoadPermission xp2 = new XamlLoadPermission(PermissionState.Unrestricted); - XamlLoadPermission xp3 = new XamlLoadPermission(Array.Empty()); - bool testbool = xp.IsUnrestricted(); - IPermission ip = xp.Copy(); - IPermission ip2 = xp.Intersect(ip); - IPermission ip3 = xp.Union(ip); - testbool = xp.IsSubsetOf(ip); - testbool = xp.Equals(new object()); - testbool = xp.Includes(accessLevel); - int hash = xp.GetHashCode(); - SecurityElement se = new SecurityElement(""); - xp.FromXml(se); - se = xp.ToXml(); - } - [Fact] public static void ZoneIdentityPermissionCallMethods() { diff --git a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index 46bccec5568d..7572d1254848 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -19,4 +19,7 @@ + + + diff --git a/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs b/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs new file mode 100644 index 000000000000..c91f24848e88 --- /dev/null +++ b/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs @@ -0,0 +1,36 @@ +// 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 Xunit; +using System.Configuration; +using System.DirectoryServices; +using System.Reflection; +using System.Web; +using System.Xaml.Permissions; + +namespace System.Xaml.Permissions.Tests +{ + public class XamlLoadPermissionTests + { + [Fact] + public static void XamlLoadPermissionCallMethods() + { + XamlAccessLevel accessLevel = XamlAccessLevel.AssemblyAccessTo(Assembly.GetExecutingAssembly().GetName()); + XamlLoadPermission xp = new XamlLoadPermission(accessLevel); + XamlLoadPermission xp2 = new XamlLoadPermission(PermissionState.Unrestricted); + XamlLoadPermission xp3 = new XamlLoadPermission(Array.Empty()); + bool testbool = xp.IsUnrestricted(); + IPermission ip = xp.Copy(); + IPermission ip2 = xp.Intersect(ip); + IPermission ip3 = xp.Union(ip); + testbool = xp.IsSubsetOf(ip); + testbool = xp.Equals(new object()); + testbool = xp.Includes(accessLevel); + int hash = xp.GetHashCode(); + SecurityElement se = new SecurityElement(""); + xp.FromXml(se); + se = xp.ToXml(); + } + } +} From 35c400d69fcd3580daa4160831b40ce08580e264 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Mon, 1 Jul 2019 17:28:42 -0700 Subject: [PATCH 4/8] Add missing namespaces --- .../tests/XamlLoadPermissionTests.cs | 2 ++ src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs b/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs index c91f24848e88..cb2e5c83548f 100644 --- a/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs +++ b/src/System.Security.Permissions/tests/XamlLoadPermissionTests.cs @@ -6,6 +6,8 @@ using System.Configuration; using System.DirectoryServices; using System.Reflection; +using System.Security; +using System.Security.Permissions; using System.Web; using System.Xaml.Permissions; diff --git a/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs b/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs index 8ebc834c80ed..d321b85ec87d 100644 --- a/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs +++ b/src/System.Windows.Extensions/tests/XamlAccessLevelTests.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Reflection; +using System.Xaml.Permissions; using Xunit; namespace System.Security.Permissions.Tests From f8a4f825b9e56a17289fbd68c198c9a4a7ed0cdb Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Tue, 2 Jul 2019 13:07:40 -0700 Subject: [PATCH 5/8] Limit XamlLoadPermission tests to Windows only --- .../tests/System.Security.Permissions.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index 7572d1254848..bf3edac06971 100644 --- a/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -19,7 +19,7 @@ - + From 636a7b410b627ff768c3ec2ad33137b37accf0ba Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Wed, 3 Jul 2019 12:46:25 -0700 Subject: [PATCH 6/8] Add System.Security.Permissions.netcoreapp.cs --- .../ref/System.Security.Permissions.cs | 23 ---------------- .../ref/System.Security.Permissions.csproj | 5 +++- .../System.Security.Permissions.netcoreapp.cs | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 src/System.Security.Permissions/ref/System.Security.Permissions.netcoreapp.cs diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.cs b/src/System.Security.Permissions/ref/System.Security.Permissions.cs index b6ce1e3c18e6..e862fa284023 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.cs +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.cs @@ -2092,26 +2092,3 @@ public enum AspNetHostingPermissionLevel } } -#if netcoreapp - -namespace System.Xaml.Permissions -{ - public sealed partial class XamlLoadPermission : System.Security.CodeAccessPermission, System.Security.Permissions.IUnrestrictedPermission - { - public XamlLoadPermission(System.Collections.Generic.IEnumerable allowedAccess) { } - public XamlLoadPermission(System.Security.Permissions.PermissionState state) { } - public XamlLoadPermission(System.Xaml.Permissions.XamlAccessLevel allowedAccess) { } - public System.Collections.Generic.IList AllowedAccess { get { throw null; } } - public override System.Security.IPermission Copy() { throw null; } - public override bool Equals(object obj) { throw null; } - public override void FromXml(System.Security.SecurityElement elem) { } - public override int GetHashCode() { throw null; } - public bool Includes(System.Xaml.Permissions.XamlAccessLevel requestedAccess) { throw null; } - public override System.Security.IPermission Intersect(System.Security.IPermission target) { throw null; } - public override bool IsSubsetOf(System.Security.IPermission target) { throw null; } - public bool IsUnrestricted() { throw null; } - public override System.Security.SecurityElement ToXml() { throw null; } - public override System.Security.IPermission Union(System.Security.IPermission other) { throw null; } - } -} -#endif diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index cfef4938a5e3..d18772908ee6 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -4,11 +4,14 @@ true net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard-Debug;netstandard-Release;uap-Debug;uap-Release - + + + + diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.netcoreapp.cs b/src/System.Security.Permissions/ref/System.Security.Permissions.netcoreapp.cs new file mode 100644 index 000000000000..5d3c1d7eea6d --- /dev/null +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.netcoreapp.cs @@ -0,0 +1,27 @@ +// 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the http://aka.ms/api-review process. +// ------------------------------------------------------------------------------ + +namespace System.Xaml.Permissions +{ + public sealed partial class XamlLoadPermission : System.Security.CodeAccessPermission, System.Security.Permissions.IUnrestrictedPermission + { + public XamlLoadPermission(System.Collections.Generic.IEnumerable allowedAccess) { } + public XamlLoadPermission(System.Security.Permissions.PermissionState state) { } + public XamlLoadPermission(System.Xaml.Permissions.XamlAccessLevel allowedAccess) { } + public System.Collections.Generic.IList AllowedAccess { get { throw null; } } + public override System.Security.IPermission Copy() { throw null; } + public override bool Equals(object obj) { throw null; } + public override void FromXml(System.Security.SecurityElement elem) { } + public override int GetHashCode() { throw null; } + public bool Includes(System.Xaml.Permissions.XamlAccessLevel requestedAccess) { throw null; } + public override System.Security.IPermission Intersect(System.Security.IPermission target) { throw null; } + public override bool IsSubsetOf(System.Security.IPermission target) { throw null; } + public bool IsUnrestricted() { throw null; } + public override System.Security.SecurityElement ToXml() { throw null; } + public override System.Security.IPermission Union(System.Security.IPermission other) { throw null; } + } +} From 28f31c9d9f02270452821f9bba02622bd6277a0e Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Wed, 3 Jul 2019 12:47:40 -0700 Subject: [PATCH 7/8] Remove type-forward for XamlAccessLevel - this is not needed since this only serves preview7 to preview 8 compatiblity needs. --- .../ref/System.Security.Permissions.Forwards.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs b/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs index 40ea704661af..6183ea30a71b 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.Forwards.cs @@ -18,6 +18,4 @@ [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.PermissionSet))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Permissions.PermissionState))] #endif -#if netcoreapp -[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xaml.Permissions.XamlAccessLevel))] -#endif + From 0115a0315051b6250a9b78aa8c23072795747461 Mon Sep 17 00:00:00 2001 From: Vatsan Madhavan Date: Wed, 3 Jul 2019 13:29:42 -0700 Subject: [PATCH 8/8] Fix condition --- .../ref/System.Security.Permissions.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj index d18772908ee6..4372861e3128 100644 --- a/src/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -4,12 +4,12 @@ true net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard-Debug;netstandard-Release;uap-Debug;uap-Release - + - +