File tree Expand file tree Collapse file tree 6 files changed +175
-165
lines changed Expand file tree Collapse file tree 6 files changed +175
-165
lines changed Original file line number Diff line number Diff line change 33 <ProductDependencies >
44 </ProductDependencies >
55 <ToolsetDependencies >
6- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 5 .0.0-beta.20506 .7" >
6+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6 .0.0-beta.20515 .7" >
77 <Uri >https://github.com/dotnet/arcade</Uri >
8- <Sha >ee39cd1573dbb8011f343e1037af51d4fc00a747 </Sha >
8+ <Sha >d4de3ce701c2ba697d71cc70e2db69d7568913dc </Sha >
99 </Dependency >
10- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 5 .0.0-beta.20506 .7" >
10+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6 .0.0-beta.20515 .7" >
1111 <Uri >https://github.com/dotnet/arcade</Uri >
12- <Sha >ee39cd1573dbb8011f343e1037af51d4fc00a747 </Sha >
12+ <Sha >d4de3ce701c2ba697d71cc70e2db69d7568913dc </Sha >
1313 </Dependency >
1414 </ToolsetDependencies >
1515</Dependencies >
Original file line number Diff line number Diff line change @@ -139,6 +139,10 @@ function(add_toolchain_linker_flag Flag)
139139 set ("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX} " "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX} } ${Flag} " PARENT_SCOPE)
140140endfunction ()
141141
142+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" )
143+ add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS} /lib/${TOOLCHAIN} " )
144+ add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS} /usr/lib/${TOOLCHAIN} " )
145+ endif ()
142146
143147if (TARGET_ARCH_NAME STREQUAL "armel" )
144148 if (DEFINED TIZEN_TOOLCHAIN) # For Tizen only
Original file line number Diff line number Diff line change @@ -201,6 +201,7 @@ if [[ "$internal" == true ]]; then
201201fi
202202
203203if [[ " $mono_dotnet " != " " ]] && [[ " $monointerpreter " == " false" ]]; then
204+ configurations=" $configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot "
204205 extra_benchmark_dotnet_arguments=" $extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
205206fi
206207
Original file line number Diff line number Diff line change @@ -161,9 +161,12 @@ $ValidatePackage = {
161161function CheckJobResult (
162162 $result ,
163163 $packagePath ,
164- [ref ]$ValidationFailures ) {
165- if ($jobResult.result -ne ' 0' ) {
166- Write-PipelineTelemetryError - Category ' SourceLink' - Message " $packagePath has broken SourceLink links."
164+ [ref ]$ValidationFailures ,
165+ [switch ]$logErrors ) {
166+ if ($result -ne ' 0' ) {
167+ if ($logError ) {
168+ Write-PipelineTelemetryError - Category ' SourceLink' - Message " $packagePath has broken SourceLink links."
169+ }
167170 $ValidationFailures.Value ++
168171 }
169172}
@@ -228,16 +231,14 @@ function ValidateSourceLinkLinks {
228231
229232 foreach ($Job in @ (Get-Job - State ' Completed' )) {
230233 $jobResult = Wait-Job - Id $Job.Id | Receive-Job
231- CheckJobResult $jobResult.result $jobResult.packagePath ([ref ]$ValidationFailures )
234+ CheckJobResult $jobResult.result $jobResult.packagePath ([ref ]$ValidationFailures ) - LogErrors
232235 Remove-Job - Id $Job.Id
233236 }
234237 }
235238
236239 foreach ($Job in @ (Get-Job )) {
237240 $jobResult = Wait-Job - Id $Job.Id | Receive-Job
238- if ($jobResult -ne ' 0' ) {
239- $ValidationFailures ++
240- }
241+ CheckJobResult $jobResult.result $jobResult.packagePath ([ref ]$ValidationFailures )
241242 Remove-Job - Id $Job.Id
242243 }
243244 if ($ValidationFailures -gt 0 ) {
You can’t perform that action at this time.
0 commit comments