Skip to content

Commit eddb525

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200609.1 (#22949)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 5.0.0-beta.20280.1 -> To Version 5.0.0-beta.20309.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 74857c3 commit eddb525

File tree

8 files changed

+164
-19
lines changed

8 files changed

+164
-19
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,17 +292,17 @@
292292
<Uri>https://github.com/dotnet/runtime</Uri>
293293
<Sha>67d74fca70d4670ad503e23dba9d6bc8a1b5909e</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20280.1">
295+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20309.1">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
297+
<Sha>54d096ee50a9bcf7ac6efd16a07d51af651d20a1</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20280.1">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20309.1">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
301+
<Sha>54d096ee50a9bcf7ac6efd16a07d51af651d20a1</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20280.1">
303+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20309.1">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
305+
<Sha>54d096ee50a9bcf7ac6efd16a07d51af651d20a1</Sha>
306306
</Dependency>
307307
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.7.0-3.20271.4">
308308
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
-->
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/arcade -->
65-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20280.1</MicrosoftDotNetGenAPIPackageVersion>
65+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20309.1</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.7.0-3.20271.4</MicrosoftNetCompilersToolsetPackageVersion>
6868
<!-- Packages from dotnet/runtime -->

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ usage()
88
echo "BuildArch can be: arm(default), armel, arm64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
1010
echo " for FreeBSD can be: freebsd11 or freebsd12."
11+
echo " for illumos can be: illumos."
1112
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD"
1213
echo "--skipunmount - optional, will skip the unmount of rootfs folder."
14+
echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
1315
exit 1
1416
}
1517

@@ -67,6 +69,13 @@ __FreeBSDPackages+=" libinotify"
6769
__FreeBSDPackages+=" lttng-ust"
6870
__FreeBSDPackages+=" krb5"
6971

72+
__IllumosPackages="icu-64.2nb2"
73+
__IllumosPackages+=" mit-krb5-1.16.2nb4"
74+
__IllumosPackages+=" openssl-1.1.1e"
75+
__IllumosPackages+=" zlib-1.2.11"
76+
77+
__UseMirror=0
78+
7079
__UnprocessedBuildArgs=
7180
while :; do
7281
if [ $# -le 0 ]; then
@@ -179,13 +188,21 @@ while :; do
179188
__BuildArch=x64
180189
__SkipUnmount=1
181190
;;
191+
illumos)
192+
__CodeName=illumos
193+
__BuildArch=x64
194+
__SkipUnmount=1
195+
;;
182196
--skipunmount)
183197
__SkipUnmount=1
184198
;;
185199
--rootfsdir|-rootfsdir)
186200
shift
187201
__RootfsDir=$1
188202
;;
203+
--use-mirror)
204+
__UseMirror=1
205+
;;
189206
*)
190207
__UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
191208
;;
@@ -214,6 +231,9 @@ if [ -d "$__RootfsDir" ]; then
214231
rm -rf $__RootfsDir
215232
fi
216233

234+
mkdir -p $__RootfsDir
235+
__RootfsDir="$( cd "$__RootfsDir" && pwd )"
236+
217237
if [[ "$__CodeName" == "alpine" ]]; then
218238
__ApkToolsVersion=2.9.1
219239
__AlpineVersion=3.9
@@ -257,6 +277,51 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
257277
# install packages we need.
258278
INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
259279
INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
280+
elif [[ "$__CodeName" == "illumos" ]]; then
281+
mkdir "$__RootfsDir/tmp"
282+
pushd "$__RootfsDir/tmp"
283+
JOBS="$(getconf _NPROCESSORS_ONLN)"
284+
echo "Downloading sysroot."
285+
wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf -
286+
echo "Building binutils. Please wait.."
287+
wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf -
288+
mkdir build-binutils && cd build-binutils
289+
../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir"
290+
make -j "$JOBS" && make install && cd ..
291+
echo "Building gcc. Please wait.."
292+
wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf -
293+
CFLAGS="-fPIC"
294+
CXXFLAGS="-fPIC"
295+
CXXFLAGS_FOR_TARGET="-fPIC"
296+
CFLAGS_FOR_TARGET="-fPIC"
297+
export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET
298+
mkdir build-gcc && cd build-gcc
299+
../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="x86_64-sun-solaris2.10" --program-prefix="x86_64-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \
300+
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
301+
--disable-libquadmath-support --disable-shared --enable-tls
302+
make -j "$JOBS" && make install && cd ..
303+
BaseUrl=https://pkgsrc.joyent.com
304+
if [[ "$__UseMirror" == 1 ]]; then
305+
BaseUrl=http://pkgsrc.smartos.skylime.net
306+
fi
307+
BaseUrl="$BaseUrl"/packages/SmartOS/2020Q1/x86_64/All
308+
echo "Downloading dependencies."
309+
read -ra array <<<"$__IllumosPackages"
310+
for package in "${array[@]}"; do
311+
echo "Installing $package..."
312+
wget "$BaseUrl"/"$package".tgz
313+
ar -x "$package".tgz
314+
tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
315+
done
316+
echo "Cleaning up temporary files."
317+
popd
318+
rm -rf "$__RootfsDir"/{tmp,+*}
319+
mkdir -p "$__RootfsDir"/usr/include/net
320+
mkdir -p "$__RootfsDir"/usr/include/netpacket
321+
wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h
322+
wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h
323+
wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
324+
wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
260325
elif [[ -n $__CodeName ]]; then
261326
qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
262327
cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
@@ -275,7 +340,7 @@ elif [[ -n $__CodeName ]]; then
275340
patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch
276341
popd
277342
fi
278-
elif [ "$__Tizen" == "tizen" ]; then
343+
elif [[ "$__Tizen" == "tizen" ]]; then
279344
ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh
280345
else
281346
echo "Unsupported target platform."

