Cherry picking main into release/6.0

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21474.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21552.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>3ea0d860c6973f2cbadc9e895c7ec2cbdaec4ad5</Sha>
+ <Sha>c336f6cb59bd52dfe2a844c738ec044affc57634</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -107,10 +107,10 @@
  <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
  <MoqPackageVersion>4.9.0</MoqPackageVersion>
  <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
- <XunitPackageVersion>2.4.1</XunitPackageVersion>
+ <XunitPackageVersion>2.4.2-pre.9</XunitPackageVersion>
  <XunitSkippableFactPackageVersion>1.3.12</XunitSkippableFactPackageVersion>
- <XunitExtensibilityExecutionPackageVersion>2.4.1</XunitExtensibilityExecutionPackageVersion>
- <XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
+ <XunitExtensibilityExecutionPackageVersion>2.4.2-pre.9</XunitExtensibilityExecutionPackageVersion>
+ <XunitRunnerVisualStudioPackageVersion>2.4.2-pre.9</XunitRunnerVisualStudioPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
  <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>

eng/common/native/init-compiler.sh

@@ -3,23 +3,25 @@
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
 
-if [[ "$#" -lt 2 ]]; then
+if [[ "$#" -lt 3 ]]; then
  echo "Usage..."
- echo "init-compiler.sh <Architecture> <compiler> <compiler major version> <compiler minor version>"
+ echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>"
+ echo "Specify the script directory."
  echo "Specify the target architecture."
  echo "Specify the name of compiler (clang or gcc)."
  echo "Specify the major version of compiler."
  echo "Specify the minor version of compiler."
  exit 1
 fi
 
-. "$( cd -P "$( dirname "$0" )" && pwd )"/../pipeline-logging-functions.sh
-
-build_arch="$1"
-compiler="$2"
+nativescriptroot="$1"
+build_arch="$2"
+compiler="$3"
 cxxCompiler="$compiler++"
-majorVersion="$3"
-minorVersion="$4"
+majorVersion="$4"
+minorVersion="$5"
+
+. "$nativescriptroot"/../pipeline-logging-functions.sh
 
 # clear the existing CC and CXX from environment
 CC=
@@ -48,8 +50,8 @@ if [[ -z "$CLR_CC" ]]; then
  # Set default versions
  if [[ -z "$majorVersion" ]]; then
  # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
