diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..8783b52
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,22 @@
+{
+    "name": ".NET in Codespaces",
+    "image": "mcr.microsoft.com/dotnet/sdk:8.0",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {},
+        "ghcr.io/devcontainers/features/dotnet:2": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+				"ms-dotnettools.vscode-dotnet-runtime",
+				"ms-dotnettools.csdevkit",
+				"ms-dotnetools.csharp",
+				"richardrigutins.csharp-shortcuts"
+			]
+        }
+    },
+    "remoteEnv": {
+        "DOTNET_MULTILEVEL_LOOKUP": "0",
+        "TARGET": "net8.0"
+    }
+}
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 793e3cf..6f652ba 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0
@@ -78,7 +78,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Authenticate to GitHub Packages
         run: dotnet nuget add source --username $GITHUB_REPOSITORY_OWNER --password ${API_KEY} --store-password-in-clear-text --name "github" "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
diff --git a/src/Rigutins.DotNetDIPlus/Rigutins.DotNetDIPlus.csproj b/src/Rigutins.DotNetDIPlus/Rigutins.DotNetDIPlus.csproj
index 183edc7..fb68bce 100644
--- a/src/Rigutins.DotNetDIPlus/Rigutins.DotNetDIPlus.csproj
+++ b/src/Rigutins.DotNetDIPlus/Rigutins.DotNetDIPlus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <Authors>richardrigutins</Authors>
@@ -31,6 +31,10 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="../../README.md" Pack="true" PackagePath="/" />
   </ItemGroup>
diff --git a/tests/Rigutins.DotNetDIPlus.Tests/Usings.cs b/tests/Rigutins.DotNetDIPlus.Tests/GlobalUsings.cs
similarity index 100%
rename from tests/Rigutins.DotNetDIPlus.Tests/Usings.cs
rename to tests/Rigutins.DotNetDIPlus.Tests/GlobalUsings.cs
diff --git a/tests/Rigutins.DotNetDIPlus.Tests/Rigutins.DotNetDIPlus.Tests.csproj b/tests/Rigutins.DotNetDIPlus.Tests/Rigutins.DotNetDIPlus.Tests.csproj
index 6d75c13..3783596 100644
--- a/tests/Rigutins.DotNetDIPlus.Tests/Rigutins.DotNetDIPlus.Tests.csproj
+++ b/tests/Rigutins.DotNetDIPlus.Tests/Rigutins.DotNetDIPlus.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>