diff --git a/build/dependencies.props b/build/dependencies.props
index 7ced3d136f..128df649dd 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -11,7 +11,6 @@
     <MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-preview2-30187</MicrosoftExtensionsProcessSourcesPackageVersion>
     <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
     <MicrosoftNETCoreApp21PackageVersion>2.1.0-preview2-26130-04</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26130-01</MicrosoftNETCorePlatformsPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.6.0</MicrosoftNETTestSdkPackageVersion>
     <SystemDataSqlClientPackageVersion>4.5.0-preview2-26130-01</SystemDataSqlClientPackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>4.5.0-preview2-26130-01</SystemSecurityCryptographyCngPackageVersion>
diff --git a/src/PackGlobalTool.targets b/src/PackGlobalTool.targets
index ed75c775b7..d97666110c 100644
--- a/src/PackGlobalTool.targets
+++ b/src/PackGlobalTool.targets
@@ -12,7 +12,7 @@
         description=$(Description);
         repositoryUrl=$(RepositoryUrl);
         targetframework=$(TargetFramework);
-        MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion);
+        repositoryCommit=$(RepositoryCommit);
       </NuspecProperties>
     </PropertyGroup>
   </Target>
diff --git a/src/dotnet-dev-certs/dotnet-dev-certs.nuspec b/src/dotnet-dev-certs/dotnet-dev-certs.nuspec
index e8dce16395..878e0f4ab2 100644
--- a/src/dotnet-dev-certs/dotnet-dev-certs.nuspec
+++ b/src/dotnet-dev-certs/dotnet-dev-certs.nuspec
@@ -16,11 +16,7 @@
     <packageTypes>
       <packageType name="DotnetTool" />
     </packageTypes>
-    <repository type="git" url="$repositoryUrl$" />
-    <dependencies>
-      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
-      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
-    </dependencies>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
   </metadata>
   <files>
     <file src="$publishdir$" target="tools/any/any/" />
diff --git a/src/dotnet-sql-cache/dotnet-sql-cache.nuspec b/src/dotnet-sql-cache/dotnet-sql-cache.nuspec
index a2498a00d2..0c6e9d05e2 100644
--- a/src/dotnet-sql-cache/dotnet-sql-cache.nuspec
+++ b/src/dotnet-sql-cache/dotnet-sql-cache.nuspec
@@ -16,11 +16,7 @@
     <packageTypes>
       <packageType name="DotnetTool" />
     </packageTypes>
-    <repository type="git" url="$repositoryUrl$" />
-    <dependencies>
-      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
-      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
-    </dependencies>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
   </metadata>
   <files>
     <file src="$publishdir$" target="tools/any/any/" />
diff --git a/src/dotnet-user-secrets/dotnet-user-secrets.nuspec b/src/dotnet-user-secrets/dotnet-user-secrets.nuspec
index fdd3fb95d5..54caef9177 100644
--- a/src/dotnet-user-secrets/dotnet-user-secrets.nuspec
+++ b/src/dotnet-user-secrets/dotnet-user-secrets.nuspec
@@ -16,11 +16,7 @@
     <packageTypes>
       <packageType name="DotnetTool" />
     </packageTypes>
-    <repository type="git" url="$repositoryUrl$" />
-    <dependencies>
-      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
-      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
-    </dependencies>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
   </metadata>
   <files>
     <file src="$publishdir$" target="tools/any/any/" />
diff --git a/src/dotnet-watch/dotnet-watch.nuspec b/src/dotnet-watch/dotnet-watch.nuspec
index 5a748260c1..5442df0874 100644
--- a/src/dotnet-watch/dotnet-watch.nuspec
+++ b/src/dotnet-watch/dotnet-watch.nuspec
@@ -16,11 +16,7 @@
     <packageTypes>
       <packageType name="DotnetTool" />
     </packageTypes>
-    <repository type="git" url="$repositoryUrl$" />
-    <dependencies>
-      <!-- Workaround https://github.com/dotnet/cli/issues/8418 -->
-      <dependency id="Microsoft.NETCore.Platforms" version="$MicrosoftNETCorePlatformsPackageVersion$" />
-    </dependencies>
+    <repository type="git" url="$repositoryUrl$" commit="$repositoryCommit$" />
   </metadata>
   <files>
     <file src="$publishdir$" target="tools/any/any/" />