diff --git a/Directory.Build.props b/Directory.Build.props
index 01869debb..2d46fe9f3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
+
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup>
@@ -10,6 +10,12 @@
     <DebugSymbols>true</DebugSymbols>
     <LangVersion>Latest</LangVersion>
 
+    <!-- TODO: Remove when https://github.com/dotnet/arcade/pull/12161 is merged and consumed. -->
+    <NetCurrent Condition="'$(NetCurrent)' == ''">net8.0</NetCurrent>
+
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <Nullable Condition="'$(IsTestProject)' != 'true'">enable</Nullable>
+
     <!--
       Tools and packages produced by this repository support infrastructure and are not shipping on NuGet or via any other official channel.
     -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 177d64c47..f90f13fc3 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
 </Project>
diff --git a/README.md b/README.md
index 3bfc33f40..f53ca70af 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Hot Reload Utilities #
 
-Testing utilities for .NET hot reload.
+Testing utilities for ".NET Hot Reload".
 
 ## What's in here ##
 
diff --git a/eng/Build.props b/eng/Build.props
index ff0ff88ca..ed7cfcd53 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+
   <ItemGroup>
-    <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\hotreload-utils.proj" />
+    <ProjectToBuild Include="$(RepoRoot)hotreload-utils.proj" />
   </ItemGroup>
+
 </Project>
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 10bc8c868..18139c7d6 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
-   <PropertyGroup>
-      <PublishingVersion>3</PublishingVersion>
-   </PropertyGroup>
+
+  <PropertyGroup>
+    <PublishingVersion>3</PublishingVersion>
+  </PropertyGroup>
+
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 86230d499..af6565329 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,21 +16,21 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22623.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23058.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
+      <Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22623.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23058.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
+      <Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22623.1">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23058.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
+      <Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22623.1">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23058.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
+      <Sha>53026f034f7b8abfb9362ed018519423d81c9abb</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index b20474848..8a090320e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
+
   <PropertyGroup>
     <!-- This repo version -->
     <!-- Base three-part version used for all outputs of the repo (assemblies, packages, vsixes) -->
@@ -16,9 +16,9 @@
     <MicrosoftCodeAnalysisVersion>4.3.1-3.22526.13</MicrosoftCodeAnalysisVersion>
     <SystemConfigurationConfigurationManagerVersion>6.0.0</SystemConfigurationConfigurationManagerVersion>
     <!-- Testing -->
-    <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22623.1</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22623.1</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22623.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23058.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23058.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23058.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
     <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
     <!--
@@ -31,4 +31,5 @@
     <RefOnlyMicrosoftBuildUtilitiesCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildUtilitiesCoreVersion>
     <RefOnlyNugetProjectModelVersion>6.2.2</RefOnlyNugetProjectModelVersion>
   </PropertyGroup>
+
 </Project>
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 09c506d11..71b66aeb8 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -1,6 +1,6 @@
 parameters:
   runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20220804.1
+  sourceIndexPackageVersion: 1.0.1-20221220.2
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
   preSteps: []
@@ -40,10 +40,10 @@ jobs:
     - ${{ preStep }}
 
   - task: UseDotNet@2
-    displayName: Use .NET Core sdk 3.1
+    displayName: Use .NET Core SDK 6
     inputs:
       packageType: sdk
-      version: 3.1.x
+      version: 6.0.x
       installationPath: $(Agent.TempDirectory)/dotnet
       workingDirectory: $(Agent.TempDirectory)
 
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 1a8c16c56..7caacc6de 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -581,7 +581,7 @@ function InitializeBuildTool() {
       ExitWithExitCode 1
     }
     $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
