Spectre.Console repo fixes

Directory.Build.props

@@ -30,6 +30,10 @@
     <PatchesDir>$(ProjectDir)patches/</PatchesDir>
     <!-- if we're not currently building,  Visual Studio will still set this -->
     <SDK_VERSION Condition="'$(SDK_VERSION)' == ''">$(NETCoreSdkVersion)</SDK_VERSION>
+    <XPlatTasksDir>$(MSBuildThisFileDirectory)eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/</XPlatTasksDir>
+    <XPlatTasksBinDir>$(XPlatTasksDir)bin/$(Configuration)/</XPlatTasksBinDir>
+    <XPlatSourceBuildTasksAssembly>$(XPlatTasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll</XPlatSourceBuildTasksAssembly>
+    <SdkReferenceDir>$(DotNetCliToolDir)sdk/$(SDK_VERSION)/</SdkReferenceDir>
   </PropertyGroup>
 
   <!--

build.sh

@@ -13,4 +13,11 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+sdkLine=$(grep -m 1 'dotnet' "$scriptroot/global.json")
+sdkPattern="\"dotnet\" *: *\"(.*)\""
+if [[ $sdkLine =~ $sdkPattern ]]; then
+  export SDK_VERSION=${BASH_REMATCH[1]}
+fi
+
 "$scriptroot/eng/common/build.sh" --build --restore "$@"

eng/Build.props

@@ -1,6 +1,9 @@
 <Project>
 
   <ItemGroup>
+    <ProjectToBuild Include="$(RepoRoot)eng\tasks\Microsoft.DotNet.SourceBuild.Tasks.XPlat\*.csproj">
+      <BuildInParallel>false</BuildInParallel>
+    </ProjectToBuild>
     <ProjectToBuild Include="$(RepoRoot)repo-projects\*.proj" />
   </ItemGroup>
 

eng/tasks/Directory.Build.props

@@ -0,0 +1,26 @@
+<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>
+    <!--
+      Do not import the Arcade SDK for the local tooling projects. This lets us
+      build them with just the .NET SDK, simplifying the build.
+    -->
+    <SkipArcadeSdkImport>true</SkipArcadeSdkImport>
+  </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.
+  -->
+  <ItemGroup>
+    <SdkAssembly Include="$(SdkReferenceDir)Newtonsoft.Json.dll" />
+
+    <SdkAssemblyReference
+      Include="@(SdkAssembly -> '%(FileName)')"
+      HintPath="$(SdkReferenceDir)%(Identity).dll" />
+  </ItemGroup>
+
+</Project>

eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</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>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="@(SdkAssemblyReference)" />
+  </ItemGroup>
+
+</Project>

eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs

@@ -0,0 +1,69 @@
+// 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 System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.DotNet.Build.Tasks
+{
+    // Takes a path to a path to a json file and a
+    // string that represents a dotted path to an attribute
+    // and updates that attribute with the new value provided. 
+    public class UpdateJson : Task
+    {
+        [Required]
+        public string JsonFilePath { get; set; }
+
+        [Required]
+        public string PathToAttribute { get; set; }
+
+        [Required]
+        public string NewAttributeValue { get; set; }
+
+        public bool SkipUpdateIfMissingKey { get; set; }
+
+        public override bool Execute()
+        {
+            JObject jsonObj = JObject.Parse(File.ReadAllText(JsonFilePath));
+
+            string[] escapedPathToAttributeParts = PathToAttribute.Replace("\\.", "\x1F").Split('.');
+            for (int i = 0; i < escapedPathToAttributeParts.Length; ++i)
+            {
+                escapedPathToAttributeParts[i] = escapedPathToAttributeParts[i].Replace("\x1F", ".");
+            }
+            UpdateAttribute(jsonObj, escapedPathToAttributeParts, NewAttributeValue);
+
+            File.WriteAllText(JsonFilePath, jsonObj.ToString());
+            return true;
+        }
+
+        private void UpdateAttribute(JToken jsonObj, string[] path, string newValue)
+        {
+            string pathItem = path[0];
+            if (jsonObj[pathItem] == null)
+            {
+                string message = $"Path item [{nameof(PathToAttribute)}] not found in json file.";
+                if (SkipUpdateIfMissingKey)
+                {
+                    Log.LogMessage(MessageImportance.Low, $"Skipping update: {message} {pathItem}");
+                    return;
+                }
+                throw new ArgumentException(message, pathItem);
+            }
+
+            if (path.Length == 1) 
+            {
+                jsonObj[pathItem] = newValue;
+                return;
+            }
+
+            UpdateAttribute(jsonObj[pathItem], path.Skip(1).ToArray(), newValue);
+        }
+    }
+}

repo-projects/Directory.Build.targets

@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SourceBuild.AddSourceToNuGetConfig" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
+  <UsingTask TaskName="UpdateJson" AssemblyFile="$(XPlatSourceBuildTasksAssembly)" />
 
   <Target Name="BuildRepoReferences" Condition="'@(RepositoryReference)' != '' and '$(SkipRepoReferences)' != 'true'">
     <Message Importance="High" Text="Building dependencies [@(RepositoryReference)] needed by '$(RepositoryName)'." />

repo-projects/spectre-console.proj

@@ -4,6 +4,9 @@
     <PropertyGroup>
       <PackagesOutput>$(ProjectDirectory)/src/Spectre.Console/bin/$(Configuration)/</PackagesOutput>
       <SpectreConsolePackageVersion>0.48.0</SpectreConsolePackageVersion>
+
+      <!-- Defining this ensures global.json gets rewritten to target the current SDK version -->
+      <GlobalJsonFile>$(ProjectDirectory)/global.json</GlobalJsonFile>
     </PropertyGroup>
 
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />