From b624109e44832529ba4de9f35b405630728c1c31 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 18:38:15 +0200
Subject: [PATCH 01/20] Use dotnet package download for toolset initialization

Replace MSBuild-based toolset restore with 'dotnet package download' in
both tools.sh and tools.ps1. Add a new DotNet helper function that
mirrors MSBuild-Core's CI error handling pattern for running arbitrary
dotnet commands.

The toolset initialization now downloads the Arcade SDK package into the
NuGet cache, copies the tools folder to artifacts/toolset/<version>,
and resolves Build.proj from SdkTasks/ with a fallback to the old
location for backward compatibility.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/common/sdk-task.ps1                       |   2 +-
 eng/common/tools.ps1                          |  84 +++-
 eng/common/tools.sh                           |  69 ++-
 src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props |  12 +-
 .../sdk/Sdk.targets                           |  19 +-
 .../tools/BuildTasks.props                    |   1 +
 .../tools/DefaultVersions.props               |   5 +-
 .../tools/Empty.targets                       |  44 +-
 .../tools/EmptyDisableRestore.targets         |  16 +
 .../tools/RepositoryInfo.targets              |  35 +-
 .../tools/SdkTasks/AfterSigning.proj          |  22 +
 .../tools/SdkTasks/AfterSolutionBuild.proj    |  10 +
 .../tools/SdkTasks/Build.proj                 | 307 ++++++++++++
 .../SdkTasks/BuildReleasePackages.targets     |  24 +
 .../SdkTasks/CreateBaselineUpdatePR.proj      |   3 +-
 .../tools/SdkTasks/Directory.Build.props      |  19 +-
 .../tools/SdkTasks/Directory.Build.targets    |   6 +
 .../tools/SdkTasks/Directory.Packages.props   |  16 +
 .../tools/SdkTasks/InstallDotNetCore.targets  |  24 +
 .../tools/SdkTasks/Publish.proj               | 449 ++++++++++++++++++
 .../SdkTasks/PublishArtifactsInManifest.proj  |  13 +-
 .../tools/SdkTasks/PublishBuildAssets.proj    |   9 +-
 .../tools/SdkTasks/PublishSignedAssets.proj   |  17 +-
 .../SdkTasks/PublishToSymbolServers.proj      |  11 +-
 .../tools/SdkTasks/Sign.proj                  |  97 ++++
 .../tools/SdkTasks/Sign.props                 | 158 ++++++
 .../tools/SdkTasks/SigningValidation.proj     |   3 +-
 .../tools/SdkTasks/Tools.proj                 |  45 ++
 .../tools/SdkTasks/TrackPrebuiltUsage.targets |  45 ++
 ...sualStudio.AcquireOptimizationData.targets |  84 ++++
 ...isualStudio.BuildIbcTrainingInputs.targets |  27 ++
 ...VisualStudio.BuildIbcTrainingSettings.proj |  12 +-
 .../VisualStudio.InsertionManifests.targets   |  50 ++
 .../VisualStudio.SetupPackage.vsmanproj       | 129 +++++
 .../tools/VisualStudio.VsixBuild.targets      |   2 -
 .../tools/VisualStudio.props                  |   4 -
 ...soft.DotNet.Build.Tasks.VisualStudio.props |  16 +
 .../Microsoft.DotNet.NuGetRepack.Tasks.props  |  11 +
 38 files changed, 1762 insertions(+), 138 deletions(-)
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/EmptyDisableRestore.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSigning.proj
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSolutionBuild.proj
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Build.proj
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/BuildReleasePackages.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Packages.props
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/InstallDotNetCore.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Publish.proj
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.proj
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.props
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Tools.proj
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/TrackPrebuiltUsage.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.AcquireOptimizationData.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.InsertionManifests.targets
 create mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.SetupPackage.vsmanproj
 create mode 100644 src/Microsoft.DotNet.Build.Tasks.VisualStudio/build/Microsoft.DotNet.Build.Tasks.VisualStudio.props
 create mode 100644 src/Microsoft.DotNet.NuGetRepack/tasks/build/Microsoft.DotNet.NuGetRepack.Tasks.props

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 64fd2f8abec..538f7d001ea 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -14,7 +14,7 @@ Param(
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
-$ci = $true
+$ci = $false
 $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
 $warnAsError = if ($noWarnAsError) { $false } else { $true }
 
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index b6787991769..7d48bca3a21 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -476,7 +476,6 @@ function LocateVisualStudio([object]$vsRequirements = $null){
   if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') {
     $vswhereVersion = $GlobalJson.tools.vswhere
   } else {
-    # keep this in sync with the VSWhereVersion in DefaultVersions.props
     $vswhereVersion = '3.1.7'
   }
 
@@ -648,13 +647,22 @@ function InitializeToolset() {
   $nugetCache = GetNuGetPackageCachePath
 
   $toolsetVersion = Read-ArcadeSdkVersion
-  $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
+  $toolsetToolsDir = Join-Path $ToolsetDir $toolsetVersion
 
-  if (Test-Path $toolsetLocationFile) {
-    $path = Get-Content $toolsetLocationFile -TotalCount 1
-    if (Test-Path $path) {
-      return $global:_InitializeToolset = $path
-    }
+  # Check if the toolset has already been extracted
+  $toolsetBuildProj = $null
+  $newPath = Join-Path $toolsetToolsDir 'SdkTasks\Build.proj'
+  $oldPath = Join-Path $toolsetToolsDir 'Build.proj'
+
+  if (Test-Path $newPath) {
+    $toolsetBuildProj = $newPath
+  } elseif (Test-Path $oldPath) {
+    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    $toolsetBuildProj = $oldPath
+  }
+
+  if ($toolsetBuildProj -ne $null) {
+    return $global:_InitializeToolset = $toolsetBuildProj
   }
 
   if (-not $restore) {
@@ -662,21 +670,31 @@ function InitializeToolset() {
     ExitWithExitCode 1
   }
 
-  $buildTool = InitializeBuildTool
+  DotNet package download "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion" --prerelease --output "$nugetCache"
 
-  $proj = Join-Path $ToolsetDir 'restore.proj'
-  $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'ToolsetRestore.binlog') } else { '' }
+  $packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion)
+  $packageToolsDir = Join-Path $packageDir 'tools'
 
-  '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
+  if (!(Test-Path $packageToolsDir)) {
+    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK tools not found at: $packageToolsDir"
+    ExitWithExitCode 3
+  }
 
-  MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
+  # Copy the tools folder to the toolset directory
+  # TODO: In the future, only copy the SdkTasks folder and remove the fallback path.
+  New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null
+  Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
 
-  $path = Get-Content $toolsetLocationFile -Encoding UTF8 -TotalCount 1
-  if (!(Test-Path $path)) {
-    throw "Invalid toolset path: $path"
+  if (Test-Path $newPath) {
+    $toolsetBuildProj = $newPath
+  } elseif (Test-Path $oldPath) {
+    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    $toolsetBuildProj = $oldPath
+  } else {
+    throw "Unable to find Build.proj in toolset at: $toolsetToolsDir"
   }
 
-  return $global:_InitializeToolset = $path
+  return $global:_InitializeToolset = $toolsetBuildProj
 }
 
 function ExitWithExitCode([int] $exitCode) {
@@ -737,6 +755,40 @@ function MSBuild() {
   MSBuild-Core @args
 }
 
+#
+# Executes a dotnet command with arguments passed to the function.
+# Terminates the script if the command fails.
+#
+function DotNet() {
+  $dotnetRoot = InitializeDotNetCli -install:$restore
+  $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
+
+  $cmdArgs = ""
+  foreach ($arg in $args) {
+    if ($null -ne $arg -and $arg.Trim() -ne "") {
+      if ($arg.EndsWith('\')) {
+        $arg = $arg + "\"
+      }
+      $cmdArgs += " `"$arg`""
+    }
+  }
+
+  $env:ARCADE_BUILD_TOOL_COMMAND = "`"$dotnetPath`" $cmdArgs"
+
+  $exitCode = Exec-Process $dotnetPath $cmdArgs
+
+  if ($exitCode -ne 0) {
+    Write-Host "dotnet command failed with exit code $exitCode. Check errors above." -ForegroundColor Red
+
+    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) {
+      Write-PipelineSetResult -Result "Failed" -Message "dotnet command execution failed."
+      ExitWithExitCode 0
+    } else {
+      ExitWithExitCode $exitCode
+    }
+  }
+}
+
 #
 # Executes msbuild (or 'dotnet msbuild') with arguments passed to the function.
 # The arguments are automatically quoted.
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index a6e0ed594fd..c89ee3e00cf 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -407,15 +407,21 @@ function InitializeToolset {
   ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk"
 
   local toolset_version=$_ReadGlobalVersion
-  local toolset_location_file="$toolset_dir/$toolset_version.txt"
+  local toolset_tools_dir="$toolset_dir/$toolset_version"
 
-  if [[ -a "$toolset_location_file" ]]; then
-    local path=`cat "$toolset_location_file"`
-    if [[ -a "$path" ]]; then
-      # return value
-      _InitializeToolset="$path"
-      return
-    fi
+  # Check if the toolset has already been extracted
+  local toolset_build_proj=""
+  if [[ -a "$toolset_tools_dir/SdkTasks/Build.proj" ]]; then
+    toolset_build_proj="$toolset_tools_dir/SdkTasks/Build.proj"
+  elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
+    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    toolset_build_proj="$toolset_tools_dir/Build.proj"
+  fi
+
+  if [[ -n "$toolset_build_proj" ]]; then
+    # return value
+    _InitializeToolset="$toolset_build_proj"
+    return
   fi
 
   if [[ "$restore" != true ]]; then
@@ -423,20 +429,27 @@ function InitializeToolset {
     ExitWithExitCode 2
   fi
 
-  local proj="$toolset_dir/restore.proj"
+  DotNet package download "Microsoft.DotNet.Arcade.Sdk@$toolset_version" --prerelease --output "$_GetNuGetPackageCachePath"
 
-  local bl=""
-  if [[ "$binary_log" == true ]]; then
-    bl="/bl:$log_dir/ToolsetRestore.binlog"
-  fi
+  local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version"
 
-  echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
-  MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file"
+  if [[ ! -d "$package_dir/tools" ]]; then
+    Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK tools not found at: $package_dir/tools"
+    ExitWithExitCode 3
+  fi
 
-  local toolset_build_proj=`cat "$toolset_location_file"`
+  # Copy the tools folder to the toolset directory
+  # TODO: In the future, only copy the SdkTasks folder and remove the fallback path.
+  mkdir -p "$toolset_tools_dir"
+  cp -r "$package_dir/tools/." "$toolset_tools_dir"
 
-  if [[ ! -a "$toolset_build_proj" ]]; then
-    Write-PipelineTelemetryError -category 'Build' "Invalid toolset path: $toolset_build_proj"
+  if [[ -a "$toolset_tools_dir/SdkTasks/Build.proj" ]]; then
+    toolset_build_proj="$toolset_tools_dir/SdkTasks/Build.proj"
+  elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
+    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    toolset_build_proj="$toolset_tools_dir/Build.proj"
+  else
+    Write-PipelineTelemetryError -category 'Build' "Unable to find Build.proj in toolset at: $toolset_tools_dir"
     ExitWithExitCode 3
   fi
 
@@ -458,6 +471,26 @@ function StopProcesses {
   return 0
 }
 
+function DotNet {
+  InitializeDotNetCli $restore
+
+  local dotnet_path="$_InitializeDotNetCli/dotnet"
+
+  export ARCADE_BUILD_TOOL_COMMAND="$dotnet_path $@"
+
+  "$dotnet_path" "$@" || {
+    local exit_code=$?
+    echo "dotnet command failed with exit code $exit_code. Check errors above."
+
+    if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then
+      Write-PipelineSetResult -result "Failed" -message "dotnet command execution failed."
+      ExitWithExitCode 0
+    else
+      ExitWithExitCode $exit_code
+    fi
+  }
+}
+
 function MSBuild {
   local args=( "$@" )
   if [[ "$pipelines_log" == true ]]; then
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
index 10e1fe67ea4..b560dbf5b65 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props
@@ -1,16 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
-  <PropertyGroup>
-    <!-- 
-      When the bootstrapper script initializes a repo it restores an empty project that imports the toolset SDK.
-      It invokes WriteToolsetLocation target with __ToolsetLocationOutputFile set to the path where the location of 
-      SDK Build.proj entry point is to be stored. Suppress all other imports for that project.      
-    -->
-    <_SuppressSdkImports>false</_SuppressSdkImports>
-    <_SuppressSdkImports Condition="'$(__ToolsetLocationOutputFile)' != ''">true</_SuppressSdkImports>
-  </PropertyGroup>
-
-  <Import Project="..\tools\Settings.props" Condition="!$(_SuppressSdkImports)" />
+  <Import Project="..\tools\Settings.props" />
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
index 11708bccc85..a55e12a0efc 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
@@ -10,21 +10,10 @@
     <_BeforeCommonTargetsHookUsed Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true'">false</_BeforeCommonTargetsHookUsed>
   </PropertyGroup>
 
-  <Import Project="..\tools\BeforeCommonTargets.targets" Condition="'$(_SuppressSdkImports)' != 'true' and '$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'"/>
-  <Import Project="..\tools\BeforeCommonTargets.CrossTargeting.targets" Condition="'$(_SuppressSdkImports)' != 'true' and '$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' == 'true'"/>
+  <Import Project="..\tools\BeforeCommonTargets.targets" Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'"/>
+  <Import Project="..\tools\BeforeCommonTargets.CrossTargeting.targets" Condition="'$(_ArcadeBeforeCommonTargetsImported)' != 'true' and '$(IsCrossTargetingBuild)' == 'true'"/>
 
-  <!-- 
-    Output the location of the Build.proj so that the build driver can find where it was restored.
-    Ideally we would have msbuild API to do that for an SDK: https://github.com/Microsoft/msbuild/issues/2992
-  -->
-  <Target Name="__WriteToolsetLocation" Outputs="$(__ToolsetLocationOutputFile)" Condition="'$(__ToolsetLocationOutputFile)' != ''">
-    <WriteLinesToFile File="$(__ToolsetLocationOutputFile)" Lines="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\Build.proj'))" Overwrite="true"/>
-    <ItemGroup>
-      <FileWrites Include="$(__ToolsetLocationOutputFile)" />
-    </ItemGroup>
-  </Target>
-
-  <Import Project="..\tools\Imports.targets" Condition="'$(_SuppressSdkImports)' != 'true' and '$(_SuppressAllTargets)' != 'true'" />
-  <Import Project="..\tools\Empty.targets" Condition="'$(_SuppressSdkImports)' != 'true' and '$(_SuppressAllTargets)' == 'true'" />
+  <Import Project="..\tools\Imports.targets" Condition="'$(_SuppressAllTargets)' != 'true' or '$(_SuppressSdkImports)' == 'false'" />
+  <Import Project="..\tools\Empty.targets" Condition="'$(_SuppressAllTargets)' == 'true'" />
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
index 9a51d5b4cb9..b90879d2451 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <ArcadeSdkToolsDir>$(MSBuildThisFileDirectory)</ArcadeSdkToolsDir>
     <ArcadeSdkBuildTasksAssembly>$(MSBuildThisFileDirectory)net\Microsoft.DotNet.Arcade.Sdk.dll</ArcadeSdkBuildTasksAssembly>
   </PropertyGroup>
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
index 8a17e952a46..4ea58d11f8e 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
@@ -95,8 +95,6 @@
     <MicrosoftDotNetBuildTasksInstallersVersion Condition="'$(MicrosoftDotNetBuildTasksInstallersVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksInstallersVersion>
     <NUnitVersion Condition="'$(NUnitVersion)' == ''">3.12.0</NUnitVersion>
     <NUnit3TestAdapterVersion Condition="'$(NUnit3TestAdapterVersion)' == ''">3.15.1</NUnit3TestAdapterVersion>
-    <!-- keep this in sync with $vswhereVersion in eng/common/tools.ps1 -->
-    <VSWhereVersion Condition="'$(VSWhereVersion)' == ''">3.1.7</VSWhereVersion>
     <SNVersion Condition="'$(SNVersion)' == ''">1.0.0</SNVersion>
     <MicrosoftDotNetBuildTasksVisualStudioVersion Condition="'$(MicrosoftDotNetBuildTasksVisualStudioVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksVisualStudioVersion>
     <MicrosoftDotNetSourceBuildTasksVersion Condition="'$(MicrosoftDotNetSourceBuildTasksVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSourceBuildTasksVersion>
@@ -105,6 +103,9 @@
     <MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion Condition="'$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)' == ''">1.1.286</MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion>
     <MicrosoftSignedWixVersion Condition="'$(MicrosoftSignedWixVersion)' == ''">3.14.1-11027.2914512</MicrosoftSignedWixVersion>
     <MicrosoftWixToolsetSdkVersion Condition="'$(MicrosoftWixToolsetSdkVersion)' == ''">5.0.2-dotnet.2811440</MicrosoftWixToolsetSdkVersion>
+
+    <MicrosoftDotNetBaselinesTasksVersion Condition="'$(MicrosoftDotNetBaselinesTasksVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBaselinesTasksVersion>
+    <MicrosoftDotNetSignCheckTaskVersion Condition="'$(MicrosoftDotNetSignCheckTaskVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignCheckTaskVersion>
   </PropertyGroup>
 
   <!-- RestoreSources overrides - defines DotNetRestoreSources variable if available -->
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
index fd18c0474aa..acda5b54784 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Build">
+<Project>
 
   <!--
     Import this file to suppress all targets while allowing the project to participate in the build.
@@ -9,19 +9,43 @@
   -->
 
   <PropertyGroup>
-    <!-- Skip importing NuGet Pack targets which are imported from the Microsoft.NET.Sdk targets -->
-    <ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
-  <!-- We don't want to create this target if the before common targets hook is in use.
-       If we are using the hook, then we avoid creation of the target altogether, which is more
-       compatible with static graph restores -->
-  <Import Project="..\tools\EmptyIsProjectRestoreSupportedTarget.targets" Condition="!$(_BeforeCommonTargetsHookUsed)"/>
-  <Target Name="Restore"/>
-  <Target Name="Build"/>
+  <PropertyGroup>
+    <BuildDependsOn>
+      BeforeBuild;
+      CoreBuild;
+      AfterBuild
+    </BuildDependsOn>
+  </PropertyGroup>
+  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
+
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+  <Target Name="Clean" />
+
+  <Target Name="BeforeBuild"/>
+  <Target Name="CoreBuild"/>
+  <Target Name="AfterBuild"/>
+
   <Target Name="Test"/>
-  <Target Name="Pack"/>
+  <Target Name="IntegrationTest" />
+  <Target Name="PerformanceTest" />
   <Target Name="Publish"/>
   <Target Name="ProcessFrameworkReferences" />
 
+  <PropertyGroup>
+    <PackDependsOn>
+      BeforePack;
+      CorePack;
+      AfterPack
+    </PackDependsOn>
+  </PropertyGroup>
+  <Target Name="Pack" DependsOnTargets="$(PackDependsOn)" />
+  <Target Name="BeforePack"/>
+  <Target Name="CorePack"/>
+  <Target Name="AfterPack"/>
+
+  <Import Project="EmptyDisableRestore.targets" Condition="'$(_EmptyDisableRestore)' != 'false'" />
+
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/EmptyDisableRestore.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/EmptyDisableRestore.targets
new file mode 100644
index 00000000000..9ece989244e
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/EmptyDisableRestore.targets
@@ -0,0 +1,16 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project DefaultTargets="Build">
+
+  <PropertyGroup>
+    <!-- Skip importing NuGet Pack targets which are imported from the Microsoft.NET.Sdk targets -->
+    <ImportNuGetBuildTasksPackTargetsFromSdk>false</ImportNuGetBuildTasksPackTargetsFromSdk>
+  </PropertyGroup>
+
+  <!-- We don't want to create this target if the before common targets hook is in use.
+       If we are using the hook, then we avoid creation of the target altogether, which is more
+       compatible with static graph restores -->
+  <Import Project="EmptyIsProjectRestoreSupportedTarget.targets" Condition="!$(_BeforeCommonTargetsHookUsed)"/>
+
+  <Target Name="Restore"/>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
index f3f1dc0a5d9..596daa4008d 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
@@ -56,7 +56,6 @@
           Condition="'$(DisableSourceLinkUrlTranslation)' == 'false'"
           DependsOnTargets="$(SourceControlManagerUrlTranslationTargets)"
           BeforeTargets="SourceControlManagerPublishTranslatedUrls">
-
     <PropertyGroup>
       <!-- Repositories mirrored on devdiv.visualstudio will have '-Trusted' added to their name and this needs to be stripped off before translation
            Eventually, all repos should move to dnceng/internal when possible. -->
@@ -119,14 +118,34 @@
 
   <!--
     Validates repository-wide requirements.
-    MSBuild only evaluates the target project once per each set of values of global properties and caches the results.
   -->
-  <Target Name="_RepositoryValidation" BeforeTargets="Build" Condition="'$(ContinuousIntegrationBuild)' == 'true'">
-    <MSBuild Projects="$(MSBuildThisFileDirectory)RepositoryValidation.proj"
-             Targets="Validate"
-             RemoveProperties="TargetFramework;Platform"
-             Properties="RepoRoot=$(RepoRoot);PackageLicenseExpression=$(PackageLicenseExpression);PackageLicenseExpressionInternal=$(PackageLicenseExpressionInternal);SuppressLicenseValidation=$(SuppressLicenseValidation)"
-             UseResultsCache="true" />
+  <Target Name="_RepositoryValidation" BeforeTargets="Build" Condition="'$(ContinuousIntegrationBuild)' == 'true'" DependsOnTargets="_ValidateLicenseFile">
+    <Message Text="Repository validated." Importance="low" />
+  </Target>
+
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.ValidateLicense" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetLicenseFilePath" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+
+  <Target Name="_ValidateLicenseFile" Condition="('$(PackageLicenseExpression)' != '' or '$(PackageLicenseExpressionInternal)' != '') and '$(SuppressLicenseValidation)' != 'true'">
+    <Error Text="Can't specify value for both PackageLicenseExpression ('$(PackageLicenseExpression)') and PackageLicenseExpressionInternal ('$(PackageLicenseExpressionInternal)')"
+           Condition="'$(PackageLicenseExpression)' != '' and '$(PackageLicenseExpressionInternal)' != ''"/>
+
+    <PropertyGroup>
+      <_LicenseExpression>$(PackageLicenseExpression)</_LicenseExpression>
+      <_LicenseExpression Condition="'$(_LicenseExpression)' == ''">$(PackageLicenseExpressionInternal)</_LicenseExpression>
+
+      <_ExpectedLicensePath>$(MSBuildThisFileDirectory)Licenses\$(_LicenseExpression).txt</_ExpectedLicensePath>
+    </PropertyGroup>
+
+    <Error Text="Unknown license expression: '$(_LicenseExpression)'."
+           Condition="!Exists('$(_ExpectedLicensePath)')"/>
+
+    <Microsoft.DotNet.Arcade.Sdk.GetLicenseFilePath Directory="$(RepoRoot)">
+      <Output TaskParameter="Path" PropertyName="_RepositoryLicensePath"/>
+    </Microsoft.DotNet.Arcade.Sdk.GetLicenseFilePath>
+
+    <Microsoft.DotNet.Arcade.Sdk.ValidateLicense LicensePath="$(_RepositoryLicensePath)" 
+                                                 ExpectedLicensePath="$(_ExpectedLicensePath)" />
   </Target>
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSigning.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSigning.proj
new file mode 100644
index 00000000000..74f91d51b5e
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSigning.proj
@@ -0,0 +1,22 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!--
+    Since multiple projects may contribute to a single insertion component
+    we need to package them in a separate phase.
+
+    Insertion manifests (vsman files) contain hashes of the referenced VSIXes.
+    These need to be calculated using signed VSIXes.
+    Hence we need to run this task after signing.
+  -->
+  <Import Project="VisualStudio.InsertionManifests.targets" Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'" />
+
+  <!-- 
+    Generate IBC training inputs for VS insertion components.
+  -->
+  <Import Project="VisualStudio.BuildIbcTrainingInputs.targets" Condition="'$(UsingToolVSSDK)' == 'true' and '$(UsingToolVisualStudioIbcTraining)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'" />
+
+  <!-- Repository extension point -->
+  <Import Project="$(RepositoryEngineeringDir)AfterSigning.targets" Condition="Exists('$(RepositoryEngineeringDir)AfterSigning.targets')"/>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSolutionBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSolutionBuild.proj
new file mode 100644
index 00000000000..dd780b23b10
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSolutionBuild.proj
@@ -0,0 +1,10 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="BuildReleasePackages.targets" Condition="'$(UsingToolNuGetRepack)' == 'true'" />
+  <Import Project="TrackPrebuiltUsage.targets" Condition="'$(TrackPrebuiltUsage)' == 'true'" />
+
+  <!-- Repository extension point -->
+  <Import Project="$(RepositoryEngineeringDir)AfterSolutionBuild.targets" Condition="Exists('$(RepositoryEngineeringDir)AfterSolutionBuild.targets')"/>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Build.proj
new file mode 100644
index 00000000000..793ed801736
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Build.proj
@@ -0,0 +1,307 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project DefaultTargets="Execute">
+
+  <!--
+
+  Required parameters:
+    RepoRoot                        Repository root.
+    Projects                        List of projects to build. Semicolon separated, may include globs.
+
+  Optional parameters:
+    Configuration                   Build configuration: "Debug", "Release", etc.
+
+    DotNetBuild                     Build the repo as part of the entire .NET stack.
+    DotNetBuildFromVMR              Identifies that the the repo is built from within the VMR.
+    DotNetBuildPass                 While building the repo as part of the entire .NET stack, this parameter specifies which build pass the current build is part of.
+    DotNetBuildSourceOnly           Build the repo as as part of the .NET stack in source-only mode, with no external dependencies.
+    DotNetSymbolServerTokenMsdl     Personal access token for MSDL symbol server. Available from variable group DotNet-Symbol-Server-Pats.
+    DotNetSymbolServerTokenSymWeb   Personal access token for SymWeb symbol server. Available from variable group DotNet-Symbol-Server-Pats.
+    DotNetSymbolExpirationInDays    Symbol expiration time in days (defaults to 10 years).
+    DotNetSignType                  Specifies the signing type: 'real' (default), 'test'.
+    DotNetRuntimeSourceFeed         Storage account to lookup for the .Net runtime files
+    DotNetRuntimeSourceFeedKey      In case the storage account to fetch the .Net runtime files are private this should contain a SAS token.
+
+    ContinuousIntegrationBuild      "true" when building on a CI server (PR build or official build)
+    Restore                         "true" to restore toolset and solution
+    Build                           "true" to build solution
+    Rebuild                         "true" to rebuild solution
+    Deploy                          "true" to deploy assets (e.g. VSIXes)
+    Test                            "true" to run tests
+    IntegrationTest                 "true" to run integration tests
+    PerformanceTest                 "true" to run performance tests
+    Pack                            "true" to build NuGet packages and VS insertion manifests
+    Sign                            "true" to sign built binaries
+    Publish                         "true" to publish artifacts (e.g. symbols)
+  -->
+
+  <PropertyGroup>
+    <_OriginalProjectsValue>$(Projects)</_OriginalProjectsValue>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ProjectToBuild>
+      <BuildStep>1</BuildStep>
+      <RestoreInParallel>true</RestoreInParallel>
+      <BuildInParallel>true</BuildInParallel>
+      <DotNetBuildPass>1</DotNetBuildPass>
+    </ProjectToBuild>
+  </ItemDefinitionGroup>
+
+  <!-- Allow for repo specific Build properties such as the list of Projects to build -->
+  <Import Project="$(RepositoryEngineeringDir)Build.props" Condition="Exists('$(RepositoryEngineeringDir)Build.props')" />
+
+  <PropertyGroup>
+    <_ProjectsPropertyWasUpdatedInBuildProps Condition="'$(_OriginalProjectsValue)' != '$(Projects)'">true</_ProjectsPropertyWasUpdatedInBuildProps>
+    <!-- An empty DotNetBuildPass refers to the 1st build pass. -->
+    <_DotNetBuildPassNormalized Condition="'$(DotNetBuildPass)' != ''">$(DotNetBuildPass)</_DotNetBuildPassNormalized>
+    <_DotNetBuildPassNormalized Condition="'$(DotNetBuildPass)' == ''">1</_DotNetBuildPassNormalized>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(Projects)' != ''">
+    <!-- Copy the original list so we can log diagnostics later. -->
+    <_OriginalProjectToBuild Include="@(ProjectToBuild)" />
+    <!-- Setting 'Projects' overrides the ProjectToBuild list. -->
+    <ProjectToBuild Remove="@(ProjectToBuild)" />
+    <ProjectToBuild Include="$(Projects)" />
+    <ProjectToBuild Update="@(ProjectToBuild)" Condition="'$(_DotNetBuildPassNormalized)' != ''" DotNetBuildPass="$(_DotNetBuildPassNormalized)" />
+  </ItemGroup>
+
+  <!--
+    Filter out projects that are part of a different build pass in the inner build when doing a unified build.
+    Don't do this filtering in non-unified builds to allow repos to define how different build passes are handled
+    in their own repo-specific builds.
+  -->
+  <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
+    <_ProjectToBuildCurrentBuildPass Include="@(ProjectToBuild->WithMetadataValue('DotNetBuildPass', '$(_DotNetBuildPassNormalized)'))" />
+    <ProjectToBuild Remove="@(ProjectToBuild)" />
+    <ProjectToBuild Include="@(_ProjectToBuildCurrentBuildPass)" />
+  </ItemGroup>
+
+  <!--
+    Default values.
+    If Projects is unspecified and ProjectToBuild was not set via Build.props, fallback to building .sln(x) files in the repo root.
+    For build passes after the first, build nothing by default.
+  -->
+  <ItemGroup>
+    <RepoRootSlnFile Include="$(RepoRoot)*.sln" />
+    <RepoRootSlnxFile Include="$(RepoRoot)*.slnx" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'@(ProjectToBuild)' == '' and '$(_DotNetBuildPassNormalized)' == '1'">
+    <ProjectToBuild Include="@(RepoRootSlnFile)" />
+    <ProjectToBuild Include="@(RepoRootSlnxFile)" Condition="'@(ProjectToBuild)' == ''"/>
+  </ItemGroup>
+
+  <Target Name="InitializeSolutionBuildInputs">
+    <ItemGroup>
+      <_SolutionBuildTargets Include="Rebuild" Condition="'$(Rebuild)' == 'true'" />
+      <_SolutionBuildTargets Include="Build" Condition="'$(Build)' == 'true' and '$(Rebuild)' != 'true'" />
+      <!-- Deploy target is set up to chain after Build so that F5 in VS works. -->
+      <_SolutionBuildTargets Include="Test" Condition="'$(Test)' == 'true'" />
+      <!-- Pack before running integration and performance tests so that these tests can test packages produced by the repo. -->
+      <_SolutionBuildTargets Include="Pack" Condition="'$(Pack)' == 'true'" />
+      <_SolutionBuildTargets Include="IntegrationTest" Condition="'$(IntegrationTest)' == 'true'" />
+      <_SolutionBuildTargets Include="PerformanceTest" Condition="'$(PerformanceTest)' == 'true'" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <_RemoveProps>Projects;Restore;Deploy;Sign;Publish;NETCORE_ENGINEERING_TELEMETRY;@(_SolutionBuildTargets)</_RemoveProps>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_CommonProps Include="Configuration=$(Configuration)"/>
+      <_CommonProps Include="ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)"/>
+      <_CommonProps Include="RepoRoot=$(RepoRoot)"/>
+      <_CommonProps Include="VersionsPropsPath=$(VersionsPropsPath)"/>
+
+      <!--
+        In .NET product build mode, some projects may have set ExcludeFromSourceOnlyBuild or ExcludeFromDotNetBuild to true.
+        NuGet Restore task reports a warning for such projects, which we suppress here.
+      -->
+      <_CommonProps Include="DisableWarnForInvalidRestoreProjects=true" Condition="'$(DotNetBuild)' == 'true'"/>
+
+      <!--
+        C++ projects expect VCTargetsPath property to be set. MSBuild generates this property to solution
+        metaproject when solution is build directly, but doesn't do so when the solution is built using MSBuild task.
+      -->
+      <_CommonProps Include="VCTargetsPath=$([MSBuild]::ValueOrDefault('$(VCTargetsPath)', '$([MSBuild]::GetVsInstallRoot())\Common7\IDE\VC\VCTargets\'))" Condition="'$(MSBuildRuntimeType)' != 'Core'"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <_SolutionBuildProps Include="@(_CommonProps)"/>
+      <_SolutionBuildProps Include="__DeployProjectOutput=$(Deploy)" Condition="'$(Deploy)' != ''"/>
+      <_SolutionBuildProps Include="__ImportPackTargets=true" Condition="'$(Pack)' == 'true'" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="Execute" DependsOnTargets="InitializeSolutionBuildInputs">
+    <Error Text="Both .sln and .slnx files found. Please specify one to use in the eng/Build.props file." Condition="'@(RepoRootSlnFile)' != '' and '@(RepoRootSlnxFile)' != ''" />
+    <Error Text="No projects were found to build. Either the 'Projects' property or 'ProjectToBuild' item group must be specified." Condition="'@(ProjectToBuild)' == ''"/>
+    <Error Text="Property 'RepoRoot' must be specified" Condition="'$(RepoRoot)' == ''"/>
+    <Error Text="File 'global.json' must exist in directory specified by RepoRoot: '$(RepoRoot)'" Condition="'$(RepoRoot)' != '' and !Exists('$(RepoRoot)global.json')"/>
+
+    <PropertyGroup>
+      <!-- 'IsRunningFromVisualStudio' may be true even when running msbuild.exe from command line. This generally means that MSBuild is from a Visual Studio installation and therefore we need to find NuGet.targets in a different location. -->
+      <_NuGetRestoreTargets Condition="Exists('$(MSBuildToolsPath)\NuGet.targets')" >$(MSBuildToolsPath)\NuGet.targets</_NuGetRestoreTargets>
+      <_NuGetRestoreTargets Condition="'$([MSBuild]::IsRunningFromVisualStudio())' == 'true' And Exists('$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets')">$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</_NuGetRestoreTargets>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(Restore)' == 'true'">
+      <_RestoreToolsProps Include="@(_CommonProps)"/>
+      <_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/>
+      <_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/>
+      <_RestoreToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/>
+
+      <!-- Used in the SDK (Tools.proj) to control whether Build.Tasks.Feed will be restored or not. -->
+      <_RestoreToolsProps Include="Publish=$(Publish)"/>
+    </ItemGroup>
+
+    <!--
+      Builds from the 'internal' project, and only those, can download the .net Runtime
+      from a private location.
+    -->
+    <ItemGroup Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
+      <_RestoreToolsProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/>
+      <_RestoreToolsProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/>
+    </ItemGroup>
+
+    <!--
+      Restore built-in tools.
+    -->
+    <MSBuild Projects="Tools.proj"
+             Targets="Restore"
+             Properties="@(_RestoreToolsProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
+             Condition="'$(Restore)' == 'true'"/>
+
+    <!--
+      Restore solutions and projects.
+
+      Run solution restore separately from the other targets, in a different build phase.
+      Since restore brings in new .props and .targets files we need to rerun evaluation.
+
+      Workarounds:
+      - Invoke restore using NuGet.targets directly (see https://github.com/NuGet/Home/issues/7648).
+        This avoids duplicate calls to RestoreTask and race conditions on writing restore results to disk.
+
+      - msbuild caches the metaproject for the solution (see https://github.com/Microsoft/msbuild/issues/1695)
+        We invalidate the cache by changing the value of __BuildPhase property.
+    -->
+
+    <ItemGroup>
+      <_SolutionRestoreProps Include="@(_SolutionBuildProps)" />
+      <_SolutionRestoreProps Include="__BuildPhase=SolutionRestore" />
+      <_SolutionRestoreProps Include="_NETCORE_ENGINEERING_TELEMETRY=Restore" />
+      <_SolutionRestoreProps Include="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
+      <_SolutionRestoreProps Include="RestoreUseStaticGraphEvaluation=$(RestoreUseStaticGraphEvaluation)" />
+      <_SolutionRestoreProps Include="RestoreEmbedFilesInBinlog=true" />
+      <_SolutionRestoreProps Include="RestoreStaticGraphEnableBinaryLogger=$(GenerateRestoreUseStaticGraphEvaluationBinlog)" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <!-- This can be set to false as an optimization for repos that don't use NuGet. -->
+      <RestoreUsingNuGetTargets Condition="'$(RestoreUsingNuGetTargets)' == ''">true</RestoreUsingNuGetTargets>
+    </PropertyGroup>
+
+    <!--
+      Detect which projects support restoring with NuGet targets.
+      As a perf optimization, the Properties list here should match exactly with
+      the properties passed to the "Restore" target a few lines below.
+      This helps MSBuild cache the result of _IsProjectRestoreSupported.
+      No need to call into the nuget internal target when restoring using
+      the new msbuild static graph APIs (RestoreUseStaticGraphEvaluation=true).
+    -->
+    <MSBuild Projects="@(ProjectToBuild)"
+             Properties="@(_SolutionRestoreProps)"
+             RemoveProperties="$(_RemoveProps)"
+             Targets="_IsProjectRestoreSupported"
+             SkipNonexistentTargets="true"
+             BuildInParallel="true"
+             Condition="'$(RestoreUsingNuGetTargets)' != 'false' and '%(ProjectToBuild.Extension)' != '.sln' and '%(ProjectToBuild.Extension)' != '.slnf' and '%(ProjectToBuild.Extension)' != '.slnx' and '$(RestoreUseStaticGraphEvaluation)' != 'true' and '$(Restore)' == 'true'">
+
+      <Output TaskParameter="TargetOutputs" ItemName="_ProjectToRestoreWithNuGet" />
+    </MSBuild>
+
+    <PropertyGroup>
+      <!-- Normalize paths to avoid false warnings by NuGet about missing project references. -->
+      <_ProjectToRestoreWithNuGetList>@(_ProjectToRestoreWithNuGet->'%(FullPath)')</_ProjectToRestoreWithNuGetList>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_ProjectToRestore Include="$(_NuGetRestoreTargets)" Condition="'$(_ProjectToRestoreWithNuGetList)' != '' and '$(RestoreUsingNuGetTargets)' != 'false'">
+        <AdditionalProperties>RestoreGraphProjectInput=$(_ProjectToRestoreWithNuGetList)</AdditionalProperties>
+        <RestoreInParallel>true</RestoreInParallel>
+      </_ProjectToRestore>
+
+      <!-- Invoke the 'Restore' target on solutions and projects which do not support NuGet. -->
+      <_ProjectToRestore Include="@(ProjectToBuild)" Exclude="@(_ProjectToRestoreWithNuGet)" />
+    </ItemGroup>
+
+    <!-- Enable binlog generation during static graph restore evaluation -->
+    <ItemGroup Condition="'$(GenerateRestoreUseStaticGraphEvaluationBinlog)' == 'true'">
+      <_ProjectToRestore>
+        <AdditionalProperties>RestoreStaticGraphBinaryLoggerParameters=$(ArtifactsLogDir)Restore-%(Filename)%(Extension).binlog</AdditionalProperties>
+      </_ProjectToRestore>
+    </ItemGroup>
+
+    <!--
+      Filter TreatWarningsAsErrors during Restore so CLI script builds and Visual Studio builds restore the same.
+      Don't ignore it when it set to 'false' to apply '-warnaserror false' from CLI script builds.
+    -->
+    <PropertyGroup>
+      <_RestoreRemoveProps>$(_RemoveProps)</_RestoreRemoveProps>
+      <_RestoreRemoveProps Condition="'$(TreatWarningsAsErrors)' != 'false'">$(_RestoreRemoveProps);TreatWarningsAsErrors</_RestoreRemoveProps>
+    </PropertyGroup>
+
+    <MSBuild Projects="@(_ProjectToRestore)"
+             Properties="@(_SolutionRestoreProps)"
+             RemoveProperties="$(_RestoreRemoveProps)"
+             Targets="Restore"
+             SkipNonexistentTargets="true"
+             BuildInParallel="%(_ProjectToRestore.RestoreInParallel)"
+             Condition="'$(Restore)' == 'true'"/>
+
+    <CallTarget Targets="ExecuteBuildTargets" Condition="'@(_SolutionBuildTargets)' != ''" />
+
+    <MSBuild Projects="AfterSolutionBuild.proj"
+             Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=Build"
+             Targets="@(_SolutionBuildTargets)"
+             Condition="'@(_SolutionBuildTargets)' != ''" />
+
+    <!--
+      Sign artifacts.
+    -->
+    <MSBuild Projects="Sign.proj"
+             Properties="@(_CommonProps)"
+             Targets="Sign"
+             Condition="'$(Sign)' == 'true'"/>
+
+    <MSBuild Projects="AfterSigning.proj"
+             Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=Sign"
+             Targets="@(_SolutionBuildTargets)"
+             Condition="'@(_SolutionBuildTargets)' != ''" />
+
+    <ItemGroup>
+      <_PublishProps Include="@(_CommonProps)"/>
+      <!-- Used in a few places in the stack to decide if publishing was enabled or not. -->
+      <_PublishProps Include="Publish=$(Publish)"/>
+    </ItemGroup>
+
+      <!-- Make sure we always publish in VMR build - working around runtime repo which sets Publish to false. -->
+    <MSBuild Projects="Publish.proj"
+             Properties="@(_PublishProps);_NETCORE_ENGINEERING_TELEMETRY=Publish"
+             Targets="Publish"
+             Condition="'$(Publish)' == 'true'"/>
+  </Target>
+
+  <Target Name="ExecuteBuildTargets"
+          Inputs="%(ProjectToBuild.BuildStep)"
+          Outputs="unused"
+          DependsOnTargets="InitializeSolutionBuildInputs">
+    <MSBuild Projects="@(ProjectToBuild)"
+             Properties="@(_SolutionBuildProps);__BuildPhase=SolutionBuild;_NETCORE_ENGINEERING_TELEMETRY=Build"
+             RemoveProperties="$(_RemoveProps)"
+             Targets="@(_SolutionBuildTargets)"
+             BuildInParallel="%(ProjectToBuild.BuildInParallel)" />
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/BuildReleasePackages.targets
new file mode 100644
index 00000000000..31bfb572a10
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/BuildReleasePackages.targets
@@ -0,0 +1,24 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.NuGetRepack.Tasks" />
+  </ItemGroup>
+
+  <Target Name="PackageReleasePackages" AfterTargets="Pack" Condition="'$(DotNetFinalVersionKind)' == ''">
+    <Message Text="Building release versions of NuGet packages" Importance="high" />
+    <Error Text="PreReleaseVersionLabel must be non-empty when using NuGet Repack tool." Condition="'$(PreReleaseVersionLabel)' == ''" />
+    
+    <ItemGroup>
+      <_BuiltPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
+    </ItemGroup>
+
+    <!-- Force references among packages to use exact versions (see https://github.com/NuGet/Home/issues/7213) -->
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_BuiltPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" />
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_BuiltPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true"/>
+
+    <!-- Rewrite the version ranges of per-build pre-release packages (see https://github.com/NuGet/Home/issues/7213) -->
+    <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_BuiltPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true"/>
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/CreateBaselineUpdatePR.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/CreateBaselineUpdatePR.proj
index c3c1920baaa..30d5b7300c8 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/CreateBaselineUpdatePR.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/CreateBaselineUpdatePR.proj
@@ -2,12 +2,11 @@
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Execute">
 
   <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
     <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Baselines.Tasks" Version="$(MicrosoftDotNetBaselinesTasksVersion)" />
+    <PackageReference Include="Microsoft.DotNet.Baselines.Tasks" />
   </ItemGroup>
 
   <Target Name="Execute" DependsOnTargets="CreateUpdatePR" />
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.props
index a889329a529..f5fcbc655e1 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.props
@@ -1,14 +1,17 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project TreatAsLocalProperty="RepoRoot">
+<Project>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup>
-    <RepoRoot>$([System.IO.Path]::GetFullPath('$(RepoRoot)/'))</RepoRoot>
-  </PropertyGroup>
+    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
 
-  <Import Project="../Directory.Build.props" />
-  <Import Project="../RepoDefaults.props" />
-  <Import Project="../RepoLayout.props" />
-  <Import Project="../TargetFrameworkDefaults.props" />
-  <Import Project="Versions.props" />
+    <!-- Disable target framework filtering for top level projects -->
+    <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
+
+    <_SuppressAllTargets>true</_SuppressAllTargets>
+    <_SuppressSdkImports>false</_SuppressSdkImports>
+    <_EmptyDisableRestore>true</_EmptyDisableRestore>
+  </PropertyGroup>
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.targets
new file mode 100644
index 00000000000..1b623e82d8f
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.targets
@@ -0,0 +1,6 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Packages.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Packages.props
new file mode 100644
index 00000000000..f3dea99e856
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Packages.props
@@ -0,0 +1,16 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.DotNet.Baselines.Tasks" Version="$(MicrosoftDotNetBaselinesTasksVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.Build.Tasks.VisualStudio" Version="$(MicrosoftDotNetBuildTasksVisualStudioVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="$(MicrosoftDotnetNuGetRepackTasksVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.SignCheckTask" Version="$(MicrosoftDotNetSignCheckTaskVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.SourceBuild.Tasks" Version="$(MicrosoftDotNetSourceBuildTasksVersion)" />
+    <PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
+    <PackageVersion Include="Microsoft.SymbolUploader.Build.Task" Version="$(MicrosoftSymbolUploaderBuildTaskVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/InstallDotNetCore.targets
new file mode 100644
index 00000000000..45ed3bd015e
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/InstallDotNetCore.targets
@@ -0,0 +1,24 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.InstallDotNetCore" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+
+  <Target Name="InstallDotNetCore" AfterTargets="Restore">
+    <PropertyGroup>
+      <_DotNetInstallScript>$(RepositoryEngineeringDir)common\dotnet-install.cmd</_DotNetInstallScript>
+      <_DotNetInstallScript Condition="'$(OS)' != 'Windows_NT'">$(RepositoryEngineeringDir)common\dotnet-install.sh</_DotNetInstallScript>
+    </PropertyGroup>
+    
+    <Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod +x &quot;$(_DotNetInstallScript)&quot;" />
+
+    <InstallDotNetCore
+      VersionsPropsPath="$(RepositoryEngineeringDir)Versions.props"
+      GlobalJsonPath="$(RepoRoot)global.json"
+      DotNetPath ="$(RepoRoot).dotnet"
+      DotNetInstallScript="$(_DotNetInstallScript)"
+      Platform="$(Platform)"
+      RuntimeSourceFeed="$(DotNetRuntimeSourceFeed)"
+      RuntimeSourceFeedKey="$(DotNetRuntimeSourceFeedKey)"/>
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Publish.proj
new file mode 100644
index 00000000000..0eef4a5908e
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Publish.proj
@@ -0,0 +1,449 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Publish">
+
+  <!--
+    Documentation for publishing is available here:
+      - https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Publishing.md
+  
+    Optional variables:
+      DotNetFinalVersionKind            Global property that stores the type of the current build: https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md#build-kind
+      DotNetSymbolServerTokenMsdl       Personal access token for MSDL symbol server. Available from variable group DotNet-Symbol-Server-Pats.
+      DotNetSymbolServerTokenSymWeb     Personal access token for SymWeb symbol server. Available from variable group DotNet-Symbol-Server-Pats.
+      DotNetSymbolExpirationInDays      Symbol expiration time in days (defaults to 10 years).
+      SkipPackageChecks                 Skips package safety checks.
+      EnableDefaultArtifacts            Includes packages under "/artifacts/packages/**" for publishing. Defaults to true.
+      DefaultArtifactVisibility         The default visibility for Artifact items. Defaults to External.
+      EnableDefaultRidSpecificArtifacts   Only externally publish packages for this build's TargetRid.
+      DotNetBuildPass                   While building the repo as part of the entire .NET stack, this parameter specifies which build pass the current build is part of.
+                                          The build pass number gets added to the asset manifest file name to avoid collisions.
+
+    Optional items:
+      Artifact (with Metadata)          Path to the artifact to publish. Declare the item in Signing.props to sign and publish the artifact.
+        - ChecksumPath                    The destination path to generate a checksum file for the artifact. Set the `RelativeBlobPathParent`
+                                          property if the RelativeBlobPath for the generate checksum should be automatically set.
+        - PublishFlatContainer            By default artifacts are published to blob artifacts. Set to false to publish to package artifacts.
+        - Kind                            [Package, Blob]. If set, overrides PublishFlatContainer usage. If not, then PublishFlatContainer=false == Package, true == Blob.
+        - RelativeBlobPath                The relative blob path when publishing to blob artifacts.
+        - IsShipping                      Set to false to mark the artifact as non-shipping. Defaults to true.
+  -->
+
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateChecksums" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" />
+  </ItemGroup>
+
+  <!--
+    Inside the VMR, we want to include "Vertical" artifacts as they should be available to other builds within the same
+    vertical on the same build machine.
+    Inside the VMR, we also want to include "Internal" artifacts in the build manifest, as they are used by other jobs
+    so we want to inclue them here so they can be in the vertical's final manifest.
+    The VMR tooling to produce the final merged manifest for the VMR build as a whole will filter them out.
+  -->
+  <ItemGroup Condition="'$(DotNetBuildFromVMR)' == 'true' and '$(DotNetBuild)' == 'true'">
+    <ArtifactVisibilityToPublish Include="Vertical;Internal;External" />
+  </ItemGroup>
+
+  <Import Project="Sign.props" />
+
+  <PropertyGroup>
+    <!-- Default publishing target is 3, but we use 4 in the VMR. -->
+    <PublishingVersion>3</PublishingVersion>
+    <PublishingVersion Condition="'$(DotNetBuildFromVMR)' == 'true'">4</PublishingVersion>
+    <PushToLocalStorage Condition="'$(DotNetBuildFromVMR)' == 'true'">true</PushToLocalStorage>
+    
+    <!-- Globally set property. -->
+    <IsStableBuild>false</IsStableBuild>
+    <IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'prerelease' or '$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
+
+    <!-- If `IsReleaseOnlyPackageVersion` is set to true, package safety checks can be skipped-->
+    <IsReleaseOnlyPackageVersion>false</IsReleaseOnlyPackageVersion>
+    <IsReleaseOnlyPackageVersion Condition ="'$(SkipPackagePublishingVersionChecks)' == 'true' or ('$(PreReleaseVersionLabel)' == '' and '$(AutoGenerateAssemblyVersion)' == 'true')">true</IsReleaseOnlyPackageVersion>
+    
+    <AutoGenerateSymbolPackages Condition="'$(AutoGenerateSymbolPackages)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</AutoGenerateSymbolPackages>
+
+    <PreserveRepoOrigin Condition="'$(PreserveRepoOrigin)' == ''">false</PreserveRepoOrigin>
+    <PublishManifestOnly Condition="'$(PublishManifestOnly)' == ''">false</PublishManifestOnly>
+
+    <!-- This tracks the dependent targets of PublishToAzureDevOpsArtifacts. We can't rename this
+         property as it is used by other repositories already. -->
+    <PublishDependsOnTargets>BeforePublish;AutoGenerateSymbolPackages</PublishDependsOnTargets>
+
+    <SymbolPackageBaseRelativeBlobPath>assets/symbols/</SymbolPackageBaseRelativeBlobPath>
+    <SymbolPackageBaseRelativeBlobPath Condition="'$(BUILD_REPOSITORY_NAME)' != ''">$(SymbolPackageBaseRelativeBlobPath)$(BUILD_REPOSITORY_NAME)/</SymbolPackageBaseRelativeBlobPath>
+    <SymbolPackageBaseRelativeBlobPath Condition="'$(BUILD_REPOSITORY_NAME)' == '' and '$(RepositoryName)' != ''">$(SymbolPackageBaseRelativeBlobPath)$(RepositoryName)/</SymbolPackageBaseRelativeBlobPath>
+    <SymbolPackageBaseRelativeBlobPath Condition="'$(BUILD_BUILDNUMBER)' != ''">$(SymbolPackageBaseRelativeBlobPath)$(BUILD_BUILDNUMBER)/</SymbolPackageBaseRelativeBlobPath>
+
+    <!-- Relative PDB path differentiator to ensure that multiple VMR legs that happen to produce the same PDBs
+         and need them all indexed get them published to different relative paths -->
+    <LoosePDBRelativeBasePath Condition="'$(LoosePDBRelativeBasePath)' == '' and '$(SYSTEM_PHASENAME)' != ''">$(SYSTEM_PHASENAME)/</LoosePDBRelativeBasePath>
+  </PropertyGroup>
+
+  <!-- Keep these asset manifest properties here as other repos already depend on them in Publishing.props. -->
+  <PropertyGroup>
+    <!-- Prefer TargetOS when set over OS -->
+    <AssetManifestOS Condition="'$(AssetManifestOS)' == ''">$([MSBuild]::ValueOrDefault('$(TargetOS)', '$(OS)'))</AssetManifestOS>
+    <!-- Prefer TargetArchitecture when set over PlatformName -->
+    <AssetManifestArch Condition="'$(AssetManifestArch)' == ''">$([MSBuild]::ValueOrDefault('$(TargetArchitecture)', '$(PlatformName)'))</AssetManifestArch>
+    <!-- Add the build pass number when DotNetBuildPass is set to a value other than 1. -->
+    <AssetManifestPass Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">-Pass$(DotNetBuildPass)</AssetManifestPass>
+  </PropertyGroup>
+
+  <!-- Only publish packages that contain this build's Target RID in the name. -->
+  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' == 'true'">
+    <Artifact Include="$(ArtifactsShippingPackagesDir)**/*.$(TargetRid).*.nupkg" Kind="Package" />
+    <Artifact Include="$(ArtifactsNonShippingPackagesDir)**/*.$(TargetRid).*.nupkg" IsShipping="false" Kind="Package" />
+    <!--
+      Integration with Microsoft.DotNet.Build.Tasks.Installers: Publish packages of the following formats as well.
+      These are arch-specific Visual Studio insertion packages. As they're Windows-only, they only include architecture in the name:
+      - VS.Redist.Common.*.$(TargetArchitecture).*.nupkg
+      - VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg
+      
+      These packages are always non-shipping, so only look there.
+
+      As these installer packages are inserted into VS as-is, .NET doesn't ship them
+      but must ensure that they're validated as though they were shipped by .NET (so they don't break when inserted into VS).
+    -->
+    <VSRedistArtifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
+    <VSRedistArtifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
+
+    <Artifact Include="@(VSRedistArtifact)">
+      <DotNetReleaseShipping Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">true</DotNetReleaseShipping>
+    </Artifact>
+
+    <!--
+      In the VMR, don't publish packages that didn't match the above conditions externally.
+      Instead, add them with Vertical visibility as they still may be needed to build RID-specific packages in other repos.
+    -->
+    <Artifact Include="$(ArtifactsShippingPackagesDir)**/*.nupkg" Exclude="@(Artifact)" Kind="Package" Visibility="Vertical" Condition="'$(DotNetBuildFromVMR)' == 'true'" />
+    <Artifact Include="$(ArtifactsNonShippingPackagesDir)**/*.nupkg" Exclude="@(Artifact)" IsShipping="false" Kind="Package" Visibility="Vertical" Condition="'$(DotNetBuildFromVMR)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'">
+    <Artifact Include="$(ArtifactsShippingPackagesDir)**/*.nupkg" Kind="Package" />
+    <Artifact Include="$(ArtifactsNonShippingPackagesDir)**/*.nupkg" IsShipping="false" Kind="Package" />
+  </ItemGroup>
+
+  <!-- Allow for repo specific Publish properties such as add additional files to be published -->
+  <Import Project="$(RepositoryEngineeringDir)Publishing.props" Condition="Exists('$(RepositoryEngineeringDir)Publishing.props')" />
+
+  <Target Name="Publish" DependsOnTargets="PublishToAzureDevOpsArtifacts" />
+
+  <Target Name="BeforePublish" Condition="'@(Artifact)' != ''">
+    <ItemGroup>
+      <_ExistingSymbolPackage Include="@(Artifact)" Condition="'%(Artifact.SkipPublish)' != 'true' and $([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.symbols.nupkg'))">
+        <!-- Update the kind of the symbol packages to blob -->
+        <Kind>Blob</Kind>
+        <!-- Set the category to Symbols (otherwise it will inherit the original package category -->
+        <Category>Symbols</Category>
+        <RelativeBlobPath>$(SymbolPackageBaseRelativeBlobPath)%(Filename)%(Extension)</RelativeBlobPath>
+      </_ExistingSymbolPackage>
+      <_PackageToPublish Include="@(Artifact)" Exclude="@(_ExistingSymbolPackage)" Condition="'%(Artifact.SkipPublish)' != 'true' and '%(Extension)' == '.nupkg'" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <!-- Exclude all existing *.symbols.nupkg in source-only build - we create a unified symbols archive instead. -->
+      <_ExistingSymbolPackage Remove="@(_ExistingSymbolPackage)" Condition="'$(DotNetBuildSourceOnly)' == 'true'"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ItemsToPushToBlobFeed Include="@(_PackageToPublish);@(_ExistingSymbolPackage)" Exclude="@(ItemsToPushToBlobFeed)" />
+    </ItemGroup>
+
+    <!-- 
+        Publish Windows PDBs produced by SymStore.targets (by default, only shipping PDBs are placed there).
+        SymbolUploader doesn't support embedded PDBs yet, so let SymStore.targets do the conversion for now.
+        https://github.com/dotnet/symstore/issues/143
+      -->
+    <ItemGroup>
+      <FilesToPublishToSymbolServer Include="$(ArtifactsSymStoreDirectory)**\*.pdb"/>
+
+      <!-- Support existing uses of FilesToPublishToSymbolServer by translating this ItemGroup into ItemsToPushToBlobFeed,
+           with type PDB. Repositories can also add these items manually if desired.
+           Note that we are careful here to include the relative paths of those PDBs. Unlike most artifacts
+           that we deal with, many PDBs can have the same name but different contents.
+
+           The other thing to remember is that in builds where PDBs are produced by multiple
+           jobs, but could have the same relative path within the build. In some cases we would want
+           both of those PDBs to be indexed. To achieve this, the relative PDB path will include the
+           LoosePDBRelativeBasePath. This may be set to SYSTEM_PHASENAME if available.
+           -->
+      <_SymbolsToPushToBlobFeed Include="@(FilesToPublishToSymbolServer)">
+        <Kind>PDB</Kind>
+        <RelativePDBPath>$(LoosePDBRelativeBasePath)%(RecursiveDir)%(Filename)%(Extension)</RelativePDBPath>
+      </_SymbolsToPushToBlobFeed>
+      <ItemsToPushToBlobFeed Include="@(_SymbolsToPushToBlobFeed)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AutoGenerateSymbolPackages" DependsOnTargets="BeforePublish" Condition="'$(AutoGenerateSymbolPackages)' == 'true'">
+    <PropertyGroup>
+      <SymbolPackagesDir Condition="'$(SymbolPackagesDir)' == ''">$(ArtifactsTmpDir)SymbolPackages\</SymbolPackagesDir>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_PackageToPublish Update="@(_PackageToPublish)">
+        <SymbolPackageToGenerate Condition="!Exists('%(RootDir)%(Directory)%(Filename).symbols.nupkg')">$(SymbolPackagesDir)%(Filename).symbols.nupkg</SymbolPackageToGenerate>
+        <SymbolPackageRelativeBlobPath>$(SymbolPackageBaseRelativeBlobPath)%(Filename).symbols.nupkg</SymbolPackageRelativeBlobPath>
+      </_PackageToPublish>
+
+      <_SymbolPackageToGenerate Include="@(_PackageToPublish->'%(SymbolPackageToGenerate)')"
+                                Exclude="@(_ExistingSymbolPackage -> '$(SymbolPackagesDir)%(Filename)%(Extension)')"
+                                Condition="'%(_PackageToPublish.SymbolPackageToGenerate)' != ''">
+        <OriginalPackage>%(_PackageToPublish.Identity)</OriginalPackage>
+        <IsShipping>%(_PackageToPublish.IsShipping)</IsShipping>
+        <Kind>Blob</Kind>
+        <Category>Symbols</Category>
+        <RelativeBlobPath>%(_PackageToPublish.SymbolPackageRelativeBlobPath)</RelativeBlobPath>
+      </_SymbolPackageToGenerate>
+    </ItemGroup>
+
+    <!--
+      If a symbol package doesn't exist yet we assume that the regular package contains Portable PDBs.
+      Such packages can act as symbol packages since they have the same structure.
+      We just need to copy them to *.symbols.nupkg.
+    -->
+    <MakeDir Condition="'@(_SymbolPackageToGenerate)' != ''" Directories="$(SymbolPackagesDir)" />
+    <Copy SourceFiles="@(_SymbolPackageToGenerate->'%(OriginalPackage)')" DestinationFiles="@(_SymbolPackageToGenerate)" />
+
+    <ItemGroup>
+      <!--
+        These packages from Arcade-Services include some native libraries that
+        our current symbol uploader can't handle. Below is a workaround until
+        we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
+      -->
+      <_SymbolPackageToGenerate Remove="$(SymbolPackagesDir)**/Microsoft.DotNet.Darc.*" />
+      <_SymbolPackageToGenerate Remove="$(SymbolPackagesDir)**/Microsoft.DotNet.Maestro.Tasks.*" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ItemsToPushToBlobFeed Include="@(_SymbolPackageToGenerate)" Exclude="@(ItemsToPushToBlobFeed)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Generate checksums from artifact items that set ChecksumPath.
+       The produced checksums get automatically added as artifacts. -->
+  <Target Name="GenerateChecksumsFromArtifacts"
+          Condition="'@(Artifact)' != '' and '@(Artifact->HasMetadata('ChecksumPath'))' != ''">
+    <ItemGroup>
+      <GenerateChecksumItems Include="@(Artifact->HasMetadata('ChecksumPath'))"
+                             DestinationPath="%(Artifact.ChecksumPath)"
+                             RemoveMetadata="RelativeBlobPath" />
+    </ItemGroup>
+
+    <GenerateChecksums Items="@(GenerateChecksumItems)" />
+
+    <ItemGroup>
+      <!-- Set RelativeBlobPath if RelativeBlobPathParent is provided. -->
+      <GenerateChecksumItemsWithDestinationPath Include="@(GenerateChecksumItems -> '%(DestinationPath)')" />
+      <Artifact Include="@(GenerateChecksumItemsWithDestinationPath)">
+        <RelativeBlobPath Condition="'$(RelativeBlobPathParent)' != ''">$(RelativeBlobPathParent.TrimEnd('/'))/%(Filename)%(Extension)</RelativeBlobPath>
+        <Kind>Blob</Kind>
+      </Artifact>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="PublishToAzureDevOpsArtifacts"
+          DependsOnTargets="$(PublishDependsOnTargets);GenerateChecksumsFromArtifacts">
+    <!-- 
+      Sadly AzDO doesn't have a variable to tell the account name. Also
+      the format of CollectionURI is not precise across different agent 
+      configurations. Code below takes care of extracting the account 
+      name from the CollectionURI in different formats.
+    -->
+    <PropertyGroup>
+      <CollectionUri>$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)</CollectionUri>
+      
+			<!-- When we have dev.azure.com/<account>/ -->
+      <AzureDevOpsAccount Condition="$(CollectionUri.IndexOf('dev.azure.com')) >= 0">$(CollectionUri.Split('/')[3])</AzureDevOpsAccount>
+		
+			<!-- When we have <account>.visualstudio.com -->
+      <AzureDevOpsAccount Condition="$(CollectionUri.IndexOf('visualstudio.com')) >= 0">$(CollectionUri.Split('.')[0].Split('/')[2])</AzureDevOpsAccount>
+    </PropertyGroup>
+
+    <!-- Asset output locations
+         When V4 publishing is enabled, there are two primary scenarios:
+         1. The build is running as part of an inner build in the VMR, and the future artifacts location is NOT yet know.
+            Publishing is primarily used to propagate assets between repos in a vertical.
+         2. Publishing at the end of a vertical, or the end of a normal build, where the future artifacts needs to be known.
+    -->
+    <PropertyGroup>
+      <LocallyStageArtifacts>false</LocallyStageArtifacts>
+      <LocallyStageArtifacts Condition="'$(PublishingVersion)' == '4' or '$(PushToLocalStorage)' == 'true'">true</LocallyStageArtifacts>
+
+      <!-- Use the SYSTEM_PHASENAME variable when available as that is guaranteed to be a unique identifier.
+           For local scenarios and when the variable isn't available, use "<os>-<arch>-<buildpass>"" as the manifest name. -->
+      <AssetManifestFileName Condition="'$(AssetManifestFileName)' == '' and '$(SYSTEM_PHASENAME)' != ''">$(SYSTEM_PHASENAME).xml</AssetManifestFileName>
+      <AssetManifestFileName Condition="'$(AssetManifestFileName)' == ''">$(AssetManifestOS)-$(AssetManifestArch)$(AssetManifestPass).xml</AssetManifestFileName>
+      <AssetManifestFilePath Condition="'$(AssetManifestFilePath)' == ''">$(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName)</AssetManifestFilePath>
+
+      <!-- PDBs are special in that they require a local staging location even if LocallyStageArtifacts is false.-->
+      <PdbArtifactsLocalStorageDir Condition="'$(PdbArtifactsLocalStorageDir)' == '' and '$(LocallyStageArtifacts)' != 'true'">$(ArtifactsTmpDir)PDBsToPublish/</PdbArtifactsLocalStorageDir>
+    </PropertyGroup>
+
+    <!-- Set up local staging artifact paths if we're going to locally stage artifacts.
+         NOTE! The SourceBuilt* setups can be removed after this change has flowed to the VMR and the bootstrap.
+         arcade is updated. -->
+    <PropertyGroup Condition="'$(LocallyStageArtifacts)' == 'true'">
+      <!-- Publish staging defaults.
+           This is intended to be the location that a build will publish its pipeline artifacts. We avoid
+           using the repo source layout for better compatibility with various scanning tools.
+           Since not all CI builds are in AzDO, ensure that there is a reasonable default under the repo source layout. -->
+      <ArtifactsPublishStagingDir Condition="'$(ArtifactsPublishStagingDir)' == '' and '$(Build_ArtifactStagingDirectory)' != ''">$([MSBuild]::NormalizeDirectory('$(Build_ArtifactStagingDirectory)', 'artifacts'))</ArtifactsPublishStagingDir>
+      <ArtifactsPublishStagingDir Condition="'$(ArtifactsPublishStagingDir)' == ''">$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'staging'))</ArtifactsPublishStagingDir>
+
+      <!-- Directory where pdbs pointed in `FilesToPublishToSymbolServer` are copied during publishing. -->
+      <PdbArtifactsLocalStorageDir Condition="'$(PdbArtifactsLocalStorageDir)' == ''">$(SourceBuiltPdbArtifactsDir)</PdbArtifactsLocalStorageDir>
+      <PdbArtifactsLocalStorageDir Condition="'$(PdbArtifactsLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)pdbs</PdbArtifactsLocalStorageDir>
+
+      <!-- Directory where shipping packages are copied during publishing. -->
+      <ShippingPackagesLocalStorageDir Condition="'$(ShippingPackagesLocalStorageDir)' == ''">$(SourceBuiltShippingPackagesDir)</ShippingPackagesLocalStorageDir>
+      <ShippingPackagesLocalStorageDir Condition="'$(ShippingPackagesLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)packages/shipping</ShippingPackagesLocalStorageDir>
+
+      <!-- Directory where nonshipping packages are copied during publishing. -->
+      <NonShippingPackagesLocalStorageDir Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(SourceBuiltNonShippingPackagesDir)</NonShippingPackagesLocalStorageDir>
+      <NonShippingPackagesLocalStorageDir  Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)packages/nonshipping</NonShippingPackagesLocalStorageDir>
+
+      <!-- Directory where asset manifests are copied during publishing. -->
+      <AssetManifestsLocalStorageDir Condition="'$(AssetManifestsLocalStorageDir)' == ''">$(SourceBuiltAssetManifestsDir)</AssetManifestsLocalStorageDir>
+      <AssetManifestsLocalStorageDir Condition="'$(AssetManifestsLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)manifests</AssetManifestsLocalStorageDir>
+
+      <!-- Directory where blob assets are copied during publishing. -->
+      <AssetsLocalStorageDir Condition="'$(AssetsLocalStorageDir)' == ''">$(SourceBuiltAssetsDir)</AssetsLocalStorageDir>
+      <AssetsLocalStorageDir Condition="'$(AssetsLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)assets</AssetsLocalStorageDir>
+
+      <!-- Default values for the future artifact name and publish locations if not provided.
+           VMR builds would typically specify these globally. Only used when publishing V4 is active. -->
+      <FutureArtifactName Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactName)' == '' and '$(SYSTEM_PHASENAME)' != ''">$(SYSTEM_PHASENAME)_Artifacts</FutureArtifactName>
+      <FutureArtifactName Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactName)' == ''">$(AssetManifestOS)_$(AssetManifestArch)$(AssetManifestPass)_Artifacts</FutureArtifactName>
+      <FutureArtifactPublishBasePath Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactPublishBasePath)' == ''">$(SourceBuiltArtifactsBasePath)</FutureArtifactPublishBasePath>
+      <FutureArtifactPublishBasePath Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactPublishBasePath)' == ''">$(ArtifactsPublishStagingDir)</FutureArtifactPublishBasePath>
+    </PropertyGroup>
+    
+    <!--
+      The new Maestro/BAR build model keeps separate Azure DevOps and GitHub build information.
+      The GitHub information will be extracted based on the Azure DevOps repository.
+    -->
+    <ItemGroup>
+      <ManifestBuildData Include="InitialAssetsLocation=$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)$(SYSTEM_TEAMPROJECT)/_apis/build/builds/$(BUILD_BUILDID)/artifacts" />
+      <ManifestBuildData Include="AzureDevOpsBuildId=$(BUILD_BUILDID)" />
+      <ManifestBuildData Include="AzureDevOpsBuildDefinitionId=$(SYSTEM_DEFINITIONID)" />
+      <ManifestBuildData Include="AzureDevOpsAccount=$(AzureDevOpsAccount)" />
+      <ManifestBuildData Include="AzureDevOpsProject=$(SYSTEM_TEAMPROJECT)" />
+      <ManifestBuildData Include="AzureDevOpsBuildNumber=$(BUILD_BUILDNUMBER)" />
+      <ManifestBuildData Include="AzureDevOpsRepository=$(BUILD_REPOSITORY_URI)" />
+      <ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <!-- By default, don't publish wixpacks. They're only needed for signing and can be dropped from the publish phase. -->
+      <Artifact>
+        <SkipPublish Condition="'%(Artifact.SkipPublish)' == '' and $([System.String]::new('%(Filename)%(Extension)').EndsWith('.wixpack.zip'))">true</SkipPublish>
+      </Artifact>
+
+      <!-- Add non-package Artifact items (repo extension point) as package already got added in the BeforePublish target. -->
+      <ItemsToPushToBlobFeed Include="@(Artifact)" Condition="'%(Artifact.SkipPublish)' != 'true' and '%(Extension)' != '.nupkg'" />
+    </ItemGroup>
+
+    <!-- Update/add attributes of ItemsToPushToBlobFeed if they were not provided. -->
+    <ItemGroup>
+      <ItemsToPushToBlobFeed>
+        <!-- Default artifact visibility is External -->
+        <Visibility Condition="'%(ItemsToPushToBlobFeed.Visibility)' == ''">$([MSBuild]::ValueOrDefault('$(DefaultArtifactVisibility)', 'External'))</Visibility>
+        <!-- Default to IsShipping=true -->
+        <IsShipping Condition="'%(ItemsToPushToBlobFeed.IsShipping)' == ''">true</IsShipping>
+        <!-- An item is a Blob if Kind wasn't already set, and PublishFlatContainer is true.
+             An item is a Package if Kind wasn't already set, and PublishFlatContainer is false or not set.
+             An item is a Package if Kind wasn't already set, and PublishFlatContainer is not set. -->
+        <Kind Condition="'%(ItemsToPushToBlobFeed.Kind)' == '' and '%(ItemsToPushToBlobFeed.PublishFlatContainer)' == 'true'">Blob</Kind>
+        <Kind Condition="'%(ItemsToPushToBlobFeed.Kind)' == '' and '%(ItemsToPushToBlobFeed.PublishFlatContainer)' != 'true'">Package</Kind>
+        <!-- DotNetReleaseShipping=true if IsShipping=true and ProducesDotNetReleaseShippingAssets=true-->
+        <DotNetReleaseShipping Condition="'%(ItemsToPushToBlobFeed.DotNetReleaseShipping)' == '' and '%(ItemsToPushToBlobFeed.IsShipping)' == 'true' and '$(ProducesDotNetReleaseShippingAssets)' == 'true'">true</DotNetReleaseShipping>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+
+    <!-- Note that the below ItemsToPushToBlobFeed metadata updates are in separate item groups to preserve previous information. -->
+    <ItemGroup>
+      <ItemsToPushToBlobFeed>
+        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.IsShipping)' != 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);NonShipping=true</ManifestArtifactData>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ItemsToPushToBlobFeed>
+        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.DotNetReleaseShipping)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);DotNetReleaseShipping=true</ManifestArtifactData>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+
+    <!-- Set the category -->
+    <ItemGroup>
+      <ItemsToPushToBlobFeed>
+        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.Category)' != ''">%(ItemsToPushToBlobFeed.ManifestArtifactData);Category=%(ItemsToPushToBlobFeed.Category)</ManifestArtifactData>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ItemsToPushToBlobFeed>
+        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.Visibility)' != ''">%(ItemsToPushToBlobFeed.ManifestArtifactData);Visibility=%(ItemsToPushToBlobFeed.Visibility)</ManifestArtifactData>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+
+    <!-- Propagate stability data to the asset level for packages. We do this so that VMR builds which have some repo builds that are not stable, and others that are, do not end up having to use the default logic
+         where ALL assets that are shipping in a stable build go to isolated feeds. Instead, we can just choose CouldBeStable==true, CouldBeStable==false.
+         This only applies currently to Packages. Blobs are required to provide paths that are always non-stable. Pdbs don't have a stability concept.
+
+         NOTE: This flag doesn't strictly mean that the package is stable versioned. A repo might suppress a stable version for a given package. -->
+    <ItemGroup>
+      <ItemsToPushToBlobFeed>
+			  <ManifestArtifactData Condition="'$(PublishingVersion)' == '4' and
+                                         '%(ItemsToPushToBlobFeed.Kind)' == 'Package' and
+																			   '$(IsStableBuild)' == 'true' and
+																			   '$(IsReleaseOnlyPackageVersion)' != 'true' and
+																			   '%(ItemsToPushToBlobFeed.IsShipping)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);CouldBeStable=true</ManifestArtifactData>
+        <!-- We narrowly set CouldBeStable=false only for packages we know won't generate a stable version because of IsReleaseOnlyPackageVersion == true.
+             This allows for the default 'stable asset to non-isolated feed' detection behavior to still pick up accidental cases of stabilization. -->
+				<ManifestArtifactData Condition="'$(PublishingVersion)' == '4' and
+                                         '%(ItemsToPushToBlobFeed.Kind)' == 'Package' and
+																				 '$(IsReleaseOnlyPackageVersion)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);CouldBeStable=false</ManifestArtifactData>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+
+    <Error Condition="'@(ItemsToPublishToBlobFeed->WithMetadataValue('IsShipping','true')->AnyHaveMetadataValue('Visibility','Vertical'))' == 'true'"
+           Text="Visibility 'Vertical' is not supported for shipping artifacts." />
+    <Error Condition="'@(ItemsToPublishToBlobFeed->WithMetadataValue('IsShipping','true')->AnyHaveMetadataValue('Visibility','Internal'))' == 'true'"
+           Text="Visibility 'Internal' is not supported for shipping artifacts." />
+    <Error Condition="'@(ItemsToPublishToBlobFeed->AnyHaveMetadataValue('Visibility','Vertical'))' == 'true' and '$(DotNetBuildFromVMR)' != 'true'"
+           Text="Visibility 'Vertical' is only supported in vertical builds inside the VMR." />
+
+    <!--
+      The user can set `PublishingVersion` via eng\Publishing.props
+    -->
+    <PushToBuildStorage
+      AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
+      AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
+      AzureDevOpsBuildId="$(BUILD_BUILDID)"
+      ItemsToPush="@(ItemsToPushToBlobFeed)"
+      ManifestBuildData="@(ManifestBuildData)"
+      ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
+      ManifestBranch="$(BUILD_SOURCEBRANCH)"
+      ManifestBuildId="$(BUILD_BUILDNUMBER)"
+      ManifestCommit="$(BUILD_SOURCEVERSION)"
+      ManifestRepoOrigin="$(RepositoryName)"
+      IsStableBuild="$(IsStableBuild)"
+      PublishingVersion="$(PublishingVersion)"
+      AssetManifestPath="$(AssetManifestFilePath)" 
+      IsReleaseOnlyPackageVersion="$(IsReleaseOnlyPackageVersion)"
+      PushToLocalStorage="$(PushToLocalStorage)"
+      AssetsLocalStorageDir="$(AssetsLocalStorageDir)"
+      PreserveRepoOrigin="$(PreserveRepoOrigin)"
+      ShippingPackagesLocalStorageDir="$(ShippingPackagesLocalStorageDir)"
+      NonShippingPackagesLocalStorageDir="$(NonShippingPackagesLocalStorageDir)"
+      AssetManifestsLocalStorageDir="$(AssetManifestsLocalStorageDir)"
+      PdbArtifactsLocalStorageDir="$(PdbArtifactsLocalStorageDir)"
+      ArtifactVisibilitiesToPublish="@(ArtifactVisibilityToPublish)"
+      UseHardlinksIfPossible="$(PublishingUseHardlinksIfPossible)"
+      FutureArtifactName="$(FutureArtifactName)"
+      FutureArtifactPublishBasePath="$(FutureArtifactPublishBasePath)" />
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
index 1c09e11e205..e551d8cf8f3 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
@@ -75,14 +75,16 @@
   -->
 
   <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
     <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
     <!-- Do not treat warnings as errors, so that we can surface audit issues. -->
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <Target Name="Execute">
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" />
+  </ItemGroup>
 
+  <Target Name="Execute">
     <Error Condition="'$(ManifestsBasePath)' == ''" Text="ManifestsBasePath is empty. Please provide the full path to asset manifest(s) directory." />
     <Error Condition="'$(BlobBasePath)' == '' OR '$(PackageBasePath)' == ''" Text="A valid full path to BlobBasePath and PackageBasePath is required." />
 
@@ -158,12 +160,7 @@
       StreamingPublishingMaxClients="$(StreamingPublishingMaxClients)"
       NonStreamingPublishingMaxClients="$(NonStreamingPublishingMaxClients)"
       FeedKeys="@(FeedKey)"
-      FeedOverrides="@(FeedOverride)"
-      />
+      FeedOverrides="@(FeedOverride)" />
   </Target>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj
index 851fbaaae10..67f34a5607a 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj
@@ -13,18 +13,11 @@
     <!-- Block stable versioning so that the merged asset manifest is pushed
          to a unique location -->
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
-  </PropertyGroup>
-  
-  <Import Project="$(RepositoryEngineeringDir)Versions.props" />
-  <Import Project="..\Version.BeforeCommonTargets.targets" />
-
-  <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
     <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" />
   </ItemGroup>
 
   <Target Name="Execute">
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
index 64464f4785c..668da283373 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
@@ -1,10 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Execute">
-
-  <PropertyGroup>
-    <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
-  </PropertyGroup>
   
   <!--
     Parameters:
@@ -16,6 +11,14 @@
       - AzdoTargetFeedPAT                       : Token to publish assets to feeds
   -->
 
+  <PropertyGroup>
+    <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" />
+  </ItemGroup>
+
   <Target Name="Execute">
     <Error
       Condition="'$(IsInternalBuild)' == ''"
@@ -66,8 +69,4 @@
     </PublishSignedAssets>
   </Target>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
index a3e199b3ae5..ae826422510 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
@@ -18,10 +18,13 @@
   -->
 
   <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
     <NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SymbolUploader.Build.Task" />
+  </ItemGroup>
+
   <Target Name="Execute">
     <ItemGroup>
       <FilesToPublishToSymbolServer Include="$(PDBArtifactsDirectory)\**\*.pdb"/>
@@ -39,7 +42,7 @@
     </ItemGroup>
 
     <!--
-    ConvertPortablePdbsToWindowsPdbs is set to true only in staging pipeline, because this is an expensive task and we don't want to do it for every build.
+      ConvertPortablePdbsToWindowsPdbs is set to true only in staging pipeline, because this is an expensive task and we don't want to do it for every build.
     -->
     <PropertyGroup>
       <DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
@@ -111,8 +114,4 @@
                     TreatPdbConversionIssuesAsInfo="$(TreatPdbConversionIssuesAsInfo)"/>
   </Target>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SymbolUploader.Build.Task" Version="$(MicrosoftSymbolUploaderBuildTaskVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.proj
new file mode 100644
index 00000000000..65e98c6ec8a
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.proj
@@ -0,0 +1,97 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Sign">
+
+  <!--
+    Documentation for publishing is available here:
+      - https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Signing.md
+  
+    Optional variables:
+      EnableDefaultArtifacts            Includes *.nupkg, *.vsix and *.wixpack.zip under "/artifacts/packages/**" for signing.
+                                        Defaults to true.
+      EnableDefaultRidSpecificArtifacts Do not sign *.nupkg packages under "/artifacts/packages/**" that do not contain the current TargetRid.
+      DefaultArtifactVisibility         The default visibility for Artifact items. Defaults to External.
+
+    Optional items:
+      Artifact (with Metadata)          Path to the artifact to publish. Declare the item in Signing.props to sign and publish the artifact.
+        - SkipPublish                     If true, skips publishing the artifact.
+  -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.SignTool" />
+    <PackageReference Include="Microsoft.Signed.Wix" />
+
+    <PackageDownload Include="Microsoft.DotNet.MacOsPkg.Cli" Version="[$(MicrosoftDotNetMacOsPkgVersion)]" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
+    <PackageDownload Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="[$(MicrosoftVisualStudioEngMicroBuildCoreVersion)]" />
+    <PackageDownload Include="sn" Version="[$(SNVersion)]" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
+    <PackageDownload Include="Microsoft.WixToolset.Sdk" Version="[$(MicrosoftWixToolsetSdkVersion)]" />
+  </ItemGroup>
+
+  <Import Project="Sign.props" />
+
+  <!-- Update sign infos that were using Microsoft400 to use the .NET-specific cert if UseDotNetCertificate is present.
+       This will update any use, even if explicitly specified.
+       NOTE: This is outside the target on purpose, as Update will not correctly evaluate in the target. See
+       https://github.com/dotnet/msbuild/issues/1618. -->
+  <ItemGroup Condition="$(UseDotNetCertificate)">
+    <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+    <StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+    <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
+  </ItemGroup>
+
+  <Target Name="Sign">
+    <Error Text="The value of DotNetSignType is invalid: '$(DotNetSignType)'"
+           Condition="'$(DotNetSignType)' != 'real' and '$(DotNetSignType)' != 'test' and '$(DotNetSignType)' != ''" />
+
+    <PropertyGroup>
+      <_DryRun>true</_DryRun>
+      <!-- Allow an official build to force dry run signing. This allows the VMR's build to test signing in CI without changing versions. -->
+      <_DryRun Condition="'$(OfficialBuild)' == 'true' and '$(ForceDryRunSigning)' != 'true'">false</_DryRun>
+
+      <_TestSign>false</_TestSign>
+      <_TestSign Condition="'$(DotNetSignType)' == 'test'">true</_TestSign>
+
+      <_DotNetCoreRequired>false</_DotNetCoreRequired>
+      <_DotNetCoreRequired Condition="'$(_DryRun)' != 'true'">true</_DotNetCoreRequired>
+
+      <!-- SN is only available on Windows -->
+      <SNBinaryPath Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe</SNBinaryPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- .pkgs and .app bundle tooling is only available on MacOS -->
+      <MacOSPkgCliItem Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="$(NuGetPackageRoot)microsoft.dotnet.macospkg.cli\$(MicrosoftDotNetMacOsPkgVersion)\tools\net*\any\Microsoft.Dotnet.MacOsPkg.Cli.dll" />
+    </ItemGroup>
+
+    <Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(ItemsToSign)' == ''" 
+           Text="List of files to sign is empty. Make sure that ItemsToSign is configured correctly." />
+
+    <PropertyGroup Condition="$(_DotNetCoreRequired)">
+      <_DotNetCorePath>$(DotNetTool)</_DotNetCorePath>
+    </PropertyGroup>
+
+    <Microsoft.DotNet.SignTool.SignToolTask
+        DryRun="$(_DryRun)"
+        TestSign="$(_TestSign)"
+        DoStrongNameCheck="$(DoStrongNameCheck)"
+        AllowEmptySignList="$(AllowEmptySignList)"
+        CertificatesSignInfo="@(CertificatesSignInfo)"
+        ItemsToSign="@(ItemsToSign)"
+        StrongNameSignInfo="@(StrongNameSignInfo)"
+        FileSignInfo="@(FileSignInfo)"
+        ItemsToSkip3rdPartyCheck="@(ItemsToSkip3rdPartyCheck)"
+        FileExtensionSignInfo="@(FileExtensionSignInfo)"
+        TempDir="$(ArtifactsTmpDir)"
+        LogDir="$(ArtifactsLogDir)"
+        DotNetPath="$(_DotNetCorePath)"
+        SNBinaryPath="$(SNBinaryPath)"
+        MicroBuildCorePath="$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.core\$(MicrosoftVisualStudioEngMicroBuildCoreVersion)"
+        Wix3ToolsPath="$(WixInstallPath)"
+        WixToolsPath="$(NuGetPackageRoot)microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)\tools\net472\x64"
+        PkgToolPath="@(MacOSPkgCliItem)"
+        RepackParallelism="$(SignToolRepackParallelism)"
+        MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)"
+        DotNetTimeout="$(SignToolDotNetTimeout)"
+        MSBuildVerbosity="$(SignToolMSBuildVerbosity)" />
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.props
new file mode 100644
index 00000000000..7b7439e02b8
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.props
@@ -0,0 +1,158 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <PropertyGroup>
+    <!-- By default, search for sign aritfacts under the list of known directories. -->
+    <EnableDefaultArtifacts>true</EnableDefaultArtifacts>
+  </PropertyGroup>
+
+  <!-- Repo extension point to sign and/or publish. Artifacts are shipping and blobs by default. -->
+  <ItemDefinitionGroup>
+    <Artifact>
+      <PublishFlatContainer>true</PublishFlatContainer>
+      <!-- Possible values: Blob, Package, PDB -->
+      <!-- Currently unset, indicating that a repo hasn't started using this property. If it's set, then it
+           wins over PublishFlatContaner. If it is not set, then PublishFlatContainer wins.
+           After existing usage of PublishFlatContainer is no longer around, set to "Blob" -->
+      <Kind></Kind>
+      <IsShipping>true</IsShipping>
+    </Artifact>
+  </ItemDefinitionGroup>
+
+  <ItemGroup>
+    <!--
+      This is intended to hold information about the certificates used for signing.
+    -->
+    <CertificatesSignInfo Include="3PartyDual" DualSigningAllowed="true" />
+    <CertificatesSignInfo Include="3PartySHA2" DualSigningAllowed="true" />
+    <!-- This signing information indicates certificates that represent a sign and notarize operation. -->
+    <CertificatesSignInfo Include="MacDeveloperHardenWithNotarization" MacCertificate="MacDeveloperHarden" MacNotarizationAppName="dotnet" />
+    <CertificatesSignInfo Include="MacDeveloperWithNotarization" MacCertificate="MacDeveloper" MacNotarizationAppName="dotnet" />
+    <CertificatesSignInfo Include="MacDeveloperVNextWithNotarization" MacCertificate="MacDeveloperVNext" MacNotarizationAppName="dotnet" />
+    <CertificatesSignInfo Include="MacDeveloperVNextHardenWithNotarization" MacCertificate="MacDeveloperVNextHarden" MacNotarizationAppName="dotnet" />
+    <!-- Certificates Which support detached signatures -->
+    <CertificatesSignInfo Include="LinuxSignTar" SupportsDetachedSignature="true" />
+    <CertificatesSignInfo Include="LinuxSign500180PGP" SupportsDetachedSignature="true" />
+  </ItemGroup>
+
+  <!-- Only publish packages that contain this build's Target RID in the name.
+       PostBuildSign switch is kept for avoiding breaks in repos that use it to avoid signing. -->
+  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(PostBuildSign)' != 'true' and '$(EnableDefaultRidSpecificArtifacts)' == 'true'">
+    <ItemsToSign Include="$(ArtifactsShippingPackagesDir)**/*.$(TargetRid).*.nupkg"/>
+    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/*.$(TargetRid).*.nupkg" />
+    <!--
+      Integration with Microsoft.DotNet.Build.Tasks.Installers: Publish packages of the following formats as well.
+      These are arch-specific Visual Studio insertion packages. As they're Windows-only, they only include architecture in the name:
+      - VS.Redist.Common.*.$(TargetArchitecture).*.nupkg
+      - VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg
+      
+      These packages are always non-shipping, so only look there.
+    -->
+    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" />
+    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" />
+
+    <!-- Always sign all vsix packages and VS Build Packages. These may be arch specific or agnostic, but they likely won't have the RID included. -->
+    <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
+    <ItemsToSign Include="$(VisualStudioBuildPackagesDir)**\*.nupkg" />
+  </ItemGroup>
+
+  <!-- PostBuildSign switch is kept for avoiding breaks in repos that use it to avoid signing. -->
+  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(PostBuildSign)' != 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'">
+    <!-- List of container files that will be opened and checked for files that need to be signed. -->
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
+    <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
+    <ItemsToSign Include="$(VisualStudioBuildPackagesDir)**\*.nupkg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Default certificate/strong-name to be used for all files with PKT=="31bf3856ad364e35". -->
+    <StrongNameSignInfo Include="MsSharedLib72" PublicKeyToken="31bf3856ad364e35" CertificateName="Microsoft400" />
+    <StrongNameSignInfo Include="SilverlightCert121" PublicKeyToken="7cec85d7bea7798e" CertificateName="Microsoft400" />
+    <StrongNameSignInfo Include="StrongName" PublicKeyToken="b77a5c561934e089" CertificateName="Microsoft400" />
+    <StrongNameSignInfo Include="StrongName" PublicKeyToken="b03f5f7f11d50a3a" CertificateName="Microsoft400" />
+    <!-- Do not include specific key files if full assembly signing is not supported, as they will not be usable when we sign. -->
+    <StrongNameSignInfo Include="$(MSBuildThisFileDirectory)snk\Open.snk" PublicKeyToken="cc7b13ffcd2ddd51" CertificateName="Microsoft400" Condition="'$(FullAssemblySigningSupported)' != 'false'" />
+    <StrongNameSignInfo Include="$(MSBuildThisFileDirectory)snk\AspNetCore.snk" PublicKeyToken="adb9793829ddae60" CertificateName="Microsoft400" Condition="'$(FullAssemblySigningSupported)' != 'false'" />
+
+    <!--
+      Map of file extensions to default certificate name. Files with these extensions are
+      signed with the specified certificate. Particularly useful for files that don't have
+      a public key token.
+      The certificate can be overriden using the StrongNameSignInfo or the FileSignInfo item group.
+    -->
+    <FileExtensionSignInfo Include=".deb" CertificateName="LinuxSign" />
+    <FileExtensionSignInfo Include=".jar" CertificateName="MicrosoftJARSHA2" />
+    <FileExtensionSignInfo Include=".ps1;.psd1;.psm1;.psc1;.py" CertificateName="Microsoft400" />
+    <FileExtensionSignInfo Include=".dll;.exe;.mibc;.msi" CertificateName="Microsoft400" />
+    <FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
+    <FileExtensionSignInfo Include=".vsix" CertificateName="VsixSHA2" />
+    <FileExtensionSignInfo Include=".zip" CertificateName="None" />
+    <FileExtensionSignInfo Include=".tgz" CertificateName="None" />
+    <FileExtensionSignInfo Include=".tar.gz" CertificateName="None" />
+    <!-- Note, RPMs can only be unpack/repacked on Linux. They can be signed on non-Linux -->
+    <FileExtensionSignInfo Include=".rpm" CertificateName="LinuxSign" />
+    <!-- Note, these can only be unpack/repacked on Mac. They can be signed on a non-Mac -->
+    <FileExtensionSignInfo Include=".pkg" CertificateName="MacDeveloper" />
+    <!-- .app bundles are technically directories, but the Microsoft.DotNet.MacOsPkg
+    tool packs these bundles into zips when unpacking .pkgs -->
+    <FileExtensionSignInfo Include=".app" CertificateName="MacDeveloper" />
+    <!-- Runtime hardening is required for notarization. -->
+    <FileExtensionSignInfo Include=".dylib" CertificateName="MacDeveloperHarden" />
+
+    <!-- Removing the default .js signing -->
+    <FileExtensionSignInfo Include=".js" CertificateName="BreakingSignatureChange" Condition="'$(NoSignJS)' != 'true'"/>
+    <FileExtensionSignInfo Include=".js" CertificateName="None" Condition="'$(NoSignJS)' == 'true'"/>
+
+    <!-- Explicitly use the azure linux cert for azl binaries -->
+    <AzureLinuxRPM Include="$(ArtifactsPackagesDir)**/*-azl-*.rpm" />
+    <AzureLinuxRPM Include="$(ArtifactsPackagesDir)**/*-azl.*-*.rpm" />
+    <FileSignInfo Include="@(AzureLinuxRPM->'%(Filename)%(Extension)')" CertificateName="LinuxSignMariner" />
+
+    <!-- Explicitly use the "new" LinuxSign cert. -->
+    <NewKeyLinuxPackage Include="$(ArtifactsPackagesDir)**/*-newkey-*.rpm" />
+    <NewKeyLinuxPackage Include="$(ArtifactsPackagesDir)**/*-newkey-*.deb" />
+    <FileSignInfo Include="@(NewKeyLinuxPackage->'%(Filename)%(Extension)')" CertificateName="LinuxSign500207PGP" />
+  </ItemGroup>
+
+  <!-- The name of the .NET specific certificate, which is a general replacement for Microsoft400
+       If UseDotNetCert is specific in a repo's eng/Signing.props, all usage of Microsoft400 is replaced
+       with MicrosoftDotNet500 -->
+  <PropertyGroup>
+    <DotNetCertificateName>MicrosoftDotNet500</DotNetCertificateName>
+    <UseDotNetCertificate>false</UseDotNetCertificate>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Flags for controlling whether empty signing lists are detected for in build and post-build signing.
+         These flags are split (rather than just a single check based on PostBuildSign == true/false because
+         some repos may do both in-build and post-build signing. -->
+    <!-- Control whether an empty ItemsToSign item group is allowed when calling SignToolTask. -->
+    <AllowEmptySignList Condition="'$(PostBuildSign)' != 'true'">false</AllowEmptySignList>
+    <AllowEmptySignList Condition="'$(PostBuildSign)' == 'true'">true</AllowEmptySignList>
+
+    <!-- Timeout in milliseconds for DotNet MicroBuild build command. '-1' is infinite. -->
+    <SignToolDotNetTimeout Condition="'$(SignToolDotNetTimeout)' == ''">-1</SignToolDotNetTimeout>
+
+    <!-- Verbosity for DotNet MicroBuild build command. -->
+    <SignToolMSBuildVerbosity Condition="'$(SignToolMSBuildVerbosity)' == ''">quiet</SignToolMSBuildVerbosity>
+
+    <NETCORE_ENGINEERING_TELEMETRY>Signing</NETCORE_ENGINEERING_TELEMETRY>
+  </PropertyGroup>
+
+  <!-- Sign tool parallelism limits. These may be overridden by a repo. -->
+  <PropertyGroup>
+    <!-- Number of containers to repack in parallel -->
+    <SignToolRepackParallelism>16</SignToolRepackParallelism>
+    <!-- Maximum size in MB that a file may be before it is repacked serially -->
+    <SignToolRepackMaximumParallelFileSize>128</SignToolRepackMaximumParallelFileSize>
+  </PropertyGroup>
+
+  <!-- Allow repository to customize signing configuration -->
+  <Import Project="$(RepositoryEngineeringDir)Signing.props" Condition="Exists('$(RepositoryEngineeringDir)Signing.props')" />
+
+  <!-- Respect Artifact item repo extension point -->
+  <ItemGroup Condition="'@(Artifact)' != ''">
+    <ItemsToSign Include="@(Artifact)" Condition="'$(PostBuildSign)' != 'true'" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj
index e1d00e97224..fc23673f135 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj
@@ -19,12 +19,11 @@
   <Import Condition="Exists('$(BuildManifestFile)')" Project="$(BuildManifestFile)" />
 
   <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
     <NETCORE_ENGINEERING_TELEMETRY>Build</NETCORE_ENGINEERING_TELEMETRY>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.SignCheckTask" Version="$(MicrosoftDotNetSignCheckTaskVersion)" />
+    <PackageReference Include="Microsoft.DotNet.SignCheckTask" />
   </ItemGroup>
 
   <Target Name="Execute">
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Tools.proj
new file mode 100644
index 00000000000..cb44d5143d7
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Tools.proj
@@ -0,0 +1,45 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <_RepoToolManifest>$([MSBuild]::NormalizePath('$(RepoRoot)', '.config', 'dotnet-tools.json'))</_RepoToolManifest>
+
+    <!-- VisualStudio.InsertionManifests.targets: Keep condition in sync with import in AfterSigning.proj. -->
+    <RestoreInternalTooling Condition="'$(UsingToolVSSDK)' == 'true' and '$(GenerateSbom)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'">true</RestoreInternalTooling>
+    <RestoreInternalToolingAfterTargets Condition="'$(RestoreInternalTooling)' == 'true'">Restore</RestoreInternalToolingAfterTargets>
+  </PropertyGroup>
+
+  <Target Name="RestoreRepoTools"
+          Condition="'$(DotNetBuildSourceOnly)' != 'true' and Exists('$(_RepoToolManifest)')"
+          BeforeTargets="Restore">
+    <!-- Respect a restore config file passed in via /p:RestoreConfigFile, common in VMR builds -->
+    <PropertyGroup>
+      <RestoreConfigFileOption></RestoreConfigFileOption>
+      <RestoreConfigFileOption Condition="'$(RestoreConfigFile)' != ''">--configfile "$(RestoreConfigFile)"</RestoreConfigFileOption>
+    </PropertyGroup>
+
+    <Exec Command='"$(DotNetTool)" tool restore $(RestoreConfigFileOption)' WorkingDirectory="$(RepoRoot)" />
+  </Target>
+
+  <!-- Set as DependsOnTargets when internal tools (e.g. IBC data, optprof) is required -->
+  <Target Name="RestoreInternalTooling"
+          AfterTargets="$(RestoreInternalToolingAfterTargets)">
+    <PropertyGroup>
+      <InternalToolsRestoreProject>$(RepoRoot)eng/common/internal/Tools.csproj</InternalToolsRestoreProject>
+      <InternalToolsRestoreConfig>$(RepoRoot)eng/common/internal/NuGet.config</InternalToolsRestoreConfig>
+    </PropertyGroup>
+
+    <MSBuild Projects="$(InternalToolsRestoreProject)"
+      Targets="Restore"
+      Properties="@(_RestoreToolsProps);RestoreConfigFile=$(InternalToolsRestoreConfig);_NETCORE_ENGINEERING_TELEMETRY=Restore"
+      Condition="'$(Restore)' == 'true'" />
+  </Target>
+
+  <!-- Repository extensibility point -->
+  <Import Project="$(RepositoryEngineeringDir)Tools.props" Condition="Exists('$(RepositoryEngineeringDir)Tools.props')" />
+
+  <Import Project="InstallDotNetCore.targets" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+
+  <Import Project="VisualStudio.AcquireOptimizationData.targets" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/TrackPrebuiltUsage.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/TrackPrebuiltUsage.targets
new file mode 100644
index 00000000000..cd835109501
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/TrackPrebuiltUsage.targets
@@ -0,0 +1,45 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.SourceBuild.Tasks" />
+  </ItemGroup>
+
+  <Target Name="WritePrebuiltUsageData" AfterTargets="Build">
+    <PropertyGroup>
+      <TrackPrebuiltUsageRootDir Condition="'$(TrackPrebuiltUsageRootDir)' == ''">$(RepoRoot)</TrackPrebuiltUsageRootDir>
+      <TrackPrebuiltUsagePackageCache Condition="'$(TrackPrebuiltUsagePackageCache)' == ''">$(NuGetPackageRoot)</TrackPrebuiltUsagePackageCache>
+      <TrackPrebuiltUsageReportDir Condition="'$(TrackPrebuiltUsageReportDir)' == ''">$(ArtifactsLogDir)</TrackPrebuiltUsageReportDir>
+      <TrackPrebuiltUsageReportFile Condition="'$(TrackPrebuiltUsageReportFile)' == ''">$(TrackPrebuiltUsageReportDir)prebuilt-usage.xml</TrackPrebuiltUsageReportFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <AllRestoredPackageFiles Include="$(TrackPrebuiltUsagePackageCache)**/*.nupkg" />
+      <SourceBuiltPackageFiles Include="$(AdditionalSourceBuiltNupkgCacheDir)**/*.nupkg" Condition="'$(AdditionalSourceBuiltNupkgCacheDir)' != ''" />
+      <SourceBuiltPackageFiles Include="$(ReferencePackageNupkgCacheDir)**/*.nupkg" Condition="'$(ReferencePackageNupkgCacheDir)' != ''" />
+      <SourceBuiltPackageFiles Include="$(PreviouslySourceBuiltNupkgCacheDir)**/*.nupkg" Condition="'$(PreviouslySourceBuiltNupkgCacheDir)' != ''" />
+
+      <!-- Scan entire TrackPrebuiltUsageRootDir, in case project.assets.json ends up in an unexpected place. -->
+      <ProjectDirectories Include="$(TrackPrebuiltUsageRootDir)" />
+    </ItemGroup>
+
+    <WritePackageUsageData
+      RestoredPackageFiles="@(AllRestoredPackageFiles)"
+      TarballPrebuiltPackageFiles="@(TarballPrebuiltPackageFiles)"
+      SourceBuiltPackageFiles="@(SourceBuiltPackageFiles)"
+      ReferencePackageFiles="@(ReferencePackageFiles)"
+      PlatformsRuntimeJsonFiles="@(PlatformsRuntimeJsonFiles)"
+      TargetRid="$(TargetRid)"
+      ProjectDirectories="@(ProjectDirectories)"
+      RootDir="$(TrackPrebuiltUsageRootDir)"
+      IgnoredProjectAssetsJsonFiles="@(IgnoredProjectAssetsJsonFiles)"
+      DataFile="$(TrackPrebuiltUsageReportFile)"
+      ProjectAssetsJsonArchiveFile="$(ProjectAssetsJsonArchiveFile)" />
+
+    <WriteUsageReports
+      DataFile="$(TrackPrebuiltUsageReportFile)"
+      PoisonedReportFile="$(PoisonedReportFile)"
+      OutputDirectory="$(TrackPrebuiltUsageReportDir)" />
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.AcquireOptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.AcquireOptimizationData.targets
new file mode 100644
index 00000000000..4159bf8f19f
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.AcquireOptimizationData.targets
@@ -0,0 +1,84 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <!-- 
+    Properties:
+      VisualStudioIbcRepositoryName    Repository name to look up the IBC drop (e.g. roslyn). Defaults to RepositoryName
+      VisualStudioIbcSourceBranchName  The name of the branch of the repository that was used to produce the IBC data to be acquired (e.g. 'master').
+      VisualStudioIbcDropId            The id of the drop. If specified, drop named 'OptimizationData/$(VisualStudioIbcRepositoryName)/$(VisualStudioIbcSourceBranchName)/$(VisualStudioIbcDropId)' is used.
+                                       Otherwise, the most recent drop of name that matches 'OptimizationData/$(VisualStudioIbcRepositoryName)/$(VisualStudioIbcSourceBranchName)/*' is used.
+      VisualStudioIbcDrop              The explicit drop to use. Overrides VisualStudioIbcSourceBranchName and VisualStudioIbcDropId
+  -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.VisualStudio" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release' and '$(OfficialBuild)' == 'true'">true</EnableNgenOptimization>
+    <VisualStudioIbcRepositoryName Condition="'$(VisualStudioIbcRepositoryName)' == ''">$(RepositoryName)</VisualStudioIbcRepositoryName>
+  </PropertyGroup>
+  
+  <!--
+    Acquire optimization data from VS drop, unless suppressed by setting EnableNgenOptimization to false.
+    Find the latest optimization data drop and downloads it to IbcOptimizationDataDir directory.
+  -->
+  <Target Name="_AcquireVisualStudioOptimizationData"
+          DependsOnTargets="_PrepareAcquireVisualStudioOptimizationData;_DownloadVisualStudioOptimizationDataOpt"
+          AfterTargets="Restore"
+          Condition="'$(EnableNgenOptimization)' == 'true'">
+  </Target>
+  
+  <Target Name="_PrepareAcquireVisualStudioOptimizationData"
+          DependsOnTargets="RestoreInternalTooling">
+    <PropertyGroup>
+      <_DropToolPath>$(NuGetPackageRoot)drop.app\$(DropAppVersion)\lib\net45\drop.exe</_DropToolPath>
+      <_DropToolExists>false</_DropToolExists>
+      <_DropToolExists Condition="Exists('$(_DropToolPath)')">true</_DropToolExists>
+    </PropertyGroup>
+
+    <!--
+      Only report error when running in an official build.
+      Allows to test optimization data operations locally by running 
+      cibuild.cmd after manually restoring internal tools project.
+    -->
+    <Error Text='Internal tool not found: "$(_DropToolPath)". Run restore on "$(RepositoryEngineeringDir)common\internal\Tools.csproj".'
+           Condition="'$(OfficialBuild)' == 'true' and !$(_DropToolExists)"/>
+  </Target>
+
+  <Target Name="_DownloadVisualStudioOptimizationDataOpt" Condition="$(_DropToolExists)">
+    <Error Text="VisualStudioDropAccessToken property has to be specified when EnableNgenOptimization and OfficialBuild is true" Condition="'$(VisualStudioDropAccessToken)' == '' and '$(OfficialBuild)' == 'true'"/>
+    <Error Text="VisualStudioIbcRepositoryName property has to be specified when EnableNgenOptimization is true and VisualStudioIbcDrop is not set" Condition="'$(VisualStudioIbcDrop)' == '' and '$(VisualStudioIbcRepositoryName)' == ''"/>
+    <Error Text="VisualStudioIbcSourceBranchName property has to be specified when EnableNgenOptimization is true and VisualStudioIbcDrop is not set" Condition="'$(VisualStudioIbcDrop)' == '' and '$(VisualStudioIbcSourceBranchName)' == ''"/>
+    <Error Text="VisualStudioIbcSourceBranchName property cannot be specified when using the VisualStudioIbcDrop property" Condition="'$(VisualStudioIbcDrop)' != '' and '$(VisualStudioIbcSourceBranchName)' != ''" />
+    <Error Text="VisualStudioIbcDropId property cannot be specified when using the VisualStudioIbcDrop property" Condition="'$(VisualStudioIbcDrop)' != '' and '$(VisualStudioIbcDropId)' != ''" />
+
+    <PropertyGroup>
+      <_DropServiceUrl>https://devdiv.artifacts.visualstudio.com</_DropServiceUrl>
+      <_PatAuthArg Condition="'$(VisualStudioDropAccessToken)' != ''">--patAuth "$(VisualStudioDropAccessToken)"</_PatAuthArg>
+      <_DestArg>$(IbcOptimizationDataDir.TrimEnd('\'))</_DestArg>
+      <_DropsJsonPath>$(ArtifactsLogDir)OptimizationDataDrops.json</_DropsJsonPath>
+      <_DropsLogPath>$(ArtifactsLogDir)OptimizationDataAcquisition.log</_DropsLogPath>
+      <_DropNamePrefix>OptimizationData/$(VisualStudioIbcRepositoryName)/$(VisualStudioIbcSourceBranchName)</_DropNamePrefix>
+      <_DropName>$(_DropNamePrefix)/$(VisualStudioIbcDropId)</_DropName>
+      <_DropName Condition="'$(VisualStudioIbcDrop)' != ''">$(VisualStudioIbcDrop)</_DropName>
+    </PropertyGroup>
+
+    <Message Text="Listing optimization data from service $(_DropServiceUrl), prefix $(_DropNamePrefix)" Importance="high"/>
+
+    <Exec Command='"$(_DropToolPath)" list --dropservice "$(_DropServiceUrl)" $(_PatAuthArg) --pathPrefixFilter "$(_DropNamePrefix)" --toJsonFile "$(_DropsJsonPath)" --traceto "$(_DropsLogPath)"' 
+          Condition="'$(VisualStudioIbcDropId)' == '' and '$(VisualStudioIbcDrop)' == ''"/>
+
+    <FindLatestDrop DropListPath="$(_DropsJsonPath)" Condition="'$(VisualStudioIbcDropId)' == '' and '$(VisualStudioIbcDrop)' == ''">
+      <Output TaskParameter="DropName" PropertyName="_DropName"/>
+    </FindLatestDrop>
+
+    <Error Text="No drop matching given name found: $(_DropServiceUrl)/$(_DropNamePrefix)/*" Condition="'$(_DropName)' == ''"/>
+
+    <MakeDir Directories="$(IbcOptimizationDataDir)" />
+
+    <Message Text="Downloading optimization data from service $(_DropServiceUrl), drop $(_DropName)" Importance="high"/>
+    <Exec Command='"$(_DropToolPath)" get --dropservice "$(_DropServiceUrl)" $(_PatAuthArg) --name "$(_DropName)" --dest "$(_DestArg)" --traceto "$(_DropsLogPath)"' />
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
new file mode 100644
index 00000000000..cbdfb7189e0
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
@@ -0,0 +1,27 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <!--
+    Properties:
+      RepositoryName                   Current repository name (e.g. 'dotnet/roslyn').
+      VisualStudioDropName             Product drop name, e.g. 'Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
+  -->
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.VisualStudio" />
+  </ItemGroup>
+
+  <Target Name="_BuildTrainingInputs" BeforeTargets="AfterBuild">
+    <Error Condition="('$(VisualStudioDropName)' == '' or '$(RepositoryName)' == '') and '$(OfficialBuild)' == 'true'"
+           Text="Properties VisualStudioDropName and RepositoryName must be specified in official build that produces Visual Studio insertion components." />
+
+    <GenerateTrainingInputFiles ConfigurationFile="$(RepositoryEngineeringDir)config\OptProf.json"
+                                InsertionDirectory="$(VisualStudioSetupInsertionPath)"
+                                OutputDirectory="$(ArtifactsDir)OptProf\$(Configuration)\Data" />
+
+    <GenerateTrainingPropsFile ProductDropName="$(VisualStudioDropName)"
+                               RepositoryName="$(RepositoryName)"
+                               OutputDirectory="$(VisualStudioSetupInsertionPath)OptProf"/>
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
index cec7c2c0a5c..9cc1f5e337c 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Execute">
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Execute">
 
   <!--
     Required parameters:
@@ -17,13 +17,9 @@
     as it is only available as a DevOps Pipeline task.
   -->
 
-  <Import Project="Directory.Build.props" />
-
-  <PropertyGroup>
-    <_VisualStudioBuildTasksAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.visualstudio\$(MicrosoftDotNetBuildTasksVisualStudioVersion)\tools\net\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</_VisualStudioBuildTasksAssembly>
-  </PropertyGroup>
-
-  <UsingTask AssemblyFile="$(_VisualStudioBuildTasksAssembly)" TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GetRunSettingsSessionConfiguration" Runtime="NET" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.VisualStudio" />
+  </ItemGroup>
 
   <PropertyGroup>
     <_OutputFilePath>$(VisualStudioSetupInsertionPath)OptProf\Training.runsettings</_OutputFilePath>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.InsertionManifests.targets
new file mode 100644
index 00000000000..7c548d8d5b9
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.InsertionManifests.targets
@@ -0,0 +1,50 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <PropertyGroup>
+    <GenerateSbom Condition="'$(GenerateSbom)' == ''">false</GenerateSbom>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_StubFiles Include="$(VisualStudioSetupIntermediateOutputPath)**\*.stub"/>
+    <_StubDirs Include="@(_StubFiles->'%(RecursiveDir)')"/>
+  </ItemGroup>
+
+  <!---
+    This target is invoked in a separate phase after all input VSIX files are signed.
+    This is important since the manifest contain hashes of the VSIX files.
+  -->
+  <Target Name="GenerateVisualStudioInsertionManifests"
+          BeforeTargets="AfterPack"
+          Outputs="%(_StubDirs.Identity)"
+          Condition="'@(_StubDirs)' != ''">
+    <PropertyGroup>
+      <_ComponentDir>%(_StubDirs.Identity)</_ComponentDir>
+      <_ComponentName>$(_ComponentDir.TrimEnd('\'))</_ComponentName>
+    </PropertyGroup>
+
+    <Message Text="Generating manifest for VS component '$(_ComponentName)'" Importance="high"/>
+
+    <Error Condition="'$(VisualStudioDropName)' == '' and '$(OfficialBuild)' == 'true'"
+           Text="Property VisualStudioDropName must be specified in official build that produces Visual Studio insertion components." />
+
+    <ItemGroup>
+      <_Args Include="OfficialBuild=$(OfficialBuild)" />
+      <_Args Include="ComponentName=$(_ComponentName)"/>
+      <_Args Include="SetupOutputPath=$(VisualStudioSetupInsertionPath)"/>
+      <_Args Include="ComponentIntermediateOutputPath=$(VisualStudioSetupIntermediateOutputPath)$(_ComponentName)\"/>
+      <_Args Include="SwixBuildPath=$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.plugins.swixbuild\$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)\" />
+      <_Args Include="VisualStudioDropName=$(VisualStudioDropName)" />
+      <_Args Include="DotNetTool=$(DotNetTool)" />
+      <_Args Include="ManifestTool=$(NuGetPackageRoot)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll" />
+      <_Args Include="GenerateSbom=$(GenerateSbom)" />
+    </ItemGroup>
+
+    <!--
+      Invoke GenerateSetupManifest target directly (instead of Build) to skip logic in common targets that is not needed 
+      and adds unnecessary dependency on .NET Framework reference assemblies.
+    -->
+    <MSBuild Projects="VisualStudio.SetupPackage.vsmanproj" Properties="@(_Args)" Targets="_BuildManifest"/>
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.SetupPackage.vsmanproj
new file mode 100644
index 00000000000..4a8d5c3aee2
--- /dev/null
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.SetupPackage.vsmanproj
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+  <!--
+    Required variables:
+      OfficialBuild                   True for official builds.
+      ComponentName                   Name of the component (VSIX)
+      SetupOutputPath                 Directory to drop Willow manifests to.
+      ComponentIntermediateOutputPath Intermediate directory where the component is being built.
+      SwixBuildPath                   SwixBuild package path.
+      VisualStudioDropName            The name of Visual Studio drop, e.g. 
+                                      "Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)"
+                                      The manifest will be published with URI
+                                      https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)
+      DotNetTool                      Path to dotnet.exe.
+      ManifestTool                    Path to Microsoft.ManifestTool.dll
+      GenerateSbom                    True if an SBOM should be generated for this component.
+  -->
+
+  <PropertyGroup>
+    <ResolveNuGetPackages>false</ResolveNuGetPackages>
+    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
+    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+  </PropertyGroup>
+
+  <Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.props" Condition="'$(SwixBuildPath)' != ''" />
+
+  <PropertyGroup>
+    <FinalizeManifest>true</FinalizeManifest>
+    <FinalizeSkipLayout>true</FinalizeSkipLayout>
+    <IsPackage>true</IsPackage>
+    <TargetName>$(ComponentName)</TargetName>
+    <OutputPath>$(SetupOutputPath)</OutputPath>
+    <IntermediateOutputPath>$(ComponentIntermediateOutputPath)</IntermediateOutputPath>
+    <GenerateSbom>$(GenerateSbom)</GenerateSbom>
+
+    <!-- Note that the url is expected to end with ';' (%3B) -->
+    <ManifestPublishUrl Condition="'$(VisualStudioDropName)' != ''">https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)%3B</ManifestPublishUrl>
+    <ManifestPublishUrl Condition="'$(VisualStudioDropName)' == ''">http://localhost/non-official-build%3B</ManifestPublishUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_PackageStubFiles Include="$(ComponentIntermediateOutputPath)*.stub"/>
+  </ItemGroup>
+
+  <Import Project="$(SwixBuildPath)build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets" Condition="'$(SwixBuildPath)' != ''" />
+
+  <Target Name="_BuildManifest" DependsOnTargets="_GetVsixFileInfo;_GenerateSbomForVsixAndAddManifestItem;_GenerateVSManifest;GenerateSetupManifest" />
+
+  <Target Name="_GetVsixFileInfo">
+    <ReadLinesFromFile File="%(_PackageStubFiles.Identity)">
+      <Output TaskParameter="Lines" ItemName="_StubLine"/>
+    </ReadLinesFromFile>
+   <!--Parse the stub file to get the details of VsixId, VsixFileName and VsxiVersion-->
+   <!--Eg: _StubLine = Microsoft.FSharp.VSIX.Templates/VisualFSharpTemplates.vsix/17.0.0.2231309
+          VsixId = Microsoft.FSharp.VSIX.Templates
+          VsixFileName = VisualFSharpTemplates.vsix
+          VsixVersion = 17.0.0.2231309-->
+    <ItemGroup>
+      <_ParsedLine Include="@(_StubLine)"
+                   VsixId="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
+                   VsixFileName="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])"
+                   VsixVersion="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[2])" />
+    <!--Set the VSmanifest name, Vsix path, Vsix unpacking path, Directory to generate SBOM and Path to generated SBOM manifest-->
+      <_VsixFileInfo Include="@(_ParsedLine->'%(VsixFileName)')">
+        <ManifestJsonPath>$(SetupOutputPath)%(VsixId).json</ManifestJsonPath>
+        <VsixPath>$(SetupOutputPath)%(VsixFileName)</VsixPath>
+        <UnpackDir>$(ComponentIntermediateOutputPath)%(VsixFileName)\unpack</UnpackDir>
+        <SbomDir>$(ComponentIntermediateOutputPath)%(VsixFileName)\sbom</SbomDir>
+        <SbomJsonPath>$(ComponentIntermediateOutputPath)%(VsixFileName)\sbom\spdx_2.2\manifest.spdx.json</SbomJsonPath>
+      </_VsixFileInfo>
+    </ItemGroup>
+
+    <ItemGroup>
+      <_VsixVersion Include="%(_VsixFileInfo.VsixVersion)" VsixFileName="%(_VsixFileInfo.Identity)" />
+    </ItemGroup>
+
+    <RemoveDuplicates Inputs="@(_VsixVersion)">
+      <Output TaskParameter="Filtered" ItemName="_VsixVersionNoDuplicates"/>
+    </RemoveDuplicates>
+
+    <!--
+      Each stub file contains VSIX version of the respective VSIX file.
+      We require that all VSIXes included in a single VS insertion component have the same version.
+      This version will be set to ManifestBuildVersion.
+    -->
+    <Error Text="Cannot generate VS manifest because Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(VsixFileName) (version %(Identity))', ', ')"
+           Condition="@(_VsixVersionNoDuplicates->Count()) != 1"/>
+
+    <PropertyGroup>
+      <ManifestBuildVersion>@(_VsixVersionNoDuplicates)</ManifestBuildVersion>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="_GenerateSbomForVsixAndAddManifestItem"
+          Inputs="@(_VsixFileInfo->'%(VsixPath)')"
+          Outputs="@(_VsixFileInfo->'%(SbomJsonPath)')"
+          DependsOnTargets="_GetVsixFileInfo"
+          Condition="'$(GenerateSbom)' != 'false'">
+    <Message Text="Generating SBOM manifest for '%(_VsixFileInfo.Identity)'" Importance="high"/>
+
+    <Error Text="Internal tool not found: 'microsoft.manifesttool.crossplatform'. Run restore on '$(RepositoryEngineeringDir)common\internal\Tools.csproj'."
+           Condition="!Exists('$(ManifestTool)')" />
+
+    <MakeDir Directories="%(_VsixFileInfo.SbomDir);%(_VsixFileInfo.UnpackDir)"/>
+    <Copy SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)" Condition = "'%(_VsixFileInfo.Extension)' == '.exe'" />
+    <Unzip SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)" Condition = "'%(_VsixFileInfo.Extension)' != '.exe'"/>
+    <!-- Generate SBOM -->
+    <Exec Command='"$(DotNetTool)" --roll-forward major "$(ManifestTool)" generate -BuildDropPath "%(_VsixFileInfo.UnpackDir)" -ManifestDirPath "%(_VsixFileInfo.SbomDir)" -PackageName "%(_VsixFileInfo.VsixFileName)" -PackageVersion "%(_VsixFileInfo.VsixVersion)" -Verbosity Verbose'/>
+    <!-- Generate VS manifest with link to the SBOM manifest-->
+    <ItemGroup>
+      <MergeManifest Include="%(_VsixFileInfo.ManifestJsonPath)" SBOMFileLocation="%(_VsixFileInfo.SbomJsonPath)" />
+    </ItemGroup>
+
+    <Message Text="Completed generating SBOM manifest for %(_VsixFileInfo.Identity)." Importance="high"/>
+  </Target>
+
+  <Target Name="_GenerateVSManifest"
+          DependsOnTargets="_GetVsixFileInfo"
+          Condition="'$(GenerateSbom)' == 'false'">
+    <Message Text="Generating VS manifest '%(_VsixFileInfo.Identity)'" Importance="high"/>
+
+    <ItemGroup>
+      <MergeManifest Include="%(_VsixFileInfo.ManifestJsonPath)" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
index 5a654f5e468..3c4a7e19972 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
@@ -19,8 +19,6 @@
          Writes a stub file to component intermediate directory.
   -->
 
-  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.FinalizeInsertionVsixFile" AssemblyFile="$(ArcadeVisualStudioBuildTasksAssembly)" Runtime="NET" />
-
   <PropertyGroup>
     <!--
       TODO: Currently we need to erase Experimental flag from VSIXes that are inserted into VS.
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props
index b8b6a807dea..000f929e7c8 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props
@@ -1,10 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
-  <PropertyGroup>
-    <ArcadeVisualStudioBuildTasksAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.visualstudio\$(MicrosoftDotNetBuildTasksVisualStudioVersion)\tools\net\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</ArcadeVisualStudioBuildTasksAssembly>
-  </PropertyGroup>
-
   <!-- Default settings for VSIX projects -->
 
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/build/Microsoft.DotNet.Build.Tasks.VisualStudio.props b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/build/Microsoft.DotNet.Build.Tasks.VisualStudio.props
new file mode 100644
index 00000000000..52299d0f885
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/build/Microsoft.DotNet.Build.Tasks.VisualStudio.props
@@ -0,0 +1,16 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <PropertyGroup>
+    <MicrosoftDotNetBuildTasksVisualStudioTaskAssembly>$(MSBuildThisFileDirectory)..\tools\net\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</MicrosoftDotNetBuildTasksVisualStudioTaskAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.FindLatestDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksVisualStudioTaskAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GenerateTrainingInputFiles" AssemblyFile="$(MicrosoftDotNetBuildTasksVisualStudioTaskAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GenerateTrainingPropsFile" AssemblyFile="$(MicrosoftDotNetBuildTasksVisualStudioTaskAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GetRunSettingsSessionConfiguration" AssemblyFile="$(MicrosoftDotNetBuildTasksVisualStudioTaskAssembly)" Runtime="NET" />
+
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.FinalizeInsertionVsixFile" AssemblyFile="$(MicrosoftDotNetBuildTasksVisualStudioTaskAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GetPkgDefAssemblyDependencyGuid" AssemblyFile="$(MicrosoftDotNetBuildTasksVisualStudioTaskAssembly)" Runtime="NET" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/build/Microsoft.DotNet.NuGetRepack.Tasks.props b/src/Microsoft.DotNet.NuGetRepack/tasks/build/Microsoft.DotNet.NuGetRepack.Tasks.props
new file mode 100644
index 00000000000..45e612f79d3
--- /dev/null
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/build/Microsoft.DotNet.NuGetRepack.Tasks.props
@@ -0,0 +1,11 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
+<Project>
+
+  <PropertyGroup>
+    <MicrosoftDotNetNuGetRepackTaskAssembly>$(MSBuildThisFileDirectory)..\tools\net\Microsoft.DotNet.NuGetRepack.Tasks.dll</MicrosoftDotNetNuGetRepackTaskAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="Microsoft.DotNet.Tools.ReplacePackageParts" AssemblyFile="$(MicrosoftDotNetNuGetRepackTaskAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Tools.UpdatePackageVersionTask" AssemblyFile="$(MicrosoftDotNetNuGetRepackTaskAssembly)" Runtime="NET" />
+
+</Project>

From 7053e65a5b932e481996a1b343f985661fc4386a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:21:17 +0200
Subject: [PATCH 02/20] Move SdkTasks to package root and update scripts

Move SdkTasks/ from tools/SdkTasks/ to the Arcade SDK package root as a
sibling of tools/. Update the csproj to pack SdkTasks/ separately and
update both tools.ps1 and tools.sh to copy SdkTasks/ from the new
package location during toolset initialization.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/common/tools.ps1                                      | 8 ++++++--
 eng/common/tools.sh                                       | 7 +++++--
 .../Microsoft.DotNet.Arcade.Sdk.csproj                    | 3 +++
 .../{tools => }/SdkTasks/AfterSigning.proj                | 0
 .../{tools => }/SdkTasks/AfterSolutionBuild.proj          | 0
 .../{tools => }/SdkTasks/Build.proj                       | 0
 .../{tools => }/SdkTasks/BuildReleasePackages.targets     | 0
 .../{tools => }/SdkTasks/CreateBaselineUpdatePR.proj      | 0
 .../{tools => }/SdkTasks/Directory.Build.props            | 0
 .../{tools => }/SdkTasks/Directory.Build.targets          | 0
 .../{tools => }/SdkTasks/Directory.Packages.props         | 0
 .../{tools => }/SdkTasks/InstallDotNetCore.targets        | 0
 .../{tools => }/SdkTasks/Publish.proj                     | 0
 .../{tools => }/SdkTasks/PublishArtifactsInManifest.proj  | 0
 .../{tools => }/SdkTasks/PublishBuildAssets.proj          | 0
 .../{tools => }/SdkTasks/PublishSignedAssets.proj         | 0
 .../{tools => }/SdkTasks/PublishToSymbolServers.proj      | 0
 .../{tools => }/SdkTasks/Sign.proj                        | 0
 .../{tools => }/SdkTasks/Sign.props                       | 0
 .../{tools => }/SdkTasks/SigningValidation.proj           | 0
 .../{tools => }/SdkTasks/Tools.proj                       | 0
 .../{tools => }/SdkTasks/TrackPrebuiltUsage.targets       | 0
 .../{tools => }/SdkTasks/Versions.props                   | 0
 .../SdkTasks/VisualStudio.AcquireOptimizationData.targets | 0
 .../SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets  | 0
 .../SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj   | 0
 .../SdkTasks/VisualStudio.IbcTraining.runsettings         | 0
 .../SdkTasks/VisualStudio.InsertionManifests.targets      | 0
 .../SdkTasks/VisualStudio.SetupPackage.vsmanproj          | 0
 29 files changed, 14 insertions(+), 4 deletions(-)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/AfterSigning.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/AfterSolutionBuild.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Build.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/BuildReleasePackages.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/CreateBaselineUpdatePR.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Directory.Build.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Directory.Build.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Directory.Packages.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/InstallDotNetCore.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Publish.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/PublishArtifactsInManifest.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/PublishBuildAssets.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/PublishSignedAssets.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/PublishToSymbolServers.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Sign.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Sign.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/SigningValidation.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Tools.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/TrackPrebuiltUsage.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/Versions.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/VisualStudio.AcquireOptimizationData.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/VisualStudio.IbcTraining.runsettings (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/VisualStudio.InsertionManifests.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{tools => }/SdkTasks/VisualStudio.SetupPackage.vsmanproj (100%)

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 7d48bca3a21..435de93f43c 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -680,11 +680,15 @@ function InitializeToolset() {
     ExitWithExitCode 3
   }
 
-  # Copy the tools folder to the toolset directory
-  # TODO: In the future, only copy the SdkTasks folder and remove the fallback path.
   New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null
   Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
 
+  # Copy SdkTasks if present at the package root (new layout)
+  $packageSdkTasksDir = Join-Path $packageDir 'SdkTasks'
+  if (Test-Path $packageSdkTasksDir) {
+    Copy-Item -Path $packageSdkTasksDir -Destination $toolsetToolsDir -Recurse -Force
+  }
+
   if (Test-Path $newPath) {
     $toolsetBuildProj = $newPath
   } elseif (Test-Path $oldPath) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index c89ee3e00cf..40229d009e3 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -438,11 +438,14 @@ function InitializeToolset {
     ExitWithExitCode 3
   fi
 
-  # Copy the tools folder to the toolset directory
-  # TODO: In the future, only copy the SdkTasks folder and remove the fallback path.
   mkdir -p "$toolset_tools_dir"
   cp -r "$package_dir/tools/." "$toolset_tools_dir"
 
+  # Copy SdkTasks if present at the package root (new layout)
+  if [[ -d "$package_dir/SdkTasks" ]]; then
+    cp -r "$package_dir/SdkTasks" "$toolset_tools_dir/"
+  fi
+
   if [[ -a "$toolset_tools_dir/SdkTasks/Build.proj" ]]; then
     toolset_build_proj="$toolset_tools_dir/SdkTasks/Build.proj"
   elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
index 861028474b9..fd5b10b516b 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
@@ -40,6 +40,9 @@
     <None Include="$(_GeneratedVersionFilePath)"
           Pack="true"
           PackagePath="tools\DefaultVersions.Generated.props" />
+    <None Include="SdkTasks/**/*.*"
+          Pack="true"
+          PackagePath="SdkTasks/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSigning.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSigning.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSigning.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSigning.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSolutionBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSolutionBuild.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/AfterSolutionBuild.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSolutionBuild.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Build.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Build.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Build.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/BuildReleasePackages.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/BuildReleasePackages.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/BuildReleasePackages.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/CreateBaselineUpdatePR.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/CreateBaselineUpdatePR.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/CreateBaselineUpdatePR.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/CreateBaselineUpdatePR.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.props
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Build.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Packages.props b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Packages.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Directory.Packages.props
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Packages.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/InstallDotNetCore.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/InstallDotNetCore.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/InstallDotNetCore.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Publish.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Publish.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Publish.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishArtifactsInManifest.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishArtifactsInManifest.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishBuildAssets.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishBuildAssets.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishSignedAssets.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishSignedAssets.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishToSymbolServers.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishToSymbolServers.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Sign.props
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/SigningValidation.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/SigningValidation.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Tools.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Tools.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Tools.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/TrackPrebuiltUsage.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/TrackPrebuiltUsage.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/TrackPrebuiltUsage.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/TrackPrebuiltUsage.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Versions.props b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Versions.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Versions.props
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Versions.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.AcquireOptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.AcquireOptimizationData.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.AcquireOptimizationData.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.AcquireOptimizationData.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.IbcTraining.runsettings b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.IbcTraining.runsettings
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.IbcTraining.runsettings
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.IbcTraining.runsettings
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.InsertionManifests.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.InsertionManifests.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.InsertionManifests.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.SetupPackage.vsmanproj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/VisualStudio.SetupPackage.vsmanproj
rename to src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.SetupPackage.vsmanproj

From 4c51ac1684efc0ba7471bc59789e6fee738b24e5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:26:04 +0200
Subject: [PATCH 03/20] Rename SdkTasks to sdk-tasks

Rename the SdkTasks folder to sdk-tasks for consistent kebab-case
naming. Update all references in tools.ps1, tools.sh, sdk-task.ps1,
sdk-task.sh, and the Arcade SDK csproj.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/common/sdk-task.ps1                       |  2 +-
 eng/common/sdk-task.sh                        |  2 +-
 eng/common/tools.ps1                          | 12 +++++------
 eng/common/tools.sh                           | 20 +++++++++----------
 .../Microsoft.DotNet.Arcade.Sdk.csproj        |  4 ++--
 .../{SdkTasks => sdk-tasks}/AfterSigning.proj |  0
 .../AfterSolutionBuild.proj                   |  0
 .../{SdkTasks => sdk-tasks}/Build.proj        |  0
 .../BuildReleasePackages.targets              |  0
 .../CreateBaselineUpdatePR.proj               |  0
 .../Directory.Build.props                     |  0
 .../Directory.Build.targets                   |  0
 .../Directory.Packages.props                  |  0
 .../InstallDotNetCore.targets                 |  0
 .../{SdkTasks => sdk-tasks}/Publish.proj      |  0
 .../PublishArtifactsInManifest.proj           |  0
 .../PublishBuildAssets.proj                   |  0
 .../PublishSignedAssets.proj                  |  0
 .../PublishToSymbolServers.proj               |  0
 .../{SdkTasks => sdk-tasks}/Sign.proj         |  0
 .../{SdkTasks => sdk-tasks}/Sign.props        |  0
 .../SigningValidation.proj                    |  0
 .../{SdkTasks => sdk-tasks}/Tools.proj        |  0
 .../TrackPrebuiltUsage.targets                |  0
 .../{SdkTasks => sdk-tasks}/Versions.props    |  0
 ...sualStudio.AcquireOptimizationData.targets |  0
 ...isualStudio.BuildIbcTrainingInputs.targets |  0
 ...VisualStudio.BuildIbcTrainingSettings.proj |  0
 .../VisualStudio.IbcTraining.runsettings      |  0
 .../VisualStudio.InsertionManifests.targets   |  0
 .../VisualStudio.SetupPackage.vsmanproj       |  0
 31 files changed, 20 insertions(+), 20 deletions(-)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/AfterSigning.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/AfterSolutionBuild.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Build.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/BuildReleasePackages.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/CreateBaselineUpdatePR.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Directory.Build.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Directory.Build.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Directory.Packages.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/InstallDotNetCore.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Publish.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/PublishArtifactsInManifest.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/PublishBuildAssets.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/PublishSignedAssets.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/PublishToSymbolServers.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Sign.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Sign.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/SigningValidation.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Tools.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/TrackPrebuiltUsage.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/Versions.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/VisualStudio.AcquireOptimizationData.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/VisualStudio.BuildIbcTrainingInputs.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/VisualStudio.BuildIbcTrainingSettings.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/VisualStudio.IbcTraining.runsettings (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/VisualStudio.InsertionManifests.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{SdkTasks => sdk-tasks}/VisualStudio.SetupPackage.vsmanproj (100%)

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 538f7d001ea..0c58931e0ca 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -22,7 +22,7 @@ $warnAsError = if ($noWarnAsError) { $false } else { $true }
 
 function Print-Usage() {
   Write-Host "Common settings:"
-  Write-Host "  -task <value>           Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
+  Write-Host "  -task <value>           Name of Arcade task (name of a project in sdk-tasks directory of the Arcade SDK package)"
   Write-Host "  -restore                Restore dependencies"
   Write-Host "  -verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
   Write-Host "  -help                   Print help and exit"
diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh
index 3270f83fa9a..13423ad146e 100755
--- a/eng/common/sdk-task.sh
+++ b/eng/common/sdk-task.sh
@@ -2,7 +2,7 @@
 
 show_usage() {
     echo "Common settings:"
-    echo "  --task <value>           Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)"
+    echo "  --task <value>           Name of Arcade task (name of a project in sdk-tasks directory of the Arcade SDK package)"
     echo "  --restore                Restore dependencies"
     echo "  --verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
     echo "  --help                   Print help and exit"
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 435de93f43c..23d78685d4e 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -610,7 +610,7 @@ function GetNuGetPackageCachePath() {
 
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject([string]$taskName) {
-  return Join-Path (Split-Path (InitializeToolset) -Parent) "SdkTasks\$taskName.proj"
+  return Join-Path (Split-Path (InitializeToolset) -Parent) "sdk-tasks\$taskName.proj"
 }
 
 function InitializeNativeTools() {
@@ -651,13 +651,13 @@ function InitializeToolset() {
 
   # Check if the toolset has already been extracted
   $toolsetBuildProj = $null
-  $newPath = Join-Path $toolsetToolsDir 'SdkTasks\Build.proj'
+  $newPath = Join-Path $toolsetToolsDir 'sdk-tasks\Build.proj'
   $oldPath = Join-Path $toolsetToolsDir 'Build.proj'
 
   if (Test-Path $newPath) {
     $toolsetBuildProj = $newPath
   } elseif (Test-Path $oldPath) {
-    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
     $toolsetBuildProj = $oldPath
   }
 
@@ -683,8 +683,8 @@ function InitializeToolset() {
   New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null
   Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
 
-  # Copy SdkTasks if present at the package root (new layout)
-  $packageSdkTasksDir = Join-Path $packageDir 'SdkTasks'
+  # Copy sdk-tasks if present at the package root (new layout)
+  $packageSdkTasksDir = Join-Path $packageDir 'sdk-tasks'
   if (Test-Path $packageSdkTasksDir) {
     Copy-Item -Path $packageSdkTasksDir -Destination $toolsetToolsDir -Recurse -Force
   }
@@ -692,7 +692,7 @@ function InitializeToolset() {
   if (Test-Path $newPath) {
     $toolsetBuildProj = $newPath
   } elseif (Test-Path $oldPath) {
-    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
     $toolsetBuildProj = $oldPath
   } else {
     throw "Unable to find Build.proj in toolset at: $toolsetToolsDir"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 40229d009e3..b752080e411 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -411,10 +411,10 @@ function InitializeToolset {
 
   # Check if the toolset has already been extracted
   local toolset_build_proj=""
-  if [[ -a "$toolset_tools_dir/SdkTasks/Build.proj" ]]; then
-    toolset_build_proj="$toolset_tools_dir/SdkTasks/Build.proj"
+  if [[ -a "$toolset_tools_dir/sdk-tasks/Build.proj" ]]; then
+    toolset_build_proj="$toolset_tools_dir/sdk-tasks/Build.proj"
   elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
-    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
     toolset_build_proj="$toolset_tools_dir/Build.proj"
   fi
 
@@ -441,15 +441,15 @@ function InitializeToolset {
   mkdir -p "$toolset_tools_dir"
   cp -r "$package_dir/tools/." "$toolset_tools_dir"
 
-  # Copy SdkTasks if present at the package root (new layout)
-  if [[ -d "$package_dir/SdkTasks" ]]; then
-    cp -r "$package_dir/SdkTasks" "$toolset_tools_dir/"
+  # Copy sdk-tasks if present at the package root (new layout)
+  if [[ -d "$package_dir/sdk-tasks" ]]; then
+    cp -r "$package_dir/sdk-tasks" "$toolset_tools_dir/"
   fi
 
-  if [[ -a "$toolset_tools_dir/SdkTasks/Build.proj" ]]; then
-    toolset_build_proj="$toolset_tools_dir/SdkTasks/Build.proj"
+  if [[ -a "$toolset_tools_dir/sdk-tasks/Build.proj" ]]; then
+    toolset_build_proj="$toolset_tools_dir/sdk-tasks/Build.proj"
   elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
-    # TODO: Remove this fallback once Build.proj has been moved to SdkTasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
     toolset_build_proj="$toolset_tools_dir/Build.proj"
   else
     Write-PipelineTelemetryError -category 'Build' "Unable to find Build.proj in toolset at: $toolset_tools_dir"
@@ -592,7 +592,7 @@ function GetDarc {
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject {
   taskName=$1
-  echo "$(dirname $_InitializeToolset)/SdkTasks/$taskName.proj"
+  echo "$(dirname $_InitializeToolset)/sdk-tasks/$taskName.proj"
 }
 
 ResolvePath "${BASH_SOURCE[0]}"
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
index fd5b10b516b..99dc80a23ac 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
@@ -40,9 +40,9 @@
     <None Include="$(_GeneratedVersionFilePath)"
           Pack="true"
           PackagePath="tools\DefaultVersions.Generated.props" />
-    <None Include="SdkTasks/**/*.*"
+    <None Include="sdk-tasks/**/*.*"
           Pack="true"
-          PackagePath="SdkTasks/%(RecursiveDir)%(Filename)%(Extension)" />
+          PackagePath="sdk-tasks/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSigning.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSigning.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSigning.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSigning.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSolutionBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSolutionBuild.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/AfterSolutionBuild.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSolutionBuild.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Build.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Build.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Build.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/BuildReleasePackages.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/BuildReleasePackages.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/BuildReleasePackages.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/CreateBaselineUpdatePR.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/CreateBaselineUpdatePR.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/CreateBaselineUpdatePR.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/CreateBaselineUpdatePR.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.props
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Build.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Packages.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Packages.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Directory.Packages.props
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Packages.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/InstallDotNetCore.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/InstallDotNetCore.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/InstallDotNetCore.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Publish.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Publish.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Publish.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishArtifactsInManifest.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishArtifactsInManifest.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishArtifactsInManifest.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishBuildAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishBuildAssets.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishBuildAssets.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishBuildAssets.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishSignedAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishSignedAssets.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishSignedAssets.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishSignedAssets.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishToSymbolServers.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishToSymbolServers.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/PublishToSymbolServers.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishToSymbolServers.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Sign.props
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/SigningValidation.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/SigningValidation.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/SigningValidation.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/SigningValidation.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Tools.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Tools.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Tools.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/TrackPrebuiltUsage.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/TrackPrebuiltUsage.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/TrackPrebuiltUsage.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/TrackPrebuiltUsage.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Versions.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Versions.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/Versions.props
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Versions.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.AcquireOptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.AcquireOptimizationData.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.AcquireOptimizationData.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.AcquireOptimizationData.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingInputs.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingInputs.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingInputs.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingSettings.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.BuildIbcTrainingSettings.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingSettings.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.IbcTraining.runsettings b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.IbcTraining.runsettings
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.IbcTraining.runsettings
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.IbcTraining.runsettings
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.InsertionManifests.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.InsertionManifests.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.InsertionManifests.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.SetupPackage.vsmanproj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/SdkTasks/VisualStudio.SetupPackage.vsmanproj
rename to src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.SetupPackage.vsmanproj

From 085ed6ce5482912ee0ff40a169a772ca4ffd6b4b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:38:10 +0200
Subject: [PATCH 04/20] Rename sdk-tasks to toolset

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/common/sdk-task.ps1                       |  2 +-
 eng/common/sdk-task.sh                        |  2 +-
 eng/common/tools.ps1                          | 12 +++++------
 eng/common/tools.sh                           | 20 +++++++++----------
 .../Microsoft.DotNet.Arcade.Sdk.csproj        |  4 ++--
 .../{sdk-tasks => toolset}/AfterSigning.proj  |  0
 .../AfterSolutionBuild.proj                   |  0
 .../{sdk-tasks => toolset}/Build.proj         |  0
 .../BuildReleasePackages.targets              |  0
 .../CreateBaselineUpdatePR.proj               |  0
 .../Directory.Build.props                     |  0
 .../Directory.Build.targets                   |  0
 .../Directory.Packages.props                  |  0
 .../InstallDotNetCore.targets                 |  0
 .../{sdk-tasks => toolset}/Publish.proj       |  0
 .../PublishArtifactsInManifest.proj           |  0
 .../PublishBuildAssets.proj                   |  0
 .../PublishSignedAssets.proj                  |  0
 .../PublishToSymbolServers.proj               |  0
 .../{sdk-tasks => toolset}/Sign.proj          |  0
 .../{sdk-tasks => toolset}/Sign.props         |  0
 .../SigningValidation.proj                    |  0
 .../{sdk-tasks => toolset}/Tools.proj         |  0
 .../TrackPrebuiltUsage.targets                |  0
 .../{sdk-tasks => toolset}/Versions.props     |  0
 ...sualStudio.AcquireOptimizationData.targets |  0
 ...isualStudio.BuildIbcTrainingInputs.targets |  0
 ...VisualStudio.BuildIbcTrainingSettings.proj |  0
 .../VisualStudio.IbcTraining.runsettings      |  0
 .../VisualStudio.InsertionManifests.targets   |  0
 .../VisualStudio.SetupPackage.vsmanproj       |  0
 31 files changed, 20 insertions(+), 20 deletions(-)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/AfterSigning.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/AfterSolutionBuild.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Build.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/BuildReleasePackages.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/CreateBaselineUpdatePR.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Directory.Build.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Directory.Build.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Directory.Packages.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/InstallDotNetCore.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Publish.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/PublishArtifactsInManifest.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/PublishBuildAssets.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/PublishSignedAssets.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/PublishToSymbolServers.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Sign.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Sign.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/SigningValidation.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Tools.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/TrackPrebuiltUsage.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/Versions.props (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/VisualStudio.AcquireOptimizationData.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/VisualStudio.BuildIbcTrainingInputs.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/VisualStudio.BuildIbcTrainingSettings.proj (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/VisualStudio.IbcTraining.runsettings (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/VisualStudio.InsertionManifests.targets (100%)
 rename src/Microsoft.DotNet.Arcade.Sdk/{sdk-tasks => toolset}/VisualStudio.SetupPackage.vsmanproj (100%)

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 0c58931e0ca..a8af86844cc 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -22,7 +22,7 @@ $warnAsError = if ($noWarnAsError) { $false } else { $true }
 
 function Print-Usage() {
   Write-Host "Common settings:"
-  Write-Host "  -task <value>           Name of Arcade task (name of a project in sdk-tasks directory of the Arcade SDK package)"
+  Write-Host "  -task <value>           Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)"
   Write-Host "  -restore                Restore dependencies"
   Write-Host "  -verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
   Write-Host "  -help                   Print help and exit"
diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh
index 13423ad146e..1cf71bb2aea 100755
--- a/eng/common/sdk-task.sh
+++ b/eng/common/sdk-task.sh
@@ -2,7 +2,7 @@
 
 show_usage() {
     echo "Common settings:"
-    echo "  --task <value>           Name of Arcade task (name of a project in sdk-tasks directory of the Arcade SDK package)"
+    echo "  --task <value>           Name of Arcade task (name of a project in toolset directory of the Arcade SDK package)"
     echo "  --restore                Restore dependencies"
     echo "  --verbosity <value>      Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
     echo "  --help                   Print help and exit"
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 23d78685d4e..89290dad916 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -610,7 +610,7 @@ function GetNuGetPackageCachePath() {
 
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject([string]$taskName) {
-  return Join-Path (Split-Path (InitializeToolset) -Parent) "sdk-tasks\$taskName.proj"
+  return Join-Path (Split-Path (InitializeToolset) -Parent) "toolset\$taskName.proj"
 }
 
 function InitializeNativeTools() {
@@ -651,13 +651,13 @@ function InitializeToolset() {
 
   # Check if the toolset has already been extracted
   $toolsetBuildProj = $null
-  $newPath = Join-Path $toolsetToolsDir 'sdk-tasks\Build.proj'
+  $newPath = Join-Path $toolsetToolsDir 'toolset\Build.proj'
   $oldPath = Join-Path $toolsetToolsDir 'Build.proj'
 
   if (Test-Path $newPath) {
     $toolsetBuildProj = $newPath
   } elseif (Test-Path $oldPath) {
-    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
     $toolsetBuildProj = $oldPath
   }
 
@@ -683,8 +683,8 @@ function InitializeToolset() {
   New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null
   Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
 
-  # Copy sdk-tasks if present at the package root (new layout)
-  $packageSdkTasksDir = Join-Path $packageDir 'sdk-tasks'
+  # Copy toolset if present at the package root (new layout)
+  $packageSdkTasksDir = Join-Path $packageDir 'toolset'
   if (Test-Path $packageSdkTasksDir) {
     Copy-Item -Path $packageSdkTasksDir -Destination $toolsetToolsDir -Recurse -Force
   }
@@ -692,7 +692,7 @@ function InitializeToolset() {
   if (Test-Path $newPath) {
     $toolsetBuildProj = $newPath
   } elseif (Test-Path $oldPath) {
-    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
     $toolsetBuildProj = $oldPath
   } else {
     throw "Unable to find Build.proj in toolset at: $toolsetToolsDir"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index b752080e411..41b886b222d 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -411,10 +411,10 @@ function InitializeToolset {
 
   # Check if the toolset has already been extracted
   local toolset_build_proj=""
-  if [[ -a "$toolset_tools_dir/sdk-tasks/Build.proj" ]]; then
-    toolset_build_proj="$toolset_tools_dir/sdk-tasks/Build.proj"
+  if [[ -a "$toolset_tools_dir/toolset/Build.proj" ]]; then
+    toolset_build_proj="$toolset_tools_dir/toolset/Build.proj"
   elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
-    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
     toolset_build_proj="$toolset_tools_dir/Build.proj"
   fi
 
@@ -441,15 +441,15 @@ function InitializeToolset {
   mkdir -p "$toolset_tools_dir"
   cp -r "$package_dir/tools/." "$toolset_tools_dir"
 
-  # Copy sdk-tasks if present at the package root (new layout)
-  if [[ -d "$package_dir/sdk-tasks" ]]; then
-    cp -r "$package_dir/sdk-tasks" "$toolset_tools_dir/"
+  # Copy toolset if present at the package root (new layout)
+  if [[ -d "$package_dir/toolset" ]]; then
+    cp -r "$package_dir/toolset" "$toolset_tools_dir/"
   fi
 
-  if [[ -a "$toolset_tools_dir/sdk-tasks/Build.proj" ]]; then
-    toolset_build_proj="$toolset_tools_dir/sdk-tasks/Build.proj"
+  if [[ -a "$toolset_tools_dir/toolset/Build.proj" ]]; then
+    toolset_build_proj="$toolset_tools_dir/toolset/Build.proj"
   elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
-    # TODO: Remove this fallback once Build.proj has been moved to sdk-tasks in all supported versions.
+    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
     toolset_build_proj="$toolset_tools_dir/Build.proj"
   else
     Write-PipelineTelemetryError -category 'Build' "Unable to find Build.proj in toolset at: $toolset_tools_dir"
@@ -592,7 +592,7 @@ function GetDarc {
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject {
   taskName=$1
-  echo "$(dirname $_InitializeToolset)/sdk-tasks/$taskName.proj"
+  echo "$(dirname $_InitializeToolset)/toolset/$taskName.proj"
 }
 
 ResolvePath "${BASH_SOURCE[0]}"
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
index 99dc80a23ac..723615e8e1a 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
@@ -40,9 +40,9 @@
     <None Include="$(_GeneratedVersionFilePath)"
           Pack="true"
           PackagePath="tools\DefaultVersions.Generated.props" />
-    <None Include="sdk-tasks/**/*.*"
+    <None Include="toolset/**/*.*"
           Pack="true"
-          PackagePath="sdk-tasks/%(RecursiveDir)%(Filename)%(Extension)" />
+          PackagePath="toolset/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSigning.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/AfterSigning.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSigning.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/AfterSigning.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSolutionBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/AfterSolutionBuild.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/AfterSolutionBuild.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/AfterSolutionBuild.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Build.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/BuildReleasePackages.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/BuildReleasePackages.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/BuildReleasePackages.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/CreateBaselineUpdatePR.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/CreateBaselineUpdatePR.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/CreateBaselineUpdatePR.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/CreateBaselineUpdatePR.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.props
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Build.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Packages.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Packages.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Directory.Packages.props
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Packages.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/InstallDotNetCore.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/InstallDotNetCore.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/InstallDotNetCore.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Publish.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Publish.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Publish.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishArtifactsInManifest.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishArtifactsInManifest.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishArtifactsInManifest.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishBuildAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishBuildAssets.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishBuildAssets.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishBuildAssets.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishSignedAssets.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishSignedAssets.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishSignedAssets.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishSignedAssets.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishToSymbolServers.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishToSymbolServers.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/PublishToSymbolServers.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/PublishToSymbolServers.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Sign.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Sign.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Sign.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Sign.props
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Sign.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/SigningValidation.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/SigningValidation.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/SigningValidation.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/SigningValidation.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Tools.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/TrackPrebuiltUsage.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/TrackPrebuiltUsage.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/TrackPrebuiltUsage.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/TrackPrebuiltUsage.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Versions.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Versions.props
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/Versions.props
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/Versions.props
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.AcquireOptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.AcquireOptimizationData.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.AcquireOptimizationData.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.AcquireOptimizationData.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingInputs.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.BuildIbcTrainingInputs.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingInputs.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.BuildIbcTrainingInputs.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingSettings.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.BuildIbcTrainingSettings.proj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.BuildIbcTrainingSettings.proj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.BuildIbcTrainingSettings.proj
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.IbcTraining.runsettings b/src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.IbcTraining.runsettings
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.IbcTraining.runsettings
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.IbcTraining.runsettings
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.InsertionManifests.targets
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.InsertionManifests.targets
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.InsertionManifests.targets
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.SetupPackage.vsmanproj
similarity index 100%
rename from src/Microsoft.DotNet.Arcade.Sdk/sdk-tasks/VisualStudio.SetupPackage.vsmanproj
rename to src/Microsoft.DotNet.Arcade.Sdk/toolset/VisualStudio.SetupPackage.vsmanproj

From 22f2a43df743285b0c867c02ecd191e21d73e318 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:47:06 +0200
Subject: [PATCH 05/20] Remove duplicate files from tools/ that exist in
 toolset/

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../tools/AfterSigning.proj                   |  60 ---
 .../tools/AfterSolutionBuild.proj             |  25 -
 .../tools/Build.proj                          | 312 ------------
 .../tools/BuildReleasePackages.targets        |  27 --
 .../tools/Directory.Build.props               |  11 -
 .../tools/InstallDotNetCore.targets           |  26 -
 .../tools/Publish.proj                        | 456 ------------------
 .../tools/Sign.proj                           | 102 ----
 .../tools/Sign.props                          | 158 ------
 .../tools/Tools.proj                          | 115 -----
 .../tools/TrackPrebuiltUsage.targets          |  46 --
 ...sualStudio.AcquireOptimizationData.targets |  86 ----
 ...isualStudio.BuildIbcTrainingInputs.targets |  30 --
 .../VisualStudio.InsertionManifests.targets   |  49 --
 .../tools/VisualStudio.SetupPackage.vsmanproj | 129 -----
 15 files changed, 1632 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSigning.proj
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSolutionBuild.proj
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Directory.Build.props
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/TrackPrebuiltUsage.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.AcquireOptimizationData.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.BuildIbcTrainingInputs.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSigning.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSigning.proj
deleted file mode 100644
index be73c83cef3..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSigning.proj
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <PropertyGroup>
-    <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
-  </PropertyGroup>
-
-  <Import Project="BuildStep.props" />
-
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="Clean" />
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      BeforeBuild;
-      CoreBuild;
-      AfterBuild
-    </BuildDependsOn>
-  </PropertyGroup>
-  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
-  <Target Name="BeforeBuild"/>
-  <Target Name="CoreBuild"/>
-  <Target Name="AfterBuild"/>
-  
-  <Target Name="Test" />
-  
-  <PropertyGroup>
-    <PackDependsOn>
-      BeforePack;
-      CorePack;
-      AfterPack
-    </PackDependsOn>
-  </PropertyGroup>
-  <Target Name="Pack" DependsOnTargets="$(PackDependsOn)" />
-  <Target Name="BeforePack"/>
-  <Target Name="CorePack"/>
-  <Target Name="AfterPack"/>
-  
-  <Target Name="IntegrationTest" />
-  <Target Name="PerformanceTest" />
-
-  <!--
-    Since multiple projects may contribute to a single insertion component
-    we need to package them in a separate phase.
-
-    Insertion manifests (vsman files) contain hashes of the referenced VSIXes.
-    These need to be calculated using signed VSIXes.
-    Hence we need to run this task after signing.
-  -->
-  <Import Project="VisualStudio.InsertionManifests.targets" Condition="'$(UsingToolVSSDK)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'" />
-
-  <!-- 
-    Generate IBC training inputs for VS insertion components.
-  -->
-  <Import Project="VisualStudio.BuildIbcTrainingInputs.targets" Condition="'$(UsingToolVSSDK)' == 'true' and '$(UsingToolVisualStudioIbcTraining)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'" />
-
-  <!-- Repository extension point -->
-  <Import Project="$(RepositoryEngineeringDir)AfterSigning.targets" Condition="Exists('$(RepositoryEngineeringDir)AfterSigning.targets')"/>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSolutionBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSolutionBuild.proj
deleted file mode 100644
index 905457b6663..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/AfterSolutionBuild.proj
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <PropertyGroup>
-    <!-- Disable target framework filtering for top level projects -->
-    <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
-  </PropertyGroup>
-
-  <Import Project="BuildStep.props" />
-
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="Clean" />
-  <Target Name="Build" />
-  <Target Name="Test" />
-  <Target Name="Pack" />
-  <Target Name="IntegrationTest" />
-  <Target Name="PerformanceTest" />
-
-  <Import Project="BuildReleasePackages.targets" Condition="'$(UsingToolNuGetRepack)' == 'true'" />
-  <Import Project="TrackPrebuiltUsage.targets" Condition="'$(TrackPrebuiltUsage)' == 'true'" />
-
-  <!-- Repository extension point -->
-  <Import Project="$(RepositoryEngineeringDir)AfterSolutionBuild.targets" Condition="Exists('$(RepositoryEngineeringDir)AfterSolutionBuild.targets')"/>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
deleted file mode 100644
index 802e0962075..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
+++ /dev/null
@@ -1,312 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Execute">
-
-  <!--
-
-  Required parameters:
-    RepoRoot                        Repository root.
-    Projects                        List of projects to build. Semicolon separated, may include globs.
-
-  Optional parameters:
-    Configuration                   Build configuration: "Debug", "Release", etc.
-
-    DotNetBuild                     Build the repo as part of the entire .NET stack.
-    DotNetBuildFromVMR              Identifies that the the repo is built from within the VMR.
-    DotNetBuildPass                 While building the repo as part of the entire .NET stack, this parameter specifies which build pass the current build is part of.
-    DotNetBuildSourceOnly           Build the repo as as part of the .NET stack in source-only mode, with no external dependencies.
-    DotNetSymbolServerTokenMsdl     Personal access token for MSDL symbol server. Available from variable group DotNet-Symbol-Server-Pats.
-    DotNetSymbolServerTokenSymWeb   Personal access token for SymWeb symbol server. Available from variable group DotNet-Symbol-Server-Pats.
-    DotNetSymbolExpirationInDays    Symbol expiration time in days (defaults to 10 years).
-    DotNetSignType                  Specifies the signing type: 'real' (default), 'test'.
-    DotNetRuntimeSourceFeed         Storage account to lookup for the .Net runtime files
-    DotNetRuntimeSourceFeedKey      In case the storage account to fetch the .Net runtime files are private this should contain a SAS token.
-
-    ContinuousIntegrationBuild      "true" when building on a CI server (PR build or official build)
-    Restore                         "true" to restore toolset and solution
-    Build                           "true" to build solution
-    Rebuild                         "true" to rebuild solution
-    Deploy                          "true" to deploy assets (e.g. VSIXes)
-    Test                            "true" to run tests
-    IntegrationTest                 "true" to run integration tests
-    PerformanceTest                 "true" to run performance tests
-    Pack                            "true" to build NuGet packages and VS insertion manifests
-    Sign                            "true" to sign built binaries
-    Publish                         "true" to publish artifacts (e.g. symbols)
-  -->
-
-  <PropertyGroup>
-    <_OriginalProjectsValue>$(Projects)</_OriginalProjectsValue>
-    <!-- Disable target framework filtering for top level projects -->
-    <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ProjectToBuild>
-      <BuildStep>1</BuildStep>
-      <RestoreInParallel>true</RestoreInParallel>
-      <BuildInParallel>true</BuildInParallel>
-      <DotNetBuildPass>1</DotNetBuildPass>
-    </ProjectToBuild>
-  </ItemDefinitionGroup>
-
-  <Import Project="RepoDefaults.props"/>
-  <Import Project="RepoLayout.props"/>
-
-  <!-- Allow for repo specific Build properties such as the list of Projects to build -->
-  <Import Project="$(RepositoryEngineeringDir)Build.props" Condition="Exists('$(RepositoryEngineeringDir)Build.props')" />
-
-  <PropertyGroup>
-    <_ProjectsPropertyWasUpdatedInBuildProps Condition="'$(_OriginalProjectsValue)' != '$(Projects)'">true</_ProjectsPropertyWasUpdatedInBuildProps>
-    <!-- An empty DotNetBuildPass refers to the 1st build pass. -->
-    <_DotNetBuildPassNormalized Condition="'$(DotNetBuildPass)' != ''">$(DotNetBuildPass)</_DotNetBuildPassNormalized>
-    <_DotNetBuildPassNormalized Condition="'$(DotNetBuildPass)' == ''">1</_DotNetBuildPassNormalized>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(Projects)' != ''">
-    <!-- Copy the original list so we can log diagnostics later. -->
-    <_OriginalProjectToBuild Include="@(ProjectToBuild)" />
-    <!-- Setting 'Projects' overrides the ProjectToBuild list. -->
-    <ProjectToBuild Remove="@(ProjectToBuild)" />
-    <ProjectToBuild Include="$(Projects)" />
-    <ProjectToBuild Update="@(ProjectToBuild)" Condition="'$(_DotNetBuildPassNormalized)' != ''" DotNetBuildPass="$(_DotNetBuildPassNormalized)" />
-  </ItemGroup>
-
-  <!--
-    Filter out projects that are part of a different build pass in the inner build when doing a unified build.
-    Don't do this filtering in non-unified builds to allow repos to define how different build passes are handled
-    in their own repo-specific builds.
-  -->
-  <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
-    <_ProjectToBuildCurrentBuildPass Include="@(ProjectToBuild->WithMetadataValue('DotNetBuildPass', '$(_DotNetBuildPassNormalized)'))" />
-    <ProjectToBuild Remove="@(ProjectToBuild)" />
-    <ProjectToBuild Include="@(_ProjectToBuildCurrentBuildPass)" />
-  </ItemGroup>
-
-  <!--
-    Default values.
-    If Projects is unspecified and ProjectToBuild was not set via Build.props, fallback to building .sln(x) files in the repo root.
-    For build passes after the first, build nothing by default.
-  -->
-  <ItemGroup>
-    <RepoRootSlnFile Include="$(RepoRoot)*.sln" />
-    <RepoRootSlnxFile Include="$(RepoRoot)*.slnx" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'@(ProjectToBuild)' == '' and '$(_DotNetBuildPassNormalized)' == '1'">
-    <ProjectToBuild Include="@(RepoRootSlnFile)" />
-    <ProjectToBuild Include="@(RepoRootSlnxFile)" Condition="'@(ProjectToBuild)' == ''"/>
-  </ItemGroup>
-
-  <Target Name="InitializeSolutionBuildInputs">
-    <ItemGroup>
-      <_SolutionBuildTargets Include="Rebuild" Condition="'$(Rebuild)' == 'true'" />
-      <_SolutionBuildTargets Include="Build" Condition="'$(Build)' == 'true' and '$(Rebuild)' != 'true'" />
-      <!-- Deploy target is set up to chain after Build so that F5 in VS works. -->
-      <_SolutionBuildTargets Include="Test" Condition="'$(Test)' == 'true'" />
-      <!-- Pack before running integration and performance tests so that these tests can test packages produced by the repo. -->
-      <_SolutionBuildTargets Include="Pack" Condition="'$(Pack)' == 'true'" />
-      <_SolutionBuildTargets Include="IntegrationTest" Condition="'$(IntegrationTest)' == 'true'" />
-      <_SolutionBuildTargets Include="PerformanceTest" Condition="'$(PerformanceTest)' == 'true'" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_RemoveProps>Projects;Restore;Deploy;Sign;Publish;NETCORE_ENGINEERING_TELEMETRY;@(_SolutionBuildTargets)</_RemoveProps>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_CommonProps Include="Configuration=$(Configuration)"/>
-      <_CommonProps Include="ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)"/>
-      <_CommonProps Include="RepoRoot=$(RepoRoot)"/>
-      <_CommonProps Include="VersionsPropsPath=$(VersionsPropsPath)"/>
-
-      <!--
-        In .NET product build mode, some projects may have set ExcludeFromSourceOnlyBuild or ExcludeFromDotNetBuild to true.
-        NuGet Restore task reports a warning for such projects, which we suppress here.
-      -->
-      <_CommonProps Include="DisableWarnForInvalidRestoreProjects=true" Condition="'$(DotNetBuild)' == 'true'"/>
-
-      <!--
-        C++ projects expect VCTargetsPath property to be set. MSBuild generates this property to solution
-        metaproject when solution is build directly, but doesn't do so when the solution is built using MSBuild task.
-      -->
-      <_CommonProps Include="VCTargetsPath=$([MSBuild]::ValueOrDefault('$(VCTargetsPath)', '$([MSBuild]::GetVsInstallRoot())\Common7\IDE\VC\VCTargets\'))" Condition="'$(MSBuildRuntimeType)' != 'Core'"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <_SolutionBuildProps Include="@(_CommonProps)"/>
-      <_SolutionBuildProps Include="__DeployProjectOutput=$(Deploy)" Condition="'$(Deploy)' != ''"/>
-      <_SolutionBuildProps Include="__ImportPackTargets=true" Condition="'$(Pack)' == 'true'" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="Execute" DependsOnTargets="InitializeSolutionBuildInputs">
-    <Error Text="Both .sln and .slnx files found. Please specify one to use in the eng/Build.props file." Condition="'@(RepoRootSlnFile)' != '' and '@(RepoRootSlnxFile)' != ''" />
-    <Error Text="No projects were found to build. Either the 'Projects' property or 'ProjectToBuild' item group must be specified." Condition="'@(ProjectToBuild)' == ''"/>
-    <Error Text="Property 'RepoRoot' must be specified" Condition="'$(RepoRoot)' == ''"/>
-    <Error Text="File 'global.json' must exist in directory specified by RepoRoot: '$(RepoRoot)'" Condition="'$(RepoRoot)' != '' and !Exists('$(RepoRoot)global.json')"/>
-
-    <PropertyGroup>
-      <!-- 'IsRunningFromVisualStudio' may be true even when running msbuild.exe from command line. This generally means that MSBuild is from a Visual Studio installation and therefore we need to find NuGet.targets in a different location. -->
-      <_NuGetRestoreTargets Condition="Exists('$(MSBuildToolsPath)\NuGet.targets')" >$(MSBuildToolsPath)\NuGet.targets</_NuGetRestoreTargets>
-      <_NuGetRestoreTargets Condition="'$([MSBuild]::IsRunningFromVisualStudio())' == 'true' And Exists('$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets')">$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</_NuGetRestoreTargets>
-    </PropertyGroup>
-
-    <ItemGroup Condition="'$(Restore)' == 'true'">
-      <_RestoreToolsProps Include="@(_CommonProps)"/>
-      <_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/>
-      <_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/>
-      <_RestoreToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/>
-
-      <!-- Used in the SDK (Tools.proj) to control whether Build.Tasks.Feed will be restored or not. -->
-      <_RestoreToolsProps Include="Publish=$(Publish)"/>
-    </ItemGroup>
-
-    <!--
-      Builds from the 'internal' project, and only those, can download the .net Runtime
-      from a private location.
-    -->
-    <ItemGroup Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
-      <_RestoreToolsProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/>
-      <_RestoreToolsProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/>
-    </ItemGroup>
-
-    <!--
-      Restore built-in tools.
-    -->
-    <MSBuild Projects="Tools.proj"
-             Targets="Restore"
-             Properties="@(_RestoreToolsProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
-             Condition="'$(Restore)' == 'true'"/>
-
-    <!--
-      Restore solutions and projects.
-
-      Run solution restore separately from the other targets, in a different build phase.
-      Since restore brings in new .props and .targets files we need to rerun evaluation.
-
-      Workarounds:
-      - Invoke restore using NuGet.targets directly (see https://github.com/NuGet/Home/issues/7648).
-        This avoids duplicate calls to RestoreTask and race conditions on writing restore results to disk.
-
-      - msbuild caches the metaproject for the solution (see https://github.com/Microsoft/msbuild/issues/1695)
-        We invalidate the cache by changing the value of __BuildPhase property.
-    -->
-
-    <ItemGroup>
-      <_SolutionRestoreProps Include="@(_SolutionBuildProps)" />
-      <_SolutionRestoreProps Include="__BuildPhase=SolutionRestore" />
-      <_SolutionRestoreProps Include="_NETCORE_ENGINEERING_TELEMETRY=Restore" />
-      <_SolutionRestoreProps Include="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
-      <_SolutionRestoreProps Include="RestoreUseStaticGraphEvaluation=$(RestoreUseStaticGraphEvaluation)" />
-      <_SolutionRestoreProps Include="RestoreEmbedFilesInBinlog=true" />
-      <_SolutionRestoreProps Include="RestoreStaticGraphEnableBinaryLogger=$(GenerateRestoreUseStaticGraphEvaluationBinlog)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <!-- This can be set to false as an optimization for repos that don't use NuGet. -->
-      <RestoreUsingNuGetTargets Condition="'$(RestoreUsingNuGetTargets)' == ''">true</RestoreUsingNuGetTargets>
-    </PropertyGroup>
-
-    <!--
-      Detect which projects support restoring with NuGet targets.
-      As a perf optimization, the Properties list here should match exactly with
-      the properties passed to the "Restore" target a few lines below.
-      This helps MSBuild cache the result of _IsProjectRestoreSupported.
-      No need to call into the nuget internal target when restoring using
-      the new msbuild static graph APIs (RestoreUseStaticGraphEvaluation=true).
-    -->
-    <MSBuild Projects="@(ProjectToBuild)"
-             Properties="@(_SolutionRestoreProps)"
-             RemoveProperties="$(_RemoveProps)"
-             Targets="_IsProjectRestoreSupported"
-             SkipNonexistentTargets="true"
-             BuildInParallel="true"
-             Condition="'$(RestoreUsingNuGetTargets)' != 'false' and '%(ProjectToBuild.Extension)' != '.sln' and '%(ProjectToBuild.Extension)' != '.slnf' and '%(ProjectToBuild.Extension)' != '.slnx' and '$(RestoreUseStaticGraphEvaluation)' != 'true' and '$(Restore)' == 'true'">
-
-      <Output TaskParameter="TargetOutputs" ItemName="_ProjectToRestoreWithNuGet" />
-    </MSBuild>
-
-    <PropertyGroup>
-      <!-- Normalize paths to avoid false warnings by NuGet about missing project references. -->
-      <_ProjectToRestoreWithNuGetList>@(_ProjectToRestoreWithNuGet->'%(FullPath)')</_ProjectToRestoreWithNuGetList>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_ProjectToRestore Include="$(_NuGetRestoreTargets)" Condition="'$(_ProjectToRestoreWithNuGetList)' != '' and '$(RestoreUsingNuGetTargets)' != 'false'">
-        <AdditionalProperties>RestoreGraphProjectInput=$(_ProjectToRestoreWithNuGetList)</AdditionalProperties>
-        <RestoreInParallel>true</RestoreInParallel>
-      </_ProjectToRestore>
-
-      <!-- Invoke the 'Restore' target on solutions and projects which do not support NuGet. -->
-      <_ProjectToRestore Include="@(ProjectToBuild)" Exclude="@(_ProjectToRestoreWithNuGet)" />
-    </ItemGroup>
-
-    <!-- Enable binlog generation during static graph restore evaluation -->
-    <ItemGroup Condition="'$(GenerateRestoreUseStaticGraphEvaluationBinlog)' == 'true'">
-      <_ProjectToRestore>
-        <AdditionalProperties>RestoreStaticGraphBinaryLoggerParameters=$(ArtifactsLogDir)Restore-%(Filename)%(Extension).binlog</AdditionalProperties>
-      </_ProjectToRestore>
-    </ItemGroup>
-
-    <!--
-      Filter TreatWarningsAsErrors during Restore so CLI script builds and Visual Studio builds restore the same.
-      Don't ignore it when it set to 'false' to apply '-warnaserror false' from CLI script builds.
-    -->
-    <PropertyGroup>
-      <_RestoreRemoveProps>$(_RemoveProps)</_RestoreRemoveProps>
-      <_RestoreRemoveProps Condition="'$(TreatWarningsAsErrors)' != 'false'">$(_RestoreRemoveProps);TreatWarningsAsErrors</_RestoreRemoveProps>
-    </PropertyGroup>
-
-    <MSBuild Projects="@(_ProjectToRestore)"
-             Properties="@(_SolutionRestoreProps)"
-             RemoveProperties="$(_RestoreRemoveProps)"
-             Targets="Restore"
-             SkipNonexistentTargets="true"
-             BuildInParallel="%(_ProjectToRestore.RestoreInParallel)"
-             Condition="'$(Restore)' == 'true'"/>
-
-    <CallTarget Targets="ExecuteBuildTargets" Condition="'@(_SolutionBuildTargets)' != ''" />
-
-    <MSBuild Projects="AfterSolutionBuild.proj"
-             Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=Build"
-             Targets="@(_SolutionBuildTargets)"
-             Condition="'@(_SolutionBuildTargets)' != ''" />
-
-    <!--
-      Sign artifacts.
-    -->
-    <MSBuild Projects="Sign.proj"
-             Properties="@(_CommonProps)"
-             Targets="Sign"
-             Condition="'$(Sign)' == 'true'"/>
-
-    <MSBuild Projects="AfterSigning.proj"
-             Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=Sign"
-             Targets="@(_SolutionBuildTargets)"
-             Condition="'@(_SolutionBuildTargets)' != ''" />
-
-    <ItemGroup>
-      <_PublishProps Include="@(_CommonProps)"/>
-      <!-- Used in a few places in the stack to decide if publishing was enabled or not. -->
-      <_PublishProps Include="Publish=$(Publish)"/>
-    </ItemGroup>
-
-      <!-- Make sure we always publish in VMR build - working around runtime repo which sets Publish to false. -->
-    <MSBuild Projects="Publish.proj"
-             Properties="@(_PublishProps);_NETCORE_ENGINEERING_TELEMETRY=Publish"
-             Targets="Publish"
-             Condition="'$(Publish)' == 'true'"/>
-  </Target>
-
-  <Target Name="ExecuteBuildTargets"
-          Inputs="%(ProjectToBuild.BuildStep)"
-          Outputs="unused"
-          DependsOnTargets="InitializeSolutionBuildInputs">
-    <MSBuild Projects="@(ProjectToBuild)"
-             Properties="@(_SolutionBuildProps);__BuildPhase=SolutionBuild;_NETCORE_ENGINEERING_TELEMETRY=Build"
-             RemoveProperties="$(_RemoveProps)"
-             Targets="@(_SolutionBuildTargets)"
-             BuildInParallel="%(ProjectToBuild.BuildInParallel)" />
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets
deleted file mode 100644
index 048dcff3db1..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildReleasePackages.targets
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <PropertyGroup>
-    <_NuGetRepackAssembly>$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\net\Microsoft.DotNet.NuGetRepack.Tasks.dll</_NuGetRepackAssembly>
-  </PropertyGroup>
-
-  <UsingTask TaskName="Microsoft.DotNet.Tools.UpdatePackageVersionTask" AssemblyFile="$(_NuGetRepackAssembly)" Runtime="NET" />
-
-  <Target Name="PackageReleasePackages" AfterTargets="Pack" Condition="'$(DotNetFinalVersionKind)' == ''">
-    <Message Text="Building release versions of NuGet packages" Importance="high" />
-
-    <Error Text="PreReleaseVersionLabel must be non-empty when using NuGet Repack tool." Condition="'$(PreReleaseVersionLabel)' == ''" />
-    
-    <ItemGroup>
-      <_BuiltPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
-    </ItemGroup>
-
-    <!-- Force references among packages to use exact versions (see https://github.com/NuGet/Home/issues/7213) -->
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="release" Packages="@(_BuiltPackages)" OutputDirectory="$(ArtifactsPackagesDir)Release" AllowPreReleaseDependencies="true" ExactVersions="true" />
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask VersionKind="prerelease" Packages="@(_BuiltPackages)" OutputDirectory="$(ArtifactsPackagesDir)PreRelease" ExactVersions="true"/>
-
-    <!-- Rewrite the version ranges of per-build pre-release packages (see https://github.com/NuGet/Home/issues/7213) -->
-    <Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_BuiltPackages)" OutputDirectory="$(ArtifactsShippingPackagesDir)" ExactVersions="true"/>
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Directory.Build.props
deleted file mode 100644
index baea506b124..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Directory.Build.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <!-- This is an empty Directory.Build.props file to prevent projects which reside
-       under this directory to use any of the repository local settings. -->
-  <PropertyGroup>
-    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets
deleted file mode 100644
index aba176e26b2..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.InstallDotNetCore" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
-  <Target Name="InstallDotNetCore"
-          AfterTargets="Restore">
-    <PropertyGroup>
-      <_DotNetInstallScript>$(RepositoryEngineeringDir)common\dotnet-install.cmd</_DotNetInstallScript>
-      <_DotNetInstallScript Condition="'$(OS)' != 'Windows_NT'">$(RepositoryEngineeringDir)common\dotnet-install.sh</_DotNetInstallScript>
-    </PropertyGroup>
-    
-    <Exec Condition="'$(OS)' != 'Windows_NT'"
-          Command="chmod +x &quot;$(_DotNetInstallScript)&quot;" />
-
-    <InstallDotNetCore
-      VersionsPropsPath="$(RepositoryEngineeringDir)Versions.props"
-      GlobalJsonPath="$(RepoRoot)global.json"
-      DotNetPath ="$(RepoRoot).dotnet"
-      DotNetInstallScript="$(_DotNetInstallScript)"
-      Platform="$(Platform)"
-      RuntimeSourceFeed="$(DotNetRuntimeSourceFeed)"
-      RuntimeSourceFeedKey="$(DotNetRuntimeSourceFeedKey)"/>
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
deleted file mode 100644
index 44834f60188..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
+++ /dev/null
@@ -1,456 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Publish">
-
-  <!--
-    Documentation for publishing is available here:
-      - https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Publishing.md
-  
-    Optional variables:
-      DotNetFinalVersionKind            Global property that stores the type of the current build: https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md#build-kind
-      DotNetSymbolServerTokenMsdl       Personal access token for MSDL symbol server. Available from variable group DotNet-Symbol-Server-Pats.
-      DotNetSymbolServerTokenSymWeb     Personal access token for SymWeb symbol server. Available from variable group DotNet-Symbol-Server-Pats.
-      DotNetSymbolExpirationInDays      Symbol expiration time in days (defaults to 10 years).
-      SkipPackageChecks                 Skips package safety checks.
-      EnableDefaultArtifacts            Includes packages under "/artifacts/packages/**" for publishing. Defaults to true.
-      DefaultArtifactVisibility         The default visibility for Artifact items. Defaults to External.
-      EnableDefaultRidSpecificArtifacts   Only externally publish packages for this build's TargetRid.
-      DotNetBuildPass                   While building the repo as part of the entire .NET stack, this parameter specifies which build pass the current build is part of.
-                                          The build pass number gets added to the asset manifest file name to avoid collisions.
-
-    Optional items:
-      Artifact (with Metadata)          Path to the artifact to publish. Declare the item in Signing.props to sign and publish the artifact.
-        - ChecksumPath                    The destination path to generate a checksum file for the artifact. Set the `RelativeBlobPathParent`
-                                          property if the RelativeBlobPath for the generate checksum should be automatically set.
-        - PublishFlatContainer            By default artifacts are published to blob artifacts. Set to false to publish to package artifacts.
-        - Kind                            [Package, Blob]. If set, overrides PublishFlatContainer usage. If not, then PublishFlatContainer=false == Package, true == Blob.
-        - RelativeBlobPath                The relative blob path when publishing to blob artifacts.
-        - IsShipping                      Set to false to mark the artifact as non-shipping. Defaults to true.
-  -->
-
-  <PropertyGroup>
-    <!-- Disable target framework filtering for top level projects -->
-    <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
-  </PropertyGroup>
-
-  <Import Project="BuildStep.props" />
-
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateChecksums" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
-  <!--
-    Inside the VMR, we want to include "Vertical" artifacts as they should be available to other builds within the same
-    vertical on the same build machine.
-    Inside the VMR, we also want to include "Internal" artifacts in the build manifest, as they are used by other jobs
-    so we want to inclue them here so they can be in the vertical's final manifest.
-    The VMR tooling to produce the final merged manifest for the VMR build as a whole will filter them out.
-  -->
-  <ItemGroup Condition="'$(DotNetBuildFromVMR)' == 'true' and '$(DotNetBuild)' == 'true'">
-    <ArtifactVisibilityToPublish Include="Vertical;Internal;External" />
-  </ItemGroup>
-
-  <!-- Required to determine whether full assembly strong name signing is supported, which may affect selection of some certificates. -->
-  <Import Project="StrongName.targets" />
-  <Import Project="Sign.props" />
-
-  <PropertyGroup>
-    <!-- Default publishing target is 3, but we use 4 in the VMR. -->
-    <PublishingVersion>3</PublishingVersion>
-    <PublishingVersion Condition="'$(DotNetBuildFromVMR)' == 'true'">4</PublishingVersion>
-    <PushToLocalStorage Condition="'$(DotNetBuildFromVMR)' == 'true'">true</PushToLocalStorage>
-    
-    <!-- Globally set property. -->
-    <IsStableBuild>false</IsStableBuild>
-    <IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'prerelease' or '$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
-
-    <!-- If `IsReleaseOnlyPackageVersion` is set to true, package safety checks can be skipped-->
-    <IsReleaseOnlyPackageVersion>false</IsReleaseOnlyPackageVersion>
-    <IsReleaseOnlyPackageVersion Condition ="'$(SkipPackagePublishingVersionChecks)' == 'true' or ('$(PreReleaseVersionLabel)' == '' and '$(AutoGenerateAssemblyVersion)' == 'true')">true</IsReleaseOnlyPackageVersion>
-    
-    <AutoGenerateSymbolPackages Condition="'$(AutoGenerateSymbolPackages)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</AutoGenerateSymbolPackages>
-
-    <PreserveRepoOrigin Condition="'$(PreserveRepoOrigin)' == ''">false</PreserveRepoOrigin>
-    <PublishManifestOnly Condition="'$(PublishManifestOnly)' == ''">false</PublishManifestOnly>
-
-    <!-- This tracks the dependent targets of PublishToAzureDevOpsArtifacts. We can't rename this
-         property as it is used by other repositories already. -->
-    <PublishDependsOnTargets>BeforePublish;AutoGenerateSymbolPackages</PublishDependsOnTargets>
-
-    <SymbolPackageBaseRelativeBlobPath>assets/symbols/</SymbolPackageBaseRelativeBlobPath>
-    <SymbolPackageBaseRelativeBlobPath Condition="'$(BUILD_REPOSITORY_NAME)' != ''">$(SymbolPackageBaseRelativeBlobPath)$(BUILD_REPOSITORY_NAME)/</SymbolPackageBaseRelativeBlobPath>
-    <SymbolPackageBaseRelativeBlobPath Condition="'$(BUILD_REPOSITORY_NAME)' == '' and '$(RepositoryName)' != ''">$(SymbolPackageBaseRelativeBlobPath)$(RepositoryName)/</SymbolPackageBaseRelativeBlobPath>
-    <SymbolPackageBaseRelativeBlobPath Condition="'$(BUILD_BUILDNUMBER)' != ''">$(SymbolPackageBaseRelativeBlobPath)$(BUILD_BUILDNUMBER)/</SymbolPackageBaseRelativeBlobPath>
-
-    <!-- Relative PDB path differentiator to ensure that multiple VMR legs that happen to produce the same PDBs
-         and need them all indexed get them published to different relative paths -->
-    <LoosePDBRelativeBasePath Condition="'$(LoosePDBRelativeBasePath)' == '' and '$(SYSTEM_PHASENAME)' != ''">$(SYSTEM_PHASENAME)/</LoosePDBRelativeBasePath>
-  </PropertyGroup>
-
-  <!-- Keep these asset manifest properties here as other repos already depend on them in Publishing.props. -->
-  <PropertyGroup>
-    <!-- Prefer TargetOS when set over OS -->
-    <AssetManifestOS Condition="'$(AssetManifestOS)' == ''">$([MSBuild]::ValueOrDefault('$(TargetOS)', '$(OS)'))</AssetManifestOS>
-    <!-- Prefer TargetArchitecture when set over PlatformName -->
-    <AssetManifestArch Condition="'$(AssetManifestArch)' == ''">$([MSBuild]::ValueOrDefault('$(TargetArchitecture)', '$(PlatformName)'))</AssetManifestArch>
-    <!-- Add the build pass number when DotNetBuildPass is set to a value other than 1. -->
-    <AssetManifestPass Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">-Pass$(DotNetBuildPass)</AssetManifestPass>
-  </PropertyGroup>
-
-  <!-- Only publish packages that contain this build's Target RID in the name. -->
-  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' == 'true'">
-    <Artifact Include="$(ArtifactsShippingPackagesDir)**/*.$(TargetRid).*.nupkg" Kind="Package" />
-    <Artifact Include="$(ArtifactsNonShippingPackagesDir)**/*.$(TargetRid).*.nupkg" IsShipping="false" Kind="Package" />
-    <!--
-      Integration with Microsoft.DotNet.Build.Tasks.Installers: Publish packages of the following formats as well.
-      These are arch-specific Visual Studio insertion packages. As they're Windows-only, they only include architecture in the name:
-      - VS.Redist.Common.*.$(TargetArchitecture).*.nupkg
-      - VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg
-      
-      These packages are always non-shipping, so only look there.
-
-      As these installer packages are inserted into VS as-is, .NET doesn't ship them
-      but must ensure that they're validated as though they were shipped by .NET (so they don't break when inserted into VS).
-    -->
-    <VSRedistArtifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
-    <VSRedistArtifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
-
-    <Artifact Include="@(VSRedistArtifact)">
-      <DotNetReleaseShipping Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">true</DotNetReleaseShipping>
-    </Artifact>
-
-    <!--
-      In the VMR, don't publish packages that didn't match the above conditions externally.
-      Instead, add them with Vertical visibility as they still may be needed to build RID-specific packages in other repos.
-    -->
-    <Artifact Include="$(ArtifactsShippingPackagesDir)**/*.nupkg" Exclude="@(Artifact)" Kind="Package" Visibility="Vertical" Condition="'$(DotNetBuildFromVMR)' == 'true'" />
-    <Artifact Include="$(ArtifactsNonShippingPackagesDir)**/*.nupkg" Exclude="@(Artifact)" IsShipping="false" Kind="Package" Visibility="Vertical" Condition="'$(DotNetBuildFromVMR)' == 'true'" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'">
-    <Artifact Include="$(ArtifactsShippingPackagesDir)**/*.nupkg" Kind="Package" />
-    <Artifact Include="$(ArtifactsNonShippingPackagesDir)**/*.nupkg" IsShipping="false" Kind="Package" />
-  </ItemGroup>
-
-  <!-- Allow for repo specific Publish properties such as add additional files to be published -->
-  <Import Project="$(RepositoryEngineeringDir)Publishing.props" Condition="Exists('$(RepositoryEngineeringDir)Publishing.props')" />
-
-  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets"/>
-
-  <Target Name="Publish" DependsOnTargets="PublishToAzureDevOpsArtifacts" />
-
-  <Target Name="BeforePublish" Condition="'@(Artifact)' != ''">
-    <ItemGroup>
-      <_ExistingSymbolPackage Include="@(Artifact)" Condition="'%(Artifact.SkipPublish)' != 'true' and $([System.String]::Copy('%(Filename)%(Extension)').EndsWith('.symbols.nupkg'))">
-        <!-- Update the kind of the symbol packages to blob -->
-        <Kind>Blob</Kind>
-        <!-- Set the category to Symbols (otherwise it will inherit the original package category -->
-        <Category>Symbols</Category>
-        <RelativeBlobPath>$(SymbolPackageBaseRelativeBlobPath)%(Filename)%(Extension)</RelativeBlobPath>
-      </_ExistingSymbolPackage>
-      <_PackageToPublish Include="@(Artifact)" Exclude="@(_ExistingSymbolPackage)" Condition="'%(Artifact.SkipPublish)' != 'true' and '%(Extension)' == '.nupkg'" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- Exclude all existing *.symbols.nupkg in source-only build - we create a unified symbols archive instead. -->
-      <_ExistingSymbolPackage Remove="@(_ExistingSymbolPackage)" Condition="'$(DotNetBuildSourceOnly)' == 'true'"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(_PackageToPublish);@(_ExistingSymbolPackage)" Exclude="@(ItemsToPushToBlobFeed)" />
-    </ItemGroup>
-
-    <!-- 
-        Publish Windows PDBs produced by SymStore.targets (by default, only shipping PDBs are placed there).
-        SymbolUploader doesn't support embedded PDBs yet, so let SymStore.targets do the conversion for now.
-        https://github.com/dotnet/symstore/issues/143
-      -->
-    <ItemGroup>
-      <FilesToPublishToSymbolServer Include="$(ArtifactsSymStoreDirectory)**\*.pdb"/>
-
-      <!-- Support existing uses of FilesToPublishToSymbolServer by translating this ItemGroup into ItemsToPushToBlobFeed,
-           with type PDB. Repositories can also add these items manually if desired.
-           Note that we are careful here to include the relative paths of those PDBs. Unlike most artifacts
-           that we deal with, many PDBs can have the same name but different contents.
-
-           The other thing to remember is that in builds where PDBs are produced by multiple
-           jobs, but could have the same relative path within the build. In some cases we would want
-           both of those PDBs to be indexed. To achieve this, the relative PDB path will include the
-           LoosePDBRelativeBasePath. This may be set to SYSTEM_PHASENAME if available.
-           -->
-      <_SymbolsToPushToBlobFeed Include="@(FilesToPublishToSymbolServer)">
-        <Kind>PDB</Kind>
-        <RelativePDBPath>$(LoosePDBRelativeBasePath)%(RecursiveDir)%(Filename)%(Extension)</RelativePDBPath>
-      </_SymbolsToPushToBlobFeed>
-      <ItemsToPushToBlobFeed Include="@(_SymbolsToPushToBlobFeed)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="AutoGenerateSymbolPackages" DependsOnTargets="BeforePublish" Condition="'$(AutoGenerateSymbolPackages)' == 'true'">
-    <PropertyGroup>
-      <SymbolPackagesDir Condition="'$(SymbolPackagesDir)' == ''">$(ArtifactsTmpDir)SymbolPackages\</SymbolPackagesDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_PackageToPublish Update="@(_PackageToPublish)">
-        <SymbolPackageToGenerate Condition="!Exists('%(RootDir)%(Directory)%(Filename).symbols.nupkg')">$(SymbolPackagesDir)%(Filename).symbols.nupkg</SymbolPackageToGenerate>
-        <SymbolPackageRelativeBlobPath>$(SymbolPackageBaseRelativeBlobPath)%(Filename).symbols.nupkg</SymbolPackageRelativeBlobPath>
-      </_PackageToPublish>
-
-      <_SymbolPackageToGenerate Include="@(_PackageToPublish->'%(SymbolPackageToGenerate)')"
-                                Exclude="@(_ExistingSymbolPackage -> '$(SymbolPackagesDir)%(Filename)%(Extension)')"
-                                Condition="'%(_PackageToPublish.SymbolPackageToGenerate)' != ''">
-        <OriginalPackage>%(_PackageToPublish.Identity)</OriginalPackage>
-        <IsShipping>%(_PackageToPublish.IsShipping)</IsShipping>
-        <Kind>Blob</Kind>
-        <Category>Symbols</Category>
-        <RelativeBlobPath>%(_PackageToPublish.SymbolPackageRelativeBlobPath)</RelativeBlobPath>
-      </_SymbolPackageToGenerate>
-    </ItemGroup>
-
-    <!--
-      If a symbol package doesn't exist yet we assume that the regular package contains Portable PDBs.
-      Such packages can act as symbol packages since they have the same structure.
-      We just need to copy them to *.symbols.nupkg.
-    -->
-    <MakeDir Condition="'@(_SymbolPackageToGenerate)' != ''" Directories="$(SymbolPackagesDir)" />
-    <Copy SourceFiles="@(_SymbolPackageToGenerate->'%(OriginalPackage)')" DestinationFiles="@(_SymbolPackageToGenerate)" />
-
-    <ItemGroup>
-      <!--
-        These packages from Arcade-Services include some native libraries that
-        our current symbol uploader can't handle. Below is a workaround until
-        we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
-      -->
-      <_SymbolPackageToGenerate Remove="$(SymbolPackagesDir)**/Microsoft.DotNet.Darc.*" />
-      <_SymbolPackageToGenerate Remove="$(SymbolPackagesDir)**/Microsoft.DotNet.Maestro.Tasks.*" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(_SymbolPackageToGenerate)" Exclude="@(ItemsToPushToBlobFeed)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Generate checksums from artifact items that set ChecksumPath.
-       The produced checksums get automatically added as artifacts. -->
-  <Target Name="GenerateChecksumsFromArtifacts"
-          Condition="'@(Artifact)' != '' and '@(Artifact->HasMetadata('ChecksumPath'))' != ''">
-    <ItemGroup>
-      <GenerateChecksumItems Include="@(Artifact->HasMetadata('ChecksumPath'))"
-                             DestinationPath="%(Artifact.ChecksumPath)"
-                             RemoveMetadata="RelativeBlobPath" />
-    </ItemGroup>
-
-    <GenerateChecksums Items="@(GenerateChecksumItems)" />
-
-    <ItemGroup>
-      <!-- Set RelativeBlobPath if RelativeBlobPathParent is provided. -->
-      <GenerateChecksumItemsWithDestinationPath Include="@(GenerateChecksumItems -> '%(DestinationPath)')" />
-      <Artifact Include="@(GenerateChecksumItemsWithDestinationPath)">
-        <RelativeBlobPath Condition="'$(RelativeBlobPathParent)' != ''">$(RelativeBlobPathParent.TrimEnd('/'))/%(Filename)%(Extension)</RelativeBlobPath>
-        <Kind>Blob</Kind>
-      </Artifact>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="PublishToAzureDevOpsArtifacts"
-          DependsOnTargets="$(PublishDependsOnTargets);GenerateChecksumsFromArtifacts">
-    <!-- 
-      Sadly AzDO doesn't have a variable to tell the account name. Also
-      the format of CollectionURI is not precise across different agent 
-      configurations. Code below takes care of extracting the account 
-      name from the CollectionURI in different formats.
-    -->
-    <PropertyGroup>
-      <CollectionUri>$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)</CollectionUri>
-      
-			<!-- When we have dev.azure.com/<account>/ -->
-      <AzureDevOpsAccount Condition="$(CollectionUri.IndexOf('dev.azure.com')) >= 0">$(CollectionUri.Split('/')[3])</AzureDevOpsAccount>
-		
-			<!-- When we have <account>.visualstudio.com -->
-      <AzureDevOpsAccount Condition="$(CollectionUri.IndexOf('visualstudio.com')) >= 0">$(CollectionUri.Split('.')[0].Split('/')[2])</AzureDevOpsAccount>
-    </PropertyGroup>
-
-    <!-- Asset output locations
-         When V4 publishing is enabled, there are two primary scenarios:
-         1. The build is running as part of an inner build in the VMR, and the future artifacts location is NOT yet know.
-            Publishing is primarily used to propagate assets between repos in a vertical.
-         2. Publishing at the end of a vertical, or the end of a normal build, where the future artifacts needs to be known.
-    -->
-    <PropertyGroup>
-      <LocallyStageArtifacts>false</LocallyStageArtifacts>
-      <LocallyStageArtifacts Condition="'$(PublishingVersion)' == '4' or '$(PushToLocalStorage)' == 'true'">true</LocallyStageArtifacts>
-
-      <!-- Use the SYSTEM_PHASENAME variable when available as that is guaranteed to be a unique identifier.
-           For local scenarios and when the variable isn't available, use "<os>-<arch>-<buildpass>"" as the manifest name. -->
-      <AssetManifestFileName Condition="'$(AssetManifestFileName)' == '' and '$(SYSTEM_PHASENAME)' != ''">$(SYSTEM_PHASENAME).xml</AssetManifestFileName>
-      <AssetManifestFileName Condition="'$(AssetManifestFileName)' == ''">$(AssetManifestOS)-$(AssetManifestArch)$(AssetManifestPass).xml</AssetManifestFileName>
-      <AssetManifestFilePath Condition="'$(AssetManifestFilePath)' == ''">$(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName)</AssetManifestFilePath>
-
-      <!-- PDBs are special in that they require a local staging location even if LocallyStageArtifacts is false.-->
-      <PdbArtifactsLocalStorageDir Condition="'$(PdbArtifactsLocalStorageDir)' == '' and '$(LocallyStageArtifacts)' != 'true'">$(ArtifactsTmpDir)PDBsToPublish/</PdbArtifactsLocalStorageDir>
-    </PropertyGroup>
-
-    <!-- Set up local staging artifact paths if we're going to locally stage artifacts.
-         NOTE! The SourceBuilt* setups can be removed after this change has flowed to the VMR and the bootstrap.
-         arcade is updated. -->
-    <PropertyGroup Condition="'$(LocallyStageArtifacts)' == 'true'">
-      <!-- Publish staging defaults.
-           This is intended to be the location that a build will publish its pipeline artifacts. We avoid
-           using the repo source layout for better compatibility with various scanning tools.
-           Since not all CI builds are in AzDO, ensure that there is a reasonable default under the repo source layout. -->
-      <ArtifactsPublishStagingDir Condition="'$(ArtifactsPublishStagingDir)' == '' and '$(Build_ArtifactStagingDirectory)' != ''">$([MSBuild]::NormalizeDirectory('$(Build_ArtifactStagingDirectory)', 'artifacts'))</ArtifactsPublishStagingDir>
-      <ArtifactsPublishStagingDir Condition="'$(ArtifactsPublishStagingDir)' == ''">$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'staging'))</ArtifactsPublishStagingDir>
-
-      <!-- Directory where pdbs pointed in `FilesToPublishToSymbolServer` are copied during publishing. -->
-      <PdbArtifactsLocalStorageDir Condition="'$(PdbArtifactsLocalStorageDir)' == ''">$(SourceBuiltPdbArtifactsDir)</PdbArtifactsLocalStorageDir>
-      <PdbArtifactsLocalStorageDir Condition="'$(PdbArtifactsLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)pdbs</PdbArtifactsLocalStorageDir>
-
-      <!-- Directory where shipping packages are copied during publishing. -->
-      <ShippingPackagesLocalStorageDir Condition="'$(ShippingPackagesLocalStorageDir)' == ''">$(SourceBuiltShippingPackagesDir)</ShippingPackagesLocalStorageDir>
-      <ShippingPackagesLocalStorageDir Condition="'$(ShippingPackagesLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)packages/shipping</ShippingPackagesLocalStorageDir>
-
-      <!-- Directory where nonshipping packages are copied during publishing. -->
-      <NonShippingPackagesLocalStorageDir Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(SourceBuiltNonShippingPackagesDir)</NonShippingPackagesLocalStorageDir>
-      <NonShippingPackagesLocalStorageDir  Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)packages/nonshipping</NonShippingPackagesLocalStorageDir>
-
-      <!-- Directory where asset manifests are copied during publishing. -->
-      <AssetManifestsLocalStorageDir Condition="'$(AssetManifestsLocalStorageDir)' == ''">$(SourceBuiltAssetManifestsDir)</AssetManifestsLocalStorageDir>
-      <AssetManifestsLocalStorageDir Condition="'$(AssetManifestsLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)manifests</AssetManifestsLocalStorageDir>
-
-      <!-- Directory where blob assets are copied during publishing. -->
-      <AssetsLocalStorageDir Condition="'$(AssetsLocalStorageDir)' == ''">$(SourceBuiltAssetsDir)</AssetsLocalStorageDir>
-      <AssetsLocalStorageDir Condition="'$(AssetsLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)assets</AssetsLocalStorageDir>
-
-      <!-- Default values for the future artifact name and publish locations if not provided.
-           VMR builds would typically specify these globally. Only used when publishing V4 is active. -->
-      <FutureArtifactName Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactName)' == '' and '$(SYSTEM_PHASENAME)' != ''">$(SYSTEM_PHASENAME)_Artifacts</FutureArtifactName>
-      <FutureArtifactName Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactName)' == ''">$(AssetManifestOS)_$(AssetManifestArch)$(AssetManifestPass)_Artifacts</FutureArtifactName>
-      <FutureArtifactPublishBasePath Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactPublishBasePath)' == ''">$(SourceBuiltArtifactsBasePath)</FutureArtifactPublishBasePath>
-      <FutureArtifactPublishBasePath Condition="'$(PublishingVersion)' == '4' and '$(FutureArtifactPublishBasePath)' == ''">$(ArtifactsPublishStagingDir)</FutureArtifactPublishBasePath>
-    </PropertyGroup>
-    
-    <!--
-      The new Maestro/BAR build model keeps separate Azure DevOps and GitHub build information.
-      The GitHub information will be extracted based on the Azure DevOps repository.
-    -->
-    <ItemGroup>
-      <ManifestBuildData Include="InitialAssetsLocation=$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)$(SYSTEM_TEAMPROJECT)/_apis/build/builds/$(BUILD_BUILDID)/artifacts" />
-      <ManifestBuildData Include="AzureDevOpsBuildId=$(BUILD_BUILDID)" />
-      <ManifestBuildData Include="AzureDevOpsBuildDefinitionId=$(SYSTEM_DEFINITIONID)" />
-      <ManifestBuildData Include="AzureDevOpsAccount=$(AzureDevOpsAccount)" />
-      <ManifestBuildData Include="AzureDevOpsProject=$(SYSTEM_TEAMPROJECT)" />
-      <ManifestBuildData Include="AzureDevOpsBuildNumber=$(BUILD_BUILDNUMBER)" />
-      <ManifestBuildData Include="AzureDevOpsRepository=$(BUILD_REPOSITORY_URI)" />
-      <ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- By default, don't publish wixpacks. They're only needed for signing and can be dropped from the publish phase. -->
-      <Artifact>
-        <SkipPublish Condition="'%(Artifact.SkipPublish)' == '' and $([System.String]::new('%(Filename)%(Extension)').EndsWith('.wixpack.zip'))">true</SkipPublish>
-      </Artifact>
-
-      <!-- Add non-package Artifact items (repo extension point) as package already got added in the BeforePublish target. -->
-      <ItemsToPushToBlobFeed Include="@(Artifact)" Condition="'%(Artifact.SkipPublish)' != 'true' and '%(Extension)' != '.nupkg'" />
-    </ItemGroup>
-
-    <!-- Update/add attributes of ItemsToPushToBlobFeed if they were not provided. -->
-    <ItemGroup>
-      <ItemsToPushToBlobFeed>
-        <!-- Default artifact visibility is External -->
-        <Visibility Condition="'%(ItemsToPushToBlobFeed.Visibility)' == ''">$([MSBuild]::ValueOrDefault('$(DefaultArtifactVisibility)', 'External'))</Visibility>
-        <!-- Default to IsShipping=true -->
-        <IsShipping Condition="'%(ItemsToPushToBlobFeed.IsShipping)' == ''">true</IsShipping>
-        <!-- An item is a Blob if Kind wasn't already set, and PublishFlatContainer is true.
-             An item is a Package if Kind wasn't already set, and PublishFlatContainer is false or not set.
-             An item is a Package if Kind wasn't already set, and PublishFlatContainer is not set. -->
-        <Kind Condition="'%(ItemsToPushToBlobFeed.Kind)' == '' and '%(ItemsToPushToBlobFeed.PublishFlatContainer)' == 'true'">Blob</Kind>
-        <Kind Condition="'%(ItemsToPushToBlobFeed.Kind)' == '' and '%(ItemsToPushToBlobFeed.PublishFlatContainer)' != 'true'">Package</Kind>
-        <!-- DotNetReleaseShipping=true if IsShipping=true and ProducesDotNetReleaseShippingAssets=true-->
-        <DotNetReleaseShipping Condition="'%(ItemsToPushToBlobFeed.DotNetReleaseShipping)' == '' and '%(ItemsToPushToBlobFeed.IsShipping)' == 'true' and '$(ProducesDotNetReleaseShippingAssets)' == 'true'">true</DotNetReleaseShipping>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-
-    <!-- Note that the below ItemsToPushToBlobFeed metadata updates are in separate item groups to preserve previous information. -->
-    <ItemGroup>
-      <ItemsToPushToBlobFeed>
-        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.IsShipping)' != 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);NonShipping=true</ManifestArtifactData>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ItemsToPushToBlobFeed>
-        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.DotNetReleaseShipping)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);DotNetReleaseShipping=true</ManifestArtifactData>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-
-    <!-- Set the category -->
-    <ItemGroup>
-      <ItemsToPushToBlobFeed>
-        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.Category)' != ''">%(ItemsToPushToBlobFeed.ManifestArtifactData);Category=%(ItemsToPushToBlobFeed.Category)</ManifestArtifactData>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ItemsToPushToBlobFeed>
-        <ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.Visibility)' != ''">%(ItemsToPushToBlobFeed.ManifestArtifactData);Visibility=%(ItemsToPushToBlobFeed.Visibility)</ManifestArtifactData>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-
-    <!-- Propagate stability data to the asset level for packages. We do this so that VMR builds which have some repo builds that are not stable, and others that are, do not end up having to use the default logic
-         where ALL assets that are shipping in a stable build go to isolated feeds. Instead, we can just choose CouldBeStable==true, CouldBeStable==false.
-         This only applies currently to Packages. Blobs are required to provide paths that are always non-stable. Pdbs don't have a stability concept.
-
-         NOTE: This flag doesn't strictly mean that the package is stable versioned. A repo might suppress a stable version for a given package. -->
-    <ItemGroup>
-      <ItemsToPushToBlobFeed>
-			  <ManifestArtifactData Condition="'$(PublishingVersion)' == '4' and
-                                         '%(ItemsToPushToBlobFeed.Kind)' == 'Package' and
-																			   '$(IsStableBuild)' == 'true' and
-																			   '$(IsReleaseOnlyPackageVersion)' != 'true' and
-																			   '%(ItemsToPushToBlobFeed.IsShipping)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);CouldBeStable=true</ManifestArtifactData>
-        <!-- We narrowly set CouldBeStable=false only for packages we know won't generate a stable version because of IsReleaseOnlyPackageVersion == true.
-             This allows for the default 'stable asset to non-isolated feed' detection behavior to still pick up accidental cases of stabilization. -->
-				<ManifestArtifactData Condition="'$(PublishingVersion)' == '4' and
-                                         '%(ItemsToPushToBlobFeed.Kind)' == 'Package' and
-																				 '$(IsReleaseOnlyPackageVersion)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);CouldBeStable=false</ManifestArtifactData>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-
-    <Error Condition="'@(ItemsToPublishToBlobFeed->WithMetadataValue('IsShipping','true')->AnyHaveMetadataValue('Visibility','Vertical'))' == 'true'"
-           Text="Visibility 'Vertical' is not supported for shipping artifacts." />
-    <Error Condition="'@(ItemsToPublishToBlobFeed->WithMetadataValue('IsShipping','true')->AnyHaveMetadataValue('Visibility','Internal'))' == 'true'"
-           Text="Visibility 'Internal' is not supported for shipping artifacts." />
-    <Error Condition="'@(ItemsToPublishToBlobFeed->AnyHaveMetadataValue('Visibility','Vertical'))' == 'true' and '$(DotNetBuildFromVMR)' != 'true'"
-           Text="Visibility 'Vertical' is only supported in vertical builds inside the VMR." />
-
-    <!--
-      The user can set `PublishingVersion` via eng\Publishing.props
-    -->
-    <PushToBuildStorage
-      AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
-      AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
-      AzureDevOpsBuildId="$(BUILD_BUILDID)"
-      ItemsToPush="@(ItemsToPushToBlobFeed)"
-      ManifestBuildData="@(ManifestBuildData)"
-      ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
-      ManifestBranch="$(BUILD_SOURCEBRANCH)"
-      ManifestBuildId="$(BUILD_BUILDNUMBER)"
-      ManifestCommit="$(BUILD_SOURCEVERSION)"
-      ManifestRepoOrigin="$(RepositoryName)"
-      IsStableBuild="$(IsStableBuild)"
-      PublishingVersion="$(PublishingVersion)"
-      AssetManifestPath="$(AssetManifestFilePath)" 
-      IsReleaseOnlyPackageVersion="$(IsReleaseOnlyPackageVersion)"
-      PushToLocalStorage="$(PushToLocalStorage)"
-      AssetsLocalStorageDir="$(AssetsLocalStorageDir)"
-      PreserveRepoOrigin="$(PreserveRepoOrigin)"
-      ShippingPackagesLocalStorageDir="$(ShippingPackagesLocalStorageDir)"
-      NonShippingPackagesLocalStorageDir="$(NonShippingPackagesLocalStorageDir)"
-      AssetManifestsLocalStorageDir="$(AssetManifestsLocalStorageDir)"
-      PdbArtifactsLocalStorageDir="$(PdbArtifactsLocalStorageDir)"
-      ArtifactVisibilitiesToPublish="@(ArtifactVisibilityToPublish)"
-      UseHardlinksIfPossible="$(PublishingUseHardlinksIfPossible)"
-      FutureArtifactName="$(FutureArtifactName)"
-      FutureArtifactPublishBasePath="$(FutureArtifactPublishBasePath)" />
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
deleted file mode 100644
index 8049677420e..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Sign">
-
-  <!--
-    Documentation for publishing is available here:
-      - https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Signing.md
-  
-    Optional variables:
-      EnableDefaultArtifacts            Includes *.nupkg, *.vsix and *.wixpack.zip under "/artifacts/packages/**" for signing.
-                                        Defaults to true.
-      EnableDefaultRidSpecificArtifacts Do not sign *.nupkg packages under "/artifacts/packages/**" that do not contain the current TargetRid.
-      DefaultArtifactVisibility         The default visibility for Artifact items. Defaults to External.
-
-    Optional items:
-      Artifact (with Metadata)          Path to the artifact to publish. Declare the item in Signing.props to sign and publish the artifact.
-        - SkipPublish                     If true, skips publishing the artifact.
-  -->
-
-  <PropertyGroup>
-    <!-- Disable target framework filtering for top level projects -->
-    <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
-  </PropertyGroup>
-
-  <Import Project="BuildStep.props" />
-  <Import Project="TargetFrameworkDefaults.props" />
-
-  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.signtool\$(MicrosoftDotNetSignToolVersion)\build\Microsoft.DotNet.SignTool.props" />
-
-  <!-- Required to determine whether full assembly strong name signing is supported, which may affect selection of some certificates. -->
-  <Import Project="StrongName.props" />
-  <Import Project="Sign.props" />
-
-  <!-- Import the wix props to get the install path -->
-  <Import Project="$(NuGetPackageRoot)microsoft.signed.wix\$(MicrosoftSignedWixVersion)\build\Microsoft.Signed.Wix.props" />
-
-  <!-- Update sign infos that were using Microsoft400 to use the .NET-specific cert if UseDotNetCertificate is present.
-       This will update any use, even if explicitly specified.
-       NOTE: This is outside the target on purpose, as Update will not correctly evaluate in the target. See
-       https://github.com/dotnet/msbuild/issues/1618. -->
-  <ItemGroup Condition="$(UseDotNetCertificate)">
-    <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
-    <StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
-    <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="$(DotNetCertificateName)" />
-  </ItemGroup>
-
-  <Target Name="Sign">
-    <Error Text="The value of DotNetSignType is invalid: '$(DotNetSignType)'"
-           Condition="'$(DotNetSignType)' != 'real' and '$(DotNetSignType)' != 'test' and '$(DotNetSignType)' != ''" />
-
-    <PropertyGroup>
-      <_DryRun>true</_DryRun>
-      <!-- Allow an official build to force dry run signing. This allows the VMR's build to test signing in CI without changing versions. -->
-      <_DryRun Condition="'$(OfficialBuild)' == 'true' and '$(ForceDryRunSigning)' != 'true'">false</_DryRun>
-
-      <_TestSign>false</_TestSign>
-      <_TestSign Condition="'$(DotNetSignType)' == 'test'">true</_TestSign>
-
-      <_DotNetCoreRequired>false</_DotNetCoreRequired>
-      <_DotNetCoreRequired Condition="'$(_DryRun)' != 'true'">true</_DotNetCoreRequired>
-
-      <!-- SN is only available on Windows -->
-      <SNBinaryPath Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe</SNBinaryPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- .pkgs and .app bundle tooling is only available on MacOS -->
-      <MacOSPkgCliItem Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="$(NuGetPackageRoot)microsoft.dotnet.macospkg.cli\$(MicrosoftDotNetMacOsPkgVersion)\tools\net*\any\Microsoft.Dotnet.MacOsPkg.Cli.dll" />
-    </ItemGroup>
-
-    <Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(ItemsToSign)' == ''" 
-           Text="List of files to sign is empty. Make sure that ItemsToSign is configured correctly." />
-
-    <PropertyGroup Condition="$(_DotNetCoreRequired)">
-      <_DotNetCorePath>$(DotNetTool)</_DotNetCorePath>
-    </PropertyGroup>
-
-    <Microsoft.DotNet.SignTool.SignToolTask
-        DryRun="$(_DryRun)"
-        TestSign="$(_TestSign)"
-        DoStrongNameCheck="$(DoStrongNameCheck)"
-        AllowEmptySignList="$(AllowEmptySignList)"
-        CertificatesSignInfo="@(CertificatesSignInfo)"
-        ItemsToSign="@(ItemsToSign)"
-        StrongNameSignInfo="@(StrongNameSignInfo)"
-        FileSignInfo="@(FileSignInfo)"
-        ItemsToSkip3rdPartyCheck="@(ItemsToSkip3rdPartyCheck)"
-        FileExtensionSignInfo="@(FileExtensionSignInfo)"
-        TempDir="$(ArtifactsTmpDir)"
-        LogDir="$(ArtifactsLogDir)"
-        DotNetPath="$(_DotNetCorePath)"
-        SNBinaryPath="$(SNBinaryPath)"
-        MicroBuildCorePath="$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.core\$(MicrosoftVisualStudioEngMicroBuildCoreVersion)"
-        Wix3ToolsPath="$(WixInstallPath)"
-        WixToolsPath="$(NuGetPackageRoot)microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)\tools\net472\x64"
-        PkgToolPath="@(MacOSPkgCliItem)"
-        RepackParallelism="$(SignToolRepackParallelism)"
-        MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)"
-        DotNetTimeout="$(SignToolDotNetTimeout)"
-        MSBuildVerbosity="$(SignToolMSBuildVerbosity)" />
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
deleted file mode 100644
index 7b7439e02b8..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <PropertyGroup>
-    <!-- By default, search for sign aritfacts under the list of known directories. -->
-    <EnableDefaultArtifacts>true</EnableDefaultArtifacts>
-  </PropertyGroup>
-
-  <!-- Repo extension point to sign and/or publish. Artifacts are shipping and blobs by default. -->
-  <ItemDefinitionGroup>
-    <Artifact>
-      <PublishFlatContainer>true</PublishFlatContainer>
-      <!-- Possible values: Blob, Package, PDB -->
-      <!-- Currently unset, indicating that a repo hasn't started using this property. If it's set, then it
-           wins over PublishFlatContaner. If it is not set, then PublishFlatContainer wins.
-           After existing usage of PublishFlatContainer is no longer around, set to "Blob" -->
-      <Kind></Kind>
-      <IsShipping>true</IsShipping>
-    </Artifact>
-  </ItemDefinitionGroup>
-
-  <ItemGroup>
-    <!--
-      This is intended to hold information about the certificates used for signing.
-    -->
-    <CertificatesSignInfo Include="3PartyDual" DualSigningAllowed="true" />
-    <CertificatesSignInfo Include="3PartySHA2" DualSigningAllowed="true" />
-    <!-- This signing information indicates certificates that represent a sign and notarize operation. -->
-    <CertificatesSignInfo Include="MacDeveloperHardenWithNotarization" MacCertificate="MacDeveloperHarden" MacNotarizationAppName="dotnet" />
-    <CertificatesSignInfo Include="MacDeveloperWithNotarization" MacCertificate="MacDeveloper" MacNotarizationAppName="dotnet" />
-    <CertificatesSignInfo Include="MacDeveloperVNextWithNotarization" MacCertificate="MacDeveloperVNext" MacNotarizationAppName="dotnet" />
-    <CertificatesSignInfo Include="MacDeveloperVNextHardenWithNotarization" MacCertificate="MacDeveloperVNextHarden" MacNotarizationAppName="dotnet" />
-    <!-- Certificates Which support detached signatures -->
-    <CertificatesSignInfo Include="LinuxSignTar" SupportsDetachedSignature="true" />
-    <CertificatesSignInfo Include="LinuxSign500180PGP" SupportsDetachedSignature="true" />
-  </ItemGroup>
-
-  <!-- Only publish packages that contain this build's Target RID in the name.
-       PostBuildSign switch is kept for avoiding breaks in repos that use it to avoid signing. -->
-  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(PostBuildSign)' != 'true' and '$(EnableDefaultRidSpecificArtifacts)' == 'true'">
-    <ItemsToSign Include="$(ArtifactsShippingPackagesDir)**/*.$(TargetRid).*.nupkg"/>
-    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/*.$(TargetRid).*.nupkg" />
-    <!--
-      Integration with Microsoft.DotNet.Build.Tasks.Installers: Publish packages of the following formats as well.
-      These are arch-specific Visual Studio insertion packages. As they're Windows-only, they only include architecture in the name:
-      - VS.Redist.Common.*.$(TargetArchitecture).*.nupkg
-      - VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg
-      
-      These packages are always non-shipping, so only look there.
-    -->
-    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" />
-    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" />
-
-    <!-- Always sign all vsix packages and VS Build Packages. These may be arch specific or agnostic, but they likely won't have the RID included. -->
-    <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
-    <ItemsToSign Include="$(VisualStudioBuildPackagesDir)**\*.nupkg" />
-  </ItemGroup>
-
-  <!-- PostBuildSign switch is kept for avoiding breaks in repos that use it to avoid signing. -->
-  <ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and '$(PostBuildSign)' != 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'">
-    <!-- List of container files that will be opened and checked for files that need to be signed. -->
-    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
-    <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
-    <ItemsToSign Include="$(VisualStudioBuildPackagesDir)**\*.nupkg" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Default certificate/strong-name to be used for all files with PKT=="31bf3856ad364e35". -->
-    <StrongNameSignInfo Include="MsSharedLib72" PublicKeyToken="31bf3856ad364e35" CertificateName="Microsoft400" />
-    <StrongNameSignInfo Include="SilverlightCert121" PublicKeyToken="7cec85d7bea7798e" CertificateName="Microsoft400" />
-    <StrongNameSignInfo Include="StrongName" PublicKeyToken="b77a5c561934e089" CertificateName="Microsoft400" />
-    <StrongNameSignInfo Include="StrongName" PublicKeyToken="b03f5f7f11d50a3a" CertificateName="Microsoft400" />
-    <!-- Do not include specific key files if full assembly signing is not supported, as they will not be usable when we sign. -->
-    <StrongNameSignInfo Include="$(MSBuildThisFileDirectory)snk\Open.snk" PublicKeyToken="cc7b13ffcd2ddd51" CertificateName="Microsoft400" Condition="'$(FullAssemblySigningSupported)' != 'false'" />
-    <StrongNameSignInfo Include="$(MSBuildThisFileDirectory)snk\AspNetCore.snk" PublicKeyToken="adb9793829ddae60" CertificateName="Microsoft400" Condition="'$(FullAssemblySigningSupported)' != 'false'" />
-
-    <!--
-      Map of file extensions to default certificate name. Files with these extensions are
-      signed with the specified certificate. Particularly useful for files that don't have
-      a public key token.
-      The certificate can be overriden using the StrongNameSignInfo or the FileSignInfo item group.
-    -->
-    <FileExtensionSignInfo Include=".deb" CertificateName="LinuxSign" />
-    <FileExtensionSignInfo Include=".jar" CertificateName="MicrosoftJARSHA2" />
-    <FileExtensionSignInfo Include=".ps1;.psd1;.psm1;.psc1;.py" CertificateName="Microsoft400" />
-    <FileExtensionSignInfo Include=".dll;.exe;.mibc;.msi" CertificateName="Microsoft400" />
-    <FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
-    <FileExtensionSignInfo Include=".vsix" CertificateName="VsixSHA2" />
-    <FileExtensionSignInfo Include=".zip" CertificateName="None" />
-    <FileExtensionSignInfo Include=".tgz" CertificateName="None" />
-    <FileExtensionSignInfo Include=".tar.gz" CertificateName="None" />
-    <!-- Note, RPMs can only be unpack/repacked on Linux. They can be signed on non-Linux -->
-    <FileExtensionSignInfo Include=".rpm" CertificateName="LinuxSign" />
-    <!-- Note, these can only be unpack/repacked on Mac. They can be signed on a non-Mac -->
-    <FileExtensionSignInfo Include=".pkg" CertificateName="MacDeveloper" />
-    <!-- .app bundles are technically directories, but the Microsoft.DotNet.MacOsPkg
-    tool packs these bundles into zips when unpacking .pkgs -->
-    <FileExtensionSignInfo Include=".app" CertificateName="MacDeveloper" />
-    <!-- Runtime hardening is required for notarization. -->
-    <FileExtensionSignInfo Include=".dylib" CertificateName="MacDeveloperHarden" />
-
-    <!-- Removing the default .js signing -->
-    <FileExtensionSignInfo Include=".js" CertificateName="BreakingSignatureChange" Condition="'$(NoSignJS)' != 'true'"/>
-    <FileExtensionSignInfo Include=".js" CertificateName="None" Condition="'$(NoSignJS)' == 'true'"/>
-
-    <!-- Explicitly use the azure linux cert for azl binaries -->
-    <AzureLinuxRPM Include="$(ArtifactsPackagesDir)**/*-azl-*.rpm" />
-    <AzureLinuxRPM Include="$(ArtifactsPackagesDir)**/*-azl.*-*.rpm" />
-    <FileSignInfo Include="@(AzureLinuxRPM->'%(Filename)%(Extension)')" CertificateName="LinuxSignMariner" />
-
-    <!-- Explicitly use the "new" LinuxSign cert. -->
-    <NewKeyLinuxPackage Include="$(ArtifactsPackagesDir)**/*-newkey-*.rpm" />
-    <NewKeyLinuxPackage Include="$(ArtifactsPackagesDir)**/*-newkey-*.deb" />
-    <FileSignInfo Include="@(NewKeyLinuxPackage->'%(Filename)%(Extension)')" CertificateName="LinuxSign500207PGP" />
-  </ItemGroup>
-
-  <!-- The name of the .NET specific certificate, which is a general replacement for Microsoft400
-       If UseDotNetCert is specific in a repo's eng/Signing.props, all usage of Microsoft400 is replaced
-       with MicrosoftDotNet500 -->
-  <PropertyGroup>
-    <DotNetCertificateName>MicrosoftDotNet500</DotNetCertificateName>
-    <UseDotNetCertificate>false</UseDotNetCertificate>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Flags for controlling whether empty signing lists are detected for in build and post-build signing.
-         These flags are split (rather than just a single check based on PostBuildSign == true/false because
-         some repos may do both in-build and post-build signing. -->
-    <!-- Control whether an empty ItemsToSign item group is allowed when calling SignToolTask. -->
-    <AllowEmptySignList Condition="'$(PostBuildSign)' != 'true'">false</AllowEmptySignList>
-    <AllowEmptySignList Condition="'$(PostBuildSign)' == 'true'">true</AllowEmptySignList>
-
-    <!-- Timeout in milliseconds for DotNet MicroBuild build command. '-1' is infinite. -->
-    <SignToolDotNetTimeout Condition="'$(SignToolDotNetTimeout)' == ''">-1</SignToolDotNetTimeout>
-
-    <!-- Verbosity for DotNet MicroBuild build command. -->
-    <SignToolMSBuildVerbosity Condition="'$(SignToolMSBuildVerbosity)' == ''">quiet</SignToolMSBuildVerbosity>
-
-    <NETCORE_ENGINEERING_TELEMETRY>Signing</NETCORE_ENGINEERING_TELEMETRY>
-  </PropertyGroup>
-
-  <!-- Sign tool parallelism limits. These may be overridden by a repo. -->
-  <PropertyGroup>
-    <!-- Number of containers to repack in parallel -->
-    <SignToolRepackParallelism>16</SignToolRepackParallelism>
-    <!-- Maximum size in MB that a file may be before it is repacked serially -->
-    <SignToolRepackMaximumParallelFileSize>128</SignToolRepackMaximumParallelFileSize>
-  </PropertyGroup>
-
-  <!-- Allow repository to customize signing configuration -->
-  <Import Project="$(RepositoryEngineeringDir)Signing.props" Condition="Exists('$(RepositoryEngineeringDir)Signing.props')" />
-
-  <!-- Respect Artifact item repo extension point -->
-  <ItemGroup Condition="'@(Artifact)' != ''">
-    <ItemsToSign Include="@(Artifact)" Condition="'$(PostBuildSign)' != 'true'" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
deleted file mode 100644
index c5ba4421054..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj
+++ /dev/null
@@ -1,115 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <Import Project="BuildStep.props" />
-
-  <!-- Properties requires by NuGet.targets to restore packages -->
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <!-- Workaround changes from newer MSBuild requiring additional properties --> 
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">5</TargetFrameworkVersion>
-    <TargetFrameworkIdentifier  Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == ''">.NETFramework,Version=v4.7.2</TargetFrameworkMoniker>   
-    <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
-
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-
-    <!-- Internal tool restore settings -->
-    <!-- VisualStudio.InsertionManifests.targets: Keep condition in sync with import in AfterSigning.proj. -->
-    <RestoreInternalTooling Condition="'$(UsingToolVSSDK)' == 'true' and '$(GenerateSbom)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'">true</RestoreInternalTooling>
-    <RestoreInternalToolingAfterTargets Condition="'$(RestoreInternalTooling)' == 'true'">Restore</RestoreInternalToolingAfterTargets>
-  </PropertyGroup>
-
-  <!-- 
-    Configure NuGet Restore to use NuGet.config file in the repository root.
-    We could drop a custom NuGet.config to the containing directory but it's simpler
-    if we use the same config for all restore operations.
-    NuGet.Config, NuGet.config, and nuget.config are all allowed casings according to NuGet:
-    https://github.com/NuGet/NuGet.Client/blob/b83566ec2369c4e9fd07e6f95d734dfe370a1e66/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs#L34-L36
-  -->
-  <PropertyGroup Condition="'$(RestoreConfigFile)' == ''">
-    <RestoreConfigFile Condition="Exists('$(RepoRoot)NuGet.config')">$(RepoRoot)NuGet.config</RestoreConfigFile>
-    <RestoreConfigFile Condition="Exists('$(RepoRoot)NuGet.Config')">$(RepoRoot)NuGet.Config</RestoreConfigFile>
-    <RestoreConfigFile Condition="Exists('$(RepoRoot)nuget.config')">$(RepoRoot)nuget.config</RestoreConfigFile>
-  </PropertyGroup>
-
-  <Import Project="$(_NuGetRestoreTargets)" />
-
-  <ItemGroup>
-    <PackageDownload Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="[$(MicrosoftDotnetNuGetRepackTasksVersion)]" Condition="'$(UsingToolNuGetRepack)' == 'true'" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!-- Don't restore the below nuget packages, repo tools and additional global.json runtimes when building source-only. -->
-    <_ImportOrUseTooling Condition="'$(_ImportOrUseTooling)' == '' and '$(DotNetBuildSourceOnly)' != 'true'">true</_ImportOrUseTooling>
-    <RestoreBuildTaskFeed>$(Publish)</RestoreBuildTaskFeed>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(_ImportOrUseTooling)' == 'true'">
-    <!-- Copy of 'sn.exe' in form of NuGet package. -->
-    <PackageDownload Include="sn" Version="[$(SNVersion)]" />
-    <PackageDownload Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="[$(MicrosoftVisualStudioEngMicroBuildCoreVersion)]" />
-    <PackageDownload Include="MicroBuild.Core.Sentinel" Version="[1.0.0]" />
-    <PackageDownload Include="vswhere" Version="[$(VSWhereVersion)]" />
-    <PackageDownload Include="Microsoft.Signed.Wix" Version="[$(MicrosoftSignedWixVersion)]" />
-    <PackageDownload Include="Microsoft.WixToolset.Sdk" Version="[$(MicrosoftWixToolsetSdkVersion)]" />
-    <PackageDownload Include="Microsoft.DotNet.SignTool" Version="[$(MicrosoftDotNetSignToolVersion)]" />
-    <PackageDownload Include="Microsoft.DotNet.MacOsPkg.Cli" Version="[$(MicrosoftDotNetMacOsPkgVersion)]" />
-    <PackageDownload Include="Microsoft.SymbolUploader.Build.Task" Version="[$(MicrosoftSymbolUploaderBuildTaskVersion)]" Condition="'$(PublishToSymbolServer)' == 'true'" />
-    <PackageDownload Include="Microsoft.DotNet.Build.Tasks.VisualStudio" Version="[$(MicrosoftDotNetBuildTasksVisualStudioVersion)]" Condition="'$(UsingToolVSSDK)' == 'true'" />
-  </ItemGroup>
-
-  <!-- Unlike the items above, we should restore M.D.B.T.F in source build scenarios.
-      Only reference this if publishing is enabled as that is the only scenario where the targets file which this package
-      provides is being imported (from Publish.proj). -->
-  <ItemGroup Condition="'$(RestoreBuildTaskFeed)' == 'true'">
-    <PackageDownload Include="Microsoft.DotNet.Build.Tasks.Feed" Version="[$(MicrosoftDotNetBuildTasksFeedVersion)]" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <_RepoToolManifest>$([MSBuild]::NormalizePath('$(RepoRoot)', '.config', 'dotnet-tools.json'))</_RepoToolManifest>
-  </PropertyGroup>
-
-  <!-- When doing source-only build, we should not use these in the inner or orchestrated builds. -->
-  <Target Name="RestoreRepoTools"
-          Condition="'$(_ImportOrUseTooling)' == 'true' and Exists('$(_RepoToolManifest)')"
-          BeforeTargets="Restore">
-
-    <!-- Respect a restore config file passed in via /p:RestoreConfigFile, common in VMR builds -->
-    <PropertyGroup>
-      <RestoreConfigFileOption></RestoreConfigFileOption>
-      <RestoreConfigFileOption Condition="'$(RestoreConfigFile)' != ''">--configfile "$(RestoreConfigFile)"</RestoreConfigFileOption>
-    </PropertyGroup>
-
-    <Exec Command='"$(DotNetTool)" tool restore $(RestoreConfigFileOption)' WorkingDirectory="$(RepoRoot)" />
-  </Target>
-
-  <!-- Set as DependsOnTargets when internal tools (e.g. IBC data, optprof) is required -->
-  <Target Name="RestoreInternalTooling"
-          AfterTargets="$(RestoreInternalToolingAfterTargets)">
-    <PropertyGroup>
-      <InternalToolsRestoreProject>$(RepoRoot)eng/common/internal/Tools.csproj</InternalToolsRestoreProject>
-      <InternalToolsRestoreConfig>$(RepoRoot)eng/common/internal/NuGet.config</InternalToolsRestoreConfig>
-    </PropertyGroup>
-    <MSBuild Projects="$(InternalToolsRestoreProject)"
-        Targets="Restore"
-        Properties="@(_RestoreToolsProps);RestoreConfigFile=$(InternalToolsRestoreConfig);_NETCORE_ENGINEERING_TELEMETRY=Restore"
-        Condition="'$(Restore)' == 'true'"/>
-  </Target>
-
-  <ItemGroup>
-    <PackageDownload Include="Microsoft.DotNet.SourceBuild.Tasks"
-      Version="[$(MicrosoftDotNetSourceBuildTasksVersion)]"
-      IsImplicitlyDefined="true"
-      Condition="'$(TrackPrebuiltUsage)' == 'true'" />
-  </ItemGroup>
-
-  <!-- Repository extensibility point -->
-  <Import Project="$(RepositoryEngineeringDir)Tools.props" Condition="Exists('$(RepositoryEngineeringDir)Tools.props')" />
-
-  <Import Project="InstallDotNetCore.targets" Condition="'$(_ImportOrUseTooling)' == 'true'" />
-
-  <Import Project="VisualStudio.AcquireOptimizationData.targets" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'" />
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/TrackPrebuiltUsage.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/TrackPrebuiltUsage.targets
deleted file mode 100644
index fc4578574cd..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/TrackPrebuiltUsage.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <PropertyGroup>
-    <MicrosoftDotNetSourceBuildTasksBuildDir>$(NuGetPackageRoot)microsoft.dotnet.sourcebuild.tasks\$(MicrosoftDotNetSourceBuildTasksVersion)\build\</MicrosoftDotNetSourceBuildTasksBuildDir>
-  </PropertyGroup>
-  <Import Project="$(MicrosoftDotNetSourceBuildTasksBuildDir)Microsoft.DotNet.SourceBuild.Tasks.props" />
-
-  <Target Name="WritePrebuiltUsageData" AfterTargets="Build">
-    <PropertyGroup>
-      <TrackPrebuiltUsageRootDir Condition="'$(TrackPrebuiltUsageRootDir)' == ''">$(RepoRoot)</TrackPrebuiltUsageRootDir>
-      <TrackPrebuiltUsagePackageCache Condition="'$(TrackPrebuiltUsagePackageCache)' == ''">$(NuGetPackageRoot)</TrackPrebuiltUsagePackageCache>
-      <TrackPrebuiltUsageReportDir Condition="'$(TrackPrebuiltUsageReportDir)' == ''">$(ArtifactsLogDir)</TrackPrebuiltUsageReportDir>
-      <TrackPrebuiltUsageReportFile Condition="'$(TrackPrebuiltUsageReportFile)' == ''">$(TrackPrebuiltUsageReportDir)prebuilt-usage.xml</TrackPrebuiltUsageReportFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <AllRestoredPackageFiles Include="$(TrackPrebuiltUsagePackageCache)**/*.nupkg" />
-      <SourceBuiltPackageFiles Include="$(AdditionalSourceBuiltNupkgCacheDir)**/*.nupkg" Condition="'$(AdditionalSourceBuiltNupkgCacheDir)' != ''" />
-      <SourceBuiltPackageFiles Include="$(ReferencePackageNupkgCacheDir)**/*.nupkg" Condition="'$(ReferencePackageNupkgCacheDir)' != ''" />
-      <SourceBuiltPackageFiles Include="$(PreviouslySourceBuiltNupkgCacheDir)**/*.nupkg" Condition="'$(PreviouslySourceBuiltNupkgCacheDir)' != ''" />
-
-      <!-- Scan entire TrackPrebuiltUsageRootDir, in case project.assets.json ends up in an unexpected place. -->
-      <ProjectDirectories Include="$(TrackPrebuiltUsageRootDir)" />
-    </ItemGroup>
-
-    <WritePackageUsageData
-      RestoredPackageFiles="@(AllRestoredPackageFiles)"
-      TarballPrebuiltPackageFiles="@(TarballPrebuiltPackageFiles)"
-      SourceBuiltPackageFiles="@(SourceBuiltPackageFiles)"
-      ReferencePackageFiles="@(ReferencePackageFiles)"
-      PlatformsRuntimeJsonFiles="@(PlatformsRuntimeJsonFiles)"
-      TargetRid="$(TargetRid)"
-      ProjectDirectories="@(ProjectDirectories)"
-      RootDir="$(TrackPrebuiltUsageRootDir)"
-      IgnoredProjectAssetsJsonFiles="@(IgnoredProjectAssetsJsonFiles)"
-      DataFile="$(TrackPrebuiltUsageReportFile)"
-      ProjectAssetsJsonArchiveFile="$(ProjectAssetsJsonArchiveFile)" />
-
-    <WriteUsageReports
-      DataFile="$(TrackPrebuiltUsageReportFile)"
-      PoisonedReportFile="$(PoisonedReportFile)"
-      OutputDirectory="$(TrackPrebuiltUsageReportDir)" />
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.AcquireOptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.AcquireOptimizationData.targets
deleted file mode 100644
index 33704816096..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.AcquireOptimizationData.targets
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <!-- 
-    Properties:
-      VisualStudioIbcRepositoryName    Repository name to look up the IBC drop (e.g. roslyn). Defaults to RepositoryName
-      VisualStudioIbcSourceBranchName  The name of the branch of the repository that was used to produce the IBC data to be acquired (e.g. 'master').
-      VisualStudioIbcDropId            The id of the drop. If specified, drop named 'OptimizationData/$(VisualStudioIbcRepositoryName)/$(VisualStudioIbcSourceBranchName)/$(VisualStudioIbcDropId)' is used.
-                                       Otherwise, the most recent drop of name that matches 'OptimizationData/$(VisualStudioIbcRepositoryName)/$(VisualStudioIbcSourceBranchName)/*' is used.
-      VisualStudioIbcDrop              The explicit drop to use. Overrides VisualStudioIbcSourceBranchName and VisualStudioIbcDropId
-  -->
-  
-  <PropertyGroup>
-    <_VisualStudioBuildTasksAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.visualstudio\$(MicrosoftDotNetBuildTasksVisualStudioVersion)\tools\net\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</_VisualStudioBuildTasksAssembly>
-  </PropertyGroup>
-  
-  <UsingTask AssemblyFile="$(_VisualStudioBuildTasksAssembly)" TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.FindLatestDrop" Runtime="NET" />
-
-  <PropertyGroup>
-    <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release' and '$(OfficialBuild)' == 'true'">true</EnableNgenOptimization>
-    <VisualStudioIbcRepositoryName Condition="'$(VisualStudioIbcRepositoryName)' == ''">$(RepositoryName)</VisualStudioIbcRepositoryName>
-  </PropertyGroup>
-  
-  <!--
-    Acquire optimization data from VS drop, unless suppressed by setting EnableNgenOptimization to false.
-    Find the latest optimization data drop and downloads it to IbcOptimizationDataDir directory.
-  -->
-  <Target Name="_AcquireVisualStudioOptimizationData"
-          DependsOnTargets="_PrepareAcquireVisualStudioOptimizationData;_DownloadVisualStudioOptimizationDataOpt"
-          AfterTargets="Restore"
-          Condition="'$(EnableNgenOptimization)' == 'true'">
-  </Target>
-  
-  <Target Name="_PrepareAcquireVisualStudioOptimizationData"
-          DependsOnTargets="RestoreInternalTooling">
-    <PropertyGroup>
-      <_DropToolPath>$(NuGetPackageRoot)drop.app\$(DropAppVersion)\lib\net45\drop.exe</_DropToolPath>
-      <_DropToolExists>false</_DropToolExists>
-      <_DropToolExists Condition="Exists('$(_DropToolPath)')">true</_DropToolExists>
-    </PropertyGroup>
-
-    <!--
-      Only report error when running in an official build.
-      Allows to test optimization data operations locally by running 
-      cibuild.cmd after manually restoring internal tools project.
-    -->
-    <Error Text='Internal tool not found: "$(_DropToolPath)". Run restore on "$(RepositoryEngineeringDir)common\internal\Tools.csproj".'
-           Condition="'$(OfficialBuild)' == 'true' and !$(_DropToolExists)"/>
-  </Target>
-
-  <Target Name="_DownloadVisualStudioOptimizationDataOpt" Condition="$(_DropToolExists)">
-    <Error Text="VisualStudioDropAccessToken property has to be specified when EnableNgenOptimization and OfficialBuild is true" Condition="'$(VisualStudioDropAccessToken)' == '' and '$(OfficialBuild)' == 'true'"/>
-    <Error Text="VisualStudioIbcRepositoryName property has to be specified when EnableNgenOptimization is true and VisualStudioIbcDrop is not set" Condition="'$(VisualStudioIbcDrop)' == '' and '$(VisualStudioIbcRepositoryName)' == ''"/>
-    <Error Text="VisualStudioIbcSourceBranchName property has to be specified when EnableNgenOptimization is true and VisualStudioIbcDrop is not set" Condition="'$(VisualStudioIbcDrop)' == '' and '$(VisualStudioIbcSourceBranchName)' == ''"/>
-    <Error Text="VisualStudioIbcSourceBranchName property cannot be specified when using the VisualStudioIbcDrop property" Condition="'$(VisualStudioIbcDrop)' != '' and '$(VisualStudioIbcSourceBranchName)' != ''" />
-    <Error Text="VisualStudioIbcDropId property cannot be specified when using the VisualStudioIbcDrop property" Condition="'$(VisualStudioIbcDrop)' != '' and '$(VisualStudioIbcDropId)' != ''" />
-
-    <PropertyGroup>
-      <_DropServiceUrl>https://devdiv.artifacts.visualstudio.com</_DropServiceUrl>
-      <_PatAuthArg Condition="'$(VisualStudioDropAccessToken)' != ''">--patAuth "$(VisualStudioDropAccessToken)"</_PatAuthArg>
-      <_DestArg>$(IbcOptimizationDataDir.TrimEnd('\'))</_DestArg>
-      <_DropsJsonPath>$(ArtifactsLogDir)OptimizationDataDrops.json</_DropsJsonPath>
-      <_DropsLogPath>$(ArtifactsLogDir)OptimizationDataAcquisition.log</_DropsLogPath>
-      <_DropNamePrefix>OptimizationData/$(VisualStudioIbcRepositoryName)/$(VisualStudioIbcSourceBranchName)</_DropNamePrefix>
-      <_DropName>$(_DropNamePrefix)/$(VisualStudioIbcDropId)</_DropName>
-      <_DropName Condition="'$(VisualStudioIbcDrop)' != ''">$(VisualStudioIbcDrop)</_DropName>
-    </PropertyGroup>
-
-    <Message Text="Listing optimization data from service $(_DropServiceUrl), prefix $(_DropNamePrefix)" Importance="high"/>
-
-    <Exec Command='"$(_DropToolPath)" list --dropservice "$(_DropServiceUrl)" $(_PatAuthArg) --pathPrefixFilter "$(_DropNamePrefix)" --toJsonFile "$(_DropsJsonPath)" --traceto "$(_DropsLogPath)"' 
-          Condition="'$(VisualStudioIbcDropId)' == '' and '$(VisualStudioIbcDrop)' == ''"/>
-
-    <FindLatestDrop DropListPath="$(_DropsJsonPath)" Condition="'$(VisualStudioIbcDropId)' == '' and '$(VisualStudioIbcDrop)' == ''">
-      <Output TaskParameter="DropName" PropertyName="_DropName"/>
-    </FindLatestDrop>
-
-    <Error Text="No drop matching given name found: $(_DropServiceUrl)/$(_DropNamePrefix)/*" Condition="'$(_DropName)' == ''"/>
-
-    <MakeDir Directories="$(IbcOptimizationDataDir)" />
-
-    <Message Text="Downloading optimization data from service $(_DropServiceUrl), drop $(_DropName)" Importance="high"/>
-    <Exec Command='"$(_DropToolPath)" get --dropservice "$(_DropServiceUrl)" $(_PatAuthArg) --name "$(_DropName)" --dest "$(_DestArg)" --traceto "$(_DropsLogPath)"' />
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.BuildIbcTrainingInputs.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.BuildIbcTrainingInputs.targets
deleted file mode 100644
index 39949cff687..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.BuildIbcTrainingInputs.targets
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <!--
-    Properties:
-      RepositoryName                   Current repository name (e.g. 'dotnet/roslyn').
-      VisualStudioDropName             Product drop name, e.g. 'Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
-  -->
-  
-  <PropertyGroup>
-    <_VisualStudioBuildTasksAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.visualstudio\$(MicrosoftDotNetBuildTasksVisualStudioVersion)\tools\net\Microsoft.DotNet.Build.Tasks.VisualStudio.dll</_VisualStudioBuildTasksAssembly>
-  </PropertyGroup>
-
-  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GenerateTrainingInputFiles" AssemblyFile="$(_VisualStudioBuildTasksAssembly)" Runtime="NET" />
-  <UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GenerateTrainingPropsFile" AssemblyFile="$(_VisualStudioBuildTasksAssembly)" Runtime="NET" />
-
-  <Target Name="_BuildTrainingInputs" BeforeTargets="AfterBuild">
-    <Error Condition="('$(VisualStudioDropName)' == '' or '$(RepositoryName)' == '') and '$(OfficialBuild)' == 'true'"
-           Text="Properties VisualStudioDropName and RepositoryName must be specified in official build that produces Visual Studio insertion components." />
-
-    <GenerateTrainingInputFiles ConfigurationFile="$(RepositoryEngineeringDir)config\OptProf.json"
-                                InsertionDirectory="$(VisualStudioSetupInsertionPath)"
-                                OutputDirectory="$(ArtifactsDir)OptProf\$(Configuration)\Data" />
-
-    <GenerateTrainingPropsFile ProductDropName="$(VisualStudioDropName)"
-                               RepositoryName="$(RepositoryName)"
-                               OutputDirectory="$(VisualStudioSetupInsertionPath)OptProf"/>
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
deleted file mode 100644
index e79964b9cd8..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <ItemGroup>
-    <_StubFiles Include="$(VisualStudioSetupIntermediateOutputPath)**\*.stub"/>
-    <_StubDirs Include="@(_StubFiles->'%(RecursiveDir)')"/>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <GenerateSbom Condition="'$(GenerateSbom)' == ''">false</GenerateSbom>
-  </PropertyGroup>
-  <!---
-    This target is invoked in a separate phase after all input VSIX files are signed.
-    This is important since the manifest contain hashes of the VSIX files.
-  -->
-  <Target Name="GenerateVisualStudioInsertionManifests"
-          BeforeTargets="AfterPack"
-          Outputs="%(_StubDirs.Identity)"
-          Condition="'@(_StubDirs)' != ''">
-    <PropertyGroup>
-      <_ComponentDir>%(_StubDirs.Identity)</_ComponentDir>
-      <_ComponentName>$(_ComponentDir.TrimEnd('\'))</_ComponentName>
-    </PropertyGroup>
-
-    <Message Text="Generating manifest for VS component '$(_ComponentName)'" Importance="high"/>
-
-    <Error Condition="'$(VisualStudioDropName)' == '' and '$(OfficialBuild)' == 'true'"
-           Text="Property VisualStudioDropName must be specified in official build that produces Visual Studio insertion components." />
-
-    <ItemGroup>
-      <_Args Include="OfficialBuild=$(OfficialBuild)" />
-      <_Args Include="ComponentName=$(_ComponentName)"/>
-      <_Args Include="SetupOutputPath=$(VisualStudioSetupInsertionPath)"/>
-      <_Args Include="ComponentIntermediateOutputPath=$(VisualStudioSetupIntermediateOutputPath)$(_ComponentName)\"/>
-      <_Args Include="SwixBuildPath=$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.plugins.swixbuild\$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)\" />
-      <_Args Include="VisualStudioDropName=$(VisualStudioDropName)" />
-      <_Args Include="DotNetTool=$(DotNetTool)" />
-      <_Args Include="ManifestTool=$(NuGetPackageRoot)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll" />
-      <_Args Include="GenerateSbom=$(GenerateSbom)" />
-    </ItemGroup>
-
-    <!--
-      Invoke GenerateSetupManifest target directly (instead of Build) to skip logic in common targets that is not needed 
-      and adds unnecessary dependency on .NET Framework reference assemblies.
-    -->
-    <MSBuild Projects="VisualStudio.SetupPackage.vsmanproj" Properties="@(_Args)" Targets="_BuildManifest"/>
-  </Target>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
deleted file mode 100644
index e94c181e4e2..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <!--
-    Required variables:
-      OfficialBuild                   True for official builds.
-      ComponentName                   Name of the component (VSIX)
-      SetupOutputPath                 Directory to drop Willow manifests to.
-      ComponentIntermediateOutputPath Intermediate directory where the component is being built.
-      SwixBuildPath                   SwixBuild package path.
-      VisualStudioDropName            The name of Visual Studio drop, e.g. 
-                                      "Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)"
-                                      The manifest will be published with URI
-                                      https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)
-      DotNetTool                      Path to dotnet.exe.
-      ManifestTool                    Path to Microsoft.ManifestTool.dll
-      GenerateSbom                    True if an SBOM should be generated for this component.
-  -->
-
-  <PropertyGroup>
-    <ResolveNuGetPackages>false</ResolveNuGetPackages>
-    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
-    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-  </PropertyGroup>
-
-  <Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.props" Condition="'$(SwixBuildPath)' != ''" />
-
-  <PropertyGroup>
-    <FinalizeManifest>true</FinalizeManifest>
-    <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <IsPackage>true</IsPackage>
-    <TargetName>$(ComponentName)</TargetName>
-    <OutputPath>$(SetupOutputPath)</OutputPath>
-    <IntermediateOutputPath>$(ComponentIntermediateOutputPath)</IntermediateOutputPath>
-    <GenerateSbom>$(GenerateSbom)</GenerateSbom>
-
-    <!-- Note that the url is expected to end with ';' (%3B) -->
-    <ManifestPublishUrl Condition="'$(VisualStudioDropName)' != ''">https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)%3B</ManifestPublishUrl>
-    <ManifestPublishUrl Condition="'$(VisualStudioDropName)' == ''">http://localhost/non-official-build%3B</ManifestPublishUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <_PackageStubFiles Include="$(ComponentIntermediateOutputPath)*.stub"/>
-  </ItemGroup>
-
-  <Import Project="$(SwixBuildPath)build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets" Condition="'$(SwixBuildPath)' != ''" />
-
-  <Target Name="_BuildManifest" DependsOnTargets="_GetVsixFileInfo;_GenerateSbomForVsixAndAddManifestItem;_GenerateVSManifest;GenerateSetupManifest" />
-
-  <Target Name="_GetVsixFileInfo">
-    <ReadLinesFromFile File="%(_PackageStubFiles.Identity)">
-      <Output TaskParameter="Lines" ItemName="_StubLine"/>
-    </ReadLinesFromFile>
-   <!--Parse the stub file to get the details of VsixId, VsixFileName and VsxiVersion-->
-   <!--Eg: _StubLine = Microsoft.FSharp.VSIX.Templates/VisualFSharpTemplates.vsix/17.0.0.2231309
-          VsixId = Microsoft.FSharp.VSIX.Templates
-          VsixFileName = VisualFSharpTemplates.vsix
-          VsixVersion = 17.0.0.2231309-->
-    <ItemGroup>
-      <_ParsedLine Include="@(_StubLine)"
-                   VsixId="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
-                   VsixFileName="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])"
-                   VsixVersion="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[2])" />
-    <!--Set the VSmanifest name, Vsix path, Vsix unpacking path, Directory to generate SBOM and Path to generated SBOM manifest-->
-      <_VsixFileInfo Include="@(_ParsedLine->'%(VsixFileName)')">
-        <ManifestJsonPath>$(SetupOutputPath)%(VsixId).json</ManifestJsonPath>
-        <VsixPath>$(SetupOutputPath)%(VsixFileName)</VsixPath>
-        <UnpackDir>$(ComponentIntermediateOutputPath)%(VsixFileName)\unpack</UnpackDir>
-        <SbomDir>$(ComponentIntermediateOutputPath)%(VsixFileName)\sbom</SbomDir>
-        <SbomJsonPath>$(ComponentIntermediateOutputPath)%(VsixFileName)\sbom\spdx_2.2\manifest.spdx.json</SbomJsonPath>
-      </_VsixFileInfo>
-    </ItemGroup>
-
-    <ItemGroup>
-      <_VsixVersion Include="%(_VsixFileInfo.VsixVersion)" VsixFileName="%(_VsixFileInfo.Identity)" />
-    </ItemGroup>
-
-    <RemoveDuplicates Inputs="@(_VsixVersion)">
-      <Output TaskParameter="Filtered" ItemName="_VsixVersionNoDuplicates"/>
-    </RemoveDuplicates>
-
-    <!--
-      Each stub file contains VSIX version of the respective VSIX file.
-      We require that all VSIXes included in a single VS insertion component have the same version.
-      This version will be set to ManifestBuildVersion.
-    -->
-    <Error Text="Cannot generate VS manifest because Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(VsixFileName) (version %(Identity))', ', ')"
-           Condition="@(_VsixVersionNoDuplicates->Count()) != 1"/>
-
-    <PropertyGroup>
-      <ManifestBuildVersion>@(_VsixVersionNoDuplicates)</ManifestBuildVersion>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_GenerateSbomForVsixAndAddManifestItem"
-          Inputs="@(_VsixFileInfo->'%(VsixPath)')"
-          Outputs="@(_VsixFileInfo->'%(SbomJsonPath)')"
-          DependsOnTargets="_GetVsixFileInfo"
-          Condition="'$(GenerateSbom)' != 'false'">
-    <Message Text="Generating SBOM manifest for '%(_VsixFileInfo.Identity)'" Importance="high"/>
-
-    <Error Text="Internal tool not found: 'microsoft.manifesttool.crossplatform'. Run restore on '$(RepositoryEngineeringDir)common\internal\Tools.csproj'."
-           Condition="!Exists('$(ManifestTool)')" />
-
-    <MakeDir Directories="%(_VsixFileInfo.SbomDir);%(_VsixFileInfo.UnpackDir)"/>
-    <Copy SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)" Condition = "'%(_VsixFileInfo.Extension)' == '.exe'" />
-    <Unzip SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)" Condition = "'%(_VsixFileInfo.Extension)' != '.exe'"/>
-    <!-- Generate SBOM -->
-    <Exec Command='"$(DotNetTool)" --roll-forward major "$(ManifestTool)" generate -BuildDropPath "%(_VsixFileInfo.UnpackDir)" -ManifestDirPath "%(_VsixFileInfo.SbomDir)" -PackageName "%(_VsixFileInfo.VsixFileName)" -PackageVersion "%(_VsixFileInfo.VsixVersion)" -Verbosity Verbose'/>
-    <!-- Generate VS manifest with link to the SBOM manifest-->
-    <ItemGroup>
-      <MergeManifest Include="%(_VsixFileInfo.ManifestJsonPath)" SBOMFileLocation="%(_VsixFileInfo.SbomJsonPath)" />
-    </ItemGroup>
-
-    <Message Text="Completed generating SBOM manifest for %(_VsixFileInfo.Identity)." Importance="high"/>
-  </Target>
-
-  <Target Name="_GenerateVSManifest"
-          DependsOnTargets="_GetVsixFileInfo"
-          Condition="'$(GenerateSbom)' == 'false'">
-
-  <Message Text="Generating VS manifest '%(_VsixFileInfo.Identity)'" Importance="high"/>
-  <ItemGroup>
-    <MergeManifest Include="%(_VsixFileInfo.ManifestJsonPath)" />
-  </ItemGroup>
-  </Target>
-
-</Project>

From 26794270f832b2d1bcadbf0fc3a6304fc8b823fb Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:55:27 +0200
Subject: [PATCH 06/20] Restore projs

---
 src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj
index cb44d5143d7..584e2db47e5 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Tools.proj
@@ -9,6 +9,13 @@
     <RestoreInternalToolingAfterTargets Condition="'$(RestoreInternalTooling)' == 'true'">Restore</RestoreInternalToolingAfterTargets>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="AfterSolutionBuild.proj" />
+    <ProjectReference Include="Sign.proj" />
+    <ProjectReference Include="AfterSigning.proj" />
+    <ProjectReference Include="Publish.proj" />
+  </ItemGroup>
+
   <Target Name="RestoreRepoTools"
           Condition="'$(DotNetBuildSourceOnly)' != 'true' and Exists('$(_RepoToolManifest)')"
           BeforeTargets="Restore">

From 19a8b343c08ac987a6ade15c997268eaac4338d5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 21:08:39 +0200
Subject: [PATCH 07/20] Fix toolset copy

---
 eng/common/tools.ps1 | 12 +++++++-----
 eng/common/tools.sh  |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 89290dad916..c31e0ae2268 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -681,12 +681,14 @@ function InitializeToolset() {
   }
 
   New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null
-  Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
 
-  # Copy toolset if present at the package root (new layout)
-  $packageSdkTasksDir = Join-Path $packageDir 'toolset'
-  if (Test-Path $packageSdkTasksDir) {
-    Copy-Item -Path $packageSdkTasksDir -Destination $toolsetToolsDir -Recurse -Force
+  # Copy toolset if present at the package root (new layout), otherwise fall back to tools
+  $packageToolsetDir = Join-Path $packageDir 'toolset'
+  if (Test-Path $packageToolsetDir) {
+    Copy-Item -Path $packageToolsetDir -Destination $toolsetToolsDir -Recurse -Force
+  } else {
+    # TODO: Remove this fallback once all supported versions have the toolset folder.
+    Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
   }
 
   if (Test-Path $newPath) {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 41b886b222d..2970ff7a45a 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -439,11 +439,13 @@ function InitializeToolset {
   fi
 
   mkdir -p "$toolset_tools_dir"
-  cp -r "$package_dir/tools/." "$toolset_tools_dir"
 
-  # Copy toolset if present at the package root (new layout)
+  # Copy toolset if present at the package root (new layout), otherwise fall back to tools
   if [[ -d "$package_dir/toolset" ]]; then
     cp -r "$package_dir/toolset" "$toolset_tools_dir/"
+  else
+    # TODO: Remove this fallback once all supported versions have the toolset folder.
+    cp -r "$package_dir/tools/." "$toolset_tools_dir"
   fi
 
   if [[ -a "$toolset_tools_dir/toolset/Build.proj" ]]; then

From e8ab0dc49d3232cde3133a1492c8d845558f8580 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 21:18:35 +0200
Subject: [PATCH 08/20] Fix missing toolset folder check

---
 eng/common/tools.ps1 | 28 +++++++++++-----------------
 eng/common/tools.sh  | 19 +++++++------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index c31e0ae2268..49bccb7374c 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -610,7 +610,7 @@ function GetNuGetPackageCachePath() {
 
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject([string]$taskName) {
-  return Join-Path (Split-Path (InitializeToolset) -Parent) "toolset\$taskName.proj"
+  return Join-Path (Split-Path (InitializeToolset) -Parent) "$taskName.proj"
 }
 
 function InitializeNativeTools() {
@@ -651,14 +651,10 @@ function InitializeToolset() {
 
   # Check if the toolset has already been extracted
   $toolsetBuildProj = $null
-  $newPath = Join-Path $toolsetToolsDir 'toolset\Build.proj'
-  $oldPath = Join-Path $toolsetToolsDir 'Build.proj'
+  $buildProjPath = Join-Path $toolsetToolsDir 'Build.proj'
 
-  if (Test-Path $newPath) {
-    $toolsetBuildProj = $newPath
-  } elseif (Test-Path $oldPath) {
-    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
-    $toolsetBuildProj = $oldPath
+  if (Test-Path $buildProjPath) {
+    $toolsetBuildProj = $buildProjPath
   }
 
   if ($toolsetBuildProj -ne $null) {
@@ -673,29 +669,27 @@ function InitializeToolset() {
   DotNet package download "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion" --prerelease --output "$nugetCache"
 
   $packageDir = Join-Path $nugetCache (Join-Path 'microsoft.dotnet.arcade.sdk' $toolsetVersion)
+  $packageToolsetDir = Join-Path $packageDir 'toolset'
   $packageToolsDir = Join-Path $packageDir 'tools'
 
-  if (!(Test-Path $packageToolsDir)) {
-    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK tools not found at: $packageToolsDir"
+  # TODO: Remove the tools/ check once all supported versions have the toolset folder.
+  if (!(Test-Path $packageToolsetDir) -and !(Test-Path $packageToolsDir)) {
+    Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Arcade SDK package does not contain a toolset or tools folder: $packageDir"
     ExitWithExitCode 3
   }
 
   New-Item -ItemType Directory -Path $toolsetToolsDir -Force | Out-Null
 
   # Copy toolset if present at the package root (new layout), otherwise fall back to tools
-  $packageToolsetDir = Join-Path $packageDir 'toolset'
   if (Test-Path $packageToolsetDir) {
-    Copy-Item -Path $packageToolsetDir -Destination $toolsetToolsDir -Recurse -Force
+    Copy-Item -Path "$packageToolsetDir\*" -Destination $toolsetToolsDir -Recurse -Force
   } else {
     # TODO: Remove this fallback once all supported versions have the toolset folder.
     Copy-Item -Path "$packageToolsDir\*" -Destination $toolsetToolsDir -Recurse -Force
   }
 
-  if (Test-Path $newPath) {
-    $toolsetBuildProj = $newPath
-  } elseif (Test-Path $oldPath) {
-    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
-    $toolsetBuildProj = $oldPath
+  if (Test-Path $buildProjPath) {
+    $toolsetBuildProj = $buildProjPath
   } else {
     throw "Unable to find Build.proj in toolset at: $toolsetToolsDir"
   }
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 2970ff7a45a..ad9af28328f 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -411,10 +411,7 @@ function InitializeToolset {
 
   # Check if the toolset has already been extracted
   local toolset_build_proj=""
-  if [[ -a "$toolset_tools_dir/toolset/Build.proj" ]]; then
-    toolset_build_proj="$toolset_tools_dir/toolset/Build.proj"
-  elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
-    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
+  if [[ -a "$toolset_tools_dir/Build.proj" ]]; then
     toolset_build_proj="$toolset_tools_dir/Build.proj"
   fi
 
@@ -433,8 +430,9 @@ function InitializeToolset {
 
   local package_dir="$_GetNuGetPackageCachePath/microsoft.dotnet.arcade.sdk/$toolset_version"
 
-  if [[ ! -d "$package_dir/tools" ]]; then
-    Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK tools not found at: $package_dir/tools"
+  # TODO: Remove the tools/ check once all supported versions have the toolset folder.
+  if [[ ! -d "$package_dir/toolset" && ! -d "$package_dir/tools" ]]; then
+    Write-PipelineTelemetryError -category 'InitializeToolset' "Arcade SDK package does not contain a toolset or tools folder: $package_dir"
     ExitWithExitCode 3
   fi
 
@@ -442,16 +440,13 @@ function InitializeToolset {
 
   # Copy toolset if present at the package root (new layout), otherwise fall back to tools
   if [[ -d "$package_dir/toolset" ]]; then
-    cp -r "$package_dir/toolset" "$toolset_tools_dir/"
+    cp -r "$package_dir/toolset/." "$toolset_tools_dir"
   else
     # TODO: Remove this fallback once all supported versions have the toolset folder.
     cp -r "$package_dir/tools/." "$toolset_tools_dir"
   fi
 
-  if [[ -a "$toolset_tools_dir/toolset/Build.proj" ]]; then
-    toolset_build_proj="$toolset_tools_dir/toolset/Build.proj"
-  elif [[ -a "$toolset_tools_dir/Build.proj" ]]; then
-    # TODO: Remove this fallback once Build.proj has been moved to toolset in all supported versions.
+  if [[ -a "$toolset_tools_dir/Build.proj" ]]; then
     toolset_build_proj="$toolset_tools_dir/Build.proj"
   else
     Write-PipelineTelemetryError -category 'Build' "Unable to find Build.proj in toolset at: $toolset_tools_dir"
@@ -594,7 +589,7 @@ function GetDarc {
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject {
   taskName=$1
-  echo "$(dirname $_InitializeToolset)/toolset/$taskName.proj"
+  echo "$(dirname $_InitializeToolset)/$taskName.proj"
 }
 
 ResolvePath "${BASH_SOURCE[0]}"

From ec4e4a50091efecd14263ea2e6a99cc5a4f53ec3 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 21:28:10 +0200
Subject: [PATCH 09/20] Remove hardcoded path

---
 src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
index 793ed801736..f960003c2f4 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
@@ -148,7 +148,6 @@
 
     <ItemGroup Condition="'$(Restore)' == 'true'">
       <_RestoreToolsProps Include="@(_CommonProps)"/>
-      <_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/>
       <_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/>
       <_RestoreToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/>
 

From c11e04f9e03dbf4cddec5bbeff02c056083bbdd5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 21:33:52 +0200
Subject: [PATCH 10/20] Remove unneeded Versions.props file

---
 .../toolset/Versions.props                    | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/toolset/Versions.props

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Versions.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Versions.props
deleted file mode 100644
index d99f8045360..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Versions.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <Import Project="..\DefaultVersions.Generated.props"/>
-
-  <PropertyGroup>
-    <MicrosoftDotNetBuildTasksVisualStudioVersion>$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksVisualStudioVersion>
-    <MicrosoftDotNetBaselinesTasksVersion Condition="'$(MicrosoftDotNetBaselinesTasksVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBaselinesTasksVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion Condition="'$(MicrosoftDotNetBuildTasksFeedVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetSignCheckTaskVersion Condition="'$(MicrosoftDotNetSignCheckTaskVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignCheckTaskVersion>
-    <MicrosoftSymbolUploaderBuildTaskVersion>$(MicrosoftSymbolUploaderBuildTaskVersion)</MicrosoftSymbolUploaderBuildTaskVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RestoreAdditionalProjectSources>
-      $(RestoreAdditionalProjectSources);
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
-    </RestoreAdditionalProjectSources>
-  </PropertyGroup>
-
-</Project>

From 16de4148bcb90cc28a0144a53d2ce6d2d6375253 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 21:42:27 +0200
Subject: [PATCH 11/20] Configure CPM correctly

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../toolset/Directory.Packages.props                        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Packages.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Packages.props
index f3dea99e856..c86d56ee87e 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Packages.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Packages.props
@@ -1,6 +1,12 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!-- NU1507: Disable multi-feed check as .NET uses multiple internal feeds intentionally -->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageVersion Include="Microsoft.DotNet.Baselines.Tasks" Version="$(MicrosoftDotNetBaselinesTasksVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />

From eb823439436d430490fd9a2444b1d02057df8b98 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:02:53 +0200
Subject: [PATCH 12/20] Set OutDirName

---
 src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
index f5fcbc655e1..19f3de1b72b 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
@@ -1,6 +1,10 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
+  <PropertyGroup>
+    <OutDirName>toolset\$(MSBuildProjectName)</OutDirName>
+  </PropertyGroup>
+
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup>

From effb8f9a08bed080c95de9a547b0bd0d2cba6859 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:39:09 +0200
Subject: [PATCH 13/20] Fix build

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/BuildStep.props | 9 ---------
 src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj    | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Arcade.Sdk/tools/BuildStep.props

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildStep.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildStep.props
deleted file mode 100644
index a48dd077e84..00000000000
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildStep.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-
-  <Import Project="RepoDefaults.props"/>
-  <Import Project="RepoLayout.props" />
-  <Import Project="DefaultVersions.props" />
-  <Import Project="BuildTasks.props" />
-
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
index f960003c2f4..afb89423811 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Build.proj
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
-<Project DefaultTargets="Execute">
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Execute">
 
   <!--
 

From ebe1366e0efcfabc372d48febc5c7cd5dfd9bc9f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:46:46 +0200
Subject: [PATCH 14/20] Add polyfill target to Empty.targets

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
index acda5b54784..360e2256fd3 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
@@ -46,6 +46,8 @@
   <Target Name="CorePack"/>
   <Target Name="AfterPack"/>
 
+  <Target Name="CreateManifestResourceNames" />
+
   <Import Project="EmptyDisableRestore.targets" Condition="'$(_EmptyDisableRestore)' != 'false'" />
 
 </Project>

From de4e7664af0ed5f89ba8afa4ea0944e8174dbf95 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:59:21 +0200
Subject: [PATCH 15/20] Fixes

---
 .../tools/ExcludeFromBuild.BeforeCommonTargets.targets          | 1 -
 src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
index 3e7006260e8..ae27633cb92 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
@@ -46,7 +46,6 @@
     avoid building tests in certain product build scenarios.
   -->
   <PropertyGroup>
-    <_SuppressAllTargets>false</_SuppressAllTargets>
     <!-- New .NET build switches -->
     <_SuppressAllTargets Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(ExcludeFromSourceOnlyBuild)' == 'true'">true</_SuppressAllTargets>
     <_SuppressAllTargets Condition="'$(DotNetBuild)' == 'true' and '$(ExcludeFromDotNetBuild)' == 'true'">true</_SuppressAllTargets>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
index 19f3de1b72b..febd5642692 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
@@ -15,7 +15,7 @@
 
     <_SuppressAllTargets>true</_SuppressAllTargets>
     <_SuppressSdkImports>false</_SuppressSdkImports>
-    <_EmptyDisableRestore>true</_EmptyDisableRestore>
+    <_EmptyDisableRestore>false</_EmptyDisableRestore>
   </PropertyGroup>
 
 </Project>

From bfd1ba1425898a62060d4b81f1300d038c2f39ab Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:07:57 +0200
Subject: [PATCH 16/20] Skip restore target

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets             | 2 +-
 .../tools/ExcludeFromBuild.BeforeCommonTargets.targets          | 2 +-
 src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
index 360e2256fd3..9d2c498e7bd 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Empty.targets
@@ -48,6 +48,6 @@
 
   <Target Name="CreateManifestResourceNames" />
 
-  <Import Project="EmptyDisableRestore.targets" Condition="'$(_EmptyDisableRestore)' != 'false'" />
+  <Import Project="EmptyDisableRestore.targets" Condition="'$(_NoSuppressRestoreTarget)' != 'false'" />
 
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
index ae27633cb92..d196db8678a 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
@@ -56,7 +56,7 @@
          which will avoid importing the restore targets inside the .NET SDK. If the restore targets exist, then static graph restore will attempt tpo
          execute. -->
     <DisableWarnForInvalidRestoreProjects Condition="'$(_SuppressAllTargets)' == 'true'">true</DisableWarnForInvalidRestoreProjects>
-    <NuGetRestoreTargets Condition="'$(_SuppressAllTargets)' == 'true'">$(MSBuildThisFileDirectory)NoRestore.targets</NuGetRestoreTargets>
+    <NuGetRestoreTargets Condition="'$(_SuppressAllTargets)' == 'true' and '$(_NoSuppressRestoreTarget)' != 'false'">$(MSBuildThisFileDirectory)NoRestore.targets</NuGetRestoreTargets>
     <!-- When a project is using the .NET SDK, but with the "UseWpf" property, there will be an attempt to import the windows desktop SDK targets.
          These are not available in certain circumstances, like linux source build. -->
     <ImportWindowsDesktopTargets Condition="'$(_SuppressAllTargets)' == 'true'">false</ImportWindowsDesktopTargets>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
index febd5642692..964e74ae5f2 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Directory.Build.props
@@ -15,7 +15,7 @@
 
     <_SuppressAllTargets>true</_SuppressAllTargets>
     <_SuppressSdkImports>false</_SuppressSdkImports>
-    <_EmptyDisableRestore>false</_EmptyDisableRestore>
+    <_NoSuppressRestoreTarget>false</_NoSuppressRestoreTarget>
   </PropertyGroup>
 
 </Project>

From f54ff50ea345bdd480b9b4c7fb2bd92e8dc6c01c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:26:03 +0200
Subject: [PATCH 17/20] Undo change

---
 eng/common/sdk-task.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index a8af86844cc..68119de603e 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -14,7 +14,7 @@ Param(
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
-$ci = $false
+$ci = $true
 $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
 $warnAsError = if ($noWarnAsError) { $false } else { $true }
 

From 9ee9de75e3f2665b74971f09893e42b2e50f43f4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:34:44 +0200
Subject: [PATCH 18/20] Small clean-up

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
index b90879d2451..9a51d5b4cb9 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ArcadeSdkToolsDir>$(MSBuildThisFileDirectory)</ArcadeSdkToolsDir>
     <ArcadeSdkBuildTasksAssembly>$(MSBuildThisFileDirectory)net\Microsoft.DotNet.Arcade.Sdk.dll</ArcadeSdkBuildTasksAssembly>
   </PropertyGroup>
 

From 12b7179ecbd82f16bab21c467d796ee1fa9c5227 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:43:08 +0200
Subject: [PATCH 19/20] Define Arcade.Sdk tasks centrally

---
 .../tools/BuildTasks.props                    | 19 +++++++++++++++++++
 .../tools/GenerateChecksums.targets           |  2 --
 .../tools/GenerateResxSource.targets          |  2 --
 .../tools/OptimizationData.targets            |  4 ----
 .../tools/RepositoryInfo.targets              |  4 ----
 .../tools/RepositoryValidation.proj           |  3 ---
 .../tools/Version.targets                     |  2 --
 .../toolset/InstallDotNetCore.targets         |  2 --
 .../toolset/Publish.proj                      |  2 --
 9 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
index 9a51d5b4cb9..23a8e252ec2 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/BuildTasks.props
@@ -15,4 +15,23 @@
     <ArcadeSdkBuildTasksAssembly>$(MSBuildThisFileDirectory)net\Microsoft.DotNet.Arcade.Sdk.dll</ArcadeSdkBuildTasksAssembly>
   </PropertyGroup>
 
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CalculateAssemblyAndFileVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CheckRequiredDotNetVersion" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.DownloadFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.ExtractNgenMethodList" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateChecksums" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateResxSource" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateSourcePackageSourceLinkTargetsFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetLicenseFilePath" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GroupItemsBy" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.InstallDotNetCore" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.LocateDotNet" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SaveItems" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SetCorFlags" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.Unsign" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.ValidateLicense" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
+
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateChecksums.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateChecksums.targets
index b625b3e70e9..02089e3a6d1 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateChecksums.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateChecksums.targets
@@ -1,8 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateChecksums" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
   <!--
     Generate Checksums for the specified assets. Runs after the build of a project.
   -->
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
index e7f105c21d0..d031f0d797f 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateResxSource.targets
@@ -6,8 +6,6 @@
     The source file is generated to intermediate output dir to avoid polluting the source tree.
     See https://github.com/dotnet/sdk/issues/94 that tracks productization of this code.
   -->
-
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateResxSource" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
   
   <!-- Set the Generator metadata so that VS triggers design-time build whenever the .resx file is saved -->
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
index 24ef2781aa1..d20874ec3e4 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
@@ -13,10 +13,6 @@
       OptimizeAssembly                   Set of assemblies to apply Partial NGEN optimization data to.
   -->
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.Unsign" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GroupItemsBy" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.ExtractNgenMethodList" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
   <PropertyGroup>
     <PostCompileBinaryModificationSentinelFile>$(IntermediateOutputPath)$(TargetFileName).pcbm</PostCompileBinaryModificationSentinelFile>
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
index 596daa4008d..36233e7cd88 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryInfo.targets
@@ -77,7 +77,6 @@
     Generates and adds {PackageId}.SourceLink.targets file to the build directory of the source package.
   -->
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateSourcePackageSourceLinkTargetsFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
 
   <PropertyGroup Condition="'$(IsPackable)' == 'true' and '$(IsSourcePackage)' == 'true' and '$(EnableSourceLink)' == 'true'">
     <BeforePack>$(BeforePack);_AddSourcePackageSourceLinkFile</BeforePack>
@@ -123,9 +122,6 @@
     <Message Text="Repository validated." Importance="low" />
   </Target>
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.ValidateLicense" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetLicenseFilePath" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
   <Target Name="_ValidateLicenseFile" Condition="('$(PackageLicenseExpression)' != '' or '$(PackageLicenseExpressionInternal)' != '') and '$(SuppressLicenseValidation)' != 'true'">
     <Error Text="Can't specify value for both PackageLicenseExpression ('$(PackageLicenseExpression)') and PackageLicenseExpressionInternal ('$(PackageLicenseExpressionInternal)')"
            Condition="'$(PackageLicenseExpression)' != '' and '$(PackageLicenseExpressionInternal)' != ''"/>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryValidation.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryValidation.proj
index 5efc4b438dd..b45d2f307ab 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryValidation.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/RepositoryValidation.proj
@@ -8,9 +8,6 @@
   
   <Import Project="BuildTasks.props" />
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.ValidateLicense" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetLicenseFilePath" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
   <Target Name="Validate" DependsOnTargets="_ValidateLicenseFile" >
     <Message Text="Repository validated." Importance="low" />
   </Target>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets
index fab5620c279..4b6b9e42679 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Version.targets
@@ -8,8 +8,6 @@
       SemanticVersioningV1        "true" if the Version needs to respect SemVer 1.0. Default is false, which means format following SemVer 2.0.
   -->
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CalculateAssemblyAndFileVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-  
   <Target Name="_InitializeAssemblyVersion" BeforeTargets="GetAssemblyVersion">
     <Warning Text="AssemblyVersion '$(AssemblyVersion)' overridden by auto-generated version" Condition="'$(AssemblyVersion)' != '' and '$(AutoGenerateAssemblyVersion)' == 'true'"/>
     
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/toolset/InstallDotNetCore.targets
index 45ed3bd015e..27bccaf4b26 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/InstallDotNetCore.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/InstallDotNetCore.targets
@@ -1,8 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.InstallDotNetCore" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
   <Target Name="InstallDotNetCore" AfterTargets="Restore">
     <PropertyGroup>
       <_DotNetInstallScript>$(RepositoryEngineeringDir)common\dotnet-install.cmd</_DotNetInstallScript>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Publish.proj
index 0eef4a5908e..abed4d711c3 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/toolset/Publish.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/toolset/Publish.proj
@@ -27,8 +27,6 @@
         - IsShipping                      Set to false to mark the artifact as non-shipping. Defaults to true.
   -->
 
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateChecksums" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
-
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" />
   </ItemGroup>

From c31eee7c25ec0d202c452dcf6301829394c29df4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <7412651+ViktorHofer@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:50:54 +0200
Subject: [PATCH 20/20] Fix sdk tasks fallback

---
 eng/common/tools.ps1 | 12 +++++++++++-
 eng/common/tools.sh  | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 49bccb7374c..6a0f33d18e1 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -610,7 +610,17 @@ function GetNuGetPackageCachePath() {
 
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject([string]$taskName) {
-  return Join-Path (Split-Path (InitializeToolset) -Parent) "$taskName.proj"
+  $toolsetDir = Split-Path (InitializeToolset) -Parent
+  $proj = Join-Path $toolsetDir "$taskName.proj"
+  if (Test-Path $proj) {
+    return $proj
+  }
+  # TODO: Remove this fallback once all supported versions use the new layout.
+  $legacyProj = Join-Path $toolsetDir "SdkTasks\$taskName.proj"
+  if (Test-Path $legacyProj) {
+    return $legacyProj
+  }
+  throw "Unable to find $taskName.proj in toolset at: $toolsetDir"
 }
 
 function InitializeNativeTools() {
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index ad9af28328f..238cb4cef88 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -588,8 +588,22 @@ function GetDarc {
 
 # Returns a full path to an Arcade SDK task project file.
 function GetSdkTaskProject {
-  taskName=$1
-  echo "$(dirname $_InitializeToolset)/$taskName.proj"
+  local taskName=$1
+  local toolsetDir
+  toolsetDir="$(dirname "$_InitializeToolset")"
+  local proj="$toolsetDir/$taskName.proj"
+  if [[ -a "$proj" ]]; then
+    echo "$proj"
+    return
+  fi
+  # TODO: Remove this fallback once all supported versions use the new layout.
+  local legacyProj="$toolsetDir/SdkTasks/$taskName.proj"
+  if [[ -a "$legacyProj" ]]; then
+    echo "$legacyProj"
+    return
+  fi
+  Write-PipelineTelemetryError -category 'Build' "Unable to find $taskName.proj in toolset at: $toolsetDir"
+  ExitWithExitCode 3
 }
 
 ResolvePath "${BASH_SOURCE[0]}"