Merged PR 25568: Merge 'upstream/release/3.1' into 'internal/internal…

…/release/3.1' - Merging internal commits for release/3.1 (dotnet#28636) - Update dependencies from https://github.com/dotnet/arcade build 20220728.5 (dotnet#28693) - Update branding to 3.1.30 (dotnet#28995) - Merge 'upstream/release/3.1' into 'internal/internal/release/3.1'
vseanreesermsft · Sep 8, 2022 · 6d75661 · 6d75661
2 parents 95d6ee7 + 9f43e49
commit 6d75661
Show file tree

Hide file tree

Showing 15 changed files with 121 additions and 61 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -47,7 +47,7 @@ stages:
           - job: Windows
             pool:
               ${{ if eq(variables['System.TeamProject'], 'public') }}:
-                name: NetCore1ESPool-Svc-Public
+                name: NetCore-Svc-Public
                 demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
               ${{ if ne(variables['System.TeamProject'], 'public') }}:
                 name: NetCore1ESPool-Svc-Internal

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -321,9 +321,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22314.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22378.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fe57b3babcfc203dd61b7229b54d399b2e3f3c72</Sha>
+      <Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/roslyn</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Version settings">
-    <VersionPrefix>3.1.29</VersionPrefix>
+    <VersionPrefix>3.1.30</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>

diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
@@ -31,6 +31,10 @@ Wait time between retry attempts in seconds
 .PARAMETER GlobalJsonFile
 File path to global.json file
 
+.PARAMETER PathPromotion
+Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines)
+or break the build if a native tool is not found on the path (on a local dev machine)
+
 .NOTES
 #>
 [CmdletBinding(PositionalBinding=$false)]
@@ -41,7 +45,8 @@ Param (
   [switch] $Force = $False,
   [int] $DownloadRetries = 5,
   [int] $RetryWaitTimeInSeconds = 30,
-  [string] $GlobalJsonFile
+  [string] $GlobalJsonFile,
+  [switch] $PathPromotion
 )
 
 if (!$GlobalJsonFile) {
@@ -76,51 +81,88 @@ try {
                     ConvertFrom-Json |
                     Select-Object -Expand "native-tools" -ErrorAction SilentlyContinue
   if ($NativeTools) {
-    $NativeTools.PSObject.Properties | ForEach-Object {
-      $ToolName = $_.Name
-      $ToolVersion = $_.Value
-      $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
-      $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
-      $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
-      $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
-      $LocalInstallerArguments += @{ Version = "$ToolVersion" }
-
-      if ($Verbose) {
-        $LocalInstallerArguments += @{ Verbose = $True }
-      }
-      if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
-        if($Force) {
-          $LocalInstallerArguments += @{ Force = $True }
+    if ($PathPromotion -eq $True) {
+      if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build
+        $NativeTools.PSObject.Properties | ForEach-Object {
+          $ToolName = $_.Name
+          $ToolVersion = $_.Value
+          $InstalledTools = @{}
+
+          if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
+            if ($ToolVersion -eq "latest") {
+              $ToolVersion = ""
+            }
+            $ArcadeToolsDirectory = "C:\arcade-tools"
+            if (-not (Test-Path $ArcadeToolsDirectory)) {
+              Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
+              exit 1
+            }
+            $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
+            if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
+              Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
+              exit 1
+            }
+            $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
+            if (-not (Test-Path -Path "$BinPathFile")) {
+              Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
+              exit 1
+            }
+            $BinPath = Get-Content "$BinPathFile"
+            $ToolPath = Convert-Path -Path $BinPath
+            Write-Host "Adding $ToolName to the path ($ToolPath)..."
+            Write-Host "##vso[task.prependpath]$ToolPath"
+            $InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
+          }
         }
-      }
-      if ($Clean) {
-        $LocalInstallerArguments += @{ Clean = $True }
-      }
-
-      Write-Verbose "Installing $ToolName version $ToolVersion"
-      Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
-      & $InstallerPath @LocalInstallerArguments
-      if ($LASTEXITCODE -Ne "0") {
-        $errMsg = "$ToolName installation failed"
-        if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
-            $showNativeToolsWarning = $true
-            if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
-                $showNativeToolsWarning = $false
+        return $InstalledTools
+      } else {
+        $NativeTools.PSObject.Properties | ForEach-Object {
+          $ToolName = $_.Name
+          $ToolVersion = $_.Value
+          $LocalInstallerArguments =  @{ ToolName = "$ToolName" }
+          $LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
+          $LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
+          $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
+          $LocalInstallerArguments += @{ Version = "$ToolVersion" }
+
+          if ($Verbose) {
+            $LocalInstallerArguments += @{ Verbose = $True }
+          }
+          if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
+            if($Force) {
+              $LocalInstallerArguments += @{ Force = $True }
             }
-            if ($showNativeToolsWarning) {
-                Write-Warning $errMsg
+          }
+          if ($Clean) {
+            $LocalInstallerArguments += @{ Clean = $True }
+          }
+
+          Write-Verbose "Installing $ToolName version $ToolVersion"
+          Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
+          & $InstallerPath @LocalInstallerArguments
+          if ($LASTEXITCODE -Ne "0") {
+            $errMsg = "$ToolName installation failed"
+            if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
+                $showNativeToolsWarning = $true
+                if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
+                    $showNativeToolsWarning = $false
+                }
+                if ($showNativeToolsWarning) {
+                    Write-Warning $errMsg
+                }
+                $toolInstallationFailure = $true
+            } else {
+                Write-Error $errMsg
+                exit 1
             }
-            $toolInstallationFailure = $true
-        } else {
-            Write-Error $errMsg
+          }
+        }
+
+        if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
             exit 1
         }
       }
     }
