[master] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -63,13 +63,13 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>4ace84dbf94128b4825c76cdd09b46dba7473478</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19557.20">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20059.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
+      <Sha>96a4497b2c38c6b7e19c39e4cb8fe5adac299fb4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19557.20">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20059.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
+      <Sha>96a4497b2c38c6b7e19c39e4cb8fe5adac299fb4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
@@ -95,17 +95,17 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19557.20">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20059.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
+      <Sha>96a4497b2c38c6b7e19c39e4cb8fe5adac299fb4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19557.20">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20059.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
+      <Sha>96a4497b2c38c6b7e19c39e4cb8fe5adac299fb4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19557.20">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20059.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b62f1617f2c453497fd55697c04dd8021a38dc17</Sha>
+      <Sha>96a4497b2c38c6b7e19c39e4cb8fe5adac299fb4</Sha>
     </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>

eng/Versions.props

@@ -41,9 +41,9 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19557.20</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.19557.20</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19557.20</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20059.3</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20059.3</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20059.3</MicrosoftDotNetGenAPIVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/corefxlab -->
   <PropertyGroup>

eng/WpfArcadeSdk/tools/GenApi/GlobalAttrExclusions.txt

@@ -1,54 +1,73 @@
-// These attributes should be excluded from reference assemblies.
-
-T:System.ComponentModel.DesignerAttribute
-T:System.ComponentModel.Design.Serialization.DesignerSerializerAttribute
-T:System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute
-T:System.ComponentModel.EditorAttribute
-T:System.ComponentModel.ToolboxItemAttribute
-T:System.ComponentModel.TypeDescriptionProviderAttribute
-T:System.Configuration.ConfigurationPropertyAttribute
-T:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute
-T:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute
-T:System.Diagnostics.DebuggerBrowsableAttribute
-T:System.Diagnostics.DebuggerDisplayAttribute
-T:System.Diagnostics.DebuggerHiddenAttribute
-T:System.Diagnostics.DebuggerNonUserCodeAttribute
-T:System.Diagnostics.DebuggerStepThroughAttribute
-T:System.Diagnostics.DebuggerTypeProxyAttribute
-T:System.Diagnostics.MonitoringDescriptionAttribute
-T:System.IO.IODescriptionAttribute
-T:System.Runtime.CompilerServices.AsyncStateMachineAttribute
-T:System.Runtime.CompilerServices.CompilerGeneratedAttribute
-T:System.Runtime.CompilerServices.IteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.TypeForwardedFromAttribute
-T:System.Runtime.CompilerServices.MethodImpl
-T:System.Runtime.ConstrainedExecution.ReliabilityContractAttribute
-T:System.Runtime.InteropServices.ClassInterfaceAttribute
-T:System.Runtime.InteropServices.ComDefaultInterfaceAttribute
-T:System.Runtime.InteropServices.ComVisibleAttribute
-T:System.Runtime.InteropServices.GuidAttribute
-T:System.Runtime.InteropServices.InterfaceTypeAttribute
-T:System.Runtime.InteropServices.StructLayoutAttribute
-T:System.Runtime.Serialization.KnownTypeAttribute
-T:System.Security.Permissions.EnvironmentPermissionAttribute
-T:System.Security.Permissions.FileIOPermissionAttribute
-T:System.Security.Permissions.HostProtectionAttribute
-T:System.Security.Permissions.IsolatedStorageFilePermissionAttribute
-T:System.Security.Permissions.PermissionSetAttribute
-T:System.Security.Permissions.ReflectionPermissionAttribute
-T:System.Security.Permissions.SecurityPermissionAttribute
-T:System.Security.Permissions.StrongNameIdentityPermissionAttribute
-T:System.Security.SecurityCriticalAttribute
-T:System.Security.SecuritySafeCriticalAttribute
-T:System.Security.SuppressUnmanagedCodeSecurityAttribute
-T:System.Xml.Serialization.XmlAttributeAttribute
-T:System.Xml.Serialization.XmlEnumAttribute
-T:System.Xml.Serialization.XmlIgnoreAttribute
-T:System.Xml.Serialization.XmlRootAttribute
-T:System.Runtime.Versioning.NonVersionableAttribute
-T:System.Runtime.CompilerServices.IntrinsicAttribute
-T:System.Runtime.CompilerServices.ExtensionAttribute
-T:System.Drawing.SRDescriptionAttribute
-T:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute
-T:System.Runtime.CompilerServices.AsyncMethodBuilderAttribute
-T:System.Reflection.DefaultMemberAttribute
+// These attributes should be excluded from reference assemblies.
+
+// Only used by generators for KnownTypes.cs - Exists in multiple namespaces as it is a shared source file
+T:MS.Internal.PresentationCore.CommonDependencyPropertyAttribute
+T:MS.Internal.PresentationFramework.CommonDependencyPropertyAttribute
+
+// Not needed for reference assemblies - Exists in multiple namespaces as it is a shared source file
+T:MS.Internal.PresentationCore.FriendAccessAllowedAttribute
+T:MS.Internal.WindowsBase.FriendAccessAllowedAttribute
+
+// Designer reads this from runtime assemblies, not reference assemblies
+T:MS.Internal.CustomCategoryAttribute
+T:System.Windows.CustomCategoryAttribute
+T:System.ComponentModel.DefaultValueAttribute
+
+T:System.ComponentModel.DesignerAttribute
+T:System.ComponentModel.Design.Serialization.DesignerSerializerAttribute
+T:System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute
+T:System.ComponentModel.EditorAttribute
+T:System.ComponentModel.ToolboxItemAttribute
+T:System.ComponentModel.TypeDescriptionProviderAttribute
+T:System.Configuration.ConfigurationPropertyAttribute
+T:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute
+T:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute
+T:System.Diagnostics.DebuggerBrowsableAttribute
+T:System.Diagnostics.DebuggerDisplayAttribute
+T:System.Diagnostics.DebuggerHiddenAttribute
+T:System.Diagnostics.DebuggerNonUserCodeAttribute
+T:System.Diagnostics.DebuggerStepThroughAttribute
+T:System.Diagnostics.DebuggerTypeProxyAttribute
+T:System.Diagnostics.MonitoringDescriptionAttribute
+T:System.Diagnostics.StackTraceHiddenAttribute
+T:System.IO.IODescriptionAttribute
+T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
+T:System.Runtime.CompilerServices.AsyncStateMachineAttribute
+T:System.Runtime.CompilerServices.CompilerGeneratedAttribute
+T:System.Runtime.CompilerServices.IteratorStateMachineAttribute
+T:System.Runtime.CompilerServices.MethodImpl
+T:System.Runtime.CompilerServices.NullableAttribute
+T:System.Runtime.CompilerServices.NullableContextAttribute
+T:System.Runtime.CompilerServices.PreserveDependencyAttribute
+T:System.Runtime.CompilerServices.TypeForwardedFromAttribute
+T:System.Runtime.ConstrainedExecution.ReliabilityContractAttribute
+T:System.Runtime.InteropServices.ClassInterfaceAttribute
+T:System.Runtime.InteropServices.ComDefaultInterfaceAttribute
+T:System.Runtime.InteropServices.ComVisibleAttribute
+T:System.Runtime.InteropServices.GuidAttribute
+T:System.Runtime.InteropServices.LCIDConversionAttribute
+T:System.Runtime.InteropServices.StructLayoutAttribute
+T:System.Security.Permissions.EnvironmentPermissionAttribute
+T:System.Security.Permissions.FileIOPermissionAttribute
+T:System.Security.Permissions.HostProtectionAttribute
+T:System.Security.Permissions.IsolatedStorageFilePermissionAttribute
+T:System.Security.Permissions.PermissionSetAttribute
+T:System.Security.Permissions.ReflectionPermissionAttribute
+T:System.Security.Permissions.SecurityPermissionAttribute
+T:System.Security.Permissions.StrongNameIdentityPermissionAttribute
+T:System.Security.SecurityCriticalAttribute
+T:System.Security.SecuritySafeCriticalAttribute
+T:System.Security.SecurityTreatAsSafeAttribute
+T:System.Security.SuppressUnmanagedCodeSecurityAttribute
+T:System.Runtime.Versioning.NonVersionableAttribute
+T:System.Runtime.CompilerServices.IntrinsicAttribute
+T:System.Runtime.CompilerServices.ExtensionAttribute
+T:System.Drawing.SRDescriptionAttribute
+T:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute
+T:System.Runtime.CompilerServices.AsyncMethodBuilderAttribute
+T:System.Reflection.DefaultMemberAttribute
+T:System.Timers.TimersDescriptionAttribute
+
+// These do not need to be persisted in the implementation
+T:System.ComponentModel.EditorBrowsableAttribute
+T:System.ObsoleteAttribute

