-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make ParameterDefaultValue.TryGetDefaultValue bitcode compliant #56324
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
54239d2
Make ParameterDefaultValue.TryGetDefaultValue bitcode compliant
maryamariyan 3b46a54
code cleanup
maryamariyan 6b033ac
enable nullable for netcoreapp
maryamariyan 00acb0c
move to second property group
maryamariyan ebbf4e5
Apply PR feedback
maryamariyan a4a9fb1
Apply PR feedback
maryamariyan 920a086
code cleanup - remove ifdef
maryamariyan f2e0a29
Update src/libraries/Microsoft.Extensions.DependencyInjection/src/Mic…
maryamariyan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
...libraries/Common/src/Extensions/ParameterDefaultValue/ParameterDefaultValue.netcoreapp.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| #nullable enable | ||
|
|
||
| using System; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
|
|
||
| namespace Microsoft.Extensions.Internal | ||
| { | ||
| internal static class ParameterDefaultValue | ||
| { | ||
| public static bool TryGetDefaultValue(ParameterInfo parameter, out object? defaultValue) | ||
| { | ||
| bool tryToGetDefaultValue = true; | ||
| defaultValue = null; | ||
| bool hasDefaultValue = parameter.HasDefaultValue; | ||
|
|
||
| if (hasDefaultValue) | ||
| { | ||
| if (tryToGetDefaultValue) | ||
| { | ||
| defaultValue = parameter.DefaultValue; | ||
maryamariyan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| bool isNullableParameterType = parameter.ParameterType.IsGenericType && | ||
| parameter.ParameterType.GetGenericTypeDefinition() == typeof(Nullable<>); | ||
|
|
||
| // Workaround for https://github.com/dotnet/runtime/issues/18599 | ||
| if (defaultValue == null && parameter.ParameterType.IsValueType | ||
| && !isNullableParameterType) // Nullable types should be left null | ||
| { | ||
| defaultValue = CreateValueType(parameter.ParameterType); | ||
| } | ||
|
|
||
| [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2067:UnrecognizedReflectionPattern", | ||
| Justification = "CreateValueType is only called on a ValueType. You can always create an instance of a ValueType.")] | ||
| static object? CreateValueType(Type t) => | ||
| RuntimeHelpers.GetUninitializedObject(t); | ||
|
|
||
| // Handle nullable enums | ||
| if (defaultValue != null && isNullableParameterType) | ||
| { | ||
| Type? underlyingType = Nullable.GetUnderlyingType(parameter.ParameterType); | ||
| if (underlyingType != null && underlyingType.IsEnum) | ||
| { | ||
| defaultValue = Enum.ToObject(underlyingType, defaultValue); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return hasDefaultValue; | ||
| } | ||
| } | ||
| } | ||
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these
#nullable enables needed?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because the file is shared between 2 projects - one that has been annotated for nullable, and one that hasn't.
runtime/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
Line 6 in 83e3c64
runtime/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
Line 7 in 83e3c64