From 77d966e1b013c53b43dcd16b8307dca9d78ae484 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 11 Jan 2024 20:01:19 +0100
Subject: [PATCH] Simplify repo tasks infra and sources

---
 .../content/eng/tools/Directory.Build.props   |   2 +-
 .../content/eng/tools/init-build.proj         | 171 ++++++++++--------
 .../eng/tools/tasks/Directory.Build.props     |  22 +--
 ...Net.SourceBuild.Tasks.LeakDetection.csproj |  18 +-
 ...soft.DotNet.SourceBuild.Tasks.XPlat.csproj |  19 +-
 .../ReplaceTextInFile.cs                      |  36 ----
 .../UpdateJson.cs                             |  19 +-
 .../SourceBuild.MSBuildSdkResolver.csproj     |  15 +-
 8 files changed, 140 insertions(+), 162 deletions(-)
 delete mode 100644 src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs

diff --git a/src/SourceBuild/content/eng/tools/Directory.Build.props b/src/SourceBuild/content/eng/tools/Directory.Build.props
index 17a556ec5..63c892c31 100644
--- a/src/SourceBuild/content/eng/tools/Directory.Build.props
+++ b/src/SourceBuild/content/eng/tools/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <!--
     Do not import the Arcade SDK for the local tooling projects. This lets us
-    build them with just the .NET Core SDK, simplifying the build.
+    build them with just the .NET SDK, simplifying the build.
   -->
   <PropertyGroup>
     <SkipArcadeSdkImport>true</SkipArcadeSdkImport>
diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj
index fb742f925..92eeca062 100644
--- a/src/SourceBuild/content/eng/tools/init-build.proj
+++ b/src/SourceBuild/content/eng/tools/init-build.proj
@@ -1,45 +1,35 @@
 <Project>
+
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
+  <PropertyGroup>
+    <!-- Fake, to satisfy the SDK. -->
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
-  <Import Project="$(GitInfoAllRepoPropsFile)" />
-
-  <UsingTask AssemblyFile="$(LeakDetectionTasksAssembly)" TaskName="MarkAndCatalogPackages" />
-
-  <ItemGroup>
-    <BuildTasksTarget Include="Restore;Build;InstallResolver" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <BuildTasksOfflineSources>$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)%3B$(PrebuiltSourceBuiltPackagesPath)</BuildTasksOfflineSources>
-  </PropertyGroup>
-
-  <Target Name="Build">
-    <CallTarget Targets="
+  <Target Name="Build"
+          DependsOnTargets="
       UnpackTarballs;
       BuildXPlatTasks;
+      BuildMSBuildSdkResolver;
       BuildLeakDetection;
       ExtractToolPackage;
       GenerateRootFs;
       PoisonPrebuiltPackages" />
-  </Target>
-
-  <Target Name="PrepareOfflineLocalTools"
-          DependsOnTargets="
-            ExtractToolPackage;
-            BuildXPlatTasks" />
-
-  <Target Name="Clean">
-    <Delete Files="$(CompletedSemaphorePath)*.*" />
-  </Target>
 
   <Target Name="UnpackTarballs"
+          Condition="'$(DotNetBuildFromSource)' == 'true'"
           Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(CompletedSemaphorePath)UnpackTarballs.complete" >
+          Outputs="$(BaseIntermediateOutputPath)UnpackTarballs.complete" >
+    <PropertyGroup>
+      <ExternalTarballsDir>$([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'archive'))</ExternalTarballsDir>
+    </PropertyGroup>
 
     <MakeDir Directories="$(PrebuiltSourceBuiltPackagesPath)" Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' == ''" />
-    <Exec Command="tar -xzf $(ExternalTarballsDir)$(SourceBuiltArtifactsTarballName).*.tar.gz"
+    <Exec Command="tar -xzf $(ExternalTarballsDir)$(SourceBuiltArtifactsTarballName).*$(ArchiveExtension)"
           WorkingDirectory="$(PrebuiltSourceBuiltPackagesPath)"
           Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' == ''" />
 
@@ -48,71 +38,101 @@
       the build to be working without prebuilts.
     -->
     <ItemGroup>
