fix: revert some platform targets to netstandard (#469)

changed aspnetcore3.1 targets to netstandard2.1 (except aspnetcore project)
Finbuckle · Sep 29, 2021 · aceff1d · aceff1d
1 parent 960458a
commit aceff1d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Extensions/EntityTypeBuilderExtensions.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Extensions/EntityTypeBuilderExtensions.cs
@@ -146,7 +146,7 @@ private static void UpdateIdentityUserIndex(this EntityTypeBuilder builder)
             builder.RemoveIndex("NormalizedUserName");
  #if NET // Covers .NET 5.0 and later.
             builder.HasIndex("NormalizedUserName", "TenantId").HasDatabaseName("UserNameIndex").IsUnique();
- #elif NETCOREAPP3_1 // .NET Core 3.1
+ #elif NETSTANDARD2_1 // .NET Core 3.1
             builder.HasIndex("NormalizedUserName", "TenantId").HasName("UserNameIndex").IsUnique();
  #endif
         }
@@ -156,7 +156,7 @@ private static void UpdateIdentityRoleIndex(this EntityTypeBuilder builder)
             builder.RemoveIndex("NormalizedName");
 #if NET // Covers .NET 5.0 and later.
             builder.HasIndex("NormalizedName", "TenantId").HasDatabaseName("RoleNameIndex").IsUnique();
-#elif NETCOREAPP3_1 // .NET Core 3.1
+#elif NETSTANDARD2_1 // .NET Core 3.1
             builder.HasIndex("NormalizedName", "TenantId").HasName("RoleNameIndex").IsUnique();
 #endif
         }

diff --git a/...inbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj b/...inbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
     <Title>Finbuckle.MultiTenant.EntityFrameworkCore</Title>
     <Description>Entity Framework Core support for Finbuckle.MultiTenant.</Description>
   </PropertyGroup>
@@ -19,11 +19,12 @@
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.*" />
       </ItemGroup>
     </When>
-    <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
       <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.*" />
         <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.*" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.*" />
+        <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
       </ItemGroup>
     </When>
   </Choose>

diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantEntityTypeBuilder.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantEntityTypeBuilder.cs
@@ -49,7 +49,7 @@ public MultiTenantEntityTypeBuilder AdjustIndex(IMutableIndex index)
             else
                 indexBuilder = Builder.HasIndex(index.Properties.Select(p => p.Name).Append("TenantId").ToArray())
                                       .HasDatabaseName(index.GetDatabaseName());
-#elif NETCOREAPP3_1
+#elif NETSTANDARD2_1
             Builder.Metadata.RemoveIndex(index.Properties);
             indexBuilder = Builder.HasIndex(index.Properties.Select(p => p.Name).Append("TenantId").ToArray())
                                   .HasName(index.GetName());

diff --git a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
     <Title>Finbuckle.MultiTenant</Title>
     <Description>Main library package for Finbuckle.MultiTenant.</Description>
   </PropertyGroup>
@@ -23,7 +23,7 @@
         <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.*" />
       </ItemGroup>
     </When>
-    <When Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <When Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
       <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.*" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.*" />