Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-97a3c80c-6b81-423b-b6be-8478013a289d

Author: Jason Zhai

build.cmd

@@ -1,3 +1,10 @@
 @echo off
-powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %*"
+
+echo %* | findstr /C:"-pack" >nul
+if %errorlevel%==0 (
+    set PackInstaller=
+) else (
+    set PackInstaller=/p:PackInstaller=false
+)
+powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %PackInstaller% %*"
 exit /b %ErrorLevel%

build.sh

@@ -8,4 +8,10 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-. "$ScriptRoot/eng/common/build.sh" --build --restore "$@"
+if [[ "$@" != *"-pack"* ]]; then
+  packInstallerFlag="/p:PackInstaller=false"
+else
+  packInstallerFlag=
+fi
+
+. "$ScriptRoot/eng/common/build.sh" --build --restore $packInstallerFlag "$@"

eng/Version.Details.xml

@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24375.3",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24375.3",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24379.1",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24379.1",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }

eng/Versions.props

@@ -36,11 +36,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
     <PackageReference Include="Microsoft.NET.StringTools" ExcludeAssets="runtime" PrivateAssets="All" />
 
-    <!--
-      Explicit System.Text.Json package reference is required for source-build to pick up the live package.
-      Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
-    -->
-    <PackageReference Include="System.Text.Json" />
     <!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
     <PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
 

global.json

@@ -4,7 +4,6 @@
 using System.CommandLine;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Execution;
-using Microsoft.Build.Framework;
 using Microsoft.Build.Logging;
 using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.Utils;
@@ -44,6 +43,8 @@ public override int Execute()
             return 0;
         }
 
+        private static string GetRequiredWorkloadsTargetName = "_GetRequiredWorkloads";
+
         private List<WorkloadId> RunTargetToGetWorkloadIds(IEnumerable<string> allProjects)
         {
             var globalProperties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
@@ -55,12 +56,15 @@ private List<WorkloadId> RunTargetToGetWorkloadIds(IEnumerable<string> allProjec
             foreach (string projectFile in allProjects)
             {
                 var project = new ProjectInstance(projectFile, globalProperties, null);
+                if (!project.Targets.ContainsKey(GetRequiredWorkloadsTargetName))
+                {
+                    continue;
+                }
 
-                bool buildResult = project.Build(new[] { "_GetRequiredWorkloads" },
-                    loggers: new ILogger[]
-                    {
+                bool buildResult = project.Build([GetRequiredWorkloadsTargetName],
+                    loggers: [
                         new ConsoleLogger(Verbosity.ToLoggerVerbosity())
-                    },
+                    ],
                     remoteLoggers: Enumerable.Empty<ForwardingLoggerRecord>(),
                     targetOutputs: out var targetOutputs);
 
@@ -73,7 +77,7 @@ private List<WorkloadId> RunTargetToGetWorkloadIds(IEnumerable<string> allProjec
                         isUserError: false);
                 }
 
-                var targetResult = targetOutputs["_GetRequiredWorkloads"];
+                var targetResult = targetOutputs[GetRequiredWorkloadsTargetName];
                 allWorkloadId.AddRange(targetResult.Items.Select(item => new WorkloadId(item.ItemSpec)));
             }