Skip to content

Commit 16422ab

Browse files
sbomersbomer
committed
Revert "Add Name to DisplayAttribute"
This reverts commit c3ef7e3.
1 parent 8a72753 commit 16422ab

File tree

52 files changed

+1
-213
lines changed

Some content is hidden

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

52 files changed

+1
-213
lines changed

‎src/Extensions/AzureBlobStorage/AzureBlobEgressProviderOptions.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,94 +11,79 @@ namespace Microsoft.Diagnostics.Monitoring.AzureBlobStorage
1111
internal sealed partial class AzureBlobEgressProviderOptions
1212
{
1313
[Display(
14-
Name = nameof(AccountUri),
1514
ResourceType = typeof(OptionsDisplayStrings),
1615
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_AccountUri))]
1716
[Required]
1817
public Uri AccountUri { get; set; }
1918

2019
[Display(
21-
Name = nameof(AccountKey),
2220
ResourceType = typeof(OptionsDisplayStrings),
2321
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_AccountKey))]
2422
public string AccountKey { get; set; }
2523

2624
[Display(
27-
Name = nameof(AccountKeyName),
2825
ResourceType = typeof(OptionsDisplayStrings),
2926
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_AccountKeyName))]
3027
public string AccountKeyName { get; set; }
3128

3229
[Display(
33-
Name = nameof(SharedAccessSignature),
3430
ResourceType = typeof(OptionsDisplayStrings),
3531
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_SharedAccessSignature))]
3632
public string SharedAccessSignature { get; set; }
3733

3834
[Display(
39-
Name = nameof(SharedAccessSignatureName),
4035
ResourceType = typeof(OptionsDisplayStrings),
4136
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_SharedAccessSignatureName))]
4237
public string SharedAccessSignatureName { get; set; }
4338

4439
[Display(
45-
Name = nameof(ManagedIdentityClientId),
4640
ResourceType = typeof(OptionsDisplayStrings),
4741
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_ManagedIdentityClientId))]
4842
public string ManagedIdentityClientId { get; set; }
4943

5044
[Display(
51-
Name = nameof(UseWorkloadIdentityFromEnvironment),
5245
ResourceType = typeof(OptionsDisplayStrings),
5346
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_UseWorkloadIdentityFromEnvironment))]
5447
public bool? UseWorkloadIdentityFromEnvironment { get; set; }
5548

5649
[Display(
57-
Name = nameof(ContainerName),
5850
ResourceType = typeof(OptionsDisplayStrings),
5951
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_ContainerName))]
6052
[Required]
6153
public string ContainerName { get; set; }
6254

6355
[Display(
64-
Name = nameof(BlobPrefix),
6556
ResourceType = typeof(OptionsDisplayStrings),
6657
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_BlobPrefix))]
6758
public string BlobPrefix { get; set; }
6859

6960
[Display(
70-
Name = nameof(CopyBufferSize),
7161
ResourceType = typeof(OptionsDisplayStrings),
7262
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CommonEgressProviderOptions_CopyBufferSize))]
7363
[Range(1, int.MaxValue)]
7464
public int? CopyBufferSize { get; set; }
7565

7666
[Display(
77-
Name = nameof(QueueName),
7867
ResourceType = typeof(OptionsDisplayStrings),
7968
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueName))]
8069
public string QueueName { get; set; }
8170

8271
[Display(
83-
Name = nameof(QueueAccountUri),
8472
ResourceType = typeof(OptionsDisplayStrings),
8573
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueAccountUri))]
8674
public Uri QueueAccountUri { get; set; }
8775

8876
[Display(
89-
Name = nameof(QueueSharedAccessSignature),
9077
ResourceType = typeof(OptionsDisplayStrings),
9178
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueSharedAccessSignature))]
9279
public string QueueSharedAccessSignature { get; set; }
9380

9481
[Display(
95-
Name = nameof(QueueSharedAccessSignatureName),
9682
ResourceType = typeof(OptionsDisplayStrings),
9783
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_QueueSharedAccessSignatureName))]
9884
public string QueueSharedAccessSignatureName { get; set; }
9985

10086
[Display(
101-
Name = nameof(Metadata),
10287
ResourceType = typeof(OptionsDisplayStrings),
10388
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureBlobEgressProviderOptions_Metadata))]
10489
public IDictionary<string, string> Metadata { get; set; }

‎src/Extensions/S3Storage/S3StorageEgressProviderOptions.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,77 +13,65 @@ namespace Microsoft.Diagnostics.Monitoring.Extension.S3Storage
1313
internal sealed partial class S3StorageEgressProviderOptions
1414
{
1515
[Display(
16-
Name = nameof(Endpoint),
1716
ResourceType = typeof(OptionsDisplayStrings),
1817
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_Endpoint))]
1918
public string? Endpoint { get; set; }
2019

2120
[Display(
22-
Name = nameof(BucketName),
2321
ResourceType = typeof(OptionsDisplayStrings),
2422
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_BucketName))]
2523
[Required(AllowEmptyStrings = false)]
2624
public string BucketName { get; set; } = string.Empty;
2725

2826
[Display(
29-
Name = nameof(RegionName),
3027
ResourceType = typeof(OptionsDisplayStrings),
3128
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_RegionName))]
3229
public string? RegionName { get; set; }
3330

3431
[Display(
35-
Name = nameof(AccessKeyId),
3632
ResourceType = typeof(OptionsDisplayStrings),
3733
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_AccessKeyId))]
3834
public string? AccessKeyId { get; set; }
3935

4036
[Display(
41-
Name = nameof(SecretAccessKey),
4237
ResourceType = typeof(OptionsDisplayStrings),
4338
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_SecretAccessKey))]
4439
public string? SecretAccessKey { get; set; }
4540

4641
[Display(
47-
Name = nameof(AwsProfileName),
4842
ResourceType = typeof(OptionsDisplayStrings),
4943
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_AWSProfileName))]
5044
public string? AwsProfileName { get; set; }
5145

5246
[Display(
53-
Name = nameof(AwsProfilePath),
5447
ResourceType = typeof(OptionsDisplayStrings),
5548
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_AWSProfilePath))]
5649
public string? AwsProfilePath { get; set; }
5750

5851
[Display(
59-
Name = nameof(PreSignedUrlExpiry),
6052
ResourceType = typeof(OptionsDisplayStrings),
6153
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_PreSignedUrlExpiry))]
6254
[Range(typeof(TimeSpan), "00:01:00", "1.00:00:00")]
6355
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Addressed by DynamicDependency on ValidationHelper.TryValidateOptions method")]
6456
public TimeSpan? PreSignedUrlExpiry { get; set; }
6557

6658
[Display(
67-
Name = nameof(ForcePathStyle),
6859
ResourceType = typeof(OptionsDisplayStrings),
6960
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_ForcePathStyle))]
7061
public bool ForcePathStyle { get; set; }
7162

7263
[Display(
73-
Name = nameof(CopyBufferSize),
7464
ResourceType = typeof(OptionsDisplayStrings),
7565
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CommonEgressProviderOptions_CopyBufferSize))]
7666
[Range(1, int.MaxValue)]
7767
public int? CopyBufferSize { get; set; }
7868

7969
[Display(
80-
Name = nameof(UseKmsEncryption),
8170
ResourceType = typeof(OptionsDisplayStrings),
8271
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_UseKmsEncryption))]
8372
public bool UseKmsEncryption { get; set; }
8473

8574
[Display(
86-
Name = nameof(KmsEncryptionKey),
8775
ResourceType = typeof(OptionsDisplayStrings),
8876
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_KmsEncryptionKey))]
8977
public string? KmsEncryptionKey { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/AuthenticationOptions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ namespace Microsoft.Diagnostics.Tools.Monitor
99
internal sealed partial class AuthenticationOptions
1010
{
1111
[Display(
12-
Name = nameof(MonitorApiKey),
1312
ResourceType = typeof(OptionsDisplayStrings),
1413
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AuthenticationOptions_MonitorApiKey))]
1514
public MonitorApiKeyOptions? MonitorApiKey { get; set; }
1615

1716
[Display(
18-
Name = nameof(AzureAd),
1917
ResourceType = typeof(OptionsDisplayStrings),
2018
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AuthenticationOptions_AzureAd))]
2119
public AzureAdOptions? AzureAd { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptions.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,29 @@ namespace Microsoft.Diagnostics.Tools.Monitor
1111
internal sealed partial class AzureAdOptions
1212
{
1313
[Display(
14-
Name = nameof(Instance),
1514
ResourceType = typeof(OptionsDisplayStrings),
1615
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_Instance))]
1716
[DefaultValue(AzureAdOptionsDefaults.DefaultInstance)]
1817
public Uri? Instance { get; set; }
1918

2019
[Display(
21-
Name = nameof(TenantId),
2220
ResourceType = typeof(OptionsDisplayStrings),
2321
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_TenantId))]
2422
[Required]
2523
public string TenantId { get; set; } = string.Empty;
2624

2725
[Display(
28-
Name = nameof(ClientId),
2926
ResourceType = typeof(OptionsDisplayStrings),
3027
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_ClientId))]
3128
[Required]
3229
public string ClientId { get; set; } = string.Empty;
3330

3431
[Display(
35-
Name = nameof(AppIdUri),
3632
ResourceType = typeof(OptionsDisplayStrings),
3733
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_AppIdUri))]
3834
public Uri? AppIdUri { get; set; }
3935

4036
[Display(
41-
Name = nameof(RequiredRole),
4237
ResourceType = typeof(OptionsDisplayStrings),
4338
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_RequiredRole))]
4439
[Required]

‎src/Microsoft.Diagnostics.Monitoring.Options/CallStacksOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public sealed class CallStacksOptions :
1111
IInProcessFeatureOptions
1212
{
1313
[Display(
14-
Name = nameof(Enabled),
1514
ResourceType = typeof(OptionsDisplayStrings),
1615
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CallStacksOptions_Enabled))]
1716
[DefaultValue(CallStacksOptionsDefaults.Enabled)]

