From b36e95a35bee90a62b166625b0f73fbdd79b3a03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Mar 2021 12:17:05 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20210325.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21167.3 -> To Version 6.0.0-beta.21175.1 --- eng/Version.Details.xml | 68 ++++++++++---------- eng/Versions.props | 26 ++++---- eng/common/generate-locproject.ps1 | 4 +- eng/common/post-build/publish-using-darc.ps1 | 7 +- eng/common/templates/steps/source-build.yml | 2 +- global.json | 8 +-- 6 files changed, 56 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 182409aa3de7d..d2c3f918574af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 91c8909b64fc346c7a44384a10ee9a45a7e3455d + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -206,9 +206,9 @@ https://github.com/dotnet/xharness bb960200cb1f171f11ecd8cf9e45d97218e2241e - + https://github.com/dotnet/arcade - 0ca849f0b71866b007fedaaa938cee63f8d056a6 + 12a2bc501ce756c9522588d88583c0256297bd70 diff --git a/eng/Versions.props b/eng/Versions.props index bdb9ffcb33dbe..864acedeead54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.9.0-5.final 3.9.0-5.final - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 2.5.1-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21173.2 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 - 6.0.0-beta.21167.3 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 2.5.1-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 + 6.0.0-beta.21175.1 5.9.0-preview.2 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 9e2f7ad98bf0b..ad3e80651fe39 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -79,7 +79,7 @@ $locJson = @{ } $json = ConvertTo-Json $locJson -Depth 5 -Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n" +Write-Host "LocProject.json generated:`n`n$json`n`n" Pop-Location if (!$UseCheckedInLocProjectJson) { @@ -91,7 +91,7 @@ else { Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { - Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." exit 1 } diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index b6e55f5e74a74..2427ca6b6aec7 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -55,15 +55,12 @@ try { $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null } } - # note the custom branch to work around https://github.com/dotnet/arcade/issues/6987 . Try to keep this rebased off master if publishing changes - - Write-Host "Using Arcade branch master-workaround-publishing-issue to work around disk space issues with alternate build pool. Will be lost on Arcade updates as this is in eng common. Contact dnceng for questions." - + & $darc add-build-to-channel ` --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` - --source-branch master-workaround-publishing-issue ` + --source-branch main ` --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 8e336b7d16b34..65ee5992bf460 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -36,7 +36,7 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ - --restore --build --pack --publish \ + --restore --build --pack --publish -bl \ $officialBuildArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ diff --git a/global.json b/global.json index 4e815806088a7..d085b22585ab9 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21167.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21167.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21175.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21175.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21175.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21175.1", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.3.21169.6" From dc0ad1cfc454d874dfa2e868c928d1ebea0fad68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Mar 2021 13:49:55 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/xharness build 20210325.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21173.1 -> To Version 1.0.0-prerelease.21175.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index dc8c2b505c354..d64902048b60d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21173.1", + "version": "1.0.0-prerelease.21175.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2c3f918574af..69dd18e1108fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,13 +198,13 @@ https://github.com/mono/linker 2f5594e95e1a5227103b9b7d6b92f4b2250be2d7 - + https://github.com/dotnet/xharness - bb960200cb1f171f11ecd8cf9e45d97218e2241e + f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e - + https://github.com/dotnet/xharness - bb960200cb1f171f11ecd8cf9e45d97218e2241e + f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 864acedeead54..b07a088094575 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,8 +148,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21173.1 - 1.0.0-prerelease.21173.1 + 1.0.0-prerelease.21175.2 + 1.0.0-prerelease.21175.2 2.4.1 2.4.2 1.3.0 From 37e8fca635763f4cc42a97e67059e62c79b9b641 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Mar 2021 13:50:31 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/runtime-assets build 20210324.2 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21162.1 -> To Version 6.0.0-beta.21174.2 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69dd18e1108fe..3dc5e6869fbcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,41 +94,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 - + https://github.com/dotnet/runtime-assets - f01b1fca0c9157a16ade2629eb7d49a220b7e9ba + 055ed026132a7070e41629cfb5e410f0fcbdf948 https://github.com/dotnet/llvm-project diff --git a/eng/Versions.props b/eng/Versions.props index b07a088094575..0f463d20019ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -107,15 +107,15 @@ 4.3.0 6.0.0-preview.3.21169.6 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 - 6.0.0-beta.21162.1 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 + 6.0.0-beta.21174.2 99.99.99-master-20210317.2 99.99.99-master-20210317.2 From 2fd9cf2ce1a2582d087bf847522028b5e4dab8d7 Mon Sep 17 00:00:00 2001 From: Ricardo Arenas Date: Thu, 25 Mar 2021 07:08:28 -0700 Subject: [PATCH 4/4] Re-introduce publishing workaround Required while https://github.com/dotnet/arcade/issues/6987 is resolved --- eng/common/post-build/publish-using-darc.ps1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 2427ca6b6aec7..b6e55f5e74a74 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -55,12 +55,15 @@ try { $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null } } - + # note the custom branch to work around https://github.com/dotnet/arcade/issues/6987 . Try to keep this rebased off master if publishing changes + + Write-Host "Using Arcade branch master-workaround-publishing-issue to work around disk space issues with alternate build pool. Will be lost on Arcade updates as this is in eng common. Contact dnceng for questions." + & $darc add-build-to-channel ` --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` - --source-branch main ` + --source-branch master-workaround-publishing-issue ` --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken `