Merge branch 'main' into microbuild

azure-pipelines/build.yml

@@ -17,7 +17,7 @@ jobs:
 
  - template: install-dependencies.yml
 
- - powershell: '& (./azure-pipelines/Get-nbgv.ps1) cloud'
+ - powershell: '& (./azure-pipelines/Get-nbgv.ps1) cloud -c'
  displayName: Set build number
 
  - ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:

azure-pipelines/publish-codecoverage.yml

@@ -18,10 +18,10 @@ steps:
 - powershell: |
  dotnet tool install --tool-path obj dotnet-reportgenerator-globaltool --version 4.8.5 --configfile azure-pipelines/justnugetorg.nuget.config
  Copy-Item -Recurse $(Pipeline.Workspace)/coverageResults-Windows/obj/* $(System.DefaultWorkingDirectory)/obj
- Write-Host "Substituting {reporoot} with $(System.DefaultWorkingDirectory)"
- $reports = Get-ChildItem -Recurse "$(Pipeline.Workspace)/coverage.*cobertura.xml"
+ Write-Host 'Substituting {reporoot} with $(System.DefaultWorkingDirectory)'
+ $reports = Get-ChildItem -Recurse '$(Pipeline.Workspace)/coverage.*cobertura.xml'
  $reports |% {
- $content = Get-Content -Path $_ |% { $_.Replace("{reporoot}", "$(System.DefaultWorkingDirectory)") }
+ $content = Get-Content -Path $_ |% { $_.Replace('{reporoot}', '$(System.DefaultWorkingDirectory)') }
  Set-Content -Path $_ -Value $content -Encoding UTF8
  }
  $Inputs = [string]::join(';', ($reports |% { Resolve-Path -relative $_ }))

init.ps1

@@ -42,10 +42,10 @@
 .PARAMETER AccessToken
  An optional access token for authenticating to Azure Artifacts authenticated feeds.
 #>
-[CmdletBinding(SupportsShouldProcess=$true)]
+[CmdletBinding(SupportsShouldProcess = $true)]
 Param (
- [ValidateSet('repo','user','machine')]
- [string]$InstallLocality='user',
+ [ValidateSet('repo', 'user', 'machine')]
+ [string]$InstallLocality = 'user',
  [Parameter()]
  [switch]$NoPrerequisites,
  [Parameter()]
@@ -87,8 +87,8 @@ if (!$NoPrerequisites) {
 }
 
 # Workaround nuget credential provider bug that causes very unreliable package restores on Azure Pipelines
-$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
-$env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
+$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20
+$env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20
 
 Push-Location $PSScriptRoot
 try {

src/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.InteropServices;
+
+[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]

src/Directory.Build.targets

@@ -1,3 +1,7 @@
 <Project>
+ <ItemGroup>
+ <Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
+ </ItemGroup>
+
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))\Directory.Build.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))' != '' " />
 </Project>

tools/Install-DotNetSdk.ps1

@@ -30,6 +30,10 @@ $DotNetInstallScriptRoot = Resolve-Path $DotNetInstallScriptRoot
 $sdkVersion = & "$PSScriptRoot/../azure-pipelines/variables/DotNetSdkVersion.ps1"
 
 $arch = [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture
+if (!$arch) { # Windows Powershell leaves this blank
+ $arch = 'x64'
+ if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { $arch = 'ARM64' }
+}
 
 # Search for all .NET Core runtime versions referenced from MSBuild projects and arrange to install them.
 $runtimeVersions = @()