Merge pull request #57740 from dotnet-maestro-bot/merge/release/6.0-r…

…c1-to-release/6.0

[automated] Merge branch 'release/6.0-rc1' => 'release/6.0'

Directory.Build.props

@@ -270,6 +270,8 @@
  <!-- Enables Strict mode for Roslyn compiler -->
  <Features>strict;nullablePublicOnly</Features>
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <!-- Warnings to always disable -->
+ <NoWarn>$(NoWarn),CS8969</NoWarn>
  <!-- Always pass portable to override arcade sdk which uses embedded for local builds -->
  <DebugType>portable</DebugType>
  <DebugSymbols>true</DebugSymbols>

NuGet.config

@@ -17,8 +17,6 @@
  <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
  <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
  <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
- <!-- Used for dotnet pack task -->
- <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
  <!-- Used for the Rich Navigation indexing task -->
  <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
  </packageSources>

eng/Version.Details.xml

@@ -8,79 +8,79 @@
  <Uri>https://github.com/dotnet/msquic</Uri>
  <Sha>98129287d56a5e0348c291ce4260e630b4aa510d</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0-rc.1.21416.1">
+ <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0-rc.1.21419.1">
  <Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>9f2345b3c5f43dbf34790e21657ae1f2445cd06a</Sha>
+ <Sha>74f858629aef569bf3b70b88183dca2ba2c2ad4e</Sha>
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
  <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
  <Uri>https://github.com/microsoft/vstest</Uri>
@@ -202,9 +202,9 @@
  <Uri>https://github.com/dotnet/xharness</Uri>
  <Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21413.4">
+ <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21418.12">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
+ <Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
  </Dependency>
  <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

@@ -17,8 +17,6 @@
  <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
  <!-- Opt-in/out repo features -->
  <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
- <!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces, interpolated string handlers, and caller arg expressions; remove this once the employed SDK uses a new enough version. -->
- <MicrosoftNetCompilersToolsetVersion>4.0.0-3.21376.12</MicrosoftNetCompilersToolsetVersion>
  <UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
  <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
  <UsingToolXliff>false</UsingToolXliff>
@@ -54,20 +52,20 @@
  <!-- SDK dependencies -->
  <MicrosoftDotNetPackageValidationVersion>1.0.0-rc.1.21404.21</MicrosoftDotNetPackageValidationVersion>
  <!-- Arcade dependencies -->
- <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21413.4</MicrosoftDotNetApiCompatVersion>
- <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksFeedVersion>
- <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21413.4</MicrosoftDotNetCodeAnalysisVersion>
- <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenAPIVersion>
- <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenFacadesVersion>
- <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21413.4</MicrosoftDotNetXUnitExtensionsVersion>
- <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21413.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
- <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksArchivesVersion>
- <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksPackagingVersion>
- <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
- <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21413.4</MicrosoftDotNetRemoteExecutorVersion>
- <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21413.4</MicrosoftDotNetVersionToolsTasksVersion>
- <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21413.4</MicrosoftDotNetPackageTestingVersion>
+ <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21418.12</MicrosoftDotNetApiCompatVersion>
+ <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksFeedVersion>
+ <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21418.12</MicrosoftDotNetCodeAnalysisVersion>
+ <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21418.12</MicrosoftDotNetGenAPIVersion>
+ <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21418.12</MicrosoftDotNetGenFacadesVersion>
+ <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21418.12</MicrosoftDotNetXUnitExtensionsVersion>
+ <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21418.12</MicrosoftDotNetXUnitConsoleRunnerVersion>
+ <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksArchivesVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+ <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21418.12</MicrosoftDotNetRemoteExecutorVersion>
+ <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21418.12</MicrosoftDotNetVersionToolsTasksVersion>
+ <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21418.12</MicrosoftDotNetPackageTestingVersion>
  <!-- NuGet dependencies -->
  <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
  <!-- Installer dependencies -->
@@ -185,7 +183,7 @@
  <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
  <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
  <!-- emscripten / Node -->
- <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.0-rc.1.21416.1</MicrosoftNETWorkloadEmscriptenManifest60100Version>
+ <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.0-rc.1.21419.1</MicrosoftNETWorkloadEmscriptenManifest60100Version>
  <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
  <!-- workloads -->
  <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

eng/common/build.sh

@@ -187,6 +187,7 @@ function InitializeCustomToolset {
 }
 
 function Build {
+ TryLogClientIpAddress
  InitializeToolset
  InitializeCustomToolset
 

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

@@ -17,6 +17,7 @@ $global:RepoFiles = @{}
 $MaxParallelJobs = 16
 
 $MaxRetries = 5
+$RetryWaitTimeInSeconds = 30
 
 # Wait time between check for system load
 $SecondsBetweenLoadChecks = 10
@@ -99,9 +100,9 @@ $ValidatePackage = {
  $Status = 200
  $Cache = $using:RepoFiles
 
- $totalRetries = 0
+ $attempts = 0
 
- while ($totalRetries -lt $using:MaxRetries) {
+ while ($attempts -lt $using:MaxRetries) {
  if ( !($Cache.ContainsKey($FilePath)) ) {
  try {
  $Uri = $Link -as [System.URI]
@@ -113,7 +114,7 @@ $ValidatePackage = {
  else {
  # If it's not a github link, we want to break out of the loop and not retry.
  $Status = 0
- $totalRetries = $using:MaxRetries
+ $attempts = $using:MaxRetries
  }
  }
  catch {
@@ -123,9 +124,15 @@ $ValidatePackage = {
  }
 
  if ($Status -ne 200) {
- $totalRetries++
+ $attempts++
 
- if ($totalRetries -ge $using:MaxRetries) {
+ if ($attempts -lt $using:MaxRetries)
+ {
+ $attemptsLeft = $using:MaxRetries - $attempts
+ Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds"
+ Start-Sleep -Seconds $using:RetryWaitTimeInSeconds
+ }
+ else {
  if ($NumFailedLinks -eq 0) {
  if ($FailedFiles.Value -eq 0) {
  Write-Host

eng/common/sdk-task.ps1

@@ -83,6 +83,7 @@ try {
  }
 
  if ($restore) {
+ Try-LogClientIpAddress
  Build 'Restore'
  }
 

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

@@ -34,24 +34,24 @@ jobs:
  inputs:
  packageType: sdk
  version: 3.1.x
-
- - script: ${{ parameters.sourceIndexBuildCommand }}
- displayName: Build Repository
+ installationPath: $(Agent.TempDirectory)/dotnet
+ workingDirectory: $(Agent.TempDirectory)
 
  - script: |
- dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
- dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
- echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
+ $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
  displayName: Download Tools
+ # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
+ workingDirectory: $(Agent.TempDirectory)
+
+ - script: ${{ parameters.sourceIndexBuildCommand }}
+ displayName: Build Repository
 
- - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
+ - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
  displayName: Process Binlog into indexable sln
- env:
- DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
 
  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
+ - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
  displayName: Upload stage1 artifacts to source index
  env:
  BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
- DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2

eng/common/tools.ps1

@@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
  return $global:_DotNetInstallDir
  }
 
+ # In case of network error, try to log the current IP for reference
+ Try-LogClientIpAddress
+
  # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
  $env:DOTNET_MULTILEVEL_LOOKUP=0
 
@@ -872,3 +875,21 @@ if (!$disableConfigureToolsetImport) {
  }
  }
 }
+
+function Try-LogClientIpAddress()
+{
+ Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
+ try
+ {
+ $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
+ $lines = $result.Content.Split([Environment]::NewLine) 
+ $socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
+ Write-Host $socketIp
+ $clientIp = $lines | Select-String -Pattern "^Client IP:.*"
+ Write-Host $clientIp
+ }
+ catch
+ {
+ Write-Host "Unable to get this machine's effective IP address for logging: $_"
+ }
+}

eng/common/tools.sh

@@ -399,6 +399,13 @@ function StopProcesses {
  return 0
 }
 
+function TryLogClientIpAddress () {
+ echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
+ if command -v curl > /dev/null; then
+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
+ fi
+}
+
 function MSBuild {
  local args=$@
  if [[ "$pipelines_log" == true ]]; then

eng/native/configurecompiler.cmake

@@ -573,7 +573,7 @@ if (MSVC)
  set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /guard:ehcont")
  add_linker_flag(/guard:ehcont)
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /CETCOMPAT")
- endif (CLR_CMAKE_HOST_ARCH_AMD64)
+ endif (CLR_CMAKE_HOST_ARCH_AMD64 AND NOT CLR_CMAKE_RUNTIME_MONO)
 
  # Statically linked CRT (libcmt[d].lib, libvcruntime[d].lib and libucrt[d].lib) by default. This is done to avoid
  # linking in VCRUNTIME140.DLL for a simplified xcopy experience by reducing the dependency on VC REDIST.