‎src/Microsoft.Diagnostics.Monitoring.Options/CorsConfigurationOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ namespace Microsoft.Diagnostics.Monitoring.WebApi
88
public class CorsConfigurationOptions
99
{
1010
[Display(
11-
Name = nameof(AllowedOrigins),
1211
ResourceType = typeof(OptionsDisplayStrings),
1312
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CorsConfiguration_AllowedOrigins))]
1413
[Required]

‎src/Microsoft.Diagnostics.Monitoring.Options/DiagnosticPortOptions.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,22 @@ namespace Microsoft.Diagnostics.Monitoring.WebApi
99
public class DiagnosticPortOptions
1010
{
1111
[Display(
12-
Name = nameof(ConnectionMode),
1312
ResourceType = typeof(OptionsDisplayStrings),
1413
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_ConnectionMode))]
1514
[DefaultValue(DiagnosticPortOptionsDefaults.ConnectionMode)]
1615
public DiagnosticPortConnectionMode? ConnectionMode { get; set; }
1716

1817
[Display(
19-
Name = nameof(EndpointName),
2018
ResourceType = typeof(OptionsDisplayStrings),
2119
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_EndpointName))]
2220
public string? EndpointName { get; set; }
2321

2422
[Display(
25-
Name = nameof(MaxConnections),
2623
ResourceType = typeof(OptionsDisplayStrings),
2724
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_MaxConnections))]
2825
public int? MaxConnections { get; set; }
2926

3027
[Display(
31-
Name = nameof(DeleteEndpointOnStartup),
3228
ResourceType = typeof(OptionsDisplayStrings),
3329
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_DiagnosticPortOptions_DeleteEndpointOnStartup))]
3430
[DefaultValue(DiagnosticPortOptionsDefaults.DeleteEndpointOnStartup)]

‎src/Microsoft.Diagnostics.Monitoring.Options/EgressOptions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ namespace Microsoft.Diagnostics.Tools.Monitor
1111
internal sealed class EgressOptions
1212
{
1313
[Display(
14-
Name = nameof(FileSystem),
1514
ResourceType = typeof(OptionsDisplayStrings),
1615
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_EgressOptions_FileSystem))]
1716
public IDictionary<string, FileSystemEgressProviderOptions>? FileSystem { get; set; }
1817

1918
[Display(
20-
Name = nameof(Properties),
2119
ResourceType = typeof(OptionsDisplayStrings),
2220
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_EgressOptions_Properties))]
2321
public IDictionary<string, string>? Properties { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/ExceptionsOptions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,19 @@ public sealed class ExceptionsOptions :
1111
IInProcessFeatureOptions
1212
{
1313
[Display(
14-
Name = nameof(Enabled),
1514
ResourceType = typeof(OptionsDisplayStrings),
1615
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_ExceptionsOptions_Enabled))]
1716
[DefaultValue(ExceptionsOptionsDefaults.Enabled)]
1817
public bool? Enabled { get; set; }
1918

2019
[Display(
21-
Name = nameof(TopLevelLimit),
2220
ResourceType = typeof(OptionsDisplayStrings),
2321
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_ExceptionsOptions_TopLevelLimit))]
2422
[Range(1, int.MaxValue)]
2523
[DefaultValue(ExceptionsOptionsDefaults.TopLevelLimit)]
2624
public int? TopLevelLimit { get; set; }
2725

2826
[Display(
29-
Name = nameof(CollectionFilters),
3027
ResourceType = typeof(OptionsDisplayStrings),
3128
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_ExceptionsOptions_CollectionFilters))]
3229
public ExceptionsConfiguration? CollectionFilters { get; set; }

‎src/Microsoft.Diagnostics.Monitoring.Options/FileSystemEgressProviderOptions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@ internal sealed class FileSystemEgressProviderOptions
1515
public const int CopyBufferSize_MaxValue = int.MaxValue;
1616

1717
[Display(
18-
Name = nameof(DirectoryPath),
1918
ResourceType = typeof(OptionsDisplayStrings),
2019
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_FileSystemEgressProviderOptions_DirectoryPath))]
2120
[Required]
2221
public string DirectoryPath { get; set; } = string.Empty;
2322

2423
[Display(
25-
Name = nameof(IntermediateDirectoryPath),
2624
ResourceType = typeof(OptionsDisplayStrings),
2725
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_FileSystemEgressProviderOptions_IntermediateDirectoryPath))]
2826
public string? IntermediateDirectoryPath { get; set; }
2927

3028
[Display(
31-
Name = nameof(CopyBufferSize),
3229
ResourceType = typeof(OptionsDisplayStrings),
3330
Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_CommonEgressProviderOptions_CopyBufferSize))]
3431
[Range(CopyBufferSize_MinValue, CopyBufferSize_MaxValue)]

0 commit comments

Comments
 (0)