-      <SourceBuiltPrebuiltsTarballFile Include="$(ExternalTarballsDir)$(SourceBuiltPrebuiltsTarballName).*.tar.gz" />
+      <SourceBuiltPrebuiltsTarballFile Include="$(ExternalTarballsDir)$(SourceBuiltPrebuiltsTarballName).*$(ArchiveExtension)" />
     </ItemGroup>
     <Exec Command="tar -xzf %(SourceBuiltPrebuiltsTarballFile.FullPath)"
           WorkingDirectory="$(PrebuiltPackagesPath)"
           Condition="'@(SourceBuiltPrebuiltsTarballFile)' != ''" />
 
     <!-- Copy SBRP packages to reference packages location -->
-    <MakeDir Directories="$(ReferencePackagesDir)" />
     <ItemGroup>
       <UnpackedSourceBuildReferencePackages Include="$(PrebuiltSourceBuiltPackagesPath)SourceBuildReferencePackages/*"/>
     </ItemGroup>
 
     <Copy SourceFiles="@(UnpackedSourceBuildReferencePackages)" DestinationFiles="$(ReferencePackagesDir)%(Filename)%(Extension)" />
 
-    <WriteLinesToFile File="$(CompletedSemaphorePath)UnpackTarballs.complete" Overwrite="true" />
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)UnpackTarballs.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
   </Target>
 
-  <Target Name="BuildXPlatTasks"
+  <!-- Build the custom msbuild sdk resolver. -->
+  <Target Name="BuildMSBuildSdkResolver"
           DependsOnTargets="UnpackTarballs"
           Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(CompletedSemaphorePath)BuildXPlatTasks.complete">
-    <PropertyGroup>
-      <XPlatTaskProjects>tasks\Microsoft.DotNet.SourceBuild.Tasks.XPlat\Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj;tasks\SourceBuild.MSBuildSdkResolver\SourceBuild.MSBuildSdkResolver.csproj</XPlatTaskProjects>
-    </PropertyGroup>
-    <MSBuild
-      Projects="$(XPlatTaskProjects)"
-      Targets="%(BuildTasksTarget.Identity)"
-      SkipNonexistentTargets="true"
-      Properties="
-        RestoreSources=$(BuildTasksOfflineSources);
-        __ToolInitPhase=%(BuildTasksTarget.Identity)" />
+          Outputs="$(BaseIntermediateOutputPath)BuildMSBuildSdkResolver.complete">
+    <MSBuild Projects="tasks\SourceBuild.MSBuildSdkResolver\SourceBuild.MSBuildSdkResolver.csproj"
+             Targets="Restore"
+             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
 
-    <WriteLinesToFile File="$(CompletedSemaphorePath)BuildXPlatTasks.complete" Overwrite="true" />
+    <MSBuild Projects="tasks\SourceBuild.MSBuildSdkResolver\SourceBuild.MSBuildSdkResolver.csproj"
+             Targets="Build;InstallResolver" />
+
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)BuildMSBuildSdkResolver.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
   </Target>
 
+  <!-- Build msbuild tasks. -->
+  <Target Name="BuildXPlatTasks"
+          DependsOnTargets="UnpackTarballs;BuildMSBuildSdkResolver"
+          Inputs="$(MSBuildProjectFullPath)"
+          Outputs="$(BaseIntermediateOutputPath)BuildXPlatTasks.complete">
+    <MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.XPlat\Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj"
+             Targets="Restore"
+             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
+
+    <MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.XPlat\Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj"
+             Targets="Build" />
+
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)BuildXPlatTasks.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
+  </Target>
+
+  <!-- Build msbuild tasks for the poisoning feature. -->
   <Target Name="BuildLeakDetection"
-          DependsOnTargets="ExtractToolPackage"
+          DependsOnTargets="ExtractToolPackage;BuildMSBuildSdkResolver"
           Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(CompletedSemaphorePath)BuildLeakDetection.complete"
+          Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete"
           Condition="'$(EnablePoison)' == 'true'">
+    <MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj"
+             Targets="Restore"
+             Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />
+
+    <MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj"
+             Targets="Build" />
+
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)BuildLeakDetection.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
+  </Target>
+
+  <Target Name="GenerateRootFs"
+          Condition="'$(BuildOS)' != 'windows'">
     <PropertyGroup>
