diff --git a/.run/Upgrade internal DI to the latest.run.xml b/.run/Upgrade internal DI to the latest.run.xml
index f9fb03f51..fe96a19d3 100644
--- a/.run/Upgrade internal DI to the latest.run.xml	
+++ b/.run/Upgrade internal DI to the latest.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Upgrade internal DI to the latest" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/build/bin/Debug/net8.0/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/build/bin/Debug/net9.0/build.exe" />
     <option name="PROGRAM_PARAMETERS" value="upgrade" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net9.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/Directory.Build.props b/Directory.Build.props
index bbbf9cc4b..c2df41992 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <InternalVersion>2.1.39</InternalVersion>
+        <InternalVersion>2.1.40</InternalVersion>
         <BasePackageId>Pure.DI</BasePackageId>
         <LangVersion>latest</LangVersion>
         <BaseTargetFramework>net9.0</BaseTargetFramework>
diff --git a/readme/Avalonia.md b/readme/Avalonia.md
index 1e3628a74..cf209b41d 100644
--- a/readme/Avalonia.md
+++ b/readme/Avalonia.md
@@ -176,7 +176,7 @@ The [project file](/samples/AvaloniaApp/AvaloniaApp.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md
index 3f5aace52..19dde553c 100644
--- a/readme/BlazorServerApp.md
+++ b/readme/BlazorServerApp.md
@@ -70,11 +70,11 @@ The [project file](/samples/BlazorServerApp/BlazorServerApp.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md
index 02ec876e9..384b25fc5 100644
--- a/readme/BlazorWebAssemblyApp.md
+++ b/readme/BlazorWebAssemblyApp.md
@@ -69,11 +69,11 @@ The [project file](/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj) lo
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/Console.md b/readme/Console.md
index 12d6ffa5b..c78c29f23 100644
--- a/readme/Console.md
+++ b/readme/Console.md
@@ -89,7 +89,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/ConsoleNativeAOT.md b/readme/ConsoleNativeAOT.md
index 8e314c492..929419c02 100644
--- a/readme/ConsoleNativeAOT.md
+++ b/readme/ConsoleNativeAOT.md
@@ -16,7 +16,7 @@ The [project file](/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.cs
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md
index fa4f483be..150bfbd8f 100644
--- a/readme/ConsoleTopLevelStatements.md
+++ b/readme/ConsoleTopLevelStatements.md
@@ -74,7 +74,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/GrpcService.md b/readme/GrpcService.md
index 979ff8e4c..69694bab1 100644
--- a/readme/GrpcService.md
+++ b/readme/GrpcService.md
@@ -55,11 +55,11 @@ The [project file](/samples/GrpcService/GrpcService.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/Maui.md b/readme/Maui.md
index aceeb4293..d115c2acf 100644
--- a/readme/Maui.md
+++ b/readme/Maui.md
@@ -211,11 +211,11 @@ The [project file](/samples/MAUIApp/MAUIApp.csproj) looks like this:
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0"/>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/MinimalWebAPI.md b/readme/MinimalWebAPI.md
index 787b7d14c..f95a68669 100644
--- a/readme/MinimalWebAPI.md
+++ b/readme/MinimalWebAPI.md
@@ -78,11 +78,11 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/WebAPI.md b/readme/WebAPI.md
index 681e9e291..f13faeed5 100644
--- a/readme/WebAPI.md
+++ b/readme/WebAPI.md
@@ -53,11 +53,11 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/WebApp.md b/readme/WebApp.md
index 6a9f3acf0..3d894dda2 100644
--- a/readme/WebApp.md
+++ b/readme/WebApp.md
@@ -53,11 +53,11 @@ The [project file](/samples/WebApp/WebApp.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Pure.DI.MS" Version="2.1.39" />
+        <PackageReference Include="Pure.DI.MS" Version="2.1.40" />
     </ItemGroup>
 
 </Project>
diff --git a/readme/WinFormsApp.md b/readme/WinFormsApp.md
index 5b2f9728e..da9689a7d 100644
--- a/readme/WinFormsApp.md
+++ b/readme/WinFormsApp.md
@@ -60,7 +60,7 @@ The [project file](/samples/WinFormsApp/WinFormsApp.csproj) looks like this:
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/WinFormsAppNetCore.md b/readme/WinFormsAppNetCore.md
index 62753a802..66b900ade 100644
--- a/readme/WinFormsAppNetCore.md
+++ b/readme/WinFormsAppNetCore.md
@@ -66,7 +66,7 @@ The [project file](/samples/WinFormsAppNetCore/WinFormsAppNetCore.csproj) looks
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/readme/Wpf.md b/readme/Wpf.md
index 8293908c5..e1281ace7 100644
--- a/readme/Wpf.md
+++ b/readme/Wpf.md
@@ -112,7 +112,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this:
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Pure.DI" Version="2.1.39">
+        <PackageReference Include="Pure.DI" Version="2.1.40">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj b/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj
index ea516b59a..4e5e5ddc8 100644
--- a/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj
+++ b/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net20;net35;net40;net45;net48;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net45;net48;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.1;netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <ImplicitUsings>false</ImplicitUsings>
         <PackageId>$(BasePackageId).Abstractions</PackageId>
diff --git a/src/Pure.DI.Core/Components/Api.g.cs b/src/Pure.DI.Core/Components/Api.g.cs
index 9498444b0..a8b1f3727 100644
--- a/src/Pure.DI.Core/Components/Api.g.cs
+++ b/src/Pure.DI.Core/Components/Api.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
 #pragma warning disable
 
 #if !PUREDI_API_FUNC_SUPPRESSION
diff --git a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
index a2433b616..5e7bdbc74 100644
--- a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
+++ b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
 #pragma warning disable
 namespace Pure.DI
 {    
diff --git a/src/Pure.DI.Core/Features/Default.g.cs b/src/Pure.DI.Core/Features/Default.g.cs
index 9abd4203f..9c220f5b7 100644
--- a/src/Pure.DI.Core/Features/Default.g.cs
+++ b/src/Pure.DI.Core/Features/Default.g.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
 #pragma warning disable
 
 namespace Pure.DI
diff --git a/src/Pure.DI.Core/Pure.DI.Core.csproj b/src/Pure.DI.Core/Pure.DI.Core.csproj
index 22f0cf0fd..ccb232ab1 100644
--- a/src/Pure.DI.Core/Pure.DI.Core.csproj
+++ b/src/Pure.DI.Core/Pure.DI.Core.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>$(BasePackageId)</RootNamespace>
-        <DefineConstants>$(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V2</DefineConstants>
+        <DefineConstants>$(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V1</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>