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 3
3
<ProductDependencies >
4
4
</ProductDependencies >
5
5
<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" >
7
7
<Uri >https://github.com/dotnet/arcade</Uri >
8
- <Sha >ee39cd1573dbb8011f343e1037af51d4fc00a747 </Sha >
8
+ <Sha >d4de3ce701c2ba697d71cc70e2db69d7568913dc </Sha >
9
9
</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" >
11
11
<Uri >https://github.com/dotnet/arcade</Uri >
12
- <Sha >ee39cd1573dbb8011f343e1037af51d4fc00a747 </Sha >
12
+ <Sha >d4de3ce701c2ba697d71cc70e2db69d7568913dc </Sha >
13
13
</Dependency >
14
14
</ToolsetDependencies >
15
15
</Dependencies >
Original file line number Diff line number Diff line change @@ -139,6 +139,10 @@ function(add_toolchain_linker_flag Flag)
139
139
set ("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX} " "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX} } ${Flag} " PARENT_SCOPE )
140
140
endfunction ()
141
141
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 ()
142
146
143
147
if (TARGET_ARCH_NAME STREQUAL "armel" )
144
148
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
201
201
fi
202
202
203
203
if [[ " $mono_dotnet " != " " ]] && [[ " $monointerpreter " == " false" ]]; then
204
+ configurations=" $configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot "
204
205
extra_benchmark_dotnet_arguments=" $extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono"
205
206
fi
206
207
Original file line number Diff line number Diff line change @@ -161,9 +161,12 @@ $ValidatePackage = {
161
161
function CheckJobResult (
162
162
$result ,
163
163
$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
+ }
167
170
$ValidationFailures.Value ++
168
171
}
169
172
}
@@ -228,16 +231,14 @@ function ValidateSourceLinkLinks {
228
231
229
232
foreach ($Job in @ (Get-Job - State ' Completed' )) {
230
233
$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
232
235
Remove-Job - Id $Job.Id
233
236
}
234
237
}
235
238
236
239
foreach ($Job in @ (Get-Job )) {
237
240
$jobResult = Wait-Job - Id $Job.Id | Receive-Job
238
- if ($jobResult -ne ' 0' ) {
239
- $ValidationFailures ++
240
- }
241
+ CheckJobResult $jobResult.result $jobResult.packagePath ([ref ]$ValidationFailures )
241
242
Remove-Job - Id $Job.Id
242
243
}
243
244
if ($ValidationFailures -gt 0 ) {
You can’t perform that action at this time.
0 commit comments