‎eng/common/cross/toolchain.cmake‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
33
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
44
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
55
set(CMAKE_SYSTEM_NAME FreeBSD)
6+
elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
7+
set(CMAKE_SYSTEM_NAME SunOS)
8+
set(ILLUMOS 1)
69
else()
710
set(CMAKE_SYSTEM_NAME Linux)
811
endif()
@@ -34,6 +37,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
3437
elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
3538
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
3639
set(triple "x86_64-unknown-freebsd11")
40+
elseif (ILLUMOS)
41+
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
42+
set(TOOLCHAIN "x86_64-illumos")
3743
else()
3844
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!")
3945
endif()
@@ -67,12 +73,43 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
6773

6874
# include official NDK toolchain script
6975
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
70-
elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
76+
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
7177
# we cross-compile by instructing clang
7278
set(CMAKE_C_COMPILER_TARGET ${triple})
7379
set(CMAKE_CXX_COMPILER_TARGET ${triple})
7480
set(CMAKE_ASM_COMPILER_TARGET ${triple})
7581
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
82+
elseif(ILLUMOS)
83+
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
84+
85+
include_directories(SYSTEM ${CROSS_ROOTFS}/include)
86+
87+
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
88+
function(locate_toolchain_exec exec var)
89+
string(TOUPPER ${exec} EXEC_UPPERCASE)
90+
if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
91+
set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
92+
return()
93+
endif()
94+
95+
find_program(EXEC_LOCATION_${exec}
96+
NAMES
97+
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
98+
"${TOOLSET_PREFIX}${exec}")
99+
100+
if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
101+
message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
102+
endif()
103+
set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
104+
endfunction()
105+
106+
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
107+
108+
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
109+
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
110+
111+
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
112+
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
76113
else()
77114
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
78115

@@ -92,11 +129,14 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
92129
endif()
93130
elseif(TARGET_ARCH_NAME STREQUAL "x86")
94131
add_link_options(-m32)
132+
elseif(ILLUMOS)
133+
add_link_options("-L${CROSS_ROOTFS}/lib/amd64")
134+
add_link_options("-L${CROSS_ROOTFS}/usr/amd64/lib")
95135
endif()
96136

97137
# Specify compile options
98138

99-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*")
139+
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
100140
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
101141
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
102142
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
@@ -155,7 +195,6 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
155195
endif()
156196
endif()
157197

158-
159198
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
160199
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
161200
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

‎eng/common/performance/perfhelixpublish.proj‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,49 @@
113113
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
114114
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
115115
</HelixWorkItem>
116-
<HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
116+
<HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
117117
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
118118
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
119119
</HelixWorkItem>
120-
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
120+
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
121121
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
122122
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
123123
</HelixWorkItem>
124-
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
124+
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
125125
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
126126
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
127127
</HelixWorkItem>
128+
<HelixWorkItem Include="Crossgen System.Private.CoreLib.dll">
129+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
130+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
131+
</HelixWorkItem>
132+
</ItemGroup>
133+
134+
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT' and '$(Architecture)' == 'x64'">
135+
<HelixWorkItem Include="Crossgen2 System.Private.Xml.dll">
136+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
137+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
138+
</HelixWorkItem>
139+
<HelixWorkItem Include="Crossgen2 System.Linq.Expressions.dll">
140+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
141+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
142+
</HelixWorkItem>
143+
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.VisualBasic.dll">
144+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
145+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
146+
</HelixWorkItem>
147+
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.CSharp.dll">
148+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
149+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
150+
</HelixWorkItem>
151+
<HelixWorkItem Include="Crossgen2 System.Private.CoreLib.dll">
152+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
153+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
154+
</HelixWorkItem>
155+
<HelixWorkItem Include="Crossgen2 Composite Framework R2R">
156+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
157+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
158+
</HelixWorkItem>
159+
128160
</ItemGroup>
129161
</Project>

‎eng/common/post-build/sourcelink-validation.ps1‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ function ValidateSourceLinkLinks {
196196
Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue
197197
}
198198

199+
$ValidationFailures = 0
200+
199201
# Process each NuGet package in parallel
200202
Get-ChildItem "$InputPath\*.symbols.nupkg" |
201203
ForEach-Object {
@@ -209,17 +211,20 @@ function ValidateSourceLinkLinks {
209211
}
210212

211213
foreach ($Job in @(Get-Job -State 'Completed')) {
212-
Receive-Job -Id $Job.Id
214+
$jobResult = Receive-Job -Id $Job.Id
215+
if ($jobResult -ne '0') {
216+
$ValidationFailures++
217+
}
213218
Remove-Job -Id $Job.Id
214219
}
215220
}
216221

217-
$ValidationFailures = 0
218222
foreach ($Job in @(Get-Job)) {
219223
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
220224
if ($jobResult -ne '0') {
221225
$ValidationFailures++
222226
}
227+
Remove-Job -Id $Job.Id
223228
}
224229
if ($ValidationFailures -gt 0) {
225230
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$ValidationFailures package(s) failed validation."

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,11 @@ function CheckSymbolsAvailable {
189189
}
190190

191191
foreach ($Job in @(Get-Job -State 'Completed')) {
192-
Receive-Job -Id $Job.Id
192+
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
193+
if ($jobResult -ne '0') {
194+
$TotalFailures++
195+
}
196+
Remove-Job -Id $Job.Id
193197
}
194198
Write-Host
195199
}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20280.1",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20280.1"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20309.1",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20309.1"
3535
}
3636
}

0 commit comments

Comments
 (0)