[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dotnet-maestro wants to merge 9 commits into from
Closed

[master] Update dependencies from dotnet/arcade #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
801ce1b
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 19, 2019
2bdc78e
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 20, 2019
19dcbdf
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 20, 2019
bb48706
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 21, 2019
c119864
Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…
ViktorHofer Nov 21, 2019
f591948
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 22, 2019
ea36f1c
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 23, 2019
29ec576
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 23, 2019
d706aa3
Update dependencies from https://github.com/dotnet/arcade build 20191…
dotnet-maestro[bot] Nov 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
<Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down
53 changes: 27 additions & 26 deletions eng/common/CheckSymbols.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff 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
57 changes: 32 additions & 25 deletions eng/common/SetupNugetSources.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
}
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
$doc.Save($filename)
}
catch {
Write-Host $_.ScriptStackTrace
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
ExitWithExitCode 1
}
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[master] Update dependencies from dotnet/arcade#124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dotnet-maestro
wants to merge
9
commits into

from

 Closed


[master] Update dependencies from dotnet/arcade
#124
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
801ce1b

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 19, 2019
2bdc78e

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
19dcbdf

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 20, 2019
bb48706

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 21, 2019
c119864

Merge branch 'master' into darc-master-5d85cd49-313f-4eaf-afb8-0a207d…


ViktorHofer Nov 21, 2019
f591948

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 22, 2019
ea36f1c

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
29ec576

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 23, 2019
d706aa3

Update dependencies from https://github.com/dotnet/arcade build 20191…


dotnet-maestro[bot] Nov 24, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 28 additions & 28 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,61 +58,61 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19567.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.19573.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>928efaa081ffd17b37f6c662fee44775f2d0b90f</Sha>
 <Sha>9393e2e903d42774c63770e40119c1621b88dc16</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

20 changes: 10 additions & 10 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,16 +32,16 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19567.2</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19567.2</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19567.2</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19567.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19567.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19567.2</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19567.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19567.2</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetApiCompatVersion>5.0.0-beta.19573.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.19573.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.19573.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19573.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19573.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19573.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.19573.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19573.1</MicrosoftDotNetVersionToolsTasksVersion>
 <!-- Installer dependencies -->
 <MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
 <MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
Expand Down

53 changes: 27 additions & 26 deletions
eng/common/CheckSymbols.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff 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

57 changes: 32 additions & 25 deletions
eng/common/SetupNugetSources.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,34 +94,41 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
 }
}

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

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
$doc.Load($filename)
# 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
}
# 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
}
# 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
# 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
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

$doc.Save($filename)
 $doc.Save($filename)
}
catch {
 Write-Host $_.ScriptStackTrace
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
 ExitWithExitCode 1
}

2 changes: 1 addition & 1 deletion
eng/common/SetupNugetSources.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. "$scriptroot/tools.sh"

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

Expand Down
Loading