Remove .NET Core 2.2 as it reached end of life, closes #227

sharparchitecture · Jan 10, 2021 · 0aff355 · 0aff355
1 parent d607e81
commit 0aff355
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 35 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,7 +16,7 @@
 
   <PropertyGroup Label="Custom targeTs">
     <!-- target frameworks for unit-tests and applications -->
-    <AppTargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.1;net5</AppTargetFrameworks>
+    <AppTargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5</AppTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.Tests/Suteki.TardisBank.Tests.csproj b/Samples/TardisBank/Src/Suteki.TardisBank.Tests/Suteki.TardisBank.Tests.csproj
@@ -24,11 +24,6 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
   </ItemGroup>

diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Startup.cs b/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Startup.cs
@@ -18,7 +18,7 @@ namespace Suteki.TardisBank.WebApi
     using SharpArch.NHibernate.Impl;
     using SharpArch.Web.AspNetCore.Transaction;
 
-#if NETCOREAPP2_1 || NETCOREAPP2_2
+#if NETCOREAPP2_1
     using System.Globalization;
     using Microsoft.AspNetCore.Mvc;
     using Newtonsoft.Json;
@@ -63,8 +63,6 @@ public void ConfigureServices(IServiceCollection services)
                 .AddJsonFormatters()
 #if NETCOREAPP2_1
                 .SetCompatibilityVersion(CompatibilityVersion.Version_2_1)
-#elif NETCOREAPP2_2
-                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
 #endif
                 ;
 #endif

diff --git a/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Suteki.TardisBank.WebApi.csproj b/Samples/TardisBank/Src/Suteki.TardisBank.WebApi/Suteki.TardisBank.WebApi.csproj
@@ -22,13 +22,8 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.9" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/Samples/TransactionAttribute/App/Startup.cs b/Samples/TransactionAttribute/App/Startup.cs
@@ -8,7 +8,7 @@
     using Microsoft.Extensions.DependencyInjection;
     using SharpArch.Web.AspNetCore.Transaction;
     using Stubs;
-#if NETCOREAPP2_1 || NETCOREAPP2_2
+#if NETCOREAPP2_1
     using System.Globalization;
     using Microsoft.AspNetCore.Mvc;
     using Newtonsoft.Json;
@@ -37,7 +37,6 @@ public void ConfigureServices(IServiceCollection services)
                     options.Filters.Add(new TransactionAttribute(isolationLevel: IsolationLevel.Chaos));
                 })
                 ;
-
 #else
             // Add framework services.
             services.AddMvcCore(options =>
@@ -56,8 +55,6 @@ public void ConfigureServices(IServiceCollection services)
                 .AddJsonFormatters()
 #if NETCOREAPP2_1
                 .SetCompatibilityVersion(CompatibilityVersion.Version_2_1)
-#elif NETCOREAPP2_2
-                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
 #endif
                 ;
 #endif

diff --git a/Samples/TransactionAttribute/App/TransactionAttribute.WebApi.csproj b/Samples/TransactionAttribute/App/TransactionAttribute.WebApi.csproj
@@ -18,10 +18,6 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\Src\SharpArch.Web.AspNetCore\SharpArch.Web.AspNetCore.csproj" />
   </ItemGroup>

diff --git a/Samples/TransactionAttribute/Tests/TransactionAttribute.Tests.csproj b/Samples/TransactionAttribute/Tests/TransactionAttribute.Tests.csproj
@@ -23,11 +23,6 @@
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
   </ItemGroup>

diff --git a/Src/SharpArch.Web.AspNetCore/SharpArch.Web.AspNetCore.csproj b/Src/SharpArch.Web.AspNetCore/SharpArch.Web.AspNetCore.csproj
@@ -31,13 +31,6 @@
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
   </ItemGroup>
 
-  <ItemGroup Label="Package References (ASP.NET Core 2.2)" Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-  </ItemGroup>
-
-
   <ItemGroup Label="Package References (ASP.NET Core 3.1)" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>