-      <LeakDetectionProjects>tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj</LeakDetectionProjects>
+      <ArmEnvironmentVariables Condition="'$(ArmEnvironmentVariables)' == ''">ROOTFS_DIR=$(ArtifactsObjDir)crossrootfs/arm</ArmEnvironmentVariables>
+      <ArmEnvironmentVariables Condition="'$(Platform)' == 'armel'">ROOTFS_DIR=$(ArtifactsObjDir)crossrootfs/armel</ArmEnvironmentVariables>
     </PropertyGroup>
-    <MSBuild
-      Projects="$(LeakDetectionProjects)"
-      Targets="%(BuildTasksTarget.Identity)"
-      SkipNonexistentTargets="true"
-      Properties="
-        RestoreSources=$(BuildTasksOfflineSources);
-        __ToolInitPhase=%(BuildTasksTarget.Identity)" />
 
-    <WriteLinesToFile File="$(CompletedSemaphorePath)BuildLeakDetection.complete" Overwrite="true" />
-  </Target>
-
-  <Target Name="GenerateRootFs" Condition="'$(OS)' != 'Windows_NT'">
-     <Exec Condition="$(Platform.Contains('arm')) AND '$(Platform)' != 'armel' AND '$(BuildArchitecture)' != 'arm64' AND '$(BuildArchitecture)' != 'arm'" Command="$(ArmEnvironmentVariables) $(ProjectDir)cross/build-rootfs.sh" />
-     <Exec Condition="'$(Platform)' == 'armel'" Command="$(ArmEnvironmentVariables) $(ProjectDir)cross/armel/tizen-build-rootfs.sh" />
+    <Exec Command="$(ArmEnvironmentVariables) $(RepoRoot)cross/build-rootfs.sh"
+          Condition="$(TargetArchitecture.Contains('arm')) and '$(TargetArchitecture)' != 'armel' and '$(BuildArchitecture)' != 'arm64' and '$(BuildArchitecture)' != 'arm'" />
+    <Exec Command="$(ArmEnvironmentVariables) $(RepoRoot)cross/armel/tizen-build-rootfs.sh"
+          Condition="'$(TargetArchitecture)' == 'armel'" />
   </Target>
 
+  <!-- Extract Arcade prebuilt package into the bootstrap folder and prepare it. -->
   <Target Name="ExtractToolPackage"
-          DependsOnTargets="UnpackTarballs;BuildXPlatTasks"
+          Condition="'$(DotNetBuildFromSource)' == 'true'"
+          DependsOnTargets="UnpackTarballs"
           Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(CompletedSemaphorePath)ExtractToolPackage.complete">
+          Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
     <Unzip SourceFiles="$(PrebuiltSourceBuiltPackagesPath)Microsoft.DotNet.Arcade.Sdk.$(ARCADE_BOOTSTRAP_VERSION).nupkg"
-           DestinationFolder="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)"
+           DestinationFolder="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)/"
            SkipUnchangedFiles="true" />
 
     <!-- When unpacking, this executable file has the wrong permissions on
@@ -120,23 +140,22 @@
     <Exec Command="chmod 755 git-clone-to-dir.sh"
       WorkingDirectory="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)/tools/SourceBuild/" />
 
-    <!-- Allow overriding of Arcade targets for SourceBuild to enable quicker
-         dev turnaround for Preview 6 -->
-    <ItemGroup>
-      <OverrideArcadeFiles Include="$(ArcadeOverridesDir)**/*" />
-    </ItemGroup>
-
-    <Copy
-      SourceFiles="@(OverrideArcadeFiles)"
-      DestinationFiles="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)/tools/SourceBuild/%(RecursiveDir)%(Filename)%(Extension)" />
-
-    <WriteLinesToFile File="$(CompletedSemaphorePath)ExtractToolPackage.complete" Overwrite="true" />
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)ExtractToolPackage.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
   </Target>
 
+  <UsingTask AssemblyFile="$(LeakDetectionTasksAssembly)" TaskName="MarkAndCatalogPackages" Condition="'$(EnablePoison)' == 'true'" />
   <Target Name="PoisonPrebuiltPackages"
           Condition="'$(EnablePoison)' == 'true'"
           Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(CompletedSemaphorePath)PoisonPrebuiltPackages.complete">
