diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0ccab928b212..f57b7cdbe786 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -193,18 +193,18 @@
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
+      <Uri>https://github.com/lbussell/arcade</Uri>
+      <Sha>08c78486a2dd4e7ee9733b4edcee696d7ef92d79</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22215.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
+      <Uri>https://github.com/lbussell/arcade</Uri>
+      <Sha>08c78486a2dd4e7ee9733b4edcee696d7ef92d79</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22215.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
+      <Uri>https://github.com/lbussell/arcade</Uri>
+      <Sha>08c78486a2dd4e7ee9733b4edcee696d7ef92d79</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22215.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props
index ad4f0693a339..1178b9d653ec 100644
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props
@@ -61,7 +61,7 @@
     <EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="_DotNetInstallDir=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="_InitializeToolset=$(ProjectDir)Tools/source-built/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj" Condition="'$(UseBootstrapArcade)' != 'true'" />
-    <EnvironmentVariables Include="_OverrideArcadeInitializeBuildToolFramework=net6.0" />
+    <EnvironmentVariables Include="_OverrideArcadeInitializeBuildToolFramework=net7.0" />
 
     <EnvironmentVariables Include="DotNetUseShippingVersions=true" />
 
diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
index aadaf52c8a1e..743754f7ab99 100644
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
@@ -126,11 +126,11 @@
          See https://github.com/dotnet/source-build/issues/1914 for details. -->
     <PropertyGroup>
       <ArcadeSdkReplacementText>
-      logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.Arcade.Sdk.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net6.0.*&apos; \) )
+      logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.Arcade.Sdk.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net7.0.*&apos; \) )
       </ArcadeSdkReplacementText>
 
       <ArcadeLoggingReplacementText>
-      logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.ArcadeLogging.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net6.0.*&apos; \) )
+      logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.ArcadeLogging.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net7.0.*&apos; \) )
       </ArcadeLoggingReplacementText>
 
       <LoggerPathReplacementText>
diff --git a/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
new file mode 100644
index 000000000000..d7dff17bc27f
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 25 Apr 2022 15:07:55 -0700
+Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory
+
+---
+ eng/common/tools.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/eng/common/tools.sh b/eng/common/tools.sh
+index 17f0a365..f8852dbb 100755
+--- a/eng/common/tools.sh
++++ b/eng/common/tools.sh
+@@ -435,6 +435,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/net6.0/Microsoft.DotNet.ArcadeLogging.dll" )
++    possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" )
+     for path in "${possiblePaths[@]}"; do
+       if [[ -f $path ]]; then
+         selectedPath=$path
diff --git a/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
new file mode 100644
index 000000000000..d7dff17bc27f
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 25 Apr 2022 15:07:55 -0700
+Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory
+
+---
+ eng/common/tools.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/eng/common/tools.sh b/eng/common/tools.sh
+index 17f0a365..f8852dbb 100755
+--- a/eng/common/tools.sh
++++ b/eng/common/tools.sh
+@@ -435,6 +435,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/net6.0/Microsoft.DotNet.ArcadeLogging.dll" )
++    possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" )
+     for path in "${possiblePaths[@]}"; do
+       if [[ -f $path ]]; then
+         selectedPath=$path
diff --git a/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
new file mode 100644
index 000000000000..d7dff17bc27f
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 25 Apr 2022 15:07:55 -0700
+Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory
+
+---
+ eng/common/tools.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/eng/common/tools.sh b/eng/common/tools.sh
+index 17f0a365..f8852dbb 100755
+--- a/eng/common/tools.sh
++++ b/eng/common/tools.sh
+@@ -435,6 +435,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/net6.0/Microsoft.DotNet.ArcadeLogging.dll" )
++    possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" )
+     for path in "${possiblePaths[@]}"; do
+       if [[ -f $path ]]; then
+         selectedPath=$path