From 6b4a11b5f130d180e6eff74eba9359a4baa2d017 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 13:08:43 +0000 Subject: [PATCH 01/36] Update dependencies from https://github.com/dotnet/arcade build 20231211.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23611.2 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- eng/common/build.ps1 | 3 ++ eng/common/build.sh | 8 +++++ eng/common/tools.ps1 | 3 +- global.json | 6 ++-- 6 files changed, 72 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad3fb37ed1bba..06c70c67b1347 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 3faeb9817f465151aa4bbcdb315f0a6170206760 + 0a0217fe0cdd3654105d1c46be4e43eeae9c163e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 15033b4453aff..8a69255428916 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 2.5.3-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 - 9.0.0-beta.23607.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 2.6.1-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 + 9.0.0-beta.23611.2 6.0.0-preview.1.102 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 33a6f2d0e2481..066044f62f29b 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -19,6 +19,7 @@ Param( [switch] $pack, [switch] $publish, [switch] $clean, + [switch] $verticalBuild, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -58,6 +59,7 @@ function Print-Usage() { Write-Host " -sign Sign build outputs" Write-Host " -publish Publish artifacts (e.g. symbols)" Write-Host " -clean Clean the solution" + Write-Host " -verticalBuild Run in 'vertical build' infra mode." Write-Host "" Write-Host "Advanced settings:" @@ -120,6 +122,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` + /p:ArcadeBuildVertical=$verticalBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 2c17ba529b913..5ce01dd161aaf 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -59,6 +59,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false source_build=false +vertical_build=false rebuild=false test=false integration_test=false @@ -129,6 +130,12 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; + -verticalbuild|-vb) + build=true + vertical_build=true + restore=true + pack=true + ;; -test|-t) test=true ;; @@ -220,6 +227,7 @@ function Build { /p:Restore=$restore \ /p:Build=$build \ /p:ArcadeBuildFromSource=$source_build \ + /p:ArcadeBuildVertical=$vertical_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index e8def7e6a85f2..162dee2b9363c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -827,7 +827,8 @@ function MSBuild-Core() { } } - $env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs" + # Be sure quote the path in case there are spaces in the dotnet installation location. + $env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs" $exitCode = Exec-Process $buildTool.Path $cmdArgs diff --git a/global.json b/global.json index 1b3640ef522bc..0f622b63af5f5 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23607.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23607.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23611.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23611.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From b023b946d8a8000b9be66f1c3ec47a881ea1bc9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:08:43 +0000 Subject: [PATCH 02/36] Update dependencies from https://github.com/dotnet/arcade build 20231212.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23612.2 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06c70c67b1347..9130c9ca75938 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 8a69255428916..0a2616f0de264 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 2.6.1-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 - 9.0.0-beta.23611.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 2.6.1-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 + 9.0.0-beta.23612.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 0f622b63af5f5..7875bb9587cfa 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23611.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23611.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23612.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23612.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From d802a7a7e3b915052b089a09d1bbab6f7df35850 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 13:10:37 +0000 Subject: [PATCH 03/36] Update dependencies from https://github.com/dotnet/arcade build 20231213.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23613.3 --- eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 32 ++++---- .../templates/job/source-index-stage1.yml | 10 +-- eng/common/tools.ps1 | 5 -- eng/common/tools.sh | 5 -- global.json | 6 +- 6 files changed, 64 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9130c9ca75938..44def1cbab394 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0a2616f0de264..0b7588445dfbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 2.6.1-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 - 9.0.0-beta.23612.2 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 2.6.1-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 + 9.0.0-beta.23613.3 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa02d82..795233662623d 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexPackageVersion: 1.0.1-20231213.4 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -30,20 +30,20 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 162dee2b9363c..540393a6634bf 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -165,11 +165,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } - # Source Build uses DotNetCoreSdkDir variable - if ($env:DotNetCoreSdkDir -ne $null) { - $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir - } - # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetExecutable = GetExecutableFileName 'dotnet' diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e98daf50c6b67..9e979ac16f62f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -123,11 +123,6 @@ function InitializeDotNetCli { # so it doesn't output warnings to the console. export LTTNG_HOME="$HOME" - # Source Build uses DotNetCoreSdkDir variable - if [[ -n "${DotNetCoreSdkDir:-}" ]]; then - export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir" - fi - # Find the first path on $PATH that contains the dotnet.exe if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then local dotnet_path=`command -v dotnet` diff --git a/global.json b/global.json index 7875bb9587cfa..3b76981b7bd0d 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23612.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23612.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23613.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23613.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From 34161a402e1a9498fb6446080250f7a06ed2de5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 13:10:48 +0000 Subject: [PATCH 04/36] Update dependencies from https://github.com/dotnet/arcade build 20231214.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23614.6 --- eng/Version.Details.xml | 80 ++++++++++----------- eng/Versions.props | 32 ++++----- eng/common/sdl/trim-assets-version.ps1 | 4 +- eng/common/templates/steps/source-build.yml | 4 +- eng/common/tools.ps1 | 24 ++++--- eng/common/tools.sh | 8 +-- global.json | 10 +-- 7 files changed, 83 insertions(+), 79 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44def1cbab394..c7c1e4aa725ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - b6349a217d7e2f6b5c1831702f8beef5c171da3f + 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0b7588445dfbb..5e06f8ef0f0e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 2.6.1-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 - 9.0.0-beta.23613.3 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 2.6.1-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 + 9.0.0-beta.23614.6 6.0.0-preview.1.102 diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index a2e0048770452..1f3c531b2f192 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -61,6 +61,8 @@ try { ExitWithExitCode 1 } + # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade. + $env:DOTNET_ROLL_FORWARD = "Major" Exec-BlockVerbosely { & "$dotnet" $CliToolName trim-assets-version ` --assets-path $InputPath ` @@ -72,4 +74,4 @@ catch { Write-Host $_ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 41bbb915736a6..1d79797363d93 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -105,7 +105,7 @@ steps: Contents: | **/*.log **/*.binlog - artifacts/source-build/self/prebuilt-report/** + artifacts/sb/prebuilt-report/** TargetFolder: '$(Build.StagingDirectory)/BuildLogs' CleanTargetFolder: true continueOnError: true @@ -126,4 +126,4 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 540393a6634bf..9048d603245b5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -596,7 +596,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -671,8 +671,14 @@ function Read-ArcadeSdkVersion() { } function InitializeToolset() { - if (Test-Path variable:global:_ToolsetBuildProj) { - return $global:_ToolsetBuildProj + # For Unified Build/Source-build support, check whether the environment variable is + # set. If it is, then use this as the toolset build project. + if ($env:_InitializeToolset -ne $null) { + return $global:_InitializeToolset = $env:_InitializeToolset + } + + if (Test-Path variable:global:_InitializeToolset) { + return $global:_InitializeToolset } $nugetCache = GetNuGetPackageCachePath @@ -683,7 +689,7 @@ function InitializeToolset() { if (Test-Path $toolsetLocationFile) { $path = Get-Content $toolsetLocationFile -TotalCount 1 if (Test-Path $path) { - return $global:_ToolsetBuildProj = $path + return $global:_InitializeToolset = $path } } @@ -706,7 +712,7 @@ function InitializeToolset() { throw "Invalid toolset path: $path" } - return $global:_ToolsetBuildProj = $path + return $global:_InitializeToolset = $path } function ExitWithExitCode([int] $exitCode) { @@ -758,12 +764,10 @@ function MSBuild() { # new scripts need to work with old packages, so we need to look for the old names/versions (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll')) - (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll')) (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')) + (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')), + (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')), + (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll')) ) $selectedPath = $null foreach ($path in $possiblePaths) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 9e979ac16f62f..ece4b73079536 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -338,7 +338,7 @@ function InitializeBuildTool { _InitializeBuildToolCommand="msbuild" # use override if it exists - commonly set by source-build if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then - _InitializeBuildToolFramework="net8.0" + _InitializeBuildToolFramework="net9.0" else _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" fi @@ -453,12 +453,10 @@ function MSBuild { local possiblePaths=() possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" ) for path in "${possiblePaths[@]}"; do if [[ -f $path ]]; then selectedPath=$path diff --git a/global.json b/global.json index 3b76981b7bd0d..68820a13cc37f 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.100-alpha.1.23613.1", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100" + "dotnet": "9.0.100-alpha.1.23613.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23613.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23613.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23614.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23614.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From 4ac9d706399ef071a3eae09a51662942840c7675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Dec 2023 13:09:04 +0000 Subject: [PATCH 05/36] Update dependencies from https://github.com/dotnet/arcade build 20231214.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23614.6 From e23280c45220ef3572d493228069342411360e42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Dec 2023 13:09:42 +0000 Subject: [PATCH 06/36] Update dependencies from https://github.com/dotnet/arcade build 20231215.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23615.2 --- eng/Version.Details.xml | 80 +++++++++++++------------- eng/Versions.props | 32 +++++------ eng/common/sdl/trim-assets-version.ps1 | 2 - global.json | 10 ++-- 4 files changed, 61 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7c1e4aa725ce..8d3f93e6e7c35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 5e06f8ef0f0e8..4f66d27f1cea4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 2.6.1-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 - 9.0.0-beta.23614.6 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 2.6.1-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 + 9.0.0-beta.23615.2 6.0.0-preview.1.102 diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index 1f3c531b2f192..0daa2a9e94628 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -61,8 +61,6 @@ try { ExitWithExitCode 1 } - # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade. - $env:DOTNET_ROLL_FORWARD = "Major" Exec-BlockVerbosely { & "$dotnet" $CliToolName trim-assets-version ` --assets-path $InputPath ` diff --git a/global.json b/global.json index 68820a13cc37f..519d3b3497203 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.100-alpha.1.23613.1", + "version": "9.0.100-alpha.1.23615.4", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-alpha.1.23613.1" + "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23614.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23614.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23615.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23615.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From c706963bb6f505dc71d70fc9bafe9b1cd24aa1d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 13:10:50 +0000 Subject: [PATCH 07/36] Update dependencies from https://github.com/dotnet/arcade build 20231215.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23615.2 From e4189240ef2dd9a1b135df0097af98eb3980ab0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Dec 2023 13:10:27 +0000 Subject: [PATCH 08/36] Update dependencies from https://github.com/dotnet/arcade build 20231219.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23619.2 --- eng/Version.Details.xml | 80 ++++++++++----------- eng/Versions.props | 32 ++++----- eng/common/build.cmd | 3 + eng/common/templates/steps/publish-logs.yml | 49 ++++++------- global.json | 6 +- 5 files changed, 87 insertions(+), 83 deletions(-) create mode 100644 eng/common/build.cmd diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d3f93e6e7c35..9697aefccd3a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 2f7acdc5f9b87f260119bb32d01c24d2773773eb + 28b89011cb850ec0fc78a0897f59acc05409e941 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4f66d27f1cea4..b7ef42ab06b44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 2.6.1-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 - 9.0.0-beta.23615.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 2.6.1-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 + 9.0.0-beta.23619.2 6.0.0-preview.1.102 diff --git a/eng/common/build.cmd b/eng/common/build.cmd new file mode 100644 index 0000000000000..99daf368abae7 --- /dev/null +++ b/eng/common/build.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index dadf1c464cd1f..d5e96ed099b12 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -15,30 +15,31 @@ steps: Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - -- task: PowerShell@2 - displayName: Redact Logs - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 - # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' - # If the file exists - sensitive data for redaction will be sourced from it - # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' - '$(publishing-dnceng-devdiv-code-r-build-re)' - '$(MaestroAccessToken)' - '$(dn-bot-all-orgs-artifact-feeds-rw)' - '$(akams-client-id)' - '$(akams-client-secret)' - '$(microsoft-symbol-server-pat)' - '$(symweb-symbol-server-pat)' - '$(dn-bot-all-orgs-build-rw-code-rw)' - ${{parameters.CustomSensitiveDataList}} - continueOnError: true - condition: always() - + +# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675 +# - task: PowerShell@2 +# displayName: Redact Logs +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 +# # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml +# # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' +# # If the file exists - sensitive data for redaction will be sourced from it +# # (single entry per line, lines starting with '# ' are considered comments and skipped) +# arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' +# -BinlogToolVersion ${{parameters.BinlogToolVersion}} +# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' +# '$(publishing-dnceng-devdiv-code-r-build-re)' +# '$(MaestroAccessToken)' +# '$(dn-bot-all-orgs-artifact-feeds-rw)' +# '$(akams-client-id)' +# '$(akams-client-secret)' +# '$(microsoft-symbol-server-pat)' +# '$(symweb-symbol-server-pat)' +# '$(dn-bot-all-orgs-build-rw-code-rw)' +# ${{parameters.CustomSensitiveDataList}} +# continueOnError: true +# condition: always() + - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/global.json b/global.json index 519d3b3497203..00df5bc547e44 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23615.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23615.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23619.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23619.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From e9e0960d24045a867124b43b1a13325f14a5b7b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 13:10:30 +0000 Subject: [PATCH 09/36] Update dependencies from https://github.com/dotnet/arcade build 20231220.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23620.1 --- eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 32 ++++---- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 2 +- .../templates/post-build/post-build.yml | 4 +- global.json | 6 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9697aefccd3a3..fe1c1d6339cae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 28b89011cb850ec0fc78a0897f59acc05409e941 + 17dff488fa9de3f27edf2e42516d06d538ed3625 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b7ef42ab06b44..94e18d90e2f6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 2.6.1-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 - 9.0.0-beta.23619.2 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 2.6.1-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 + 9.0.0-beta.23620.1 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0b01531357e3a..01c0dd995e4b6 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 3b25fd97923c6..d9c5b4aaf9b0d 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d64236b28cfb1..bbc010fe73261 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -267,7 +267,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index 00df5bc547e44..cd5b6034a4224 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23619.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23619.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23620.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23620.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From 480fb1fb741bf5195f1737a93d0440a12d2b4698 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 13:11:32 +0000 Subject: [PATCH 10/36] Update dependencies from https://github.com/dotnet/arcade build 20231220.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23620.7 --- eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 32 ++++---- .../templates/post-build/common-variables.yml | 2 +- eng/common/templates/steps/publish-logs.yml | 2 +- global.json | 6 +- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe1c1d6339cae..c7179c6f187a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 17dff488fa9de3f27edf2e42516d06d538ed3625 + c0c425d9b85b125bbaf59581639355f1d2b99149 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 94e18d90e2f6f..7a4632c1b8e35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 2.6.1-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 - 9.0.0-beta.23620.1 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 2.6.1-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 + 9.0.0-beta.23620.7 6.0.0-preview.1.102 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 4ef7bd271fbde..d7bf5c6e352cf 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -18,7 +18,7 @@ variables: - name: SymbolToolVersion value: 1.0.1 - name: BinlogToolVersion - value: 1.0.8 + value: 1.0.9 - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index d5e96ed099b12..de8f2d6a23535 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,7 +3,7 @@ parameters: JobLabel: '' CustomSensitiveDataList: '' # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed - BinlogToolVersion: '1.0.8' + BinlogToolVersion: '1.0.9' steps: - task: Powershell@2 diff --git a/global.json b/global.json index cd5b6034a4224..974d4bd2acaf8 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23620.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23620.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23620.7", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23620.7", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From 6ac3138784a3f9066d1a83636a2b2ccbcfef6953 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 13:10:48 +0000 Subject: [PATCH 11/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 --- eng/Version.Details.xml | 80 ++++++++++----------- eng/Versions.props | 32 ++++----- eng/common/templates/steps/publish-logs.yml | 49 +++++++------ global.json | 6 +- 4 files changed, 83 insertions(+), 84 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7179c6f187a7..7fec7cdc5bad7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - c0c425d9b85b125bbaf59581639355f1d2b99149 + a1e4795fcba619bba3534700b660ad6d2e3ce859 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 7a4632c1b8e35..b433568f9fbb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 2.6.1-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 - 9.0.0-beta.23620.7 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 2.6.1-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 + 9.0.0-beta.23621.2 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index de8f2d6a23535..835e52751283d 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -15,31 +15,30 @@ steps: Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - -# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675 -# - task: PowerShell@2 -# displayName: Redact Logs -# inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 -# # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml -# # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' -# # If the file exists - sensitive data for redaction will be sourced from it -# # (single entry per line, lines starting with '# ' are considered comments and skipped) -# arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' -# -BinlogToolVersion ${{parameters.BinlogToolVersion}} -# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' -# '$(publishing-dnceng-devdiv-code-r-build-re)' -# '$(MaestroAccessToken)' -# '$(dn-bot-all-orgs-artifact-feeds-rw)' -# '$(akams-client-id)' -# '$(akams-client-secret)' -# '$(microsoft-symbol-server-pat)' -# '$(symweb-symbol-server-pat)' -# '$(dn-bot-all-orgs-build-rw-code-rw)' -# ${{parameters.CustomSensitiveDataList}} -# continueOnError: true -# condition: always() - + +- task: PowerShell@2 + displayName: Redact Logs + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml + # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # If the file exists - sensitive data for redaction will be sourced from it + # (single entry per line, lines starting with '# ' are considered comments and skipped) + arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + '$(publishing-dnceng-devdiv-code-r-build-re)' + '$(MaestroAccessToken)' + '$(dn-bot-all-orgs-artifact-feeds-rw)' + '$(akams-client-id)' + '$(akams-client-secret)' + '$(microsoft-symbol-server-pat)' + '$(symweb-symbol-server-pat)' + '$(dn-bot-all-orgs-build-rw-code-rw)' + ${{parameters.CustomSensitiveDataList}} + continueOnError: true + condition: always() + - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/global.json b/global.json index 974d4bd2acaf8..9a163b1af2bc8 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.7", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23620.7", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23620.7", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23621.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23621.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23621.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From 92a2ab89bca855175d5688884060cded81028d6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Dec 2023 13:08:59 +0000 Subject: [PATCH 12/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 From c3fa0adb9c4095e9eee9887f1253148d38df2ed9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Dec 2023 13:08:59 +0000 Subject: [PATCH 13/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 From c47340270ac2f6a94ddec043259dce1079e5f469 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 13:09:11 +0000 Subject: [PATCH 14/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 From 97699534388c9b04fee6299ea0adf8c3bab5d65c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Dec 2023 13:08:13 +0000 Subject: [PATCH 15/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 From 81485f2f91384aa27660b366121550f4be882f38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Dec 2023 13:09:00 +0000 Subject: [PATCH 16/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 From e3dac3a2dea6160615f5b6e4b0ca9a93f54efbe5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 13:09:11 +0000 Subject: [PATCH 17/36] Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23621.2 From 84bc4d38e08fd0b288bc44a9e82096df2d8136cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Dec 2023 13:10:35 +0000 Subject: [PATCH 18/36] Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23628.1 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fec7cdc5bad7..2cb5cfcef9169 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - a1e4795fcba619bba3534700b660ad6d2e3ce859 + 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b433568f9fbb7..138acc0d92edc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 2.6.1-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 - 9.0.0-beta.23621.2 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 2.6.1-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 + 9.0.0-beta.23628.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 9a163b1af2bc8..3ba843b7873e5 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23621.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23621.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23621.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23628.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23628.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From f49a747d75af636054a9cc32c5d30e02e36951f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Dec 2023 13:09:09 +0000 Subject: [PATCH 19/36] Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23628.1 From 5809d89118cb962d0545afb8b14708afae502007 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Dec 2023 13:07:10 +0000 Subject: [PATCH 20/36] Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23628.1 From 29d86b7ab2cd72c6411213a5a721cbd2d364719c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jan 2024 13:07:28 +0000 Subject: [PATCH 21/36] Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23628.1 From e6a16b516e1afc41afde402505b950d8209ab51e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jan 2024 13:07:34 +0000 Subject: [PATCH 22/36] Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.23628.1 From e755ce5b38bf74e30d7178f40ac3d9eea3cfe1c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Jan 2024 13:09:52 +0000 Subject: [PATCH 23/36] Update dependencies from https://github.com/dotnet/arcade build 20240102.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24052.3 --- eng/Version.Details.xml | 80 +++++++++++------------ eng/Versions.props | 32 ++++----- eng/common/helixpublish.proj | 1 + eng/common/internal/Directory.Build.props | 2 + eng/common/internal/Tools.csproj | 2 + global.json | 6 +- 6 files changed, 64 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cb5cfcef9169..58c55559dbfae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 9e5fd26c0d1a187dfa08242d83e341634d4b1b07 + 3531486ae4b4e78149d815d99db3d3a0e8a3c64d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 138acc0d92edc..c98945b4a1aec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 2.6.1-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 - 9.0.0-beta.23628.1 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 2.6.1-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 + 9.0.0-beta.24052.3 6.0.0-preview.1.102 diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj index d7f185856e791..c1323bf412105 100644 --- a/eng/common/helixpublish.proj +++ b/eng/common/helixpublish.proj @@ -1,3 +1,4 @@ + diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index dbf99d82a5c2e..a735fe9a133ca 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,4 +1,6 @@ + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 7f5ce6d608133..8fa77e5b181f8 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,6 @@ + net472 false @@ -27,4 +28,5 @@ + diff --git a/global.json b/global.json index 3ba843b7873e5..cb904c0eba88b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23628.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23628.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24052.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24052.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24052.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From 5bde6f42b8473ea20abbf61060acef836f3e74b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 13:09:00 +0000 Subject: [PATCH 24/36] Update dependencies from https://github.com/dotnet/arcade build 20240103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24053.1 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58c55559dbfae..ea8a1f9c2eaad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness b058fd28cbd724817c21efee85bb34effb5d2c14 - + https://github.com/dotnet/arcade - 3531486ae4b4e78149d815d99db3d3a0e8a3c64d + f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c98945b4a1aec..fc45d455e888b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 2.6.1-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 - 9.0.0-beta.24052.3 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 2.6.1-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 + 9.0.0-beta.24053.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index cb904c0eba88b..a8ddad6c240ce 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24052.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24052.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24052.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24053.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24053.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24053.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23603.1" From d663e18e9ebe9591903b7630c7081bb1fcbfca69 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 3 Jan 2024 19:54:58 +0000 Subject: [PATCH 25/36] [wasi] Always add wasi-wasm rid to KnownRuntimePack for local builds in targetingpacks.targets --- eng/targetingpacks.targets | 9 +++++++++ src/mono/wasi/build/WasiApp.InTree.targets | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 162b6c5210ad0..ab4c6c3e72852 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -188,4 +188,13 @@ DotNetHostPath="$(DotNetTool)" /> + + + + + + + diff --git a/src/mono/wasi/build/WasiApp.InTree.targets b/src/mono/wasi/build/WasiApp.InTree.targets index 39236ac77c4f1..5a48423781d86 100644 --- a/src/mono/wasi/build/WasiApp.InTree.targets +++ b/src/mono/wasi/build/WasiApp.InTree.targets @@ -20,14 +20,6 @@ - - - - - - - - From d39c00ff5dfb674f819241498aa855714bccc07b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Jan 2024 13:09:20 +0000 Subject: [PATCH 26/36] Update dependencies from https://github.com/dotnet/arcade build 20240104.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24054.2 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ddfae2fa6769..d1523de96928c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness a855ee8bf3e90a5baef9de25ccff5be597390087 - + https://github.com/dotnet/arcade - f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 + 574b28f9639dbd60738c6662d44f47b4abf5bba1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c1e77dbfa6bf9..bfbeb23749dac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 2.6.1-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 - 9.0.0-beta.24053.1 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 2.6.1-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 + 9.0.0-beta.24054.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index ea43701c8c0fa..0d329d8160acd 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24053.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24053.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24053.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24054.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24054.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24054.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23617.5" From 3bf7b0df1dbe62c9bf133ef03d0a640ac5df85b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Jan 2024 13:09:21 +0000 Subject: [PATCH 27/36] Update dependencies from https://github.com/dotnet/arcade build 20240105.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24055.2 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1523de96928c..8abc9672f83ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness a855ee8bf3e90a5baef9de25ccff5be597390087 - + https://github.com/dotnet/arcade - 574b28f9639dbd60738c6662d44f47b4abf5bba1 + bab85ba4579526962b0dbb0aa4db625c50da8859 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index bfbeb23749dac..711400697fd1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 2.6.1-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 - 9.0.0-beta.24054.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 2.6.1-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 + 9.0.0-beta.24055.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 0d329d8160acd..dce48a5e56c70 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24054.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24054.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24054.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24055.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24055.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24055.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23617.5" From db5dab6e4461943c5914153944e053595ee514dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Jan 2024 13:08:03 +0000 Subject: [PATCH 28/36] Update dependencies from https://github.com/dotnet/arcade build 20240105.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24055.2 From 07441295adadb1e211b3de2775a2e39f60df6f20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Jan 2024 13:08:46 +0000 Subject: [PATCH 29/36] Update dependencies from https://github.com/dotnet/arcade build 20240105.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24055.2 From e5121a382e19980bef5ad48adcc5feeadc25735c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 13:08:17 +0000 Subject: [PATCH 30/36] Update dependencies from https://github.com/dotnet/arcade build 20240108.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24058.6 --- eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 32 ++++---- eng/common/cross/build-rootfs.sh | 6 +- eng/common/cross/riscv64/sources.list.sid | 2 +- .../templates/job/publish-build-assets.yml | 4 + eng/common/tools.ps1 | 10 ++- global.json | 6 +- 7 files changed, 76 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8abc9672f83ed..905edeb3e368c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness a855ee8bf3e90a5baef9de25ccff5be597390087 - + https://github.com/dotnet/arcade - bab85ba4579526962b0dbb0aa4db625c50da8859 + 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 711400697fd1e..633ea6db4d5d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 2.6.1-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 - 9.0.0-beta.24055.2 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 2.6.1-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 + 9.0.0-beta.24058.6 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 4228f202e5bfa..9b2791cf568aa 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -182,12 +182,12 @@ while :; do __AlpinePackages="${__AlpinePackages// lldb-dev/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 - __UbuntuRepo="http://deb.debian.org/debian-ports" + __UbuntuRepo="http://deb.debian.org/debian" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package - if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then - __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" + if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then + __Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring" fi ;; ppc64le) diff --git a/eng/common/cross/riscv64/sources.list.sid b/eng/common/cross/riscv64/sources.list.sid index 65f730d224caa..b5f7a7e6e1eb5 100644 --- a/eng/common/cross/riscv64/sources.list.sid +++ b/eng/common/cross/riscv64/sources.list.sid @@ -1 +1 @@ -deb http://deb.debian.org/debian-ports sid main +deb http://deb.debian.org/debian sid main diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d9c5b4aaf9b0d..3115990d51147 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -63,6 +63,10 @@ jobs: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - checkout: self + fetchDepth: 3 + clean: true + - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9048d603245b5..0da65b5748a7f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -596,7 +596,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net9.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/global.json b/global.json index dce48a5e56c70..4cc1379acf630 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24055.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24055.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24055.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24058.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24058.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24058.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23617.5" From 6e9d7dbf65ef1cf09c3aaf0ed0478ffb1ce9de71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Jan 2024 13:08:09 +0000 Subject: [PATCH 31/36] Update dependencies from https://github.com/dotnet/arcade build 20240110.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24060.5 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 905edeb3e368c..3bc2772e4c276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness a855ee8bf3e90a5baef9de25ccff5be597390087 - + https://github.com/dotnet/arcade - 05493e05d4bbf262f1be1bd517ac95f5bff3a2ef + 074491b2a86631659e28a712439befcea29041ee https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 633ea6db4d5d0..c0172388bfe5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 2.6.1-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 - 9.0.0-beta.24058.6 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 2.6.1-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 + 9.0.0-beta.24060.5 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 4cc1379acf630..046b050a56a2d 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24058.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24058.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24058.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24060.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24060.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24060.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23617.5" From 69796e988d542a7d0f8bcb90a3b3fc06d4be47bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 13:07:07 +0000 Subject: [PATCH 32/36] Update dependencies from https://github.com/dotnet/arcade build 20240110.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24060.5 From 56db1f8fc712e35800f9c2b6ce497638265520e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 13:07:37 +0000 Subject: [PATCH 33/36] Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24062.5 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bc2772e4c276..3efdae0eb929a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness a855ee8bf3e90a5baef9de25ccff5be597390087 - + https://github.com/dotnet/arcade - 074491b2a86631659e28a712439befcea29041ee + d731f58a502086842739a358ab490bec08fdb8a7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c0172388bfe5e..3c691d7132f3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 2.6.1-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 - 9.0.0-beta.24060.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 2.6.1-beta.24062.5 + 9.0.0-beta.24062.5 + 2.6.1-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 + 9.0.0-beta.24062.5 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 046b050a56a2d..9951fb2f30a23 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24060.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24060.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24060.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24062.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23617.5" From 1b810cc0887a7c9d04e5fee156d2aa1ff4a259d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 13:06:44 +0000 Subject: [PATCH 34/36] Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24062.5 From 2cd1d3f7a6efe53ef541c74e45597759f08840d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 13:05:43 +0000 Subject: [PATCH 35/36] Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24062.5 From 6daa5a19dfb89cc495d49766efcbd72a68cad923 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jan 2024 13:07:52 +0000 Subject: [PATCH 36/36] Update dependencies from https://github.com/dotnet/arcade build 20240115.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23607.2 -> To Version 9.0.0-beta.24065.5 --- eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 32 ++++---- .../templates/post-build/common-variables.yml | 2 +- eng/common/templates/steps/publish-logs.yml | 2 +- global.json | 6 +- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3efdae0eb929a..fb60d43159971 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness a855ee8bf3e90a5baef9de25ccff5be597390087 - + https://github.com/dotnet/arcade - d731f58a502086842739a358ab490bec08fdb8a7 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 3c691d7132f3c..c4734cdc5f209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 2.6.1-beta.24062.5 - 9.0.0-beta.24062.5 - 2.6.1-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 - 9.0.0-beta.24062.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 2.6.1-beta.24065.5 + 9.0.0-beta.24065.5 + 2.6.1-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 6.0.0-preview.1.102 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index d7bf5c6e352cf..b9ede10bf099a 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -18,7 +18,7 @@ variables: - name: SymbolToolVersion value: 1.0.1 - name: BinlogToolVersion - value: 1.0.9 + value: 1.0.11 - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 835e52751283d..80861297ddc07 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,7 +3,7 @@ parameters: JobLabel: '' CustomSensitiveDataList: '' # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed - BinlogToolVersion: '1.0.9' + BinlogToolVersion: '1.0.11' steps: - task: Powershell@2 diff --git a/global.json b/global.json index 9951fb2f30a23..643da0f7fb548 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24062.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24065.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24065.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24065.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23617.5"