diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8b39a6250a..9a2370fc831 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,25 +75,25 @@ - + 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/arcade - 670231b2034b040c42af651d4c34d679784f0318 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 670231b2034b040c42af651d4c34d679784f0318 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb diff --git a/eng/Versions.props b/eng/Versions.props index 7f9dc300d9c..19aed33466e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,9 +37,9 @@ - 7.0.0-beta.21554.4 - 7.0.0-beta.21554.4 - 7.0.0-beta.21554.4 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 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 a4a92efbedf..cd2181bafa0 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 8b52e92759d..9addf14c4fe 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21554.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21555.2" }, "sdk": { "version": "6.0.100-rc.1.21430.12"