Update dependencies from https://github.com/dotnet/arcade build 20221005.4 (#44399)

[release/3.1] Update dependencies from dotnet/arcade

NuGet.config

@@ -4,17 +4,13 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-6e3b6bb" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-6e3b6bb2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-extensions -->
-    <add key="darc-int-dotnet-extensions-a5c93f6" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-a5c93f64/nuget/v3/index.json" />
     <!--  Begin: Package sources from dotnet-razor-tooling -->
-    <add key="darc-int-dotnet-razor-tooling-4ca8978" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-4ca89780/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-razor-tooling -->
     <!--  Begin: Package sources from dotnet-corefx -->
     <!--  End: Package sources from dotnet-corefx -->
     <!--  Begin: Package sources from dotnet-core-setup -->
-    <add key="darc-int-dotnet-core-setup-0bcbc31" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0bcbc312/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  End: Package sources from dotnet-extensions -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -27,15 +23,11 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-core-setup -->
-    <add key="darc-int-dotnet-core-setup-0bcbc31" value="true" />
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-6e3b6bb" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-extensions -->
-    <add key="darc-int-dotnet-extensions-a5c93f6" value="true" />
     <!--  End: Package sources from dotnet-extensions -->
     <!--  Begin: Package sources from dotnet-razor-tooling -->
-    <add key="darc-int-dotnet-razor-tooling-4ca8978" value="true" />
     <!--  End: Package sources from dotnet-razor-tooling -->
     <!--  End: Package sources from dotnet-core-setup -->
     <!--  Begin: Package sources from dotnet-corefx -->

eng/Version.Details.xml

@@ -418,13 +418,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
       <Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22378.5">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22505.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
+      <Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22378.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22505.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
+      <Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.29-servicing.22417.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

eng/Versions.props

@@ -64,7 +64,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22378.5</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22505.4</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->

eng/common/build.ps1

