diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 09422bfd09b866..cdd387ac2b4b68 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21529.1", + "version": "1.0.0-prerelease.21554.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 004ddccb3d6195..e9569fc8fbf8a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/icu - 5146c6e78ad134305a4b3e857379bdd134db7ac0 + 0f1dc5572da0246e68c92fdeed02d589e5965efd https://github.com/dotnet/msquic a7213b4676c1803bb251771291a525482d42e511 - + https://github.com/dotnet/emsdk - efad634a7c316b67654b38690c56b3702363d6ae + 9d801337aab87a186ea73db11a75fb97a97e45b8 https://github.com/dotnet/wcf @@ -18,153 +18,153 @@ - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 - + https://github.com/dotnet/llvm-project - b1e4b4a52fe087e726d6bb95c78d234352f9e847 + 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 https://github.com/dotnet/runtime @@ -202,45 +202,45 @@ https://github.com/dotnet/linker a5f8466cb452f50436544572e38ff5faa17e2094 - + https://github.com/dotnet/xharness - 952c5c3e6082b77d282d8158f6a1361ef23e205f + 4663a6e7cd3dcec7a2226bda7445179ec29c2944 - + https://github.com/dotnet/xharness - 952c5c3e6082b77d282d8158f6a1361ef23e205f + 4663a6e7cd3dcec7a2226bda7445179ec29c2944 - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8455e2bb85f250a4f1649fcdc3658c25f4cd78aa + 93aae682a468b3c7858d497da5cf79d8ac8eecdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8455e2bb85f250a4f1649fcdc3658c25f4cd78aa + 93aae682a468b3c7858d497da5cf79d8ac8eecdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8455e2bb85f250a4f1649fcdc3658c25f4cd78aa + 93aae682a468b3c7858d497da5cf79d8ac8eecdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8455e2bb85f250a4f1649fcdc3658c25f4cd78aa + 93aae682a468b3c7858d497da5cf79d8ac8eecdc - + https://github.com/dotnet/hotreload-utils - d7f8f855b9d6d3a7090b3bc2745d1bdc8c323fcc + b2b9b361d92ebb4ba574ea693aa20b37e7d6b1e9 - + https://github.com/dotnet/runtime-assets - e444c9ce30e40a75994fe6b4fd5e87a7ef63355b + 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/roslyn-analyzers - 3541eb2b9c85dd1416ba7571f49c0e44019756b7 + 380759dbc374f0fa2e2b714b0bf317231a06c2dd https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f903d0fbc672e5..d09a845afeaf6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,27 +51,27 @@ 3.3.2 4.0.0-4.final 4.0.0-4.final - 7.0.0-preview1.21528.1 + 7.0.0-preview1.21554.2 4.0.0-5.21453.15 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 2.5.1-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 2.5.1-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 + 7.0.0-beta.21555.2 6.0.0-preview.1.102 @@ -121,22 +121,22 @@ 4.5.0 7.0.0-alpha.1.21551.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 - 7.0.0-beta.21520.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 - 1.0.0-prerelease.21530.2 - 1.0.0-prerelease.21530.2 - 1.0.0-prerelease.21530.2 - 1.0.0-prerelease.21530.2 + 1.0.0-prerelease.21556.2 + 1.0.0-prerelease.21556.2 + 1.0.0-prerelease.21556.2 + 1.0.0-prerelease.21556.2 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -154,9 +154,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21529.1 - 1.0.0-prerelease.21529.1 - 1.0.2-alpha.0.21525.2 + 1.0.0-prerelease.21554.1 + 1.0.0-prerelease.21554.1 + 1.0.2-alpha.0.21551.2 2.4.2-pre.9 2.4.2 1.3.0 @@ -172,20 +172,20 @@ 7.0.100-1.21528.2 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21525.1 + 7.0.0-alpha.1.21551.1 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 - 11.1.0-alpha.1.21529.2 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21554.1 - 7.0.0-alpha.1.21527.1 + 7.0.0-alpha.1.21554.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index a4a92efbedf9a9..cd2181bafa057d 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/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5023d36dcb3c5b..5cd5325d7b4e6b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,11 +31,6 @@ parameters: # container and pool. platform: {} - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - defaultContainerHostPool: - vmImage: ubuntu-20.04 - jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -47,7 +42,15 @@ jobs: container: ${{ parameters.platform.container }} ${{ if eq(parameters.platform.pool, '') }}: - pool: ${{ parameters.defaultContainerHostPool }} + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index ae85a99a853f4b..4af724eb1a9ec9 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -5,8 +5,6 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - pool: - vmImage: 'windows-2019' condition: '' dependsOn: '' @@ -24,7 +22,13 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables - pool: ${{ parameters.pool }} + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} diff --git a/global.json b/global.json index c87af2701bf6f0..a05722999a8711 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21529.1", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21529.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21529.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21555.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21551.1"