Skip to content

Commit c9745a6

Browse files
commonsensesoftwarecommonsensesoftware
committed
Remove unnecessary compiler directives
1 parent 6ead32f commit c9745a6

29 files changed

+47
-131
lines changed

‎src/Abstractions/src/Asp.Versioning.Abstractions/ApiVersionParser.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ public virtual ApiVersion Parse( Text text )
187187
/// <inheritdoc />
188188
#if NETSTANDARD1_0
189189
public virtual bool TryParse( Text? text, out ApiVersion apiVersion )
190-
#elif NETSTANDARD2_0
191-
public virtual bool TryParse( Text text, out ApiVersion apiVersion )
192190
#else
193191
public virtual bool TryParse( Text text, [MaybeNullWhen( false )] out ApiVersion apiVersion )
194192
#endif

‎src/Abstractions/src/Asp.Versioning.Abstractions/Asp.Versioning.Abstractions.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<Compile Include="$(BackportDir)Array.cs" Visible="false" />
3131
</ItemGroup>
3232

33+
<ItemGroup Condition=" ('$(TargetFramework)' == 'netstandard1.0') OR ('$(TargetFramework)' == 'netstandard2.0') ">
34+
<Compile Include="$(BackportDir)NullableAttributes.cs" Visible="false" />
35+
</ItemGroup>
36+
3337
<ItemGroup Condition=" '$(TargetFramework)' != 'net7.0' ">
3438
<Compile Include="$(BackportDir)BitOperations.cs" Visible="false" />
3539
<Compile Include="$(BackportDir)HashCode.cs" Visible="false" />

‎src/Abstractions/src/Asp.Versioning.Abstractions/ISunsetPolicyManager.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,5 @@ public interface ISunsetPolicyManager
1818
/// policy for the specified <paramref name="apiVersion">API version</paramref>. If
1919
/// <paramref name="apiVersion">API version</paramref> is <c>null</c>, it is assumed the caller intends to match
2020
/// any sunset policy for the specified <paramref name="name"/>.</remarks>
21-
bool TryGetPolicy(
22-
string? name,
23-
ApiVersion? apiVersion,
24-
#if !NETSTANDARD
25-
[MaybeNullWhen( false )]
26-
#endif
27-
out SunsetPolicy sunsetPolicy );
21+
bool TryGetPolicy( string? name, ApiVersion? apiVersion, [MaybeNullWhen( false )] out SunsetPolicy sunsetPolicy );
2822
}

