Merge branch 'main' of https://github.com/DevBetterCom/DevBetterWeb

kritulrathod · May 2, 2024 · c6dcbd1 · c6dcbd1
2 parents db612aa + 7d27ded
commit c6dcbd1
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 46 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -58,7 +58,7 @@ jobs:
         id: setup_dotnet_core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
           include-prerelease: true
 
       - name: Checkout repository

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
         include-prerelease: true
     - name: Build and Test with dotnet
       run: dotnet test --filter FullyQualifiedName!~Vimeo.Tests --configuration Release

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
         include-prerelease: true
 
     - name: Build and test

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="altcover" Version="8.6.68" />
+    <PackageVersion Include="altcover" Version="8.8.10" />
     <PackageVersion Include="Ardalis.ApiClient" Version="0.2.3" />
     <PackageVersion Include="Ardalis.ApiEndpoints" Version="4.1.0" />
     <PackageVersion Include="Ardalis.EFCore.Extensions" Version="6.0.0" />
@@ -40,24 +40,24 @@
     <PackageVersion Include="MediaInfo.Wrapper.Core" Version="21.9.3" />
     <PackageVersion Include="MediatR" Version="12.1.1" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.15" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.13" />
+    <PackageVersion Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.4" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.13" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
     <PackageVersion Include="Microsoft.CodeCoverage" Version="17.8.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="7.0.13" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" PrivateAssets="all" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.13" />
     <PackageVersion Include="NETStandard.Library" Version="2.0.3" />
@@ -71,7 +71,7 @@
     <PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.1-dev-00043" />
     <PackageVersion Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.0.2" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.4" />
     <PackageVersion Include="SQLite" Version="3.13.0" />
     <PackageVersion Include="Stripe.net" Version="40.16.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.0",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj b/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AssemblyName>DevBetterWeb.Core</AssemblyName>
 		<PackageId>DevBetterWeb.Core</PackageId>
 		<LangVersion>latest</LangVersion>

diff --git a/src/DevBetterWeb.Core/Exceptions/InvalidBillingPeriodException.cs b/src/DevBetterWeb.Core/Exceptions/InvalidBillingPeriodException.cs
@@ -17,8 +17,4 @@ public InvalidBillingPeriodException(string? message) : base(message)
   public InvalidBillingPeriodException(string? message, Exception? innerException) : base(message, innerException)
   {
   }
-
-  protected InvalidBillingPeriodException(SerializationInfo info, StreamingContext context) : base(info, context)
-  {
-  }
 }
diff --git a/src/DevBetterWeb.Core/Exceptions/InvalidEmailException.cs b/src/DevBetterWeb.Core/Exceptions/InvalidEmailException.cs
@@ -17,8 +17,4 @@ public InvalidEmailException(string? message) : base(message)
   public InvalidEmailException(string? message, Exception? innerException) : base(message, innerException)
   {
   }
-
-  protected InvalidEmailException(SerializationInfo info, StreamingContext context) : base(info, context)
-  {
-  }
 }
diff --git a/src/DevBetterWeb.Core/Exceptions/InvitationNotActiveException.cs b/src/DevBetterWeb.Core/Exceptions/InvitationNotActiveException.cs
@@ -17,8 +17,4 @@ public InvitationNotActiveException(string? message) : base(message)
   public InvitationNotActiveException(string? message, Exception? innerException) : base(message, innerException)
   {
   }
-
-  protected InvitationNotActiveException(SerializationInfo info, StreamingContext context) : base(info, context)
-  {
-  }
 }
diff --git a/src/DevBetterWeb.Core/Exceptions/NoCurrentMemberSubscriptionFoundException.cs b/src/DevBetterWeb.Core/Exceptions/NoCurrentMemberSubscriptionFoundException.cs
@@ -17,8 +17,4 @@ public NoCurrentMemberSubscriptionFoundException(string? message) : base(message
   public NoCurrentMemberSubscriptionFoundException(string? message, Exception? innerException) : base(message, innerException)
   {
   }
-
-  protected NoCurrentMemberSubscriptionFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
-  {
-  }
 }
diff --git a/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj b/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>DevBetterWeb.Infrastructure</AssemblyName>
     <PackageId>DevBetterWeb.Infrastructure</PackageId>
     <LangVersion>latest</LangVersion>

diff --git a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<AssemblyName>DevBetterWeb.Web</AssemblyName>
 		<OutputType>Exe</OutputType>

diff --git a/src/DevBetterWeb.Web/Pages/CodeOfConduct.cshtml b/src/DevBetterWeb.Web/Pages/CodeOfConduct.cshtml
@@ -69,7 +69,7 @@
             </p>
             <h2>Enforcement</h2>
             <p>
-            Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
+            Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement by contacting Steve Smith directly via Discord or <a href="https://ardalis.com/contact">ardalis.com/contact</a> All complaints will be reviewed and investigated promptly and fairly.
             </p>
             <p>
             All community leaders are obligated to respect the privacy and security of the reporter of any incident.
@@ -113,7 +113,6 @@
 
             <h2>Attribution</h2>
             <p>
-            This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
-            </p>
+                This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at <a href="https://www.contributor-covenant.org/version/2/1/code_of_conduct.html">https: //www.contributor-covenant.org/version/2/1/code_of_conduct.html</a>.
             </p>
 </div>
diff --git a/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj b/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>

diff --git a/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj b/tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj b/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>