diff --git a/CSharpInteractive.HostApi/CSharpInteractive.HostApi.csproj b/CSharpInteractive.HostApi/CSharpInteractive.HostApi.csproj
index 0ef20de..957d516 100644
--- a/CSharpInteractive.HostApi/CSharpInteractive.HostApi.csproj
+++ b/CSharpInteractive.HostApi/CSharpInteractive.HostApi.csproj
@@ -15,7 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NuGet.Versioning" Version="6.4.0"/>
+        <PackageReference Include="NuGet.Versioning" Version="6.8.1"/>
         <PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
         <InternalsVisibleTo Include="dotnet-csi"/>
diff --git a/CSharpInteractive/CSharpInteractive.Tool.csproj b/CSharpInteractive/CSharpInteractive.Tool.csproj
index ffb5259..a89f7c3 100644
--- a/CSharpInteractive/CSharpInteractive.Tool.csproj
+++ b/CSharpInteractive/CSharpInteractive.Tool.csproj
@@ -29,9 +29,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0-3.final" />
-        <PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
-        <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
         <PackageReference Include="Pure.DI" Version="2.1.38">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -43,11 +40,30 @@
         <PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
         <ProjectReference Include="..\CSharpInteractive.HostApi\CSharpInteractive.HostApi.csproj" PrivateAssets="all"/>
         <PackageReference Include="TeamCity.DotNet.Integration" Version="1.0.33" PrivateAssets="all" GeneratePathProperty="true" ExcludeAssets="All" IncludeAssets="none" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
         <InternalsVisibleTo Include="CSharpInteractive.Tests"/>
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
     </ItemGroup>
 
+    <Choose>
+        <When Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">
+            <ItemGroup>
+                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+                <PackageReference Include="NuGet.Build.Tasks" Version="6.8.1"/>
+                <PackageReference Include="Microsoft.Build.Framework" Version="16.11.0" IncludeAssets="all"/>
+                <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" IncludeAssets="all"/>
+            </ItemGroup>
+        </When>
+        <Otherwise>
+            <ItemGroup>
+                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+                <PackageReference Include="NuGet.Build.Tasks" Version="6.11.1"/>
+                <PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" IncludeAssets="all"/>
+                <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" IncludeAssets="all"/>
+                <PackageReference Include="System.Formats.Asn1" Version="9.0.0" IncludeAssets="all"/>
+            </ItemGroup>
+        </Otherwise>
+    </Choose>
+
     <PropertyGroup>
         <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
     </PropertyGroup>
diff --git a/CSharpInteractive/CSharpInteractive.csproj b/CSharpInteractive/CSharpInteractive.csproj
index 8150cea..82a81a8 100644
--- a/CSharpInteractive/CSharpInteractive.csproj
+++ b/CSharpInteractive/CSharpInteractive.csproj
@@ -22,9 +22,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0-3.final" />
-        <PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
-        <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
         <PackageReference Include="Pure.DI" Version="2.1.38">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -34,13 +31,32 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
         <ProjectReference Include="..\CSharpInteractive.HostApi\CSharpInteractive.HostApi.csproj" PrivateAssets="all" GeneratePathProperty="true" IncludeAssets="All"/>
         <PackageReference Include="TeamCity.DotNet.Integration" Version="1.0.33" PrivateAssets="all" GeneratePathProperty="true" ExcludeAssets="All" IncludeAssets="none" />
         <InternalsVisibleTo Include="CSharpInteractive.Tests"/>
         <InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
     </ItemGroup>
 
+    <Choose>
+        <When Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">
+            <ItemGroup>
+                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+                <PackageReference Include="NuGet.Build.Tasks" Version="6.8.1"/>
+                <PackageReference Include="Microsoft.Build.Framework" Version="16.11.0" IncludeAssets="all"/>
+                <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" IncludeAssets="all"/>
+            </ItemGroup>
+        </When>
+        <Otherwise>
+            <ItemGroup>
+                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+                <PackageReference Include="NuGet.Build.Tasks" Version="6.11.1"/>
+                <PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" IncludeAssets="all"/>
+                <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" IncludeAssets="all"/>
+                <PackageReference Include="System.Formats.Asn1" Version="9.0.0" IncludeAssets="all"/>
+            </ItemGroup>
+        </Otherwise>
+    </Choose>
+
     <PropertyGroup>
         <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
     </PropertyGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index 9577042..a5f6064 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
-        <NoWarn>NETSDK1057;NETSDK1215;NU1605;NU5118;NU5100;NU5131;NU5104;NU5105;NU1902;NU1903;NU1904;CS2008;CS1591</NoWarn>
+        <NoWarn>NETSDK1138;NETSDK1057;NETSDK1215;NU1605;NU5118;NU5100;NU5131;NU5104;NU5105;NU1902;NU1903;NU1904;CS2008;CS1591</NoWarn>
         <Version>1.0.0-dev</Version>
         <Authors>NikolayP</Authors>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>