diff --git a/.run/GrpcService_ http.run.xml b/.run/BlazorServerApp_ IIS Express.run.xml
similarity index 83%
rename from .run/GrpcService_ http.run.xml
rename to .run/BlazorServerApp_ IIS Express.run.xml
index 363f30044..7e840e034 100644
--- a/.run/GrpcService_ http.run.xml	
+++ b/.run/BlazorServerApp_ IIS Express.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="GrpcService: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+  <configuration default="false" name="BlazorServerApp: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/BlazorServerApp/BlazorServerApp.csproj" />
     <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
     <option name="LAUNCH_PROFILE_NAME" value="IIS Express" />
diff --git a/.run/BlazorServerApp_ https.run.xml b/.run/BlazorServerApp_ https.run.xml
new file mode 100644
index 000000000..253e5323d
--- /dev/null
+++ b/.run/BlazorServerApp_ https.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="BlazorServerApp: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/BlazorServerApp/BlazorServerApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="https" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/BlazorWebAssemblyApp_ http.run.xml b/.run/BlazorWebAssemblyApp_ http.run.xml
index 4971c99d0..dc1bfe07e 100644
--- a/.run/BlazorWebAssemblyApp_ http.run.xml	
+++ b/.run/BlazorWebAssemblyApp_ http.run.xml	
@@ -14,4 +14,20 @@
       <option name="Build" />
     </method>
   </configuration>
+  <configuration default="false" name="BlazorWebAssemblyApp: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="http" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <browser name="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
 </component>
\ No newline at end of file
diff --git a/.run/MinimalWebAPI_ IIS Express.run.xml b/.run/MinimalWebAPI_ IIS Express.run.xml
new file mode 100644
index 000000000..28c19f15d
--- /dev/null
+++ b/.run/MinimalWebAPI_ IIS Express.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MinimalWebAPI: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/MinimalWebAPI/MinimalWebAPI.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="IIS Express" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/MinimalWebAPI_ https.run.xml b/.run/MinimalWebAPI_ https.run.xml
new file mode 100644
index 000000000..c17d0b5f3
--- /dev/null
+++ b/.run/MinimalWebAPI_ https.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MinimalWebAPI: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/MinimalWebAPI/MinimalWebAPI.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="https" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/WebAPI_ IIS Express.run.xml b/.run/WebAPI_ IIS Express.run.xml
new file mode 100644
index 000000000..29b723c86
--- /dev/null
+++ b/.run/WebAPI_ IIS Express.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WebAPI: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/WebAPI/WebAPI.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="IIS Express" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/WebAPI_ https.run.xml b/.run/WebAPI_ https.run.xml
new file mode 100644
index 000000000..9e0225a34
--- /dev/null
+++ b/.run/WebAPI_ https.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WebAPI: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/WebAPI/WebAPI.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="https" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/WebApp_ IIS Express.run.xml b/.run/WebApp_ IIS Express.run.xml
new file mode 100644
index 000000000..660d272bd
--- /dev/null
+++ b/.run/WebApp_ IIS Express.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WebApp: IIS Express" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/WebApp/WebApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="IIS Express" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/WebApp_ http.run.xml b/.run/WebApp_ http.run.xml
index eaa7e12b4..78f56c0bb 100644
--- a/.run/WebApp_ http.run.xml	
+++ b/.run/WebApp_ http.run.xml	
@@ -14,4 +14,19 @@
       <option name="Build" />
     </method>
   </configuration>
+  <configuration default="false" name="WebApp: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/WebApp/WebApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="http" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
 </component>
\ No newline at end of file
diff --git a/.run/WebApp_ https.run.xml b/.run/WebApp_ https.run.xml
new file mode 100644
index 000000000..22cf55eb8
--- /dev/null
+++ b/.run/WebApp_ https.run.xml	
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="WebApp: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile" folderName="Examples">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/samples/WebApp/WebApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="https" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build/Tools/Versions.cs b/build/Tools/Versions.cs
index d7b2bd75a..f352a599c 100644
--- a/build/Tools/Versions.cs
+++ b/build/Tools/Versions.cs
@@ -20,12 +20,17 @@ public NuGetVersion GetNext(NuGetRestoreSettings restoreSettings, VersionRange v
                 : new NuGetVersion(i.Major, i.Minor, i.Patch + patchIncrement))
             .Max()
         ?? new NuGetVersion(
-            versionRange.MinVersion.Major,
-            versionRange.MinVersion.Minor,
-            versionRange.MinVersion.Patch);
+            versionRange.MinVersion?.Major ?? 1,
+            versionRange.MinVersion?.Minor ?? 0,
+            versionRange.MinVersion?.Patch ?? 0);
 
     private static NuGetVersion GetNextRelease(VersionRangeBase versionRange, NuGetVersion version)
     {
+        if (versionRange.MinVersion is null)
+        {
+            return version;
+        }
+
         if (versionRange.MinVersion.Release != "0" && versionRange.MinVersion.Release != version.Release)
         {
             return versionRange.MinVersion;
diff --git a/build/build.csproj b/build/build.csproj
index 4819b44b4..6d6f3706b 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CSharpInteractive" Version="1.1.4" />
+        <PackageReference Include="CSharpInteractive" Version="1.1.5" />
         <PackageReference Include="Pure.DI" Version="$(InternalVersion)">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/AvaloniaApp/AvaloniaApp.csproj b/samples/AvaloniaApp/AvaloniaApp.csproj
index f53c68cc3..7c0e27fde 100644
--- a/samples/AvaloniaApp/AvaloniaApp.csproj
+++ b/samples/AvaloniaApp/AvaloniaApp.csproj
@@ -13,12 +13,12 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\Clock\Clock.csproj"/>
-        <PackageReference Include="Avalonia" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
+        <PackageReference Include="Avalonia" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.1" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/AvaloniaSimpleApp/AvaloniaSimpleApp.csproj b/samples/AvaloniaSimpleApp/AvaloniaSimpleApp.csproj
index 5b312020e..0a7a1ad0b 100644
--- a/samples/AvaloniaSimpleApp/AvaloniaSimpleApp.csproj
+++ b/samples/AvaloniaSimpleApp/AvaloniaSimpleApp.csproj
@@ -11,11 +11,11 @@
     <ItemGroup>
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
-        <PackageReference Include="Avalonia" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
+        <PackageReference Include="Avalonia" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.1" />
     </ItemGroup>
 </Project>
diff --git a/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj b/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
index 904daa8ef..d03198792 100644
--- a/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
+++ b/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
@@ -11,7 +11,7 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj b/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj
index ba78ef403..3f76233be 100644
--- a/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj
+++ b/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj
@@ -14,12 +14,12 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\Clock\Clock.csproj"/>
-        <PackageReference Include="Avalonia" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
+        <PackageReference Include="Avalonia" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.1" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/WebAPI/WebAPI.csproj b/samples/WebAPI/WebAPI.csproj
index c0a2122f2..6735e9b2c 100644
--- a/samples/WebAPI/WebAPI.csproj
+++ b/samples/WebAPI/WebAPI.csproj
@@ -10,7 +10,7 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
     </ItemGroup>
 
 </Project>