-    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
+    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
   } elseif ($msbuildEngine -eq "vs") {
     try {
       $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -743,6 +743,8 @@ function MSBuild() {
       (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
       (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
       (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
+      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
     )
     $selectedPath = $null
     foreach ($path in $possiblePaths) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 2f27d7453..cf9fb1ea2 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -312,7 +312,7 @@ function InitializeBuildTool {
   # return values
   _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
   _InitializeBuildToolCommand="msbuild"
-  _InitializeBuildToolFramework="net7.0"
+  _InitializeBuildToolFramework="net8.0"
 }
 
 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -428,6 +428,8 @@ function MSBuild {
     possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
     possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
+    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
     for path in "${possiblePaths[@]}"; do
       if [[ -f $path ]]; then
         selectedPath=$path
diff --git a/global.json b/global.json
index 2b713b54e..d7f0cdbd8 100644
--- a/global.json
+++ b/global.json
@@ -1,8 +1,9 @@
 {
   "tools": {
-    "dotnet": "7.0.100"
+    "dotnet": "8.0.100-alpha.1.23055.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22623.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23058.1",
+    "Microsoft.Build.Traversal": "3.2.0"
   }
 }
diff --git a/hotreload-utils.proj b/hotreload-utils.proj
index 56a11fd6f..e39b88b59 100644
--- a/hotreload-utils.proj
+++ b/hotreload-utils.proj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.Build.Traversal/3.0.3">
+<Project Sdk="Microsoft.Build.Traversal">
+
   <ItemGroup>
     <ProjectReference Include="src/Microsoft.DotNet.HotReload.Utils.Generator/Microsoft.DotNet.HotReload.Utils.Generator.csproj" />
     <ProjectReference Include="src/Microsoft.DotNet.HotReload.Utils.Generator.Data/Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj" />
@@ -9,4 +10,5 @@
 
     <ProjectReference Include="tests\**\*.*proj" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj b/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj
index 4deae9971..19418efc4 100644
--- a/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj
+++ b/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
-    <TargetFramework>net7.0</TargetFramework>
     <PackageType>MSBuildSdk</PackageType>
-    <!-- Allow to run on later tooling (i.e. net7.0) if exact match isn't present -->
+    <!-- Allow to run on later tooling if exact match isn't present -->
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/build/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets b/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/build/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets
index 6e93bc635..0cfc3a0ae 100644
--- a/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/build/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets
+++ b/src/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool/build/Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets
@@ -5,11 +5,11 @@
     <!-- If DotNetTool is undefined, we default to assuming 'dotnet' is on the path -->
     <DotNetTool Condition="'$(DotNetTool)' == ''">dotnet</DotNetTool>
 
-    <_HotReloadDeltaGeneratorPath Condition="'$(_HotReloadDeltaGeneratorPath)' == ''">$(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.dll</_HotReloadDeltaGeneratorPath>
+    <_HotReloadDeltaGeneratorPath Condition="'$(_HotReloadDeltaGeneratorPath)' == ''">$(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.dll</_HotReloadDeltaGeneratorPath>
 
     <_HotReloadDeltaGeneratorCommand>"$(DotNetTool)" $(_HotReloadDeltaGeneratorPath)</_HotReloadDeltaGeneratorCommand>
 
-    <_HotReloadDeltaGeneratorTasksPath Condition="'$(_HotReloadDeltaGeneratorTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\net7.0\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.dll</_HotReloadDeltaGeneratorTasksPath>
+    <_HotReloadDeltaGeneratorTasksPath Condition="'$(_HotReloadDeltaGeneratorTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.dll</_HotReloadDeltaGeneratorTasksPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -18,7 +18,6 @@
     <_HotReloadDeltaGeneratorShouldRun Condition="'$(_HotReloadDeltaGeneratorShouldRun)' == ''">false</_HotReloadDeltaGeneratorShouldRun>
   </PropertyGroup>
 
-
   <UsingTask TaskName="HotReloadDeltaGeneratorComputeScriptOutputs" AssemblyFile="$(_HotReloadDeltaGeneratorTasksPath)" />
 
   <!-- Doesn't actually run the delta geneator, but just analyzes the script and figures out what output items it would produce.
@@ -67,5 +66,4 @@
     </ItemGroup>
   </Target>
 
-
 </Project>
diff --git a/src/Microsoft.DotNet.HotReload.Utils.Generator.Data/Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj b/src/Microsoft.DotNet.HotReload.Utils.Generator.Data/Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj
index 6461060e3..35e3d8428 100644
--- a/src/Microsoft.DotNet.HotReload.Utils.Generator.Data/Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj
+++ b/src/Microsoft.DotNet.HotReload.Utils.Generator.Data/Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj
@@ -1,7 +1,2 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Microsoft.DotNet.HotReload.Utils.Generator.Frontend/Microsoft.DotNet.HotReload.Utils.Generator.Frontend.csproj b/src/Microsoft.DotNet.HotReload.Utils.Generator.Frontend/Microsoft.DotNet.HotReload.Utils.Generator.Frontend.csproj
index 2c700e99c..d7b0d005c 100644
--- a/src/Microsoft.DotNet.HotReload.Utils.Generator.Frontend/Microsoft.DotNet.HotReload.Utils.Generator.Frontend.csproj
+++ b/src/Microsoft.DotNet.HotReload.Utils.Generator.Frontend/Microsoft.DotNet.HotReload.Utils.Generator.Frontend.csproj
@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.DotNet.HotReload.Utils.Generator\Microsoft.DotNet.HotReload.Utils.Generator.csproj" />
diff --git a/src/Microsoft.DotNet.HotReload.Utils.Generator.Tasks/Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj b/src/Microsoft.DotNet.HotReload.Utils.Generator.Tasks/Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj
index da5a1b5fb..752222ee6 100644
--- a/src/Microsoft.DotNet.HotReload.Utils.Generator.Tasks/Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj
+++ b/src/Microsoft.DotNet.HotReload.Utils.Generator.Tasks/Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj
@@ -1,9 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
-
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion)" />
@@ -15,4 +10,5 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.DotNet.HotReload.Utils.Generator.Data\Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.DotNet.HotReload.Utils.Generator/Microsoft.DotNet.HotReload.Utils.Generator.csproj b/src/Microsoft.DotNet.HotReload.Utils.Generator/Microsoft.DotNet.HotReload.Utils.Generator.csproj
index e296cdd3d..22f850e11 100644
--- a/src/Microsoft.DotNet.HotReload.Utils.Generator/Microsoft.DotNet.HotReload.Utils.Generator.csproj
+++ b/src/Microsoft.DotNet.HotReload.Utils.Generator/Microsoft.DotNet.HotReload.Utils.Generator.csproj
@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -36,4 +31,5 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.DotNet.HotReload.Utils.Generator.Data\Microsoft.DotNet.HotReload.Utils.Generator.Data.csproj" />
   </ItemGroup>
+
 </Project>
diff --git a/src/hotreload-delta-gen/README.md b/src/hotreload-delta-gen/README.md
index d59d3e1aa..b2a7d9ee5 100644
--- a/src/hotreload-delta-gen/README.md
+++ b/src/hotreload-delta-gen/README.md
@@ -9,12 +9,12 @@ For integration into MS Build projects, see [../Microsoft.DotNet.HotReload.Utils
 
 The standalone `hotreload-delta-gen` tool is more useful for one-off experiments in which case it is best to install it as a global dotnet tool.
 
-## How to install from the dotnet7-transport NuGet feed
+## How to install from the dotnet8-transport NuGet feed
 
-Preview versions are published to the `dotnet7-transport` feed.
+Preview versions are published to the `dotnet8-transport` feed.
 
 ```console
-dotnet tool install --global --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json hotreload-delta-gen --version [LATEST_VER]
+dotnet tool install --global --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json hotreload-delta-gen --version [LATEST_VER]
 ```
 
 Where `[LATEST_VER]` is the latest published version (`dotnet tool install` will tell you the latest available if you omit the `--version` argument)
@@ -27,7 +27,7 @@ Install .NET 7
 
 Run `build.sh -restore -build -publish -pack -c Release` from the repo root.
 
-That will create the executable `artifacts/bin/hotreload-delta-gen/Release/net7.0/publish/hotreload-delta-gen`.
+That will create the executable `artifacts/bin/hotreload-delta-gen/Release/net8.0/publish/hotreload-delta-gen`.
 
 
 ## How to use it
diff --git a/src/hotreload-delta-gen/example/TestClass.csproj b/src/hotreload-delta-gen/example/TestClass.csproj
index e333d39e0..08b537860 100644
--- a/src/hotreload-delta-gen/example/TestClass.csproj
+++ b/src/hotreload-delta-gen/example/TestClass.csproj
@@ -1,35 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <OutputType>library</OutputType>
-        <EnableDefaultItems>false</EnableDefaultItems>
-        <DeltaScript>diffscript.json</DeltaScript>
-    </PropertyGroup>
-    <ItemGroup>
-      <Compile Include="TestClass.cs"/>
-      <ProjectReference Include="..\src\hotreload-delta-gen.csproj" ReferenceOutputAssembly="false" />
-    </ItemGroup>
 
-    <!-- find the built hotreload-delta-gen.dll from this repo -->
+  <PropertyGroup>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <DeltaScript>diffscript.json</DeltaScript>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="TestClass.cs"/>
+    <ProjectReference Include="..\src\hotreload-delta-gen.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <!-- find the built hotreload-delta-gen.dll from this repo -->
+  <PropertyGroup>
+    <DotNetTool Condition="'$(DotNetTool)' == ''">dotnet</DotNetTool>
+    <ToolConfiguration Condition="'$(ToolConfiguration)'==''">$(Configuration)</ToolConfiguration>
+    <ToolTargetFramework Condition="'$(ToolTargetFramework)'==''">$(TargetFramework)</ToolTargetFramework>
+    <HotReloadToolPath>$(OutputPath)\..\..\hotreload-delta-gen\$(ToolConfiguration)\$(ToolTargetFramework)\hotreload-delta-gen.dll</HotReloadToolPath>
+    <HotReloadToolCommand>$(DotNetTool) $(HotReloadToolPath)</HotReloadToolCommand>
+  </PropertyGroup>
+
+  <!-- run the tool after this assembly is built -->
+  <Target Name="RunDiff" AfterTargets="Build">
     <PropertyGroup>
-      <DotNetTool Condition="'$(DotNetTool)' == ''">dotnet</DotNetTool>
-      <ToolConfiguration Condition="'$(ToolConfiguration)'==''">$(Configuration)</ToolConfiguration>
-      <ToolTargetFramework Condition="'$(ToolTargetFramework)'==''">$(TargetFramework)</ToolTargetFramework>
-      <HotReloadToolPath>$(OutputPath)\..\..\hotreload-delta-gen\$(ToolConfiguration)\$(ToolTargetFramework)\hotreload-delta-gen.dll</HotReloadToolPath>
-      <HotReloadToolCommand>$(DotNetTool) $(HotReloadToolPath)</HotReloadToolCommand>
+      <HotReloadGeneratorArgs>-msbuild:$(MSBuildProjectFullPath)</HotReloadGeneratorArgs>
+      <HotReloadGeneratorArgs>$(HotReloadGeneratorArgs) -script:$(DeltaScript)</HotReloadGeneratorArgs>
+      <HotReloadGeneratorArgs Condition="'$(Configuration)' != ''">$(HotReloadGeneratorArgs) -p:Configuration=$(Configuration)</HotReloadGeneratorArgs>
+      <HotReloadGeneratorArgs Condition="'$(RuntimeIdentifier)' != ''">$(HotReloadGeneratorArgs) -p:RuntimeIdentifier=$(RuntimeIdentifier)</HotReloadGeneratorArgs>
+      <HotReloadGeneratorArgs Condition="'$(BuiltRuntimeConfiguration)' != ''">$(HotReloadGeneratorArgs) -p:BuiltRuntimeConfiguration=$(BuiltRuntimeConfiguration)</HotReloadGeneratorArgs>
+      <HotReloadGeneratorArgs>$(HotReloadGeneratorArgs) -outputSummary:$(OutputPath)\hotreload-delta-gen-summary.json</HotReloadGeneratorArgs>
     </PropertyGroup>
-
-    <!-- run the tool after this assembly is built -->
-    <Target Name="RunDiff" AfterTargets="Build">
-      <PropertyGroup>
-        <HotReloadGeneratorArgs>-msbuild:$(MSBuildProjectFullPath)</HotReloadGeneratorArgs>
-        <HotReloadGeneratorArgs>$(HotReloadGeneratorArgs) -script:$(DeltaScript)</HotReloadGeneratorArgs>
-        <HotReloadGeneratorArgs Condition="'$(Configuration)' != ''">$(HotReloadGeneratorArgs) -p:Configuration=$(Configuration)</HotReloadGeneratorArgs>
-        <HotReloadGeneratorArgs Condition="'$(RuntimeIdentifier)' != ''">$(HotReloadGeneratorArgs) -p:RuntimeIdentifier=$(RuntimeIdentifier)</HotReloadGeneratorArgs>
-        <HotReloadGeneratorArgs Condition="'$(BuiltRuntimeConfiguration)' != ''">$(HotReloadGeneratorArgs) -p:BuiltRuntimeConfiguration=$(BuiltRuntimeConfiguration)</HotReloadGeneratorArgs>
-        <HotReloadGeneratorArgs>$(HotReloadGeneratorArgs) -outputSummary:$(OutputPath)\hotreload-delta-gen-summary.json</HotReloadGeneratorArgs>
-      </PropertyGroup>
-      <Exec Command="$(HotReloadToolCommand) $(HotReloadGeneratorArgs)" />
-    </Target>
+    <Exec Command="$(HotReloadToolCommand) $(HotReloadGeneratorArgs)" />
+  </Target>
 
 </Project>
diff --git a/src/hotreload-delta-gen/src/hotreload-delta-gen.csproj b/src/hotreload-delta-gen/src/hotreload-delta-gen.csproj
index 15818f443..f3c7dbb06 100644
--- a/src/hotreload-delta-gen/src/hotreload-delta-gen.csproj
+++ b/src/hotreload-delta-gen/src/hotreload-delta-gen.csproj
@@ -1,17 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.DotNet.HotReload.Utils.Generator.Frontend\Microsoft.DotNet.HotReload.Utils.Generator.Frontend.csproj" />
-  </ItemGroup>
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <PackageId>hotreload-delta-gen</PackageId>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.DotNet.HotReload.Utils.Generator.Frontend\Microsoft.DotNet.HotReload.Utils.Generator.Frontend.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests/Acceptance/EncCapabilitiesCompat.Tests/EncCapabilitiesCompat.Tests.csproj b/tests/Acceptance/EncCapabilitiesCompat.Tests/EncCapabilitiesCompat.Tests.csproj
index 5a5f2bda6..d909267e9 100644
--- a/tests/Acceptance/EncCapabilitiesCompat.Tests/EncCapabilitiesCompat.Tests.csproj
+++ b/tests/Acceptance/EncCapabilitiesCompat.Tests/EncCapabilitiesCompat.Tests.csproj
@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.DotNet.HotReload.Utils.Generator\Microsoft.DotNet.HotReload.Utils.Generator.csproj" />
diff --git a/tests/BuildTool/ImportExplcitly.ShouldNotRun.Tests/ImportExplicitly.ShouldNotRun.Tests.csproj b/tests/BuildTool/ImportExplcitly.ShouldNotRun.Tests/ImportExplicitly.ShouldNotRun.Tests.csproj
index 075499e13..7f9e042db 100644
--- a/tests/BuildTool/ImportExplcitly.ShouldNotRun.Tests/ImportExplicitly.ShouldNotRun.Tests.csproj
+++ b/tests/BuildTool/ImportExplcitly.ShouldNotRun.Tests/ImportExplicitly.ShouldNotRun.Tests.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
     <!-- NOTE: no DeltaScript property - importing the BuildTool.targets should have no effect -->
   </PropertyGroup>
 
   <Import Project="..\ImportExplicitly.props" />
-
   <Import Project="$(InTreeGeneratorBuildToolTargetsPath)" />
+
 </Project>
diff --git a/tests/BuildTool/ImportExplcitly.Tests/ImportExplicitly.Tests.csproj b/tests/BuildTool/ImportExplcitly.Tests/ImportExplicitly.Tests.csproj
index 5ea7afcf5..028f781b5 100644
--- a/tests/BuildTool/ImportExplcitly.Tests/ImportExplicitly.Tests.csproj
+++ b/tests/BuildTool/ImportExplcitly.Tests/ImportExplicitly.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" TreatAsLocalProperty="ContinuousIntegrationBuild;Optimize;EmitDebugInformation">
+
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <IsPackable>false</IsPackable>
     <!-- to call AsssemblyExtensions.ApplyUpdate we need Optimize=false, EmitDebugInformation=true in all configurations -->
     <Optimize>false</Optimize>
     <EmitDebugInformation>true</EmitDebugInformation>
@@ -16,6 +15,6 @@
   </ItemGroup>
 
   <Import Project="..\ImportExplicitly.props" />
-
   <Import Project="$(InTreeGeneratorBuildToolTargetsPath)" />
+
 </Project>
diff --git a/tests/BuildTool/ImportExplicitly.props b/tests/BuildTool/ImportExplicitly.props
index 1b49b4575..f787d8b05 100644
--- a/tests/BuildTool/ImportExplicitly.props
+++ b/tests/BuildTool/ImportExplicitly.props
@@ -1,20 +1,15 @@
 <Project>
 
   <!-- Set the paths for the generator buildtool and tasks assemblies explicitly so that we can Import the in-tree BuildTool.targets file -->
-
-  <ItemGroup>
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Microsoft.DotNet.HotReload.Utils.Generator.Tasks\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-
-  <!-- explicitly set tool path -->
   <PropertyGroup>
+    <InTreeGeneratorBuildToolTargetsPath>$(RepoRoot)src\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\build\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets</InTreeGeneratorBuildToolTargetsPath>
     <_HotReloadDeltaGeneratorPath>$(BaseOutputPath)..\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\$(Configuration)\$(TargetFramework)\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.dll</_HotReloadDeltaGeneratorPath>
     <_HotReloadDeltaGeneratorTasksPath>$(BaseOutputPath)..\Microsoft.DotNet.HotReload.Utils.Generator.Tasks\$(Configuration)\$(TargetFramework)\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.dll</_HotReloadDeltaGeneratorTasksPath>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <InTreeGeneratorBuildToolTargetsPath>$(MSBuildThisFileDirectory)..\..\src\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\build\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.targets</InTreeGeneratorBuildToolTargetsPath>
-  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.DotNet.HotReload.Utils.Generator.Tasks\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
 
 </Project>