Skip to content

Commit 3f2c447

Browse files
Merge from master
2 parents be2c8c3 + ac9d1b7 commit 3f2c447

File tree

642 files changed

+575
-3203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

642 files changed

+575
-3203
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<VersionPrefix>4.8.0</VersionPrefix>
5-
<PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
5+
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
66
<AssemblyVersion>4.0.0.0</AssemblyVersion>
77
<SystemIOPackagingVersion>4.6.0-preview7.19320.1</SystemIOPackagingVersion>
88
</PropertyGroup>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
using System.Diagnostics;
2626
using System.Collections.Generic;
2727
using System.Security;
28-
using System.Security.Permissions;
2928
using Microsoft.Win32.SafeHandles;
3029

3130
using UnsafeNativeMethods=MS.Win32.PresentationCore.UnsafeNativeMethods;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using System.Runtime.InteropServices;
1212

1313
using System.Security;
14-
using System.Security.Permissions;
1514
using MS.Internal.PresentationCore;
1615

1716
namespace MS.Internal

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using System.Runtime.InteropServices;
1111
using System.Windows.Media;
1212
using System.Security;
13-
using System.Security.Permissions;
1413
using SR=MS.Internal.PresentationCore.SR;
1514
using SRID=MS.Internal.PresentationCore.SRID;
1615

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "precomp.hxx"
99

1010
using namespace System::Security;
11-
using namespace System::Security::Permissions;
1211

1312
namespace MS { namespace Internal { namespace Text { namespace TextInterface { namespace Native
1413
{
@@ -95,27 +94,8 @@ private ref class Util sealed
9594
/// </summary>
9695
static bool IsFullTrustCaller()
9796
{
98-
#ifndef _CLR_NETCORE
99-
try
100-
{
101-
if (_fullTrustPermissionSet == nullptr)
102-
{
103-
_fullTrustPermissionSet = gcnew PermissionSet(PermissionState::Unrestricted);
104-
}
105-
_fullTrustPermissionSet->Demand();
106-
}
107-
catch (SecurityException^)
108-
{
109-
return false;
110-
}
111-
#endif
11297
return true;
11398
}
114-
115-
#ifndef _CLR_NETCORE
116-
private:
117-
static PermissionSet^ _fullTrustPermissionSet = nullptr;
118-
#endif
11999
};
120100

121101
#define ConvertHresultToException(hr, msg) Native::Util::ConvertHresultToException(hr)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using namespace System::Runtime::InteropServices;
1010
using namespace MS::Internal::Text::TextInterface::Interfaces;
1111
#ifndef _CLR_NETCORE
12-
using namespace System::Security::Permissions;
1312
#endif
1413
using namespace System::Threading;
1514

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "FontFile.h"
66
#include "DWriteTypeConverter.h"
77

8-
using namespace System::Security::Permissions;
98

109
namespace MS { namespace Internal { namespace Text { namespace TextInterface
1110
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "NativePointerWrapper.h"
1111

1212
using namespace System::Security;
13-
using namespace System::Security::Permissions;
1413
using namespace MS::Internal::Text::TextInterface::Generics;
1514

1615
namespace MS { namespace Internal { namespace Text { namespace TextInterface

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "fsassert.h"
2222

2323
using namespace System::Security;
24-
using namespace System::Security::Permissions;
2524

2625
void * Mem_Alloc(size_t size)
2726
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ using namespace System::Reflection;
2323
using namespace System::Runtime::CompilerServices;
2424
using namespace System::Runtime::InteropServices;
2525
using namespace System::Security;
26-
using namespace System::Security::Permissions;
2726
using namespace System::Diagnostics;
2827

2928
[assembly:DependencyAttribute("System,", LoadHint::Always)];

0 commit comments

Comments
 (0)