+          Outputs="$(BaseIntermediateOutputPath)PoisonPrebuiltPackages.complete">
+    <PropertyGroup>
+      <SourceBuiltPoisonMarkerFile>.source-built.xml</SourceBuiltPoisonMarkerFile>
+      <SourceBuiltPoisonReportDataFile>$(PackageReportDir)poison-source-built-catalog.xml</SourceBuiltPoisonReportDataFile>
+    </PropertyGroup>
+
     <ItemGroup>
       <PrebuiltPackages Include="$(PrebuiltPackagesPath)**/*.nupkg" />
       <PrebuiltSourceBuiltPackages Include="$(PrebuiltSourceBuiltPackagesPath)**/*.nupkg" />
@@ -147,8 +166,12 @@
     <MarkAndCatalogPackages PackagesToMark="@(PrebuiltPackages)" CatalogOutputFilePath="$(PoisonReportDataFile)" MarkerFileName="$(PoisonMarkerFile)" />
     <MarkAndCatalogPackages PackagesToMark="@(PrebuiltSourceBuiltPackages)" CatalogOutputFilePath="$(SourceBuiltPoisonReportDataFile)" MarkerFileName="$(SourceBuiltPoisonMarkerFile)" />
 
-    <WriteLinesToFile File="$(CompletedSemaphorePath)PoisonPrebuiltPackages.complete" Overwrite="true" />
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done poisoning." />
+
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)PoisonPrebuiltPackages.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
   </Target>
 
 </Project>
diff --git a/src/SourceBuild/content/eng/tools/tasks/Directory.Build.props b/src/SourceBuild/content/eng/tools/tasks/Directory.Build.props
index 65f8365de..f00026353 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Directory.Build.props
+++ b/src/SourceBuild/content/eng/tools/tasks/Directory.Build.props
@@ -1,29 +1,21 @@
 <Project>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
-    <!-- Build all tasks as AnyCPU to match NuGet DLLs in the SDK: avoid warnings. -->
-    <Platform>AnyCPU</Platform>
+    <RestoreSources Condition="'$(DotNetBuildFromSource)' == 'true'">$(ReferencePackagesDir);$(PrebuiltPackagesPath);$(PrebuiltSourceBuiltPackagesPath)</RestoreSources>
   </PropertyGroup>
 
   <!--
     Use some assemblies from the SDK, instead of package references. This ensures they match what's
     found when the task is loaded by the SDK's MSBuild.
+    Reference NuGet assemblies, except a command line assembly that causes warnings such as:
+    MSB3277: Found conflicts between different versions of "System.Collections" that could not be resolved.
   -->
   <ItemGroup>
-    <SdkAssembly Include="$(SdkReferenceDir)Newtonsoft.Json.dll" />
-
-    <!--
-      Reference NuGet assemblies, except a command line assembly that causes warnings such as:
-      MSB3277: Found conflicts between different versions of "System.Collections" that could not be resolved.
-    -->
-    <SdkAssembly
-      Include="$(SdkReferenceDir)NuGet.*.dll"
-      Exclude="$(SdkReferenceDir)NuGet.CommandLine.XPlat.dll" />
-
-    <SdkAssemblyReference
-      Include="@(SdkAssembly -> '%(FileName)')"
-      HintPath="$(SdkReferenceDir)%(Identity).dll" />
+    <SdkAssembly Include="$([MSBuild]::NormalizePath('$(NetCoreRoot)', 'sdk', '$(NETCoreSdkVersion)', 'Newtonsoft.Json.dll'));
+                          $([MSBuild]::NormalizeDirectory('$(NetCoreRoot)', 'sdk', '$(NETCoreSdkVersion)'))NuGet.*.dll"
+                 Exclude="$([MSBuild]::NormalizePath('$(NetCoreRoot)', 'sdk', '$(NETCoreSdkVersion)', 'NuGet.CommandLine.XPlat.dll'))" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
index 27510e6db..33b0acaa8 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
@@ -3,25 +3,19 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>$(LeakDetectionTasksBinDir)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core">
-      <Version>15.7.179</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="../Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="@(SdkAssemblyReference)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="*.cs" />
+    <ReferencePath Include="@(SdkAssembly)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
index a28c1b5a3..d3a161702 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj
@@ -2,26 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
-    <OutputPath>$(XPlatTasksBinDir)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Framework">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Tasks.Core">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core">
-      <Version>15.7.179</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="@(SdkAssemblyReference)" />
+    <ReferencePath Include="@(SdkAssembly)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs
deleted file mode 100644
index dcd6b28f1..000000000
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReplaceTextInFile.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.IO;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-
-namespace Microsoft.DotNet.Build.Tasks
-{
-    public class ReplaceTextInFile : Task
-    {
-        [Required]
-        public string InputFile { get; set; }
-
-        [Required]
-        public string OldText { get; set; }
-
-        [Required]
-        public string NewText { get; set; }
-
-
-        public override bool Execute()
-        {
-            string fileContents = File.ReadAllText(InputFile);
-            string newLineChars = FileUtilities.DetectNewLineChars(fileContents);
-
-            fileContents = fileContents.Replace(OldText, NewText);
-
-            File.WriteAllText(InputFile, FileUtilities.NormalizeNewLineChars(fileContents, newLineChars));
-
-            return true;
-        }
-    }
-}
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
index 8b65026fc..b79e1783e 100644
--- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
+++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs
@@ -23,21 +23,25 @@ namespace Microsoft.DotNet.Build.Tasks
         [Required]
         public string PathToAttribute { get; set; }
 
