Skip to content

Commit da2ee06

Browse files
dotnet-maestro[bot]brettfo
dotnet-maestro[bot]
authored and
brettfo
committed
[master] Update dependencies from dotnet/arcade (#7891)
* 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 * don't publish symbols for tools and proto * 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
1 parent bd667c5 commit da2ee06

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+930
-797
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19569.6">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19601.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>c29c916a0d1736522cfd944fcc06ead33b5e27db</Sha>
8+
<Sha>c0b56ff3569e3c7475070486c40543ea4c6f6dc7</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/build-utils.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@ function Make-BootstrapBuild() {
237237
Create-Directory $dir
238238

239239
# prepare FsLex and Fsyacc and AssemblyCheck
240-
Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish" -logFileName "BuildTools" -configuration $bootstrapConfiguration
240+
Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish /p:PublishWindowsPdb=false" -logFileName "BuildTools" -configuration $bootstrapConfiguration
241241
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fslex" -Force -Recurse
242242
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fsyacc" -Force -Recurse
243243
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\AssemblyCheck" -Force -Recurse
244244

245245
# prepare compiler
246246
$projectPath = "$RepoRoot\proto.proj"
247-
Run-MSBuild $projectPath "/restore /t:Publish /p:TargetFramework=$bootstrapTfm;ProtoTargetFramework=$bootstrapTfm" -logFileName "Bootstrap" -configuration $bootstrapConfiguration
247+
Run-MSBuild $projectPath "/restore /t:Publish /p:TargetFramework=$bootstrapTfm;ProtoTargetFramework=$bootstrapTfm /p:PublishWindowsPdb=false" -logFileName "Bootstrap" -configuration $bootstrapConfiguration
248248
Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsc" -Force -Recurse
249249
Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsi" -Force -Recurse
250250

‎eng/common/CheckSymbols.ps1‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ param(
55
)
66

77
Add-Type -AssemblyName System.IO.Compression.FileSystem
8+
. $PSScriptRoot\pipeline-logging-functions.ps1
89

910
function FirstMatchingSymbolDescriptionOrDefault {
1011
param(
1112
[string] $FullPath, # Full path to the module that has to be checked
12-
[string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
13+
[string] $TargetServerParameter, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
1314
[string] $SymbolsPath
1415
)
1516

@@ -21,36 +22,36 @@ function FirstMatchingSymbolDescriptionOrDefault {
2122
# checking and which type of file was uploaded.
2223

2324
# The file itself is returned
24-
$SymbolPath = $SymbolsPath + "\" + $FileName
25+
$SymbolPath = $SymbolsPath + '\' + $FileName
2526

2627
# PDB file for the module
27-
$PdbPath = $SymbolPath.Replace($Extension, ".pdb")
28+
$PdbPath = $SymbolPath.Replace($Extension, '.pdb')
2829

2930
# PDB file for R2R module (created by crossgen)
30-
$NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb")
31+
$NGenPdb = $SymbolPath.Replace($Extension, '.ni.pdb')
3132

3233
# DBG file for a .so library
33-
$SODbg = $SymbolPath.Replace($Extension, ".so.dbg")
34+
$SODbg = $SymbolPath.Replace($Extension, '.so.dbg')
3435

3536
# DWARF file for a .dylib
36-
$DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
37+
$DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf')
3738

38-
.\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
39+
.\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParameter $FullPath -o $SymbolsPath | Out-Null
3940

4041
if (Test-Path $PdbPath) {
41-
return "PDB"
42+
return 'PDB'
4243
}
4344
elseif (Test-Path $NGenPdb) {
44-
return "NGen PDB"
45+
return 'NGen PDB'
4546
}
4647
elseif (Test-Path $SODbg) {
47-
return "DBG for SO"
48+
return 'DBG for SO'
4849
}
4950
elseif (Test-Path $DylibDwarf) {
50-
return "Dwarf for Dylib"
51+
return 'Dwarf for Dylib'
5152
}
5253
elseif (Test-Path $SymbolPath) {
53-
return "Module"
54+
return 'Module'
5455
}
5556
else {
5657
return $null
@@ -68,15 +69,15 @@ function CountMissingSymbols {
6869
}
6970

7071
# Extensions for which we'll look for symbols
71-
$RelevantExtensions = @(".dll", ".exe", ".so", ".dylib")
72+
$RelevantExtensions = @('.dll', '.exe', '.so', '.dylib')
7273

7374
# How many files are missing symbol information
7475
$MissingSymbols = 0
7576

7677
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
7778
$PackageGuid = New-Guid
7879
$ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
79-
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
80+
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols'
8081

8182
[System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
8283

@@ -86,31 +87,31 @@ function CountMissingSymbols {
8687
Get-ChildItem -Recurse $ExtractPath |
8788
Where-Object {$RelevantExtensions -contains $_.Extension} |
8889
ForEach-Object {
89-
if ($_.FullName -Match "\\ref\\") {
90+
if ($_.FullName -Match '\\ref\\') {
9091
Write-Host "`t Ignoring reference assembly file" $_.FullName
9192
return
9293
}
9394

94-
$SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath
95-
$SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath
95+
$SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--microsoft-symbol-server' -SymbolsPath $SymbolsPath
96+
$SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--internal-server' -SymbolsPath $SymbolsPath
9697

9798
Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
9899

99100
if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
100-
Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")"
101+
Write-Host "Symbols found on MSDL (${$SymbolsOnMSDL}) and SymWeb (${$SymbolsOnSymWeb})"
101102
}
102103
else {
103104
$MissingSymbols++
104105

105106
if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
106-
Write-Host "No symbols found on MSDL or SymWeb!"
107+
Write-Host 'No symbols found on MSDL or SymWeb!'
107108
}
108109
else {
109110
if ($SymbolsOnMSDL -eq $null) {
110-
Write-Host "No symbols found on MSDL!"
111+
Write-Host 'No symbols found on MSDL!'
111112
}
112113
else {
113-
Write-Host "No symbols found on SymWeb!"
114+
Write-Host 'No symbols found on SymWeb!'
114115
}
115116
}
116117
}
@@ -129,26 +130,26 @@ function CheckSymbolsAvailable {
129130
Get-ChildItem "$InputPath\*.nupkg" |
130131
ForEach-Object {
131132
$FileName = $_.Name
132-
133+
133134
# These packages from Arcade-Services include some native libraries that
134135
# our current symbol uploader can't handle. Below is a workaround until
135136
# we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
136-
if ($FileName -Match "Microsoft\.DotNet\.Darc\.") {
137+
if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') {
137138
Write-Host "Ignoring Arcade-services file: $FileName"
138139
Write-Host
139140
return
140141
}
141-
elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") {
142+
elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') {
142143
Write-Host "Ignoring Arcade-services file: $FileName"
143144
Write-Host
144145
return
145146
}
146-
147+
147148
Write-Host "Validating $FileName "
148149
$Status = CountMissingSymbols "$InputPath\$FileName"
149150

150151
if ($Status -ne 0) {
151-
Write-Error "Missing symbols for $Status modules in the package $FileName"
152+
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName"
152153
}
153154

154155
Write-Host

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
9494
}
9595
}
9696

97-
if (!(Test-Path $ConfigFile -PathType Leaf)) {
98-
Write-Host "Couldn't find the file NuGet config file: $ConfigFile"
99-
ExitWithExitCode 1
100-
}
97+
try {
98+
if (!(Test-Path $ConfigFile -PathType Leaf)) {
99+
Write-PipelineTelemetryError -Category 'Build' -Message "Couldn't find the file NuGet config file: $ConfigFile"
100+
ExitWithExitCode 1
101+
}
101102

102-
# Load NuGet.config
103-
$doc = New-Object System.Xml.XmlDocument
104-
$filename = (Get-Item $ConfigFile).FullName
105-
$doc.Load($filename)
103+
# Load NuGet.config
104+
$doc = New-Object System.Xml.XmlDocument
105+
$filename = (Get-Item $ConfigFile).FullName
106+
$doc.Load($filename)
106107

107-
# Get reference to <PackageSources> or create one if none exist already
108-
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
109-
if ($sources -eq $null) {
110-
$sources = $doc.CreateElement("packageSources")
111-
$doc.DocumentElement.AppendChild($sources) | Out-Null
112-
}
108+
# Get reference to <PackageSources> or create one if none exist already
109+
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
110+
if ($sources -eq $null) {
111+
$sources = $doc.CreateElement("packageSources")
112+
$doc.DocumentElement.AppendChild($sources) | Out-Null
113+
}
113114

114-
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
115-
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
116-
if ($creds -eq $null) {
117-
$creds = $doc.CreateElement("packageSourceCredentials")
118-
$doc.DocumentElement.AppendChild($creds) | Out-Null
119-
}
115+
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
116+
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
117+
if ($creds -eq $null) {
118+
$creds = $doc.CreateElement("packageSourceCredentials")
119+
$doc.DocumentElement.AppendChild($creds) | Out-Null
120+
}
120121

121-
# Insert credential nodes for Maestro's private feeds
122-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
122+
# Insert credential nodes for Maestro's private feeds
123+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
123124

124-
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
125-
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
125+
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
126+
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
126127

127-
$doc.Save($filename)
128+
$doc.Save($filename)
129+
}
130+
catch {
131+
Write-Host $_.ScriptStackTrace
132+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
133+
ExitWithExitCode 1
134+
}

‎eng/common/SetupNugetSources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
4242
. "$scriptroot/tools.sh"
4343

4444
if [ ! -f "$ConfigFile" ]; then
45-
echo "Couldn't find the file NuGet config file: $ConfigFile"
45+
Write-PipelineTelemetryError -Category 'Build' -Message "Couldn't find the file NuGet config file: $ConfigFile"
4646
ExitWithExitCode 1
4747
fi
4848

0 commit comments

Comments
 (0)