Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (#394)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20190923.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19473.5

* Update dependencies from https://github.com/dotnet/arcade build 20190926.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19476.6

* Update dependencies from https://github.com/dotnet/arcade build 20190927.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19477.2

* Update dependencies from https://github.com/dotnet/arcade build 20190930.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19480.3

* Update dependencies from https://github.com/dotnet/arcade build 20191001.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19501.4

* Update dependencies from https://github.com/dotnet/arcade build 20191002.11

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19502.11

* Update dependencies from https://github.com/dotnet/arcade build 20191004.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19504.2

* Update dependencies from https://github.com/dotnet/arcade build 20191005.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19505.1

* Update dependencies from https://github.com/dotnet/arcade build 20191006.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19506.1

* Update dependencies from https://github.com/dotnet/arcade build 20191009.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19509.5

* Update dependencies from https://github.com/dotnet/arcade build 20191010.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19510.4

* Update dependencies from https://github.com/dotnet/arcade build 20191011.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19511.1

* Update dependencies from https://github.com/dotnet/arcade build 20191015.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19515.1

* Update dependencies from https://github.com/dotnet/arcade build 20191015.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19515.2

* Update dependencies from https://github.com/dotnet/arcade build 20191017.8

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19517.8

* Update dependencies from https://github.com/dotnet/arcade build 20191018.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19518.2

* Update dependencies from https://github.com/dotnet/arcade build 20191021.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19521.4

* Update dependencies from https://github.com/dotnet/arcade build 20191022.8

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19522.8

* Update dependencies from https://github.com/dotnet/arcade build 20191023.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19523.3

* Update dependencies from https://github.com/dotnet/arcade build 20191024.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19524.2

* Update dependencies from https://github.com/dotnet/arcade build 20191025.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19525.2

* Update dependencies from https://github.com/dotnet/arcade build 20191026.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19526.1

* Update dependencies from https://github.com/dotnet/arcade build 20191027.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19527.3

* Update dependencies from https://github.com/dotnet/arcade build 20191028.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19528.5

* Update dependencies from https://github.com/dotnet/arcade build 20191029.9

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19529.9

* Update dependencies from https://github.com/dotnet/arcade build 20191030.15

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19530.15

* Update dependencies from https://github.com/dotnet/arcade build 20191031.14

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19531.14

* Update dependencies from https://github.com/dotnet/arcade build 20191101.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19551.3

* Update dependencies from https://github.com/dotnet/arcade build 20191102.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19552.1

* Update dependencies from https://github.com/dotnet/arcade build 20191104.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19554.3

* Update dependencies from https://github.com/dotnet/arcade build 20191105.7

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19555.7

* Update dependencies from https://github.com/dotnet/arcade build 20191106.10

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19556.10

* Update dependencies from https://github.com/dotnet/arcade build 20191107.20

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19557.20

* Update dependencies from https://github.com/dotnet/arcade build 20191108.11

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19558.11

* Update dependencies from https://github.com/dotnet/arcade build 20191111.8

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19561.8

* Update dependencies from https://github.com/dotnet/arcade build 20191112.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19562.5

* Update dependencies from https://github.com/dotnet/arcade build 20191113.9

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19563.9

* Update dependencies from https://github.com/dotnet/arcade build 20191114.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19564.2

* Update dependencies from https://github.com/dotnet/arcade build 20191114.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19564.6

* Update dependencies from https://github.com/dotnet/arcade build 20191115.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19565.1

* Update dependencies from https://github.com/dotnet/arcade build 20191116.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19566.1

* Update dependencies from https://github.com/dotnet/arcade build 20191117.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19567.2

* Update dependencies from https://github.com/dotnet/arcade build 20191118.10

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19568.10

* Update dependencies from https://github.com/dotnet/arcade build 20191119.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19569.6

* Update dependencies from https://github.com/dotnet/arcade build 20191120.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19570.6

* Update dependencies from https://github.com/dotnet/arcade build 20191121.10

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19571.10

* Update dependencies from https://github.com/dotnet/arcade build 20191122.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19572.5

* Update dependencies from https://github.com/dotnet/arcade build 20191123.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19573.1

* Update dependencies from https://github.com/dotnet/arcade build 20191124.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19574.1

* Update dependencies from https://github.com/dotnet/arcade build 20191125.7

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19575.7

* Update dependencies from https://github.com/dotnet/arcade build 20191126.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19576.2

* Update dependencies from https://github.com/dotnet/arcade build 20191127.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19577.4

* Update dependencies from https://github.com/dotnet/arcade build 20191128.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19578.1

* Update dependencies from https://github.com/dotnet/arcade build 20191129.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19579.1

* Update dependencies from https://github.com/dotnet/arcade build 20191130.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19580.1

* Update dependencies from https://github.com/dotnet/arcade build 20191201.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19601.1

* Update dependencies from https://github.com/dotnet/arcade build 20191202.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19602.4

* Update dependencies from https://github.com/dotnet/arcade build 20191203.17

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19603.17

* Update dependencies from https://github.com/dotnet/arcade build 20191204.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19604.4

* Update dependencies from https://github.com/dotnet/arcade build 20191205.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19605.6

* Update dependencies from https://github.com/dotnet/arcade build 20191206.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19606.1

* Update dependencies from https://github.com/dotnet/arcade build 20191207.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19607.1

* Update dependencies from https://github.com/dotnet/arcade build 20191208.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19608.1

* Update dependencies from https://github.com/dotnet/arcade build 20191211.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19611.6

* Update dependencies from https://github.com/dotnet/arcade build 20191212.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19612.1

* Update dependencies from https://github.com/dotnet/arcade build 20191213.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19613.1

* Update dependencies from https://github.com/dotnet/arcade build 20191214.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19614.1

* Update dependencies from https://github.com/dotnet/arcade build 20191215.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19615.1

* Update dependencies from https://github.com/dotnet/arcade build 20191216.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19616.4

* Update dependencies from https://github.com/dotnet/arcade build 20191217.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19617.1

* Update dependencies from https://github.com/dotnet/arcade build 20191219.10

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19619.10

* Update dependencies from https://github.com/dotnet/arcade build 20191220.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19620.1

* Update dependencies from https://github.com/dotnet/arcade build 20191221.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19621.1

* Update dependencies from https://github.com/dotnet/arcade build 20191222.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19622.1

* Update dependencies from https://github.com/dotnet/arcade build 20191223.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19623.1

* Update dependencies from https://github.com/dotnet/arcade build 20191224.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19624.1

* Update dependencies from https://github.com/dotnet/arcade build 20191225.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19625.1

* Update dependencies from https://github.com/dotnet/arcade build 20191226.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19626.1

* Update dependencies from https://github.com/dotnet/arcade build 20191227.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19627.1

* Update dependencies from https://github.com/dotnet/arcade build 20191228.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19628.1

* Update dependencies from https://github.com/dotnet/arcade build 20191229.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19629.1

* Update dependencies from https://github.com/dotnet/arcade build 20191230.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19630.1

* Update dependencies from https://github.com/dotnet/arcade build 20191231.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19631.1

* Update dependencies from https://github.com/dotnet/arcade build 20200101.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20051.1

* Update dependencies from https://github.com/dotnet/arcade build 20200102.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20052.1

* Update dependencies from https://github.com/dotnet/arcade build 20200103.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20053.2

* Update dependencies from https://github.com/dotnet/arcade build 20200104.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20054.1

* Update dependencies from https://github.com/dotnet/arcade build 20200105.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20055.1

* Update dependencies from https://github.com/dotnet/arcade build 20200106.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20056.6

* Update dependencies from https://github.com/dotnet/arcade build 20200107.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20057.5

* Update dependencies from https://github.com/dotnet/arcade build 20200108.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20058.1

* Update dependencies from https://github.com/dotnet/arcade build 20200109.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20059.3

* Update dependencies from https://github.com/dotnet/arcade build 20200110.4

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20060.4

* Update dependencies from https://github.com/dotnet/arcade build 20200111.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20061.1

* Update dependencies from https://github.com/dotnet/arcade build 20200112.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20062.1

* Update dependencies from https://github.com/dotnet/arcade build 20200113.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20063.2

* Update dependencies from https://github.com/dotnet/arcade build 20200115.5

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20065.5

* Update dependencies from https://github.com/dotnet/arcade build 20200116.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20066.1

* Update dependencies from https://github.com/dotnet/arcade build 20200117.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20067.2

* Update dependencies from https://github.com/dotnet/arcade build 20200118.1

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20068.1

* Update dependencies from https://github.com/dotnet/arcade build 20200121.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20071.3

* Update dependencies from https://github.com/dotnet/arcade build 20200122.2

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20072.2

* Update dependencies from https://github.com/dotnet/arcade build 20200122.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20072.3

* Update dependencies from https://github.com/dotnet/arcade build 20200123.17

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20073.17

* Update dependencies from https://github.com/dotnet/arcade build 20200124.6

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20074.6

* Remove unnecessary workarounds

* Implement a workaround for dotnet/wpf#1718

Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
  • Loading branch information
dotnet-maestro[bot] and sharwell authored Jan 25, 2020
1 parent 869a894 commit 437953e
Show file tree
Hide file tree
Showing 66 changed files with 1,712 additions and 1,621 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19470.9">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20074.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>84778cd659cc0509e9ebf651c73f2341ae82df8c</Sha>
<Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
9 changes: 0 additions & 9 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<!-- This repo version -->
<VersionPrefix>3.2.0</VersionPrefix>
<NugetPackagePrefix>1.0.1</NugetPackagePrefix>
Expand Down Expand Up @@ -58,12 +57,4 @@
<RoslynDiagnosticsAnalyzersVersion>2.6.2-beta2</RoslynDiagnosticsAnalyzersVersion>
<StyleCopAnalyzersVersion>1.2.0-beta.66</StyleCopAnalyzersVersion>
</PropertyGroup>
<PropertyGroup>
<RestoreSources>
$(RestoreSources);
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
https://api.nuget.org/v3/index.json
</RestoreSources>
</PropertyGroup>
</Project>
53 changes: 27 additions & 26 deletions eng/common/CheckSymbols.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -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
Expand All @@ -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)