-        [Required]
+        // New attribute value. May be null. If null,
+        // the token is removed.
         public string NewAttributeValue { get; set; }
 
         public bool SkipUpdateIfMissingKey { get; set; }
 
         public override bool Execute()
         {
+            // Using a character that isn't allowed in the package id
+            const char Delimiter = ':';
+
             string json = File.ReadAllText(JsonFilePath);
             string newLineChars = FileUtilities.DetectNewLineChars(json);
             JObject jsonObj = JObject.Parse(json);
 
-            string[] escapedPathToAttributeParts = PathToAttribute.Replace("\\.", "\x1F").Split('.');
+            string[] escapedPathToAttributeParts = PathToAttribute.Split(Delimiter);
             for (int i = 0; i < escapedPathToAttributeParts.Length; ++i)
             {
-                escapedPathToAttributeParts[i] = escapedPathToAttributeParts[i].Replace("\x1F", ".");
+                escapedPathToAttributeParts[i] = escapedPathToAttributeParts[i];
             }
             UpdateAttribute(jsonObj, escapedPathToAttributeParts, NewAttributeValue);
 
@@ -61,7 +65,14 @@ namespace Microsoft.DotNet.Build.Tasks
 
             if (path.Length == 1) 
             {
-                jsonObj[pathItem] = newValue;
+                if (newValue == null)
+                {
+                    jsonObj[pathItem].Parent.Remove();
+                }
+                else
+                {
+                    jsonObj[pathItem] = newValue;
+                }
                 return;
             }
 
diff --git a/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj b/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj
index f6fa859e9..04f354465 100644
--- a/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj
+++ b/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj
@@ -2,19 +2,22 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <SourceBuildMSBuildSdkResolverPath>$(DotNetSdkResolversDir)$(MSBuildProjectName)\$(MSBuildProjectName).dll</SourceBuildMSBuildSdkResolverPath>
   </PropertyGroup>
 
   <Target Name="InstallResolver">
+    <PropertyGroup>
+      <SourceBuildMSBuildSdkResolverPath>$([MSBuild]::NormalizePath('$(DotNetRoot)', 'sdk', '$(NETCoreSdkVersion)', 'SdkResolvers', '$(MSBuildProjectName)', '$(MSBuildProjectName).dll'))</SourceBuildMSBuildSdkResolverPath>
+    </PropertyGroup>
+
     <Copy SourceFiles="$(TargetPath)" DestinationFiles="$(SourceBuildMSBuildSdkResolverPath)" />
-    <Message Importance="High" Text="Adding resolver to SDK: $(MSBuildProjectName) -> $(SourceBuildMSBuildSdkResolverPath)" />
+    <Message Text="Adding resolver to SDK: $(MSBuildProjectName) -> $(SourceBuildMSBuildSdkResolverPath)" Importance="High"  />
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="15.7.179" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.7.179" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
   </ItemGroup>
 
 </Project>