diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 59daf7f5e..59ab5e449 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -98,13 +98,13 @@
-
+
https://github.com/dotnet/arcade
- a81e6e87cf21837abfde2da6eb9b057bea9f49fc
+ fa0486ddb04a76341d822903c8977fb9fa088d1e
-
+
https://github.com/dotnet/arcade
- a81e6e87cf21837abfde2da6eb9b057bea9f49fc
+ fa0486ddb04a76341d822903c8977fb9fa088d1e
diff --git a/eng/Versions.props b/eng/Versions.props
index c6fe6f344..d7c37f990 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,7 +17,7 @@
- 5.0.0-beta.20461.7
+ 5.0.0-beta.20465.7
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index cdd1bba4f..c7e7ae67d 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -144,11 +144,27 @@ $ValidatePackage = {
if ($FailedFiles -eq 0) {
Write-Host 'Passed.'
- return 0
+ return [pscustomobject]@{
+ result = 0
+ packagePath = $PackagePath
+ }
}
else {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
- return 1
+ return [pscustomobject]@{
+ result = 1
+ packagePath = $PackagePath
+ }
+ }
+}
+
+function CheckJobResult(
+ $result,
+ $packagePath,
+ [ref]$ValidationFailures) {
+ if ($jobResult.result -ne '0') {
+ Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
+ $ValidationFailures.Value++
}
}
@@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
}
foreach ($Job in @(Get-Job -State 'Completed')) {
- $jobResult = Receive-Job -Id $Job.Id
- if ($jobResult -ne '0') {
- $ValidationFailures++
- }
+ $jobResult = Wait-Job -Id $Job.Id | Receive-Job
+ CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
Remove-Job -Id $Job.Id
}
}
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index a36fa6f26..fcc6019b4 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -141,11 +141,6 @@ $CountMissingSymbols = {
if ($using:Clean) {
Remove-Item $ExtractPath -Recurse -Force
}
-
- if ($MissingSymbols -ne 0)
- {
- Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
- }
Pop-Location
@@ -165,6 +160,7 @@ function CheckJobResult(
$DupedSymbols.Value++
}
elseif ($jobResult.result -ne '0') {
+ Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
$TotalFailures.Value++
}
}
@@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
$NumJobs = @(Get-Job -State 'Running').Count
- Write-Host $NumJobs
while ($NumJobs -ge $MaxParallelJobs) {
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
diff --git a/global.json b/global.json
index f6e48ac30..cf9977c7d 100644
--- a/global.json
+++ b/global.json
@@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7"
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7"
}
}
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 307808e57..d627baa05 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -197,19 +197,14 @@
-
+
-
-
-
-
+
-
-
-
-
+
-
-
-
@@ -379,20 +364,15 @@
-
+
-
-
-