@@ -24,6 +24,7 @@ Param(
   [switch] $help,
   [string] $runtimeSourceFeed = "",
   [string] $runtimeSourceFeedKey = "",
+  [switch] $nativeToolsOnMachine,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
@@ -60,6 +61,7 @@ function Print-Usage() {
     Write-Host "  -msbuildEngine <value>        Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
     Write-Host "  -runtimeSourceFeed <value>    Alternate feed source for restoring .NET Runtimes and SDKs"
     Write-Host "  -runtimeSourceFeedKey <value> Key value for non-public values of runtimeSourceFeed"
+    Write-Host "  -nativeToolsOnMachine   Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
     Write-Host ""
 
     Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -134,6 +136,9 @@ try {
     . $configureToolsetScript
   }
 
+  if ($nativeToolsOnMachine) {
+    $env:NativeToolsOnMachine = $true
+  }
   if (($restore) -and ($null -eq $env:DisableNativeToolsetInstalls)) {
     InitializeNativeTools
   }

eng/common/darc-init.ps1

@@ -10,8 +10,7 @@ param (
 function InstallDarcCli ($darcVersion, $toolpath) {
   $darcCliPackageName = 'microsoft.dotnet.darc'
 
-  $dotnetRoot = InitializeDotNetCli -install:$true
-  $dotnet = "$dotnetRoot\dotnet.exe"
+  $dotnet = "dotnet"
   $toolList = & "$dotnet" tool list -g
 
   if ($toolList -like "*$darcCliPackageName*") {

eng/common/init-tools-native.ps1

@@ -111,6 +111,7 @@ try {
             $ToolPath = Convert-Path -Path $BinPath
             Write-Host "Adding $ToolName to the path ($ToolPath)..."
             Write-Host "##vso[task.prependpath]$ToolPath"
+            $env:PATH = "$ToolPath;$env:PATH"
             $InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
           }
         }

eng/common/templates/job/execute-sdl.yml

@@ -20,7 +20,7 @@ jobs:
     - group: DotNet-VSTS-Bot
   pool:
     name: NetCore1ESPool-Svc-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    demands: ImageOverride -equals windows.vs2019.amd64
   steps:
   - checkout: self
     clean: true

eng/common/templates/job/onelocbuild.yml

@@ -5,7 +5,7 @@ parameters:
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool:
     name: NetCore1ESPool-Svc-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    demands: ImageOverride -equals windows.vs2019.amd64
 
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

eng/common/templates/jobs/jobs.yml

@@ -75,7 +75,7 @@ jobs:
           - ${{ job.job }}
       pool:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        demands: ImageOverride -equals windows.vs2019.amd64
       runAsPublic: ${{ parameters.runAsPublic }}
       publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
       enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -89,4 +89,4 @@ jobs:
         - Asset_Registry_Publish
       pool:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        demands: ImageOverride -equals windows.vs2019.amd64

eng/common/templates/post-build/channels/generic-internal-channel.yml

@@ -25,7 +25,7 @@ stages:
       - group: DotNet-Symbol-Server-Pats
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals windows.vs2019.amd64
     steps:
       # This is necessary whenever we want to publish/restore to an AzDO private feed
       - task: NuGetAuthenticate@0
@@ -69,7 +69,7 @@ stages:
     condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals windows.vs2019.amd64
     steps:
       - task: DownloadBuildArtifacts@0
         displayName: Download Package Artifacts

eng/common/templates/post-build/channels/generic-public-channel.yml

@@ -26,7 +26,7 @@ stages:
       - group: DotNet-Symbol-Server-Pats
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals windows.vs2019.amd64
     steps:
       - task: DownloadBuildArtifacts@0
         displayName: Download Blob Artifacts
@@ -76,7 +76,7 @@ stages:
     condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2019
+      demands: ImageOverride -equals windows.vs2019.amd64
     steps:
       - task: DownloadBuildArtifacts@0
         displayName: Download Package Artifacts

eng/common/templates/post-build/darc-gather-drop.yml

@@ -11,7 +11,7 @@ jobs:
       value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
   pool:
     name: NetCore1ESPool-Svc-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    demands: ImageOverride -equals windows.vs2019.amd64
   steps:
     - task: PowerShell@2
       displayName: Darc gather-drop

eng/common/templates/post-build/post-build.yml

@@ -29,7 +29,7 @@ stages:
       displayName: NuGet Validation
       pool:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        demands: ImageOverride -equals windows.vs2019.amd64
       steps:
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
@@ -49,7 +49,7 @@ stages:
       displayName: Signing Validation
       pool:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        demands: ImageOverride -equals windows.vs2019.amd64
       steps:
         # This is necessary whenever we want to publish/restore to an AzDO private feed
         # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -80,7 +80,7 @@ stages:
         - template: common-variables.yml
       pool:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2019
+        demands: ImageOverride -equals windows.vs2019.amd64
       steps:
         - task: DownloadBuildArtifacts@0
           displayName: Download Blob Artifacts

eng/common/templates/post-build/promote-build.yml

@@ -13,7 +13,7 @@ jobs:
       value: ${{ parameters.ChannelId }}
   pool:
     name: NetCore1ESPool-Svc-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    demands: ImageOverride -equals windows.vs2019.amd64
   steps:
     - task: PowerShell@2
       displayName: Add Build to Channel

eng/common/templates/post-build/setup-maestro-vars.yml

@@ -3,7 +3,7 @@ jobs:
   displayName: Setup Maestro Vars
   pool:
     name: NetCore1ESPool-Svc-Internal
-    demands: ImageOverride -equals Build.Server.Amd64.VS2019
+    demands: ImageOverride -equals windows.vs2019.amd64
   steps:
     - task: DownloadBuildArtifacts@0
       displayName: Download Release Configs

global.json

@@ -26,6 +26,6 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.10",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22378.5"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22505.4"
   }
 }