diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73a9cea2..7bc040ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
+          7.0.100-rc.2.22477.23
         
     - run: dotnet --info
     
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 00000000..37b4ece7
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,51 @@
+<Project>
+
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+        <FrameworkVersionRuntime>6.0.0</FrameworkVersionRuntime>
+        <FrameworkVersionTesting>6.0.0</FrameworkVersionTesting>
+        <YarpVersion>1.0.1</YarpVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
+        <FrameworkVersionRuntime>7.0.0-rc.2.*</FrameworkVersionRuntime>
+        <FrameworkVersionTesting>7.0.0-rc.2.*</FrameworkVersionTesting>
+        <YarpVersion>1.0.1</YarpVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <!-- build -->
+        <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+
+        <!-- runtime -->
+        <PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="1.0.0" />
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(FrameworkVersionRuntime)" />
+        <PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
+
+        <!-- testing -->
+        <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(FrameworkVersionTesting)" />
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersionTesting)" />
+        <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersionTesting)" />
+        
+        <PackageReference Update="Duende.IdentityServer" Version="6.1.5" />
+        
+        <PackageReference Update="CsQuery.NETStandard" Version="1.3.6.1" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+        <PackageReference Update="xunit" Version="2.4.2" />
+        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Update="FluentAssertions" Version="6.7.0" />
+        <PackageReference Update="coverlet.collector" Version="3.1.2">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <Target Name="SetAssemblyVersion" AfterTargets="MinVer">
+        <PropertyGroup>
+            <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
+        </PropertyGroup>
+    </Target>
+</Project>
\ No newline at end of file
diff --git a/global.json b/global.json
index b7e93133..fad48d84 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100-rc.2.22477.23",
     "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }
\ No newline at end of file
diff --git a/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj b/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj
index 204a2217..7ea5b69f 100644
--- a/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj
+++ b/src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj
@@ -10,10 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
-    <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+    
     <ProjectReference Include="..\Duende.Bff\Duende.Bff.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj b/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj
index 8f4b1dd5..a65a6ede 100644
--- a/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj
+++ b/src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj
@@ -11,9 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Yarp.ReverseProxy" Version="1.0.1" />
-        <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Yarp.ReverseProxy" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Duende.Bff/Duende.Bff.csproj b/src/Duende.Bff/Duende.Bff.csproj
index 9896f8f9..66a6e0ec 100644
--- a/src/Duende.Bff/Duende.Bff.csproj
+++ b/src/Duende.Bff/Duende.Bff.csproj
@@ -13,9 +13,6 @@
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-        <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-
-        <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="1.0.0" />
+        <PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj b/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj
index ab3fbe0c..1bd875de 100644
--- a/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj
+++ b/test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" Version="6.7.0" />
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="coverlet.collector">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj b/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj
index 58567d9a..1f8027c4 100644
--- a/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj
+++ b/test/Duende.Bff.Tests/Duende.Bff.Tests.csproj
@@ -1,27 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
+    <PackageReference Include="CsQuery.NETStandard" />
   
-    <PackageReference Include="Duende.IdentityServer" Version="6.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.9" />
+    <PackageReference Include="Duende.IdentityServer" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
   <ItemGroup>