Skip to content

Commit 974c0c5

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200421.14
- Microsoft.DotNet.XUnitExtensions: 5.0.0-beta.20201.2 -> 5.0.0-beta.20221.14 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20201.2 -> 5.0.0-beta.20221.14 - Microsoft.DotNet.GenFacades: 5.0.0-beta.20201.2 -> 5.0.0-beta.20221.14 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20201.2 -> 5.0.0-beta.20221.14 - Microsoft.DotNet.RemoteExecutor: 5.0.0-beta.20201.2 -> 5.0.0-beta.20221.14
1 parent c9f2a55 commit 974c0c5

20 files changed

+162
-117
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
6767
<SourceBuildId>5596</SourceBuildId>
6868
</Dependency>
6969
<!-- Arcade -->
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20201.2">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20221.14">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
72+
<Sha>e13ae00db986456a5012f2d9d479d893b3f5aff6</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20201.2">
74+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20221.14">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
76+
<Sha>e13ae00db986456a5012f2d9d479d893b3f5aff6</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20201.2">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20221.14">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
80+
<Sha>e13ae00db986456a5012f2d9d479d893b3f5aff6</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20201.2">
82+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20221.14">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
84+
<Sha>e13ae00db986456a5012f2d9d479d893b3f5aff6</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20201.2">
86+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20221.14">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
88+
<Sha>e13ae00db986456a5012f2d9d479d893b3f5aff6</Sha>
8989
</Dependency>
9090
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="5.0.0-preview.5.20223.4">
9191
<Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
</PropertyGroup>
4040
<!-- Arcade -->
4141
<PropertyGroup>
42-
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20201.2</MicrosoftDotNetGenFacadesPackageVersion>
43-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20201.2</MicrosoftDotNetRemoteExecutorVersion>
44-
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20201.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
42+
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20221.14</MicrosoftDotNetGenFacadesPackageVersion>
43+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20221.14</MicrosoftDotNetRemoteExecutorVersion>
44+
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20221.14</MicrosoftDotNetXUnitExtensionsPackageVersion>
4545
<MicrosoftNETTestSdkVersion>16.5.0</MicrosoftNETTestSdkVersion>
4646
</PropertyGroup>
4747
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

eng/common/SetupNugetSources.ps1

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) {
8383
$passwordElement.SetAttribute("value", $Password)
8484
}
8585

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

8989
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
@@ -123,19 +123,21 @@ if ($creds -eq $null) {
123123
$doc.DocumentElement.AppendChild($creds) | Out-Null
124124
}
125125

126+
$userName = "dn-bot"
127+
126128
# Insert credential nodes for Maestro's private feeds
127-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
129+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
128130

129131
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
130132
if ($dotnet3Source -ne $null) {
131-
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
132-
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
133+
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
134+
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
133135
}
134136

135137
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
136138
if ($dotnet31Source -ne $null) {
137-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
138-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
139+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
140+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
139141
}
140142

141143
$doc.Save($filename)

eng/common/build.ps1

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ function Print-Usage() {
6969

7070
. $PSScriptRoot\tools.ps1
7171

72-
$moduleLocation = Resolve-Path "$PSScriptRoot\..\Screenshots.win.psm1"
73-
$initScreenshotsModule = [scriptblock]::Create("Import-Module $moduleLocation")
74-
7572
function InitializeCustomToolset {
7673
if (-not $restore) {
7774
return
@@ -145,39 +142,12 @@ try {
145142
InitializeNativeTools
146143
}
147144

148-
$TakeScreenshots = $ci -and ($test -or $integrationTest -or $performanceTest);
149-
$ImageLogs = '';
150-
if ($TakeScreenshots) {
151-
$ImageLogs = Join-Path $LogDir 'screenshots'
152-
Create-Directory $ImageLogs
153-
154-
[ScriptBlock] $ScreenshotCaptureScript = {
155-
param($ImageLogs)
156-
Start-CaptureScreenshots "$ImageLogs"
157-
};
158-
159-
$job = Start-Job -InitializationScript $initScreenshotsModule `
160-
-ScriptBlock $ScreenshotCaptureScript `
161-
-ArgumentList $ImageLogs
162-
}
163-
164145
Build
165146
}
166147
catch {
167148
Write-Host $_.ScriptStackTrace
168149
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
169150
ExitWithExitCode 1
170151
}
171-
finally {
172-
if ($TakeScreenshots) {
173-
[ScriptBlock] $ScreenshotCaptureScript = {
174-
param($ImageLogs)
175-
Stop-CaptureScreenshots -TargetDir $ImageLogs
176-
};
177-
Start-Job -InitializationScript $initScreenshotsModule `
178-
-ScriptBlock $ScreenshotCaptureScript `
179-
-ArgumentList $ImageLogs | Receive-Job -AutoRemoveJob -Wait
180-
}
181-
}
182152

183153
ExitWithExitCode 0

eng/common/cross/build-rootfs.sh

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e
4+
35
usage()
46
{
57
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
@@ -15,6 +17,8 @@ __CodeName=xenial
1517
__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
1618
__InitialDir=$PWD
1719
__BuildArch=arm
20+
__AlpineArch=armv7
21+
__QEMUArch=arm
1822
__UbuntuArch=armhf
1923
__UbuntuRepo="http://ports.ubuntu.com/"
2024
__LLDB_Package="liblldb-3.9-dev"
@@ -26,9 +30,10 @@ __UbuntuPackages="build-essential"
2630
__AlpinePackages="alpine-base"
2731
__AlpinePackages+=" build-base"
2832
__AlpinePackages+=" linux-headers"
29-
__AlpinePackagesEdgeTesting=" lldb-dev"
30-
__AlpinePackagesEdgeMain=" llvm9-libs"
33+
__AlpinePackagesEdgeCommunity=" lldb-dev"
34+
__AlpinePackagesEdgeMain=" llvm10-libs"
3135
__AlpinePackagesEdgeMain+=" python3"
36+
__AlpinePackagesEdgeMain+=" libedit"
3237

3338
# symlinks fixer
3439
__UbuntuPackages+=" symlinks"
@@ -55,12 +60,11 @@ __AlpinePackages+=" openssl-dev"
5560
__AlpinePackages+=" zlib-dev"
5661

5762
__FreeBSDBase="12.1-RELEASE"
58-
__FreeBSDPkg="1.10.5"
63+
__FreeBSDPkg="1.12.0"
5964
__FreeBSDPackages="libunwind"
6065
__FreeBSDPackages+=" icu"
6166
__FreeBSDPackages+=" libinotify"
6267
__FreeBSDPackages+=" lttng-ust"
63-
__FreeBSDPackages+=" llvm-90"
6468
__FreeBSDPackages+=" krb5"
6569

6670
__UnprocessedBuildArgs=
@@ -78,7 +82,7 @@ while :; do
7882
arm)
7983
__BuildArch=arm
8084
__UbuntuArch=armhf
81-
__AlpineArch=armhf
85+
__AlpineArch=armv7
8286
__QEMUArch=arm
8387
;;
8488
arm64)
@@ -205,7 +209,7 @@ fi
205209

206210
if [ -d "$__RootfsDir" ]; then
207211
if [ $__SkipUnmount == 0 ]; then
208-
umount $__RootfsDir/*
212+
umount $__RootfsDir/* || true
209213
fi
210214
rm -rf $__RootfsDir
211215
fi
@@ -231,9 +235,9 @@ if [[ "$__CodeName" == "alpine" ]]; then
231235
add $__AlpinePackagesEdgeMain
232236

233237
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
234-
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
238+
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
235239
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
236-
add $__AlpinePackagesEdgeTesting
240+
add $__AlpinePackagesEdgeCommunity
237241

238242
rm -r $__ApkToolsDir
239243
elif [[ "$__CodeName" == "freebsd" ]]; then
@@ -246,7 +250,9 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
246250
# get and build package manager
247251
wget -O - https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf -
248252
cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
249-
./autogen.sh && ./configure --prefix=$__RootfsDir/host && make install
253+
# needed for install to succeed
254+
mkdir -p $__RootfsDir/host/etc
255+
./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install
250256
rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
251257
# install packages we need.
252258
$__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
@@ -260,7 +266,7 @@ elif [[ -n $__CodeName ]]; then
260266
chroot $__RootfsDir symlinks -cr /usr
261267

262268
if [ $__SkipUnmount == 0 ]; then
263-
umount $__RootfsDir/*
269+
umount $__RootfsDir/* || true
264270
fi
265271

266272
if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then

eng/common/post-build/check-channel-consistency.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ param(
66
try {
77
. $PSScriptRoot\post-build-utils.ps1
88

9+
if ($PromoteToChannels -eq "") {
10+
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
11+
ExitWithExitCode 0
12+
}
13+
914
# Check that every channel that Maestro told to promote the build to
1015
# is available in YAML
1116
$PromoteToChannelsIds = $PromoteToChannels -split "\D" | Where-Object { $_ }

eng/common/post-build/symbols-validation.ps1

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
param(
22
[Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored
33
[Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation
4-
[Parameter(Mandatory=$true)][string] $DotnetSymbolVersion # Version of dotnet symbol to use
4+
[Parameter(Mandatory=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use
5+
[Parameter(Mandatory=$false)][switch] $ContinueOnError # If we should keep checking symbols after an error
56
)
67

78
function FirstMatchingSymbolDescriptionOrDefault {
@@ -125,6 +126,8 @@ function CheckSymbolsAvailable {
125126
Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue
126127
}
127128

129+
$TotalFailures = 0
130+
128131
Get-ChildItem "$InputPath\*.nupkg" |
129132
ForEach-Object {
130133
$FileName = $_.Name
@@ -148,11 +151,22 @@ function CheckSymbolsAvailable {
148151

149152
if ($Status -ne 0) {
150153
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName"
151-
ExitWithExitCode $exitCode
154+
155+
if ($ContinueOnError) {
156+
$TotalFailures++
157+
}
158+
else {
159+
ExitWithExitCode 1
160+
}
152161
}
153162

154163
Write-Host
155164
}
165+
166+
if ($TotalFailures -ne 0) {
167+
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages"
168+
ExitWithExitCode 1
169+
}
156170
}
157171

158172
function InstallDotnetSymbol {

eng/common/sdk-task.ps1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ try {
5757
ExitWithExitCode 1
5858
}
5959

60+
if( $msbuildEngine -eq "vs") {
61+
# Ensure desktop MSBuild is available for sdk tasks.
62+
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) {
63+
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty
64+
}
65+
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
66+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty
67+
}
68+
69+
InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
70+
}
71+
6072
$taskProject = GetSdkTaskProject $task
6173
if (!(Test-Path $taskProject)) {
6274
Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red

eng/common/sdl/extract-artifact-packages.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ try {
6363
}
6464
}
6565
catch {
66-
Write-Host $_.ScriptStackTrace
66+
Write-Host $_
6767
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
6868
ExitWithExitCode 1
6969
}
@@ -74,7 +74,7 @@ try {
7474
Measure-Command { ExtractArtifacts }
7575
}
7676
catch {
77-
Write-Host $_.ScriptStackTrace
77+
Write-Host $_
7878
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
7979
ExitWithExitCode 1
8080
}

eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.7.2"/>
3+
<package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
44
</packages>

0 commit comments

Comments
 (0)