-
-    if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
-        exit 1
-    }
   }
   else {
     Write-Host "No native tools defined in global.json"
@@ -134,7 +176,7 @@ try {
     Write-Host "Native tools are available from" (Convert-Path -Path $InstallBin)
     Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
   }
-  else {
+  elseif (-not ($PathPromotion)) {
     Write-Error "Native tools install directory does not exist, installation failed"
     exit 1
   }

diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
@@ -19,7 +19,8 @@ jobs:
   variables:
     - group: DotNet-VSTS-Bot
   pool:
-    vmImage: windows-2019
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
   - checkout: self
     clean: true

diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
@@ -4,7 +4,8 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool:
-    vmImage: windows-2019
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
 
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
@@ -74,7 +74,8 @@ jobs:
         - ${{ each job in parameters.jobs }}:
           - ${{ job.job }}
       pool:
-        vmImage: windows-2019
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       runAsPublic: ${{ parameters.runAsPublic }}
       publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
       enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -87,4 +88,5 @@ jobs:
       dependsOn:
         - Asset_Registry_Publish
       pool:
-        vmImage: windows-2019
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
@@ -24,7 +24,8 @@ stages:
     variables:
       - group: DotNet-Symbol-Server-Pats
     pool:
-      vmImage: 'windows-2019'
+      name: NetCore1ESPool-Svc-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     steps:
       # This is necessary whenever we want to publish/restore to an AzDO private feed
       - task: NuGetAuthenticate@0
@@ -67,7 +68,8 @@ stages:
         value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
     condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
     pool:
-      vmImage: 'windows-2019'
+      name: NetCore1ESPool-Svc-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     steps:
       - task: DownloadBuildArtifacts@0
         displayName: Download Package Artifacts

diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
@@ -25,7 +25,8 @@ stages:
     variables:
       - group: DotNet-Symbol-Server-Pats
     pool:
-      vmImage: 'windows-2019'
+      name: NetCore1ESPool-Svc-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     steps:
       - task: DownloadBuildArtifacts@0
         displayName: Download Blob Artifacts
@@ -74,7 +75,8 @@ stages:
         value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
     condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
     pool:
-      vmImage: 'windows-2019'
+      name: NetCore1ESPool-Svc-Internal
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     steps:
       - task: DownloadBuildArtifacts@0
         displayName: Download Package Artifacts

diff --git a/eng/common/templates/post-build/darc-gather-drop.yml b/eng/common/templates/post-build/darc-gather-drop.yml
@@ -10,7 +10,8 @@ jobs:
     - name: BARBuildId
       value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
   pool:
-    vmImage: 'windows-2019'
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
     - task: PowerShell@2
       displayName: Darc gather-drop

diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
@@ -28,7 +28,8 @@ stages:
     - job:
       displayName: NuGet Validation
       pool:
-        vmImage: 'windows-2019'
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
         - task: DownloadBuildArtifacts@0
           displayName: Download Package Artifacts
@@ -47,7 +48,8 @@ stages:
     - job:
       displayName: Signing Validation
       pool:
-        vmImage: 'windows-2019'
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       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
@@ -77,7 +79,8 @@ stages:
       variables:
         - template: common-variables.yml
       pool:
-        vmImage: 'windows-2019'
+        name: NetCore1ESPool-Svc-Internal
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
       steps:
         - task: DownloadBuildArtifacts@0
           displayName: Download Blob Artifacts

diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml
@@ -12,7 +12,8 @@ jobs:
     - name: ChannelId
       value: ${{ parameters.ChannelId }}
   pool:
-    vmImage: 'windows-2019'
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
     - task: PowerShell@2
       displayName: Add Build to Channel

diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -2,7 +2,8 @@ jobs:
 - job: setupMaestroVars
   displayName: Setup Maestro Vars
   pool:
-    vmImage: 'windows-2019'
+    name: NetCore1ESPool-Svc-Internal
+    demands: ImageOverride -equals Build.Server.Amd64.VS2019
   steps:
     - task: DownloadBuildArtifacts@0
       displayName: Download Release Configs

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -568,6 +568,10 @@ function InitializeNativeTools() {
         InstallDirectory = "$ToolsDir"
       }
     }
+    if ($env:NativeToolsOnMachine) {
+      Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
+      $nativeArgs += @{ PathPromotion = $true }
+    }
     & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs
   }
 }

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.421",
+    "dotnet": "3.1.422",
     "runtimes": {
       "dotnet": [
         "2.1.30",
@@ -9,9 +9,9 @@
     }
   },
   "sdk": {
-    "version": "3.1.421"
+    "version": "3.1.422"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22314.5"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22378.5"
   }
 }