Merge pull request #1104 from dotnet/dev/vatsan/preview8-snap-rel30

Snap master -> release/3.0 at the end of Preview 7 (PR no.2)

Author: vatsan-madhavan

src/Microsoft.DotNet.Wpf/src/Common/Graphics/exports.cs

@@ -25,7 +25,6 @@
 using System.Diagnostics;
 using System.Collections.Generic;
 using System.Security;
-using System.Security.Permissions;
 using Microsoft.Win32.SafeHandles;
 
 using UnsafeNativeMethods=MS.Win32.PresentationCore.UnsafeNativeMethods;

src/Microsoft.DotNet.Wpf/src/Common/Graphics/wgx_exports.cs

@@ -11,7 +11,6 @@
 using System.Runtime.InteropServices;
 
 using System.Security;
-using System.Security.Permissions;
 using MS.Internal.PresentationCore;
 
 namespace MS.Internal

src/Microsoft.DotNet.Wpf/src/Common/Graphics/wgx_render.cs

@@ -10,7 +10,6 @@
 using System.Runtime.InteropServices;
 using System.Windows.Media;
 using System.Security;
-using System.Security.Permissions;
 using SR=MS.Internal.PresentationCore.SR;
 using SRID=MS.Internal.PresentationCore.SRID;
 

src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Common.h

@@ -8,7 +8,6 @@
 #include "precomp.hxx"
 
 using namespace System::Security;