Expand All @@ -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!'
}
}
}
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions eng/common/PublishToSymbolServers.proj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<PropertyGroup>
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
<PublishToSymbolServer>true</PublishToSymbolServer>
<PublishToSymWeb Condition="'$(PublishToSymWeb)' == ''">true</PublishToSymWeb>
<PublishToMSDL Condition="'$(PublishToMSDL)' == ''">true</PublishToMSDL>
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
</PropertyGroup>

Expand All @@ -56,7 +58,7 @@
DryRun="false"
ConvertPortablePdbsToWindowsPdbs="false"
PdbConversionTreatAsWarning=""
Condition="$(PublishToSymbolServer)"/>
Condition="$(PublishToSymbolServer) and $(PublishToMSDL)"/>

<!--
Symbol Uploader: SymWeb
Expand All @@ -73,7 +75,7 @@
DryRun="false"
ConvertPortablePdbsToWindowsPdbs="false"
PdbConversionTreatAsWarning=""
Condition="$(PublishToSymbolServer)"/>
Condition="$(PublishToSymbolServer) and $(PublishToSymWeb)"/>
</Target>

<ItemGroup>
Expand Down
141 changes: 141 additions & 0 deletions eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
#
# This script needs to be called in every job that will restore packages and which the base repo has
# private AzDO feeds in the NuGet.config.
#
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
#
# - task: PowerShell@2
# displayName: Setup Private Feeds Credentials
# condition: eq(variables['Agent.OS'], 'Windows_NT')
# inputs:
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
# env:
# Token: $(dn-bot-dnceng-artifact-feeds-rw)

