Skip to content

Commit 8cb7d15

Browse files
dotnet-maestro[bot]mmitche
dotnet-maestro[bot]
authored and
mmitche
committed
Update dependencies from https://github.com/dotnet/arcade build 20191203.16 (#7936)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19603.16
1 parent 4936143 commit 8cb7d15

Some content is hidden

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

54 files changed

+1261
-1367
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.19602.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19603.16">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>9d34fd008e754e1ada35c8b6bc3694e7a90b4ed7</Sha>
8+
<Sha>8e47254f93b276c974968aff83222f89ec3931ed</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/CheckSymbols.ps1

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

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

109
function FirstMatchingSymbolDescriptionOrDefault {
1110
param(
1211
[string] $FullPath, # Full path to the module that has to be checked
13-
[string] $TargetServerParameter, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
12+
[string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
1413
[string] $SymbolsPath
1514
)
1615

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

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

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

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

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

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

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

4140
if (Test-Path $PdbPath) {
42-
return 'PDB'
41+
return "PDB"
4342
}
4443
elseif (Test-Path $NGenPdb) {
45-
return 'NGen PDB'
44+
return "NGen PDB"
4645
}
4746
elseif (Test-Path $SODbg) {
48-
return 'DBG for SO'
47+
return "DBG for SO"
4948
}
5049
elseif (Test-Path $DylibDwarf) {
51-
return 'Dwarf for Dylib'
50+
return "Dwarf for Dylib"
5251
}
5352
elseif (Test-Path $SymbolPath) {
54-
return 'Module'
53+
return "Module"
5554
}
5655
else {
5756
return $null
@@ -69,15 +68,15 @@ function CountMissingSymbols {
6968
}
7069

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

7473
# How many files are missing symbol information
7574
$MissingSymbols = 0
7675

7776
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
7877
$PackageGuid = New-Guid
7978
$ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
80-
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols'
79+
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
8180

8281
[System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
8382

@@ -87,31 +86,31 @@ function CountMissingSymbols {
8786
Get-ChildItem -Recurse $ExtractPath |
8887
Where-Object {$RelevantExtensions -contains $_.Extension} |
8988
ForEach-Object {
90-
if ($_.FullName -Match '\\ref\\') {
89+
if ($_.FullName -Match "\\ref\\") {
9190
Write-Host "`t Ignoring reference assembly file" $_.FullName
9291
return
9392
}
9493

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

9897
Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
9998

10099
if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
101-
Write-Host "Symbols found on MSDL (${$SymbolsOnMSDL}) and SymWeb (${$SymbolsOnSymWeb})"
100+
Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")"
102101
}
103102
else {
104103
$MissingSymbols++
105104

106105
if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
107-
Write-Host 'No symbols found on MSDL or SymWeb!'
106+
Write-Host "No symbols found on MSDL or SymWeb!"
108107
}
109108
else {
110109
if ($SymbolsOnMSDL -eq $null) {
111-
Write-Host 'No symbols found on MSDL!'
110+
Write-Host "No symbols found on MSDL!"
112111
}
113112
else {
114-
Write-Host 'No symbols found on SymWeb!'
113+
Write-Host "No symbols found on SymWeb!"
115114
}
116115
}
117116
}
@@ -130,26 +129,26 @@ function CheckSymbolsAvailable {
130129
Get-ChildItem "$InputPath\*.nupkg" |
131130
ForEach-Object {
132131
$FileName = $_.Name
133-
132+
134133
# These packages from Arcade-Services include some native libraries that
135134
# our current symbol uploader can't handle. Below is a workaround until
136135
# we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
137-
if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') {
136+
if ($FileName -Match "Microsoft\.DotNet\.Darc\.") {
138137
Write-Host "Ignoring Arcade-services file: $FileName"
139138
Write-Host
140139
return
141140
}
142-
elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') {
141+
elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") {
143142
Write-Host "Ignoring Arcade-services file: $FileName"
144143
Write-Host
145144
return
146145
}
147-
146+
148147
Write-Host "Validating $FileName "
149148
$Status = CountMissingSymbols "$InputPath\$FileName"
150149

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

155154
Write-Host

‎eng/common/PublishToSymbolServers.proj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<PropertyGroup>
3838
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
3939
<PublishToSymbolServer>true</PublishToSymbolServer>
40-
<PublishToSymWeb Condition="'$(PublishToSymWeb)' == ''">true</PublishToSymWeb>
41-
<PublishToMSDL Condition="'$(PublishToMSDL)' == ''">true</PublishToMSDL>
4240
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
4341
</PropertyGroup>
4442

@@ -58,7 +56,7 @@
5856
DryRun="false"
5957
ConvertPortablePdbsToWindowsPdbs="false"
6058
PdbConversionTreatAsWarning=""
61-
Condition="$(PublishToSymbolServer) and $(PublishToMSDL)"/>
59+
Condition="$(PublishToSymbolServer)"/>
6260

6361
<!--
6462
Symbol Uploader: SymWeb
@@ -75,7 +73,7 @@
7573
DryRun="false"
7674
ConvertPortablePdbsToWindowsPdbs="false"
7775
PdbConversionTreatAsWarning=""
78-
Condition="$(PublishToSymbolServer) and $(PublishToSymWeb)"/>
76+
Condition="$(PublishToSymbolServer)"/>
7977
</Target>
8078

8179
<ItemGroup>

‎eng/common/SetupNugetSources.ps1

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1717
# inputs:
1818
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
19-
# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token
19+
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
2020
# env:
2121
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
2222

@@ -94,41 +94,48 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
9494
}
9595
}
9696

97-
try {
98-
if (!(Test-Path $ConfigFile -PathType Leaf)) {
99-
Write-PipelineTelemetryError -Category 'Build' -Message "Couldn't find the file NuGet config file: $ConfigFile"
97+
if (!(Test-Path $ConfigFile -PathType Leaf)) {
98+
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
99+
ExitWithExitCode 1
100+
}
101+
102+
if (!$Password) {
103+
Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT'
100104
ExitWithExitCode 1
101-
}
105+
}
102106

103-
# Load NuGet.config
104-
$doc = New-Object System.Xml.XmlDocument
105-
$filename = (Get-Item $ConfigFile).FullName
106-
$doc.Load($filename)
107+
# Load NuGet.config
108+
$doc = New-Object System.Xml.XmlDocument
109+
$filename = (Get-Item $ConfigFile).FullName
110+
$doc.Load($filename)
107111

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-
}
112+
# Get reference to <PackageSources> or create one if none exist already
113+
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
114+
if ($sources -eq $null) {
115+
$sources = $doc.CreateElement("packageSources")
116+
$doc.DocumentElement.AppendChild($sources) | Out-Null
117+
}
114118

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-
}
119+
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
120+
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
121+
if ($creds -eq $null) {
122+
$creds = $doc.CreateElement("packageSourceCredentials")
123+
$doc.DocumentElement.AppendChild($creds) | Out-Null
124+
}
121125

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

129+
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
130+
if ($dotnet3Source -ne $null) {
125131
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
126132
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
127-
128-
$doc.Save($filename)
129133
}
130-
catch {
131-
Write-Host $_.ScriptStackTrace
132-
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
133-
ExitWithExitCode 1
134+
135+
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
136+
if ($dotnet31Source -ne $null) {
137+
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
138+
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
134139
}
140+
141+
$doc.Save($filename)

0 commit comments

Comments
 (0)