‎src/Abstractions/src/Asp.Versioning.Abstractions/ISunsetPolicyManagerExtensions.cs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ public static class ISunsetPolicyManagerExtensions
1717
public static bool TryGetPolicy(
1818
this ISunsetPolicyManager policyManager,
1919
ApiVersion apiVersion,
20-
#if !NETSTANDARD
21-
[MaybeNullWhen( false )]
22-
#endif
23-
out SunsetPolicy sunsetPolicy )
20+
[MaybeNullWhen( false )] out SunsetPolicy sunsetPolicy )
2421
{
2522
if ( policyManager == null )
2623
{
@@ -40,10 +37,7 @@ public static bool TryGetPolicy(
4037
public static bool TryGetPolicy(
4138
this ISunsetPolicyManager policyManager,
4239
string name,
43-
#if !NETSTANDARD
44-
[MaybeNullWhen( false )]
45-
#endif
46-
out SunsetPolicy sunsetPolicy )
40+
[MaybeNullWhen( false )] out SunsetPolicy sunsetPolicy )
4741
{
4842
if ( policyManager == null )
4943
{
@@ -104,10 +98,7 @@ public static bool TryResolvePolicy(
10498
this ISunsetPolicyManager policyManager,
10599
string? name,
106100
ApiVersion? apiVersion,
107-
#if !NETSTANDARD
108-
[MaybeNullWhen( false )]
109-
#endif
110-
out SunsetPolicy sunsetPolicy )
101+
[MaybeNullWhen( false )] out SunsetPolicy sunsetPolicy )
111102
{
112103
if ( policyManager == null )
113104
{

‎src/Abstractions/src/Asp.Versioning.Abstractions/LinkHeaderValue.cs‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,7 @@ public StringSegment Language
161161
public static bool TryParse(
162162
StringSegment input,
163163
Func<Uri, Uri>? resolveRelativeUrl,
164-
#if !NETSTANDARD
165-
[MaybeNullWhen( false )]
166-
#endif
167-
out LinkHeaderValue parsedValue )
164+
[MaybeNullWhen( false )] out LinkHeaderValue parsedValue )
168165
{
169166
#if NETSTANDARD1_0
170167
if ( string.IsNullOrEmpty( input ) )
@@ -302,9 +299,7 @@ public static bool TryParse(
302299
public static bool TryParseList(
303300
IList<string>? input,
304301
Func<Uri, Uri>? resolveRelativeUrl,
305-
#if !NETSTANDARD
306302
[MaybeNullWhen( false )]
307-
#endif
308303
out IList<LinkHeaderValue> parsedValues )
309304
{
310305
if ( input == null )
@@ -404,10 +399,7 @@ private static void AppendTargetAttribute( StringBuilder builder, ReadOnlySpan<c
404399
private static bool TryParseTargetLink(
405400
ref StringSegment segment,
406401
Func<Uri, Uri>? resolveRelativeUrl,
407-
#if !NETSTANDARD
408-
[MaybeNullWhen( false )]
409-
#endif
410-
out Uri targetLink )
402+
[MaybeNullWhen( false )] out Uri targetLink )
411403
{
412404
var start = segment.IndexOf( '<' );
413405

@@ -495,7 +487,7 @@ public bool Remove( KeyValuePair<StringSegment, StringSegment> item ) =>
495487

496488
public bool TryGetValue(
497489
StringSegment key,
498-
#if !NETSTANDARD
490+
#if !NETSTANDARD1_0
499491
[MaybeNullWhen( false )]
500492
#endif
501493
out StringSegment value ) => items.TryGetValue( key, out value );

‎src/Abstractions/src/Asp.Versioning.Abstractions/netstandard2.0/IApiVersionParser.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,5 @@ public interface IApiVersionParser
2020
/// <param name="text">The text to parse as an API version.</param>
2121
/// <param name="apiVersion">The parsed API version or null.</param>
2222
/// <returns>True if the parsing was successful; otherwise false.</returns>
23-
bool TryParse(
24-
ReadOnlySpan<char> text,
25-
#if !NETSTANDARD
26-
[MaybeNullWhen( false )]
27-
#endif
28-
out ApiVersion apiVersion );
23+
bool TryParse( ReadOnlySpan<char> text, [MaybeNullWhen( false )] out ApiVersion apiVersion );
2924
}

‎src/Abstractions/src/Asp.Versioning.Abstractions/netstandard2.0/IApiVersionParserExtensions.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ public static ApiVersion Parse( this IApiVersionParser parser, string? text )
3333
public static bool TryParse(
3434
this IApiVersionParser parser,
3535
string? text,
36-
#if !NETSTANDARD
37-
[MaybeNullWhen( false )]
38-
#endif
39-
out ApiVersion apiVersion )
36+
[MaybeNullWhen( false )] out ApiVersion apiVersion )
4037
{
4138
if ( parser == null )
4239
{

‎src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Asp.Versioning.WebApi.OData.ApiExplorer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<ItemGroup>
1818
<Compile Include="$(BackportDir)BitOperations.cs" Visible="false" />
1919
<Compile Include="$(BackportDir)HashCode.cs" Visible="false" />
20+
<Compile Include="$(BackportDir)NullableAttributes.cs" Visible="false" />
2021
<Compile Include="$(BackportDir)StringExtensions.cs" Visible="false" />
2122
<Compile Include="..\..\..\..\Common\src\Common.OData\TypeExtensions.cs" Link="TypeExtensions.cs" />
2223
<Compile Include="..\..\..\WebApi\src\Asp.Versioning.WebApi.ApiExplorer\System.Web.Http\Controllers\HttpActionDescriptorExtensions.cs" Link="System.Web.Http\Controllers\HttpActionDescriptorExtensions.cs" />

‎src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/ApiExplorer/VersionedApiExplorer.cs‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ protected virtual Collection<VersionedApiDescription> ExploreRouteControllers(
713713

714714
var apiDescriptions = new Collection<VersionedApiDescription>();
715715
var routeTemplate = route.RouteTemplate;
716-
string controllerVariableValue;
716+
string? controllerVariableValue;
717717

718718
if ( controllerVariableRegex.IsMatch( routeTemplate ) )
719719
{
@@ -734,12 +734,12 @@ protected virtual Collection<VersionedApiDescription> ExploreRouteControllers(
734734
}
735735
}
736736
else if ( route.Defaults.TryGetValue( RouteValueKeys.Controller, out controllerVariableValue ) &&
737-
controllerMappings.TryGetValue( controllerVariableValue, out var controllerDescriptor ) )
737+
controllerMappings.TryGetValue( controllerVariableValue!, out var controllerDescriptor ) )
738738
{
739739
// bound controller variable {controller = "controllerName"}
740740
foreach ( var nestedControllerDescriptor in controllerDescriptor.AsEnumerable() )
741741
{
742-
if ( ShouldExploreController( controllerVariableValue, nestedControllerDescriptor, route, apiVersion ) )
742+
if ( ShouldExploreController( controllerVariableValue!, nestedControllerDescriptor, route, apiVersion ) )
743743
{
744744
ExploreRouteActions( route, routeTemplate, nestedControllerDescriptor, apiDescriptions, apiVersion );
745745
}
@@ -782,7 +782,7 @@ private void ExploreRouteActions(
782782
return;
783783
}
784784

785-
string actionVariableValue;
785+
string? actionVariableValue;
786786

787787
if ( actionVariableRegex.IsMatch( localPath ) )
788788
{
@@ -935,17 +935,8 @@ private static bool ShouldEmitPrefixes( ICollection<ApiParameterDescription> par
935935
parameter.CanConvertPropertiesFromString() ) > 1;
936936
}
937937

938-
private static Type GetCollectionElementType( Type collectionType )
939-
{
940-
var elementType = collectionType.GetElementType();
941-
942-
if ( elementType == null )
943-
{
944-
elementType = typeof( ICollection<> ).GetGenericBinderTypeArgs( collectionType ).First();
945-
}
946-
947-
return elementType;
948-
}
938+
private static Type GetCollectionElementType( Type collectionType ) =>
939+
collectionType.GetElementType() ?? typeof( ICollection<> ).GetGenericBinderTypeArgs( collectionType ).First();
949940

950941
private static void AddPlaceholderForProperties(
951942
Dictionary<string, object> parameterValuesForRoute,

‎src/AspNet/WebApi/src/Asp.Versioning.WebApi/Asp.Versioning.WebApi.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<ItemGroup>
1818
<Compile Include="$(BackportDir)BitOperations.cs" Visible="false" />
1919
<Compile Include="$(BackportDir)HashCode.cs" Visible="false" />
20+
<Compile Include="$(BackportDir)NullableAttributes.cs" Visible="false" />
2021
</ItemGroup>
2122

2223
<ItemGroup>

0 commit comments

Comments
 (0)