eng/common/CheckSymbols.ps1

@@ -5,11 +5,12 @@ param(
 )
 
 Add-Type -AssemblyName System.IO.Compression.FileSystem
+. $PSScriptRoot\pipeline-logging-functions.ps1
 
 function FirstMatchingSymbolDescriptionOrDefault {
   param( 
     [string] $FullPath,                  # Full path to the module that has to be checked
-    [string] $TargetServerParam,         # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+    [string] $TargetServerParameter,         # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
     [string] $SymbolsPath
   )
 
@@ -21,36 +22,36 @@ function FirstMatchingSymbolDescriptionOrDefault {
   # checking and which type of file was uploaded.
 
   # The file itself is returned
-  $SymbolPath = $SymbolsPath + "\" + $FileName
+  $SymbolPath = $SymbolsPath + '\' + $FileName
 
   # PDB file for the module
-  $PdbPath = $SymbolPath.Replace($Extension, ".pdb")
+  $PdbPath = $SymbolPath.Replace($Extension, '.pdb')
 
   # PDB file for R2R module (created by crossgen)
-  $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb")
+  $NGenPdb = $SymbolPath.Replace($Extension, '.ni.pdb')
 
   # DBG file for a .so library
-  $SODbg = $SymbolPath.Replace($Extension, ".so.dbg")
+  $SODbg = $SymbolPath.Replace($Extension, '.so.dbg')
 
   # DWARF file for a .dylib
-  $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
+  $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf')
 
-  .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
+  .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParameter $FullPath -o $SymbolsPath | Out-Null
 
   if (Test-Path $PdbPath) {
-    return "PDB"
+    return 'PDB'
   }
   elseif (Test-Path $NGenPdb) {
-    return "NGen PDB"
+    return 'NGen PDB'
   }
   elseif (Test-Path $SODbg) {
-    return "DBG for SO"
+    return 'DBG for SO'
   }  
   elseif (Test-Path $DylibDwarf) {
-    return "Dwarf for Dylib"
+    return 'Dwarf for Dylib'
   }  
   elseif (Test-Path $SymbolPath) {
-    return "Module"
+    return 'Module'
   }
   else {
     return $null
@@ -68,15 +69,15 @@ function CountMissingSymbols {
   }
 
   # Extensions for which we'll look for symbols
-  $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib")
+  $RelevantExtensions = @('.dll', '.exe', '.so', '.dylib')
 
   # How many files are missing symbol information
   $MissingSymbols = 0
 
   $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
   $PackageGuid = New-Guid
   $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
-  $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
+  $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols'
 
   [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
 
@@ -86,31 +87,31 @@ function CountMissingSymbols {
   Get-ChildItem -Recurse $ExtractPath |
     Where-Object {$RelevantExtensions -contains $_.Extension} |
     ForEach-Object {
-      if ($_.FullName -Match "\\ref\\") {
+      if ($_.FullName -Match '\\ref\\') {
         Write-Host "`t Ignoring reference assembly file" $_.FullName
         return
       }
 
-      $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath
-      $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath
+      $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName  -TargetServerParameter '--microsoft-symbol-server' -SymbolsPath $SymbolsPath
+      $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--internal-server' -SymbolsPath $SymbolsPath
 
       Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
 
       if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
-        Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")"
+        Write-Host "Symbols found on MSDL (${$SymbolsOnMSDL}) and SymWeb (${$SymbolsOnSymWeb})"
       }
       else {
         $MissingSymbols++
 
         if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
-          Write-Host "No symbols found on MSDL or SymWeb!"
+          Write-Host 'No symbols found on MSDL or SymWeb!'
         }
         else {
           if ($SymbolsOnMSDL -eq $null) {
-            Write-Host "No symbols found on MSDL!"
+            Write-Host 'No symbols found on MSDL!'
           }
           else {
-            Write-Host "No symbols found on SymWeb!"
+            Write-Host 'No symbols found on SymWeb!'
           }
         }
       }
@@ -129,26 +130,26 @@ function CheckSymbolsAvailable {
   Get-ChildItem "$InputPath\*.nupkg" |
     ForEach-Object {
       $FileName = $_.Name
-	  
+
       # These packages from Arcade-Services include some native libraries that
       # our current symbol uploader can't handle. Below is a workaround until
       # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
-      if ($FileName -Match "Microsoft\.DotNet\.Darc\.") {
+      if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') {
         Write-Host "Ignoring Arcade-services file: $FileName"
         Write-Host
         return
       }
-      elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") {
+      elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') {
         Write-Host "Ignoring Arcade-services file: $FileName"
         Write-Host
         return
       }
-	  
+
       Write-Host "Validating $FileName "
       $Status = CountMissingSymbols "$InputPath\$FileName"
 
       if ($Status -ne 0) {
-        Write-Error "Missing symbols for $Status modules in the package $FileName"
+        Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName"
       }
 
       Write-Host

eng/common/SetupNugetSources.ps1

@@ -16,7 +16,7 @@
 #    condition: eq(variables['Agent.OS'], 'Windows_NT')
 #    inputs:
 #      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-#      arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token
+#      arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
 #    env:
 #      Token: $(dn-bot-dnceng-artifact-feeds-rw)
 
@@ -95,10 +95,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
 
 if (!(Test-Path $ConfigFile -PathType Leaf)) {
-  Write-Host "Couldn't find the file NuGet config file: $ConfigFile"
+  Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
   ExitWithExitCode 1
 }
 
+if (!$Password) {
+    Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT'
+    ExitWithExitCode 1
+}
+
 # Load NuGet.config
 $doc = New-Object System.Xml.XmlDocument
 $filename = (Get-Item $ConfigFile).FullName
@@ -121,7 +126,16 @@ if ($creds -eq $null) {
 # Insert credential nodes for Maestro's private feeds
 InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
 
-AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
-AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
+if ($dotnet3Source -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+}
+
+$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
+if ($dotnet31Source -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+}
 
 $doc.Save($filename)