Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 7508f81

Browse files
jkotassafern
authored andcommitted
Delete FriendAccessAllowedAttribute and associated dead code (#15101)
- Preserved commented out FriendAccessAllowed on types and methods that are still used as friends in System.Runtime.WindowsRuntime Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
1 parent 36deef2 commit 7508f81

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/Common/src/CoreLib/System/Diagnostics/Tracing/Winmeta.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ public enum EventLevel
5555
/// <summary>
5656
/// WindowsEventTask. Custom values must be in the range from 1 through 65534
5757
/// </summary>
58-
#if (!ES_BUILD_STANDALONE && !ES_BUILD_PN)
59-
[System.Runtime.CompilerServices.FriendAccessAllowed]
60-
#endif
6158
public enum EventTask
6259
{
6360
/// <summary>
@@ -68,9 +65,6 @@ public enum EventTask
6865
/// <summary>
6966
/// EventOpcode. Custom values must be in the range from 11 through 239
7067
/// </summary>
71-
#if (!ES_BUILD_STANDALONE && !ES_BUILD_PN)
72-
[System.Runtime.CompilerServices.FriendAccessAllowed]
73-
#endif
7468
public enum EventOpcode
7569
{
7670
/// <summary>
@@ -124,9 +118,6 @@ public enum EventOpcode
124118
/// EventChannel. Custom values must be in the range from 16 through 255. Currently only predefined values allowed.
125119
/// </summary>
126120
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1028:EnumStorageShouldBeInt32", Justification = "Backwards compatibility")]
127-
#if (!ES_BUILD_STANDALONE && !ES_BUILD_PN)
128-
[System.Runtime.CompilerServices.FriendAccessAllowed]
129-
#endif
130121
public enum EventChannel : byte
131122
{
132123
/// <summary>

src/Common/src/CoreLib/System/ObjectDisposedException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public String ObjectName
7272
{
7373
get
7474
{
75-
if ((_objectName == null)) // && !CompatibilitySwitches.IsAppEarlierThanWindowsPhone8)
75+
if (_objectName == null)
7676
{
7777
return String.Empty;
7878
}

0 commit comments

Comments
 (0)