diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 43bcb248c..3098cd31a 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -340,10 +340,11 @@ stages:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
- - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
- parameters:
- dependsOn: Source_Build_Create_Tarball
- condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true')
+ # disable tarball build ci until 7.0 stabilizes
+ # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+ # parameters:
+ # dependsOn: Source_Build_Create_Tarball
+ # condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true')
# https://github.com/dotnet/core-sdk/issues/248
# - template: /eng/build.yml
diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
index f07718f1a..34ccaf5d6 100644
--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
@@ -88,7 +88,9 @@
$(GitHubRepositoryName)
1.0.0
1.0.0
- @(RootRepoCommitSha)
+
+
+ 2f7c1a94d6c9f8f9173ebadf2ec2ba512b2b4576
@(RootRepoUri)
@(RootRepoCommitCount)
$(GitHubRepositoryName)
diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj
index 3b45c1bef..17f84b37d 100644
--- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj
+++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj
@@ -24,7 +24,8 @@
[$(AspNetCorePackageVersionFor31Templates)];
[$(AspNetCorePackageVersionFor50Templates)]" />
-
+
+
diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
index 007eba94b..59fc33284 100644
--- a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
+++ b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
@@ -19,7 +19,7 @@ index 0a7442c7c4..741b654ec4 100644
@@ -36,7 +36,7 @@
4.0.5
5.0.2
- 6.0.0-rtm.21479.7
+ 7.0.0-alpha.1.21480.1
- 1.0.0-preview1.1.21112.1
+ 1.0.0-preview1.1.21112.1
4.6.0
@@ -35,7 +35,7 @@ index b27862fb9d..539e127a63 100644
-
+
-
+
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
diff --git a/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch
deleted file mode 100644
index 9cc7b6bf9..000000000
--- a/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From aba2e21af6d299f0e5c04c7848e4971e0da0e5b5 Mon Sep 17 00:00:00 2001
-From: dseefeld
-Date: Tue, 20 Jul 2021 21:01:43 +0000
-Subject: [PATCH] Update TFMs to net6.0
-
-When building from source, only the current TFM is built. Update
-TargetFrameworks to only have net6.0.
----
- eng/Versions.props | 1 +
- src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj | 1 +
- .../Microsoft.SourceLink.AzureDevOpsServer.Git.csproj | 1 +
- .../Microsoft.SourceLink.AzureRepos.Git.csproj | 1 +
- .../Microsoft.SourceLink.Bitbucket.Git.csproj | 1 +
- src/SourceLink.Common/Microsoft.SourceLink.Common.csproj | 1 +
- src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj | 1 +
- src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj | 1 +
- src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj | 1 +
- src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj | 1 +
- src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj | 1 +
- 11 files changed, 11 insertions(+)
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index 4ea51a8..eff58cf 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -7,6 +7,7 @@
- true
-
- true
-+ false
- true
- 2.4.1
- 16.7.0
-diff --git a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
-index 3fa8c71..da0277b 100644
---- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
-+++ b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
-index ceec252..84e89bd 100644
---- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
-+++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
-index bdb048e..b01b429 100644
---- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
-+++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
-index bf27b3f..11ac33d 100644
---- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
-+++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
-index 09ac8ec..534b316 100644
---- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
-+++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
-index 626b9cc..0c025ca 100644
---- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
-+++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
-index 4a1d0af..ada8986 100644
---- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
-+++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
-index 19f92a8..b9ec7b4 100644
---- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
-+++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
-index fa9e33e..acca3af 100644
---- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
-+++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
-@@ -3,6 +3,7 @@
-
-
- net472;net6.0
-+ net6.0
- true
-
-
-diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj
-index 5d17262..3dd091a 100644
---- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj
-+++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj
-@@ -3,6 +3,7 @@
-
-
- net6.0;netstandard2.0
-+ net6.0
- false
- none
- false
---
-2.31.1
-
diff --git a/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch b/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch
deleted file mode 100644
index 8dffe11a5..000000000
--- a/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4c6179851c1e4ff7f6835707d11f0d9a411aefbc Mon Sep 17 00:00:00 2001
-From: Matt Galbraith
-Date: Mon, 23 Aug 2021 08:52:35 -0700
-Subject: [PATCH] https://github.com/dotnet/arcade/issues/7778 - Ignore curl
- failures for no-network build scenario
-
----
- eng/common/tools.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eng/common/tools.sh b/eng/common/tools.sh
-index 3c5f3a12..41e32310 100755
---- a/eng/common/tools.sh
-+++ b/eng/common/tools.sh
-@@ -402,7 +402,7 @@ function StopProcesses {
- function TryLogClientIpAddress () {
- echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
- if command -v curl > /dev/null; then
-- curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
-+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
- fi
- }
-
---
-2.30.2
-