acamit · acamit · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,30 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+!**/.gitignore
+!.git/HEAD
+!.git/config
+!.git/packed-refs
+!.git/refs/heads/**
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+ <PropertyGroup>
+   <LangVersion>latest</LangVersion>
+ </PropertyGroup>
+</Project>
diff --git a/Framework/YCompany.Claims.Caching/YCompany.Caching.csproj b/Framework/YCompany.Claims.Caching/YCompany.Caching.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/Framework/YCompany.Claims.ExceptionHandling/YCompany.ExceptionHandling.csproj b/Framework/YCompany.Claims.ExceptionHandling/YCompany.ExceptionHandling.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Framework/YCompany.Claims.Logging/YCompany.Logging.csproj b/Framework/YCompany.Claims.Logging/YCompany.Logging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Framework/YCompany.Claims.MessagingQueue/YCompany.MessagingQueue.csproj b/Framework/YCompany.Claims.MessagingQueue/YCompany.MessagingQueue.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Framework/YCompany.HealthChecks/YCompany.HealthChecks.csproj b/Framework/YCompany.HealthChecks/YCompany.HealthChecks.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="7.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.0-preview.6.24328.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Services/YCompanyClaimsAPI/YCompany.Claims.DataAccess/YCompany.Claims.DataAccess.csproj b/Services/YCompanyClaimsAPI/YCompany.Claims.DataAccess/YCompany.Claims.DataAccess.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Services/YCompanyClaimsAPI/YCompany.Claims.Domain/YCompany.Claims.Domain.csproj b/Services/YCompanyClaimsAPI/YCompany.Claims.Domain/YCompany.Claims.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...es/YCompanyClaimsAPI/YCompany.Claims.Infrastructure/YCompany.Claims.Infrastructure.csproj b/...es/YCompanyClaimsAPI/YCompany.Claims.Infrastructure/YCompany.Claims.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Services/YCompanyClaimsAPI/YCompany.Claims.Services/YCompany.Claims.Services.csproj b/Services/YCompanyClaimsAPI/YCompany.Claims.Services/YCompany.Claims.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/Dockerfile b/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/Dockerfile
@@ -0,0 +1,31 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER app
+WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["Services/YCompanyClaimsAPI/YCompanyClaimsAPI/YCompanyClaimsAPI.csproj", "Services/YCompanyClaimsAPI/YCompanyClaimsAPI/"]
+COPY ["Framework/YCompany.Claims.ExceptionHandling/YCompany.ExceptionHandling.csproj", "Framework/YCompany.Claims.ExceptionHandling/"]
+COPY ["Framework/YCompany.Claims.Logging/YCompany.Logging.csproj", "Framework/YCompany.Claims.Logging/"]
+COPY ["Framework/YCompany.Claims.MessagingQueue/YCompany.MessagingQueue.csproj", "Framework/YCompany.Claims.MessagingQueue/"]
+COPY ["Services/YCompanyClaimsAPI/YCompany.Claims.DataAccess/YCompany.Claims.DataAccess.csproj", "Services/YCompanyClaimsAPI/YCompany.Claims.DataAccess/"]
+COPY ["Services/YCompanyClaimsAPI/YCompany.Claims.Domain/YCompany.Claims.Domain.csproj", "Services/YCompanyClaimsAPI/YCompany.Claims.Domain/"]
+COPY ["Framework/YCompany.HealthChecks/YCompany.HealthChecks.csproj", "Framework/YCompany.HealthChecks/"]
+RUN dotnet restore "./Services/YCompanyClaimsAPI/YCompanyClaimsAPI/YCompanyClaimsAPI.csproj"
+COPY . .
+WORKDIR "/src/Services/YCompanyClaimsAPI/YCompanyClaimsAPI"
+RUN dotnet build "./YCompanyClaimsAPI.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./YCompanyClaimsAPI.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "YCompanyClaimsAPI.dll"]
diff --git a/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/Properties/launchSettings.json b/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/Properties/launchSettings.json
@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:44492",
-      "sslPort": 44322
-    }
-  },
+{
   "profiles": {
     "YCompanyClaimsAPI": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7047;http://localhost:5120",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7047;http://localhost:5120"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,26 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_HTTPS_PORTS": "8081",
+        "ASPNETCORE_HTTP_PORTS": "8080"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:44492",
+      "sslPort": 44322
     }
   }
-}
+}
diff --git a/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/YCompanyClaimsAPI.csproj b/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/YCompanyClaimsAPI.csproj
@@ -1,13 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>8015be99-09d4-4e64-85ef-926fcce0be02</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..\..</DockerfileContext>
+    <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

diff --git a/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/YCompanyClaimsAPI.csproj.user b/Services/YCompanyClaimsAPI/YCompanyClaimsAPI/YCompanyClaimsAPI.csproj.user
@@ -3,5 +3,6 @@
   <PropertyGroup>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
+    <ActiveDebugProfile>Container (Dockerfile)</ActiveDebugProfile>
   </PropertyGroup>
 </Project>
diff --git a/...nicationsAPI/YCompany.Communications.DataAccess/YCompany.Communications.DataAccess.csproj b/...nicationsAPI/YCompany.Communications.DataAccess/YCompany.Communications.DataAccess.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...anyCommunicationsAPI/YCompany.Communications.Domain/YCompany.Communications.Domain.csproj b/...anyCommunicationsAPI/YCompany.Communications.Domain/YCompany.Communications.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...sAPI/YCompany.Communications.Infrastructure/YCompany.Communications.Infrastructure.csproj b/...sAPI/YCompany.Communications.Infrastructure/YCompany.Communications.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...ommunicationsAPI/YCompany.Communications.Services/YCompany.Communications.Services.csproj b/...ommunicationsAPI/YCompany.Communications.Services/YCompany.Communications.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/Dockerfile b/Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/Dockerfile
@@ -0,0 +1,25 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER app
+WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI.csproj", "Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/"]
+RUN dotnet restore "./Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI.csproj"
+COPY . .
+WORKDIR "/src/Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI"
+RUN dotnet build "./YCompanyCommunicationsAPI.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./YCompanyCommunicationsAPI.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "YCompanyCommunicationsAPI.dll"]
diff --git a/Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/Properties/launchSettings.json b/Services/YCompanyCommunicationsAPI/YCompanyCommunicationsAPI/Properties/launchSettings.json
@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:36792",
-      "sslPort": 44346
-    }
-  },
+{
   "profiles": {
     "YCompanyCommunicationsAPI": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7189;http://localhost:5099",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7189;http://localhost:5099"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,26 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_HTTPS_PORTS": "8081",
+        "ASPNETCORE_HTTP_PORTS": "8080"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:36792",
+      "sslPort": 44346
     }
   }
-}
+}