- if [[ "$compiler" == "clang" ]]; then versions=( 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
- elif [[ "$compiler" == "gcc" ]]; then versions=( 11 10 9 8 7 6 5 4.9 ); fi
+ if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
+ elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
 
  for version in "${versions[@]}"; do
  parts=(${version//./ })

eng/common/post-build/sourcelink-validation.ps1

@@ -22,6 +22,11 @@ $RetryWaitTimeInSeconds = 30
 # Wait time between check for system load
 $SecondsBetweenLoadChecks = 10
 
+if (!$InputPath -or !(Test-Path $InputPath)){
+ Write-Host "No files to validate."
+ ExitWithExitCode 0
+}
+
 $ValidatePackage = {
  param( 
  [string] $PackagePath # Full path to a Symbols.NuGet package

eng/common/post-build/symbols-validation.ps1

@@ -4,9 +4,11 @@ param(
  [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use
  [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs
  [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error
- [Parameter(Mandatory = $false)][switch] $Clean # Clean extracted symbols directory after checking symbols
+ [Parameter(Mandatory = $false)][switch] $Clean, # Clean extracted symbols directory after checking symbols
+ [Parameter(Mandatory = $false)][string] $SymbolExclusionFile # Exclude the symbols in the file from publishing to symbol server
 )
 
+. $PSScriptRoot\..\tools.ps1
 # Maximum number of jobs to run in parallel
 $MaxParallelJobs = 16
 
@@ -25,14 +27,28 @@ if ($CheckForWindowsPdbs) {
  $WindowsPdbVerificationParam = "--windows-pdbs"
 }
 
+$ExclusionSet = New-Object System.Collections.Generic.HashSet[string];
+
+if (!$InputPath -or !(Test-Path $InputPath)){
+ Write-Host "No symbols to validate."
+ ExitWithExitCode 0
+}
+
+#Check if the path exists
+if ($SymbolExclusionFile -and (Test-Path $SymbolExclusionFile)){
+ [string[]]$Exclusions = Get-Content "$SymbolExclusionFile"
+ $Exclusions | foreach { if($_ -and $_.Trim()){$ExclusionSet.Add($_)} }
+}
+else{
+ Write-Host "Symbol Exclusion file does not exists. No symbols to exclude."
+}
+
 $CountMissingSymbols = {
  param( 
  [string] $PackagePath, # Path to a NuGet package
  [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs
  )
 
- . $using:PSScriptRoot\..\tools.ps1
-
  Add-Type -AssemblyName System.IO.Compression.FileSystem
 
  Write-Host "Validating $PackagePath "
@@ -142,37 +158,44 @@ $CountMissingSymbols = {
  return $null
  }
 
- $FileGuid = New-Guid
- $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid
-
- $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault `
- -FullPath $FileName `
- -TargetServerParam '--microsoft-symbol-server' `
- -SymbolsPath "$ExpandedSymbolsPath-msdl" `
- -WindowsPdbVerificationParam $WindowsPdbVerificationParam
- $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault `
- -FullPath $FileName `
- -TargetServerParam '--internal-server' `
- -SymbolsPath "$ExpandedSymbolsPath-symweb" `
- -WindowsPdbVerificationParam $WindowsPdbVerificationParam
-
- Write-Host -NoNewLine "`t Checking file " $FileName "... "
-
- if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
- Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)"
+ $FileRelativePath = $FileName.Replace("$ExtractPath\", "")
+ if (($($using:ExclusionSet) -ne $null) -and ($($using:ExclusionSet).Contains($FileRelativePath) -or ($($using:ExclusionSet).Contains($FileRelativePath.Replace("\", "/"))))){
+ Write-Host "Skipping $FileName from symbol validation"
  }
- else {
- $MissingSymbols++
 
- if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
- Write-Host 'No symbols found on MSDL or SymWeb!'
+ else {
+ $FileGuid = New-Guid
+ $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid
+
+ $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault `
+ -FullPath $FileName `
+ -TargetServerParam '--microsoft-symbol-server' `
+ -SymbolsPath "$ExpandedSymbolsPath-msdl" `
+ -WindowsPdbVerificationParam $WindowsPdbVerificationParam
+ $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault `
+ -FullPath $FileName `
+ -TargetServerParam '--internal-server' `
+ -SymbolsPath "$ExpandedSymbolsPath-symweb" `
+ -WindowsPdbVerificationParam $WindowsPdbVerificationParam
+
+ Write-Host -NoNewLine "`t Checking file " $FileName "... "
+
+ if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
+ Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)"
  }
  else {
- if ($SymbolsOnMSDL -eq $null) {
- Write-Host 'No symbols found on MSDL!'
+ $MissingSymbols++
+
+ if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
+ Write-Host 'No symbols found on MSDL or SymWeb!'
  }
  else {
- Write-Host 'No symbols found on SymWeb!'
+ if ($SymbolsOnMSDL -eq $null) {
+ Write-Host 'No symbols found on MSDL!'
+ }
+ else {
+ Write-Host 'No symbols found on SymWeb!'
+ }
  }
  }
  }

eng/common/sdl/configure-sdl-tool.ps1

@@ -69,13 +69,13 @@ try {
  # For some tools, add default and automatic args.
  if ($tool.Name -eq 'credscan') {
  if ($targetDirectory) {
- $tool.Args += "TargetDirectory < $TargetDirectory"
+ $tool.Args += "`"TargetDirectory < $TargetDirectory`""
  }
- $tool.Args += "OutputType < pre"
+ $tool.Args += "`"OutputType < pre`""
  $tool.Args += $CrScanAdditionalRunConfigParams
  } elseif ($tool.Name -eq 'policheck') {
  if ($targetDirectory) {
- $tool.Args += "Target < $TargetDirectory"
+ $tool.Args += "`"Target < $TargetDirectory`""
  }
  $tool.Args += $PoliCheckAdditionalRunConfigParams
  }

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

@@ -60,11 +60,7 @@ jobs:
  - name: GuardianPackagesConfigFile
  value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
  pool:
- # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
- ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
- name: Hosted VS2017
- ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
- vmImage: windows-2019
+ vmImage: windows-2019
  steps:
  - checkout: self
  clean: true

eng/common/templates/job/onelocbuild.yml

@@ -4,14 +4,15 @@ parameters:
 
  # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
  pool:
- vmImage: vs2017-win2016
+ vmImage: 'windows-2019'
 
  CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
  GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
  SourcesDirectory: $(Build.SourcesDirectory)
  CreatePr: true
  AutoCompletePr: false
+ ReusePr: true
  UseLfLineEndings: true
  UseCheckedInLocProjectJson: false
  LanguageSet: VS_Main_Languages
@@ -64,6 +65,8 @@ jobs:
  ${{ if eq(parameters.CreatePr, true) }}:
  isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
  isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
+ ${{ if eq(parameters.RepoType, 'gitHub') }}:
+ isShouldReusePrSelected: ${{ parameters.ReusePr }}
  packageSourceAuth: patAuth
  patVariable: ${{ parameters.CeapexPat }}
  ${{ if eq(parameters.RepoType, 'gitHub') }}:

eng/common/templates/job/source-index-stage1.yml

@@ -6,7 +6,7 @@ parameters:
  preSteps: []
  binlogPath: artifacts/log/Debug/Build.binlog
  pool:
- vmImage: vs2017-win2016
+ vmImage: 'windows-2019'
  condition: ''
  dependsOn: ''
 

eng/common/templates/jobs/jobs.yml

@@ -83,7 +83,7 @@ jobs:
  - ${{ if eq(parameters.enableSourceBuild, true) }}:
  - Source_Build_Complete
  pool:
- vmImage: vs2017-win2016
+ vmImage: 'windows-2019'
  runAsPublic: ${{ parameters.runAsPublic }}
  publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
  enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
  dependsOn:
  - Asset_Registry_Publish
  pool:
- vmImage: vs2017-win2016
+ vmImage: 'windows-2019'

eng/common/templates/steps/send-to-helix.yml

@@ -20,7 +20,6 @@ parameters:
  IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
  DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
  DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
- EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
  WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
  IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
  HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int)
@@ -54,7 +53,6 @@ steps:
  IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
  DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
  DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
- EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
  WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
  HelixBaseUri: ${{ parameters.HelixBaseUri }}
  Creator: ${{ parameters.Creator }}
@@ -85,7 +83,6 @@ steps:
  IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
  DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
  DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
- EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
  WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
  HelixBaseUri: ${{ parameters.HelixBaseUri }}
  Creator: ${{ parameters.Creator }}

global.json

@@ -3,7 +3,7 @@
  "dotnet": "6.0.100-rc.1.21430.12"
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21474.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21552.1"
  },
  "sdk": {
  "version": "6.0.100-rc.1.21430.12",