Browse Source

Remove unnecessary preprocessor directives in the EF Core stores

pull/2504/head
Kévin Chalet 2 months ago
parent
commit
98e6575345
  1. 3
      src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreBuilder.cs
  2. 14
      src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs
  3. 14
      src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs
  4. 14
      src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreResourceStore.cs
  5. 14
      src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreScopeStore.cs
  6. 14
      src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs

3
src/OpenIddict.EntityFrameworkCore/OpenIddictEntityFrameworkCoreBuilder.cs

@ -100,7 +100,6 @@ public sealed class OpenIddictEntityFrameworkCoreBuilder
where TToken : OpenIddictEntityFrameworkCoreToken<TKey, TApplication, TAuthorization> where TToken : OpenIddictEntityFrameworkCoreToken<TKey, TApplication, TAuthorization>
where TKey : notnull, IEquatable<TKey> where TKey : notnull, IEquatable<TKey>
{ {
#if NET
// If the specified key type isn't a string (which is special-cased by the stores to avoid having to resolve // If the specified key type isn't a string (which is special-cased by the stores to avoid having to resolve
// a TypeDescriptor instance) and the platform supports type registration, register the key type to ensure the // a TypeDescriptor instance) and the platform supports type registration, register the key type to ensure the
// TypeDescriptor associated with that type will be preserved by the IL Linker and can be resolved at runtime. // TypeDescriptor associated with that type will be preserved by the IL Linker and can be resolved at runtime.
@ -108,7 +107,7 @@ public sealed class OpenIddictEntityFrameworkCoreBuilder
{ {
TypeDescriptor.RegisterType<TKey>(); TypeDescriptor.RegisterType<TKey>();
} }
#endif
Services.Replace(ServiceDescriptor.Scoped<IOpenIddictApplicationManager>(static provider => Services.Replace(ServiceDescriptor.Scoped<IOpenIddictApplicationManager>(static provider =>
provider.GetRequiredService<OpenIddictApplicationManager<TApplication>>())); provider.GetRequiredService<OpenIddictApplicationManager<TApplication>>()));
Services.Replace(ServiceDescriptor.Scoped<IOpenIddictAuthorizationManager>(static provider => Services.Replace(ServiceDescriptor.Scoped<IOpenIddictAuthorizationManager>(static provider =>

14
src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreApplicationStore.cs

@ -1151,12 +1151,7 @@ public class OpenIddictEntityFrameworkCoreApplicationStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return (TKey?) converter.ConvertFromInvariantString(identifier); return (TKey?) converter.ConvertFromInvariantString(identifier);
} }
@ -1182,12 +1177,7 @@ public class OpenIddictEntityFrameworkCoreApplicationStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return converter.ConvertToInvariantString(identifier); return converter.ConvertToInvariantString(identifier);
} }

14
src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs

@ -1086,12 +1086,7 @@ public class OpenIddictEntityFrameworkCoreAuthorizationStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return (TKey?) converter.ConvertFromInvariantString(identifier); return (TKey?) converter.ConvertFromInvariantString(identifier);
} }
@ -1117,12 +1112,7 @@ public class OpenIddictEntityFrameworkCoreAuthorizationStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return converter.ConvertToInvariantString(identifier); return converter.ConvertToInvariantString(identifier);
} }

14
src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreResourceStore.cs

@ -605,12 +605,7 @@ public class OpenIddictEntityFrameworkCoreResourceStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return (TKey?) converter.ConvertFromInvariantString(identifier); return (TKey?) converter.ConvertFromInvariantString(identifier);
} }
@ -636,12 +631,7 @@ public class OpenIddictEntityFrameworkCoreResourceStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return converter.ConvertToInvariantString(identifier); return converter.ConvertToInvariantString(identifier);
} }

14
src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreScopeStore.cs

@ -709,12 +709,7 @@ public class OpenIddictEntityFrameworkCoreScopeStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return (TKey?) converter.ConvertFromInvariantString(identifier); return (TKey?) converter.ConvertFromInvariantString(identifier);
} }
@ -740,12 +735,7 @@ public class OpenIddictEntityFrameworkCoreScopeStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return converter.ConvertToInvariantString(identifier); return converter.ConvertToInvariantString(identifier);
} }

14
src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs

@ -1199,12 +1199,7 @@ public class OpenIddictEntityFrameworkCoreTokenStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return (TKey?) converter.ConvertFromInvariantString(identifier); return (TKey?) converter.ConvertFromInvariantString(identifier);
} }
@ -1230,12 +1225,7 @@ public class OpenIddictEntityFrameworkCoreTokenStore<
else else
{ {
var converter = var converter = TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#if NET
TypeDescriptor.GetConverterFromRegisteredType(typeof(TKey));
#else
TypeDescriptor.GetConverter(typeof(TKey));
#endif
return converter.ConvertToInvariantString(identifier); return converter.ConvertToInvariantString(identifier);
} }

Loading…
Cancel
Save