Drop support for ASP.NET Core 2.2 and 3.0 and Add ASP.NET Core 2.1.

Author: mo-esmp

src/DynamicAuthorization.Mvc.Core/DynamicAuthorization.Mvc.Core.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <Version>1.0.3</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
@@ -17,14 +18,10 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
-  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

src/DynamicAuthorization.Mvc.Core/DynamicAuthorization.Mvc.Core.nuspec

@@ -17,9 +17,6 @@
         <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="2.2.0" exclude="Build,Analyzers" />
         <dependency id="Microsoft.AspNetCore.Mvc" version="2.2.0" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework=".NETCoreApp3.0">
-        <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="3.0.0" exclude="Build,Analyzers" />
-      </group>
       <group targetFramework=".NETCoreApp3.1">
         <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="3.1.0" exclude="Build,Analyzers" />
       </group>
@@ -28,9 +25,6 @@
       </group>
     </dependencies>
     <frameworkReferences>
-      <group targetFramework=".NETCoreApp3.0">
-        <frameworkReference name="Microsoft.AspNetCore.App" />
-      </group>
       <group targetFramework=".NETCoreApp3.1">
         <frameworkReference name="Microsoft.AspNetCore.App" />
       </group>
@@ -41,7 +35,6 @@
   </metadata>
   <files>
     <file src="bin\release\netstandard2.0\*.dll" target="lib/netstandard2.0" />
-    <file src="bin\release\netcoreapp3.0\*.dll" target="lib/netcoreapp3.0" />
     <file src="bin\release\netcoreapp3.1\*.dll" target="lib/netcoreapp3.1" />
     <file src="bin\release\net5.0\*.dll" target="lib/net5.0" />
   </files>

src/DynamicAuthorization.Mvc.Ui/DynamicAuthorization.Mvc.Ui.csproj

@@ -1,12 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <RazorCompileOnBuild>true</RazorCompileOnBuild>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

src/DynamicAuthorization.Mvc.Ui/DynamicAuthorization.Mvc.Ui.nuspec

@@ -14,8 +14,9 @@
     <copyright></copyright>
     <tags>authorize authorization authentication dynamic-authorization dynamic-authentication identity membership</tags>
     <dependencies>
-      <group targetFramework=".NETCoreApp3.0">
-        <dependency id="DynamicAuthorization.Mvc.Core" version="1.0.2" exclude="Build,Analyzers" />
+      <group targetFramework=".NETCoreApp2.1">
+        <dependency id="DynamicAuthorization.Mvc.Core" version="1.0.3" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.App" version="2.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETCoreApp3.1">
         <dependency id="DynamicAuthorization.Mvc.Core" version="1.0.2" exclude="Build,Analyzers" />
@@ -25,9 +26,6 @@
       </group>
     </dependencies>
     <frameworkReferences>
-      <group targetFramework=".NETCoreApp3.0">
-        <frameworkReference name="Microsoft.AspNetCore.App" />
-      </group>
       <group targetFramework=".NETCoreApp3.1">
         <frameworkReference name="Microsoft.AspNetCore.App" />
       </group>
@@ -37,7 +35,7 @@
     </frameworkReferences>
   </metadata>
   <files>
-    <file src="bin\release\netcoreapp3.0\*.dll" target="lib/netcoreapp3.0" />
+    <file src="bin\release\netcoreapp2.1\*.dll" target="lib/netcoreapp2.1" />
     <file src="bin\release\netcoreapp3.1\*.dll" target="lib/netcoreapp3.1" />
     <file src="bin\release\net5.0\*.dll" target="lib/net5.0" />
   </files>

src/DynamicAuthorization.Mvc.Ui/Filters/AddResourcesToViewFilter.cs

@@ -25,10 +25,11 @@ private static string SetResource(string resourceName)
         {
             var resourceStream = typeof(AddResourcesToViewFilter).Assembly.GetManifestResourceStream(resourceName);
 
-            using var reader = new StreamReader(resourceStream, Encoding.UTF8);
-            var resource = reader.ReadToEnd();
-
-            return resource;
+            using (var reader = new StreamReader(resourceStream, Encoding.UTF8))
+            {
+                var resource = reader.ReadToEnd();
+                return resource;
+            }
         }
     }
 }