[CmdletBinding()]
param (
[Parameter(Mandatory = $true)][string]$ConfigFile,
[Parameter(Mandatory = $true)][string]$Password
)

$ErrorActionPreference = "Stop"
Set-StrictMode -Version 2.0
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

. $PSScriptRoot\tools.ps1

# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

if ($packageSource -eq $null)
{
$packageSource = $doc.CreateElement("add")
$packageSource.SetAttribute("key", $SourceName)
$packageSource.SetAttribute("value", $SourceEndPoint)
$sources.AppendChild($packageSource) | Out-Null
}
else {
Write-Host "Package source $SourceName already present."
}

AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
}

# Add a credential node for the specified source
function AddCredential($creds, $source, $username, $password) {
# Looks for credential configuration for the given SourceName. Create it if none is found.
$sourceElement = $creds.SelectSingleNode($Source)
if ($sourceElement -eq $null)
{
$sourceElement = $doc.CreateElement($Source)
$creds.AppendChild($sourceElement) | Out-Null
}

# Add the <Username> node to the credential if none is found.
$usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']")
if ($usernameElement -eq $null)
{
$usernameElement = $doc.CreateElement("add")
$usernameElement.SetAttribute("key", "Username")
$sourceElement.AppendChild($usernameElement) | Out-Null
}
$usernameElement.SetAttribute("value", $Username)

# Add the <ClearTextPassword> to the credential if none is found.
# Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs.
# -> https://github.com/NuGet/Home/issues/5526
$passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']")
if ($passwordElement -eq $null)
{
$passwordElement = $doc.CreateElement("add")
$passwordElement.SetAttribute("key", "ClearTextPassword")
$sourceElement.AppendChild($passwordElement) | Out-Null
}
$passwordElement.SetAttribute("value", $Password)
}

function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

ForEach ($PackageSource in $maestroPrivateSources) {
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
}
}

if (!(Test-Path $ConfigFile -PathType Leaf)) {
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
$doc.Load($filename)

# Get reference to <PackageSources> or create one if none exist already
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
if ($sources -eq $null) {
$sources = $doc.CreateElement("packageSources")
$doc.DocumentElement.AppendChild($sources) | Out-Null
}

# Looks for a <PackageSourceCredentials> node. Create it if none is found.
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
if ($creds -eq $null) {
$creds = $doc.CreateElement("packageSourceCredentials")
$doc.DocumentElement.AppendChild($creds) | Out-Null
}

# Insert credential nodes for Maestro's private feeds
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -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)
Loading

0 comments on commit 437953e

Please sign in to comment.