diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70cd1c881..d29988684 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,19 +172,19 @@ - + https://github.com/dotnet/arcade - 670231b2034b040c42af651d4c34d679784f0318 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 670231b2034b040c42af651d4c34d679784f0318 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 670231b2034b040c42af651d4c34d679784f0318 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index dff5b6505..addbf3a08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21554.4 + 7.0.0-beta.21555.2 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index a4a92efbe..cd2181baf 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -134,17 +134,17 @@ $CountMissingSymbols = { # Save the output and get diagnostic output $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String - if (Test-Path $PdbPath) { - return 'PDB' + if ((Test-Path $PdbPath) -and (Test-path $SymbolPath)) { + return 'Module and PDB for Module' } - elseif (Test-Path $NGenPdb) { - return 'NGen PDB' + elseif ((Test-Path $NGenPdb) -and (Test-Path $PdbPath) -and (Test-Path $SymbolPath)) { + return 'Dll, PDB and NGen PDB' } - elseif (Test-Path $SODbg) { - return 'DBG for SO' + elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) { + return 'So and DBG for SO' } - elseif (Test-Path $DylibDwarf) { - return 'Dwarf for Dylib' + elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) { + return 'Dylib and Dwarf for Dylib' } elseif (Test-Path $SymbolPath) { return 'Module' diff --git a/global.json b/global.json index 1277a880b..93e669afc 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21554.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21555.2" } }