-using namespace System::Security::Permissions;
 
 namespace MS { namespace Internal { namespace Text { namespace TextInterface { namespace Native
 {    
@@ -95,27 +94,8 @@ private ref class Util sealed
     /// </summary>
     static bool IsFullTrustCaller()
     {
-#ifndef _CLR_NETCORE
-        try
-        {
-            if (_fullTrustPermissionSet == nullptr)
-            {
-                _fullTrustPermissionSet = gcnew PermissionSet(PermissionState::Unrestricted);
-            }
-            _fullTrustPermissionSet->Demand();
-        }
-        catch (SecurityException^)
-        {
-            return false;
-        }
-#endif
         return true;
     }
-
-#ifndef _CLR_NETCORE
-private:
-    static PermissionSet^ _fullTrustPermissionSet = nullptr;
-#endif 
 };
 
 #define ConvertHresultToException(hr, msg) Native::Util::ConvertHresultToException(hr)

src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/Factory.cpp

@@ -9,7 +9,6 @@
 using namespace System::Runtime::InteropServices;
 using namespace MS::Internal::Text::TextInterface::Interfaces;
 #ifndef _CLR_NETCORE
-using namespace System::Security::Permissions;
 #endif
 using namespace System::Threading;
 

src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/FontFile.cpp

@@ -5,7 +5,6 @@
 #include "FontFile.h"
 #include "DWriteTypeConverter.h"
 
-using namespace System::Security::Permissions;
 
 namespace MS { namespace Internal { namespace Text { namespace TextInterface
 {

src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/DWriteWrapper/ItemProps.h

@@ -10,7 +10,6 @@
 #include "NativePointerWrapper.h"
 
 using namespace System::Security;
-using namespace System::Security::Permissions;
 using namespace MS::Internal::Text::TextInterface::Generics;
 
 namespace MS { namespace Internal { namespace Text { namespace TextInterface

src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/CPP/TrueTypeSubsetter/TtfDelta/ttmem.cpp

@@ -21,7 +21,6 @@
 #include "fsassert.h"
 
 using namespace System::Security;
-using namespace System::Security::Permissions;
 
 void * Mem_Alloc(size_t size)
 {

src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/main.cpp

@@ -23,7 +23,6 @@ using namespace System::Reflection;
 using namespace System::Runtime::CompilerServices;
 using namespace System::Runtime::InteropServices;
 using namespace System::Security;
-using namespace System::Security::Permissions;
 using namespace System::Diagnostics;
 
 [assembly:DependencyAttribute("System,", LoadHint::Always)];

src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj

@@ -28,6 +28,5 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="$(SystemDrawingCommonPackage)" Version="$(SystemDrawingCommonVersion)" />
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
   </ItemGroup>
 </Project>

src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/SystemDrawingExtension.cs

@@ -123,18 +123,6 @@ internal override Stream GetCommentFromGifStream(Stream stream)
             return new MemoryStream(piComment.Value);
         }
 
-        // return a new safe-printing permission
-        internal override CodeAccessPermission NewSafePrintingPermission()
-        {
-            return new PrintingPermission(PrintingPermissionLevel.SafePrinting);
-        }
-
-        // return a new default-printing permission
-        internal override CodeAccessPermission NewDefaultPrintingPermission()
-        {
-            return new PrintingPermission(PrintingPermissionLevel.DefaultPrinting);
-        }
-
         // write a metafile stream to the output stream in PNG format
         internal override void SaveMetafileToImageStream(MemoryStream metafileStream, Stream imageStream)
         {

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/CompilationUnit.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Security.Permissions;
 
 namespace MS.Internal
 {

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/FileUnit.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Security.Permissions;
 
 namespace MS.Internal
 {

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs

@@ -19,7 +19,6 @@
 using System.Reflection;
 using System.Globalization;
 using System.ComponentModel;
-using System.Security.Permissions;
 using System.Security.Cryptography;
 
 using System.CodeDom;

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Shared/SourceFileInfo.cs

@@ -14,7 +14,6 @@
 //---------------------------------------------------------------------------
 
 using System;
-using System.Security.Permissions;
 using System.IO;
 
 namespace MS.Internal

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs

@@ -14,7 +14,6 @@
 using System.IO;
 using System.Collections;
 using System.Security;
-using System.Security.Permissions;
 
 using System.Globalization;
 using System.Diagnostics;

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs

@@ -13,7 +13,6 @@
 using System.IO;
 using System.Collections;
 using System.Security;
-using System.Security.Permissions;
 using System.Text;
 
 using System.Globalization;

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsPenimc.cs

@@ -6,7 +6,6 @@
 
 using System;
 using System.Security;
-using System.Security.Permissions;
 using System.Threading;
 using System.Runtime.InteropServices;
 using System.Runtime.ConstrainedExecution;

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsPointer.cs

@@ -9,7 +9,6 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Security;
-using System.Security.Permissions;
 using System.Text;
 
 namespace MS.Win32.Pointer

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/Win32/UnsafeNativeMethodsTablet.cs

@@ -6,7 +6,6 @@
 using System;
 using System.Text;
 using System.Security;
-using System.Security.Permissions;
 using System.Runtime.InteropServices;
 using System.Runtime.ConstrainedExecution;
 using System.Windows.Ink;

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AppModel/CustomCredentialPolicy.cs

@@ -32,7 +32,6 @@
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Security;
-using System.Security.Permissions;
 
 using MS.Internal.PresentationCore;
 using MS.Win32;
@@ -48,13 +47,6 @@ static CustomCredentialPolicy()
             _initialized = false;
         }
 
-        public CustomCredentialPolicy()
-        {
-            _environmentPermissionSet = new PermissionSet(null);
-            _environmentPermissionSet.AddPermission(new EnvironmentPermission(EnvironmentPermissionAccess.Read, "USERDOMAIN"));
-            _environmentPermissionSet.AddPermission(new EnvironmentPermission(EnvironmentPermissionAccess.Read, "USERNAME"));
-        }
-
         static internal void EnsureCustomCredentialPolicy()
         {
             if (!_initialized)
@@ -63,23 +55,15 @@ static internal void EnsureCustomCredentialPolicy()
                 {
                     if (!_initialized)
                     {
-                        new SecurityPermission(SecurityPermissionFlag.ControlPolicy).Assert();  // BlessedAssert: 
-                        try
+                        // We should allow an application to set its own credential policy, if it has permssion to.
+                        // We do not want to overwrite the application's setting. 
+                        // Check whether it is already set before setting it. 
+                        // The default of this property is null. It demands ControlPolicy permission to be set.
+                        if (AuthenticationManager.CredentialPolicy == null)
                         {
-                            // We should allow an application to set its own credential policy, if it has permssion to.
-                            // We do not want to overwrite the application's setting. 
-                            // Check whether it is already set before setting it. 
-                            // The default of this property is null. It demands ControlPolicy permission to be set.
-                            if (AuthenticationManager.CredentialPolicy == null)
-                            {
-                                AuthenticationManager.CredentialPolicy = new CustomCredentialPolicy();
-                            }
-                            _initialized = true;
-                        }
-                        finally
-                        {
-                            CodeAccessPermission.RevertAssert();
+                            AuthenticationManager.CredentialPolicy = new CustomCredentialPolicy();
                         }
+                        _initialized = true;
                     }
                 }
             }
@@ -92,13 +76,13 @@ public bool ShouldSendCredential(Uri challengeUri, WebRequest request, NetworkCr
             switch (MapUrlToZone(challengeUri))
             {
                 // Always send credentials (including default credentials) to these zones
-                case SecurityZone.Intranet:
-                case SecurityZone.Trusted:
-                case SecurityZone.MyComputer:
+                case NativeMethods.URLZONE_INTRANET:
+                case NativeMethods.URLZONE_TRUSTED:
+                case NativeMethods.URLZONE_LOCAL_MACHINE:
                     return true;
                 // Don't send default credentials to any of these zones
-                case SecurityZone.Internet:
-                case SecurityZone.Untrusted:
+                case NativeMethods.URLZONE_INTERNET:
+                case NativeMethods.URLZONE_UNTRUSTED:
                 default:
                     return !IsDefaultCredentials(credential);
             }
@@ -108,40 +92,16 @@ public bool ShouldSendCredential(Uri challengeUri, WebRequest request, NetworkCr
 
         private bool IsDefaultCredentials(NetworkCredential credential)
         {
-            _environmentPermissionSet.Assert();  // BlessedAssert: 
-            try
-            {
-                return credential == CredentialCache.DefaultCredentials;
-            }
-            finally
-            {
-                CodeAccessPermission.RevertAssert();
-            }
+            return credential == CredentialCache.DefaultCredentials;
         }
 
-        internal static SecurityZone MapUrlToZone(Uri uri)
+        internal static int MapUrlToZone(Uri uri)
         {
             EnsureSecurityManager();
 
             int targetZone;
             _securityManager.MapUrlToZone(BindUriHelper.UriToString(uri), out targetZone, 0);
-
-            // The enum is directly mappable, but taking no chances...
-            switch (targetZone)
-            {
-                case NativeMethods.URLZONE_LOCAL_MACHINE:
-                    return SecurityZone.MyComputer;
-                case NativeMethods.URLZONE_INTERNET:
-                    return SecurityZone.Internet;
-                case NativeMethods.URLZONE_INTRANET:
-                    return SecurityZone.Intranet;
-                case NativeMethods.URLZONE_TRUSTED:
-                    return SecurityZone.Trusted;
-                case NativeMethods.URLZONE_UNTRUSTED:
-                    return SecurityZone.Untrusted;
-            }
-
-            return SecurityZone.NoZone;
+            return targetZone;
         }
 
         private static void EnsureSecurityManager()
@@ -170,7 +130,5 @@ private class InternetSecurityManager
         private static object _lockObj;
 
         private static bool _initialized;
-
-        PermissionSet _environmentPermissionSet;
     }
 }