build: 📦 upgrade to .net 8 preview 7

mehdihadeli · Sep 5, 2023 · b4abfd1 · b4abfd1
1 parent 4b98642
commit b4abfd1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 38 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.6.23330.14"
+    "version": "8.0.100-preview.7.23376.3"
   }
 }
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -18,31 +18,16 @@
     <PackageVersion Include="CorrelationId" Version="3.0.1" />
     <PackageVersion Include="MassTransit.Abstractions" Version="8.0.14" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0-preview.7.23375.9" />
     <PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
     <PackageVersion Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.410101" />
     <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.32" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0-preview.7.23375.6" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.0-preview.7.23375.9" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0-preview.7.23375.6" />
     <PackageVersion Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
     <PackageVersion Include="Microsoft.Tye.Extensions.Configuration" Version="0.10.0-alpha.21420.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64" />
@@ -58,8 +43,8 @@
     <PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
     <PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="1.0.0-dev-00113" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
+    <PackageVersion Include="System.Net.Http.Json" Version="8.0.0-preview.7.23375.6" />
     <PackageVersion Include="System.Threading.RateLimiting" Version="7.0.4" />
-    <PackageVersion Include="System.Net.Http.Json" Version="7.0.4" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
@@ -76,18 +61,18 @@
     <PackageVersion Include="prometheus-net.AspNetCore.HealthChecks" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.0-preview.7.23375.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.23375.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0-preview.7.23375.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-preview.7.23375.4" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
     <PackageVersion Include="EFCore.NamingConventions" Version="7.0.2" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-preview.7" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Serilog" Version="3.0.1" />
@@ -150,7 +135,7 @@
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0-preview.7.23375.9" />
     <PackageVersion Include="NSwag.ApiDescription.Client" Version="13.0.5" />
   </ItemGroup>
   <ItemGroup>
@@ -174,8 +159,8 @@
     <PackageVersion Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageVersion Include="MinimalApis.Extensions" Version="0.10.1" />
     <PackageVersion Include="NetFabric.Hyperlinq.Analyzer" Version="2.0.4" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="Scrutor" Version="4.1.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Scrutor" Version="4.2.2" />
     <PackageVersion Include="SendGrid" Version="9.25.3" />
     <PackageVersion Include="Spectre.Console" Version="0.45.0" />
     <PackageVersion Include="SqlKata" Version="2.4.0" />
@@ -192,7 +177,7 @@
     <PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="7.1.3" />
     <PackageVersion Include="LinqKit.Core" Version="1.2.4" />
     <PackageVersion Include="Sieve" Version="2.5.5" />
-    <PackageVersion Include="Polly" Version="7.2.3" />
+    <PackageVersion Include="Polly" Version="8.0.0-beta.1" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Linq.Async.Queryable" Version="6.0.1" />
   </ItemGroup>
@@ -206,7 +191,7 @@
     <PackageVersion Include="EasyCaching.Serialization.MessagePack" Version="1.9.0" />
     <PackageVersion Include="EasyCaching.Serialization.Json" Version="1.9.0" />
     <PackageVersion Include="EasyCaching.Redis" Version="1.9.0" />
-    <PackageVersion Include="EasyCaching.InMemory" Version="1.8.0" />
+    <PackageVersion Include="EasyCaching.InMemory" Version="1.9.0" />
     <PackageVersion Include="EasyCaching.Core" Version="1.9.0" />
   </ItemGroup>
 </Project>
diff --git a/.../Extensions/ServiceCollectionsExtensions/ServiceCollectionExtensions.CoreRegistrations.cs b/.../Extensions/ServiceCollectionsExtensions/ServiceCollectionExtensions.CoreRegistrations.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using Polly;
 using Sieve.Services;
 using Vertical.Slice.Template.Shared.Abstractions.Core.Domain.Events;
 using Vertical.Slice.Template.Shared.Abstractions.Ef.Repository;
@@ -20,6 +21,10 @@ public static IServiceCollection AddCore(this IServiceCollection services, param
 
         services.AddScoped<ISieveProcessor, ApplicationSieveProcessor>();
         services.ScanAndRegisterDbExecutors(scanAssemblies);
+
+        var policy = Policy.Handle<System.Exception>().RetryAsync(2);
+        services.AddSingleton<AsyncPolicy>(policy);
+
         return services;
     }
 }
diff --git a/src/Vertical.Slice.Template.Shared/Vertical.Slice.Template.Shared.csproj b/src/Vertical.Slice.Template.Shared/Vertical.Slice.Template.Shared.csproj
@@ -7,7 +7,6 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>Vertical.Slice.Template.Shared</AssemblyName>
@@ -36,6 +35,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" />
     <PackageReference Include="Microsoft.Extensions.Options" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
@@ -50,6 +50,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
     <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="System.Linq.Async.Queryable" />
+    <PackageReference Include="System.Net.Http.Json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -75,7 +76,4 @@
     <PackageReference Include="Serilog.Sinks.Debug" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Core\Types" />
-  </ItemGroup>
 </Project>
diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
@@ -19,9 +19,9 @@
     <PackageVersion Include="Hypothesist.MassTransit" Version="2.0.30" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
     <PackageVersion Include="MassTransit" Version="8.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.7.23375.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.7.23375.4" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
     <PackageVersion Include="Microsoft.VisualStudio.TestPlatform" Version="14.0.0" />
     <PackageVersion Include="Mongo2Go" Version="3.1.3" />
     <PackageVersion Include="NSubstitute" Version="5.0.0" />